Remove knowledge of AppConfiguration from WPAccount Objective-C

Author: mokagio

WordPress/Classes/Models/WPAccount+Lookup.swift

@@ -15,6 +15,13 @@ public extension WPAccount {
         return self.uuid == uuid
     }
 
+    // This is here in an extension that belongs to the apps target so we can decouple WPAccount from AppConfiguration.
+    // Decoupling allows moving the type to WordPressData, see https://github.com/wordpress-mobile/WordPress-iOS/issues/24165.
+    @objc
+    static func tokenForUsername(_ username: String) -> String {
+        token(forUsername: username, isJetpack: AppConfiguration.isJetpack)
+    }
+
     /// Does this `WPAccount` object have any associated blogs?
     ///
     @objc

WordPress/Classes/Models/WPAccount.h

@@ -47,7 +47,7 @@
 - (void)removeBlogsObject:(Blog *)value;
 - (void)addBlogs:(NSSet *)values;
 - (void)removeBlogs:(NSSet *)values;
-+ (NSString *)tokenForUsername:(NSString *)username;
++ (NSString *)tokenForUsername:(NSString *)username isJetpack:(BOOL)isJetpack;
 - (BOOL)hasAtomicSite;
 
 @end

WordPress/Classes/Models/WPAccount.m

@@ -129,10 +129,13 @@ - (BOOL)hasAtomicSite {
 
 #pragma mark - Static methods
 
-+ (NSString *)tokenForUsername:(NSString *)username
++ (NSString *)tokenForUsername:(NSString *)username isJetpack:(BOOL)isJetpack
 {
+    if (isJetpack) {
+        [WPAccount migrateAuthKeyForUsername:username];
+    }
+
     NSError *error = nil;
-    [WPAccount migrateAuthKeyForUsername:username];
     NSString *authToken = [SFHFKeychainUtils getPasswordForUsername:username
                                                      andServiceName:[WPAccount authKeychainServiceName]
                                                         accessGroup:nil
@@ -148,10 +151,8 @@ + (void)migrateAuthKeyForUsername:(NSString *)username
 {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        if ([AppConfiguration isJetpack]) {
-            SharedDataIssueSolver *sharedDataIssueSolver = [SharedDataIssueSolver instance];
-            [sharedDataIssueSolver migrateAuthKeyFor:username];
-        }
+        SharedDataIssueSolver *sharedDataIssueSolver = [SharedDataIssueSolver instance];
+        [sharedDataIssueSolver migrateAuthKeyFor:username];
     });
 }