Resolve comments

Author: Alex-4-Git

GoogleSignIn/Sources/GIDGoogleUser.m

@@ -38,7 +38,7 @@
 // Key constants used for encode and decode.
 static NSString *const kAuthenticationKey = @"authentication";
 static NSString *const kProfileDataKey = @"profileData";
-static NSString *const kAuthState = @"authState";
+static NSString *const kAuthStateKey = @"authState";
 
 // Parameters for the token exchange endpoint.
 static NSString *const kAudienceParameter = @"audience";
@@ -48,15 +48,54 @@
 static NSString *const kEMMSupportParameterName = @"emm_support";
 
 // Minimal time interval before expiration for the access token or it needs to be refreshed.
-NSTimeInterval kMinimalTimeToExpire = 60.0;
+static NSTimeInterval const kMinimalTimeToExpire = 60.0;
+
+#pragma mark - GIDAuthentication
+
+// Internal class for GIDGoogleUser decoding backward compatibility.
+@interface GIDAuthentication : NSObject <NSSecureCoding>
+
+@property(nonatomic) OIDAuthState* authState;
+
+- (instancetype)initWithAuthState:(OIDAuthState *)authState;
+
+@end
+
+@implementation GIDAuthentication
+
+- (instancetype)initWithAuthState:(OIDAuthState *)authState {
+  _authState = authState;
+}
+
+#pragma mark - NSSecureCoding
+
++ (BOOL)supportsSecureCoding {
+  return YES;
+}
+
+- (nullable instancetype)initWithCoder:(NSCoder *)decoder {
+  self = [super init];
+  if (self) {
+    _authState = [decoder decodeObjectOfClass:[OIDAuthState class] forKey:kAuthStateKey];
+  }
+  return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)encoder {
+  [encoder encodeObject:_authState forKey:kAuthStateKey];
+}
+
+@end
+
+#pragma mark - GIDGoogleUser
 
 @implementation GIDGoogleUser {
   OIDAuthState *_authState;
   GIDConfiguration *_cachedConfiguration;
 
-  // A queue for pending refrsh token handlers so we don't fire multiple requests in parallel.
+  // A queue for pending token refresh handlers so we don't fire multiple requests in parallel.
   // Access to this ivar should be synchronized.
-  NSMutableArray *_refreshTokensHandlerQueue;
+  NSMutableArray<GIDGoogleUserCompletion> *_tokenRefreshHandlerQueue;
 }
 
 - (nullable NSString *)userID {
@@ -116,10 +155,10 @@ - (void)doWithFreshTokens:(GIDGoogleUserCompletion)completion {
     });
     return;
   }
-  @synchronized (_refreshTokensHandlerQueue) {
+  @synchronized (_tokenRefreshHandlerQueue) {
     // Push the handler into the callback queue.
-    [_refreshTokensHandlerQueue addObject:[completion copy]];
-    if (_refreshTokensHandlerQueue.count > 1) {
+    [_tokenRefreshHandlerQueue addObject:[completion copy]];
+    if (_tokenRefreshHandlerQueue.count > 1) {
       // This is not the first handler in the queue, no fetch is needed.
       return;
     }
@@ -153,10 +192,10 @@ - (void)doWithFreshTokens:(GIDGoogleUserCompletion)completion {
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
     [GIDEMMSupport handleTokenFetchEMMError:error completion:^(NSError *_Nullable error) {
       // Process the handler queue to call back.
-      NSArray *refreshTokensHandlerQueue;
-      @synchronized(self->_refreshTokensHandlerQueue) {
-        refreshTokensHandlerQueue = [self->_refreshTokensHandlerQueue copy];
-        [self->_refreshTokensHandlerQueue removeAllObjects];
+      NSArray<GIDGoogleUserCompletion> *refreshTokensHandlerQueue;
+      @synchronized(self->_tokenRefreshHandlerQueue) {
+        refreshTokensHandlerQueue = [self->_tokenRefreshHandlerQueue copy];
+        [self->_tokenRefreshHandlerQueue removeAllObjects];
       }
       for (GIDGoogleUserCompletion completion in refreshTokensHandlerQueue) {
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -165,10 +204,10 @@ - (void)doWithFreshTokens:(GIDGoogleUserCompletion)completion {
       }
     }];
 #elif TARGET_OS_OSX || TARGET_OS_MACCATALYST
-    NSArray *refreshTokensHandlerQueue;
-    @synchronized(self->_refreshTokensHandlerQueue) {
-      refreshTokensHandlerQueue = [self->_refreshTokensHandlerQueue copy];
-      [self->_refreshTokensHandlerQueue removeAllObjects];
+    NSArray<GIDGoogleUserCompletion> *refreshTokensHandlerQueue;
+    @synchronized(self->_tokenRefreshHandlerQueue) {
+      refreshTokensHandlerQueue = [self->_tokenRefreshHandlerQueue copy];
+      [self->_tokenRefreshHandlerQueue removeAllObjects];
     }
     for (GIDGoogleUserCompletion completion in refreshTokensHandlerQueue) {
       dispatch_async(dispatch_get_main_queue(), ^{
@@ -192,7 +231,7 @@ - (instancetype)initWithAuthState:(OIDAuthState *)authState
                       profileData:(nullable GIDProfileData *)profileData {
   self = [super init];
   if (self) {
-    _refreshTokensHandlerQueue = [[NSMutableArray alloc] init];
+    _tokenRefreshHandlerQueue = [[NSMutableArray alloc] init];
     _authState = authState;
     _authState.stateChangeDelegate = self;
     _profile = profileData;
@@ -292,30 +331,26 @@ + (BOOL)supportsSecureCoding {
 - (nullable instancetype)initWithCoder:(NSCoder *)decoder {
   self = [super init];
   if (self) {
-    _refreshTokensHandlerQueue = [[NSMutableArray alloc] init];
-    _profile = [decoder decodeObjectOfClass:[GIDProfileData class] forKey:kProfileDataKey];
-    _authState = [decoder decodeObjectOfClass:[OIDAuthState class] forKey:kAuthState];
-    _authState.stateChangeDelegate = self;
+    GIDProfileData *profile =
+        [decoder decodeObjectOfClass:[GIDProfileData class] forKey:kProfileDataKey];
 
-#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-    GTMAppAuthFetcherAuthorization *authorization = self.emmSupport ?
-        [[GIDAppAuthFetcherAuthorizationWithEMMSupport alloc] initWithAuthState:_authState] :
-        [[GTMAppAuthFetcherAuthorization alloc] initWithAuthState:_authState];
-#elif TARGET_OS_OSX || TARGET_OS_MACCATALYST
-    GTMAppAuthFetcherAuthorization *authorization =
-        [[GTMAppAuthFetcherAuthorization alloc] initWithAuthState:_authState];
-#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-    authorization.tokenRefreshDelegate = self;
-    self.fetcherAuthorizer = authorization;
+    OIDAuthState *authState;
+    if ([decoder containsValueForKey:kAuthStateKey]) { // Current encoding
+      authState = [decoder decodeObjectOfClass:[OIDAuthState class] forKey:kAuthStateKey];
+    } else { // Old encoding
+      GIDAuthentication *authentication = [decoder decodeObjectOfClass:[GIDAuthentication class]
+                                                                   forKey:kAuthenticationKey];
+      authState = authentication.authState;
+    }
 
-    [self updateTokensWithAuthState:_authState];
+    self = [self initWithAuthState:authState profileData:profile];
   }
   return self;
 }
 
 - (void)encodeWithCoder:(NSCoder *)encoder {
   [encoder encodeObject:_profile forKey:kProfileDataKey];
-  [encoder encodeObject:_authState forKey:kAuthState];
+  [encoder encodeObject:_authState forKey:kAuthStateKey];
 }
 
 @end

GoogleSignIn/Sources/GIDGoogleUser_Private.h

@@ -28,6 +28,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class OIDAuthState;
 
+/// A completion block that takes a `GIDGoogleUser` or an error if the attempt to refresh tokens was unsuccessful.
+typedef void (^GIDGoogleUserCompletion)(GIDGoogleUser *_Nullable user, NSError *_Nullable error);
+
 // Internal methods for the class that are not part of the public API.
 @interface GIDGoogleUser () <GTMAppAuthFetcherAuthorizationTokenRefreshDelegate,
                              OIDAuthStateChangeDelegate>

GoogleSignIn/Sources/Public/GoogleSignIn/GIDGoogleUser.h

@@ -31,9 +31,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-/// A completion block that takes a `GIDGoogleUser` or an error if the attempt to refresh tokens was unsuccessful.
-typedef void (^GIDGoogleUserCompletion)(GIDGoogleUser *_Nullable user, NSError *_Nullable error);
-
 /// This class represents a user account.
 @interface GIDGoogleUser : NSObject <NSSecureCoding>
 
@@ -67,11 +64,13 @@ typedef void (^GIDGoogleUserCompletion)(GIDGoogleUser *_Nullable user, NSError *
 @property(nonatomic, readonly) id<GTMFetcherAuthorizationProtocol> fetcherAuthorizer;
 #pragma clang diagnostic pop
 
-/// Get a valid access token and a valid ID token, refreshing them first if they have expired or are about to expire.
+/// Get a valid access token and a valid ID token, refreshing them first if they have expired or
+/// are about to expire.
 ///
-/// @param completion A completion block that takes a `GIDGoogleUser` or an error if the attempt to refresh tokens was
-///     unsuccessful.  The block will be called asynchronously on the main queue.
-- (void)doWithFreshTokens:(GIDGoogleUserCompletion)completion;
+/// @param completion A completion block that takes a `GIDGoogleUser` or an error if the attempt to
+///     refresh tokens was unsuccessful.  The block will be called asynchronously on the main queue.
+- (void)doWithFreshTokens:(void (^)(GIDGoogleUser *_Nullable user,
+                                    NSError *_Nullable error))completion;
 
 @end
 

Samples/ObjC/SignInSample/Source/SignInViewController.m

@@ -185,7 +185,7 @@ - (CGFloat)minimumButtonWidth {
 
 - (void)reportAuthStatus {
   GIDGoogleUser *googleUser = [GIDSignIn.sharedInstance currentUser];
-  if (googleUser.authentication) {
+  if (googleUser) {
     _signInAuthStatus.text = @"Status: Authenticated";
   } else {
     // To authenticate, use Google Sign-In button.
@@ -198,7 +198,7 @@ - (void)reportAuthStatus {
 // Update the interface elements containing user data to reflect the
 // currently signed in user.
 - (void)refreshUserInfo {
-  if (GIDSignIn.sharedInstance.currentUser.authentication == nil) {
+  if (!GIDSignIn.sharedInstance.currentUser) {
     self.userName.text = kPlaceholderUserName;
     self.userEmailAddress.text = kPlaceholderEmailAddress;
     self.userAvatar.image = [UIImage imageNamed:kPlaceholderAvatarImageName];