Style improvement

GoogleSignIn/Sources/GIDProfileData.m

@@ -59,7 +59,7 @@ NSString *const kBasicProfileFamilyNameKey = @"family_name";
   return self;
 }
 
-- (instancetype)initWithIDToken:(OIDIDToken *)idToken {
+- (nullable instancetype)initWithIDToken:(OIDIDToken *)idToken {
   if (!idToken ||
       !idToken.claims[kBasicProfilePictureKey] ||
       !idToken.claims[kBasicProfileNameKey] ||
@@ -68,12 +68,11 @@ NSString *const kBasicProfileFamilyNameKey = @"family_name";
     return nil;
   }
 
-  return [[GIDProfileData alloc]
-      initWithEmail:idToken.claims[kBasicProfileEmailKey]
-               name:idToken.claims[kBasicProfileNameKey]
-          givenName:idToken.claims[kBasicProfileGivenNameKey]
-         familyName:idToken.claims[kBasicProfileFamilyNameKey]
-           imageURL:[NSURL URLWithString:idToken.claims[kBasicProfilePictureKey]]];
+  return [self initWithEmail:idToken.claims[kBasicProfileEmailKey]
+                        name:idToken.claims[kBasicProfileNameKey]
+                   givenName:idToken.claims[kBasicProfileGivenNameKey]
+                  familyName:idToken.claims[kBasicProfileFamilyNameKey]
+                    imageURL:[NSURL URLWithString:idToken.claims[kBasicProfilePictureKey]]];
 }
 
 - (BOOL)hasImage {

GoogleSignIn/Sources/GIDProfileDataFetcher/Implementations/GIDProfileDataFetcher.h

@@ -18,8 +18,6 @@
 
 #import "GoogleSignIn/Sources/GIDProfileDataFetcher/API/GIDProfileDataFetcher.h"
 
-@class OIDIDToken;
-
 @protocol GIDHTTPFetcher;
 
 NS_ASSUME_NONNULL_BEGIN

GoogleSignIn/Sources/GIDProfileDataFetcher/Implementations/GIDProfileDataFetcher.m

@@ -27,7 +27,7 @@ static NSString *const kUserInfoURLTemplate = @"https://%@/oauth2/v3/userinfo";
   return [self initWithDataFetcher:httpFetcher];
 }
 
-- (instancetype)initWithDataFetcher: (id<GIDHTTPFetcher>)httpFetcher {
+- (instancetype)initWithDataFetcher:(id<GIDHTTPFetcher>)httpFetcher {
   self = [super init];
   if (self) {
     _httpFetcher = httpFetcher;
@@ -42,10 +42,11 @@ static NSString *const kUserInfoURLTemplate = @"https://%@/oauth2/v3/userinfo";
       [[OIDIDToken alloc] initWithIDTokenString:authState.lastTokenResponse.idToken];
   // If the profile data are present in the ID token, use them.
   if (idToken) {
-    GIDProfileData *profileData = [[GIDProfileData alloc]initWithIDToken:idToken];
+    GIDProfileData *profileData = [[GIDProfileData alloc] initWithIDToken:idToken];
     completion(profileData, nil);
     return;
   }
+  
   // If we can't retrieve profile data from the ID token, make a userInfo request to fetch them.
   NSString *infoString = [NSString stringWithFormat:kUserInfoURLTemplate,
                              [GIDSignInPreferences googleUserInfoServer]];
@@ -60,25 +61,24 @@ static NSString *const kUserInfoURLTemplate = @"https://%@/oauth2/v3/userinfo";
                      completion:^(NSData *data, NSError *error) {
     if (error) {
       completion(nil, error);
-    } else {
-      NSError *jsonDeserializationError;
-      NSDictionary<NSString *, NSString *> *profileDict =
+      return;
+    }
+    NSError *jsonDeserializationError;
+    NSDictionary<NSString *, NSString *> *profileDict =
         [NSJSONSerialization JSONObjectWithData:data
                                         options:NSJSONReadingMutableContainers
                                           error:&jsonDeserializationError];
-      if (profileDict) {
-        GIDProfileData *profileData = [[GIDProfileData alloc]
-            initWithEmail:idToken.claims[kBasicProfileEmailKey]
-                     name:profileDict[kBasicProfileNameKey]
-                givenName:profileDict[kBasicProfileGivenNameKey]
-               familyName:profileDict[kBasicProfileFamilyNameKey]
-                 imageURL:[NSURL URLWithString:profileDict[kBasicProfilePictureKey]]];
-        completion(profileData, nil);
-      }
-      else {
-        completion(nil, jsonDeserializationError);
-      }
+    if (jsonDeserializationError) {
+      completion(nil, jsonDeserializationError);
+      return;
     }
+    GIDProfileData *profileData = [[GIDProfileData alloc]
+        initWithEmail:idToken.claims[kBasicProfileEmailKey]
+                 name:profileDict[kBasicProfileNameKey]
+            givenName:profileDict[kBasicProfileGivenNameKey]
+           familyName:profileDict[kBasicProfileFamilyNameKey]
+             imageURL:[NSURL URLWithString:profileDict[kBasicProfilePictureKey]]];
+    completion(profileData, nil);
   }];
 }
 

GoogleSignIn/Sources/GIDProfileData_Private.h

@@ -34,10 +34,10 @@ extern NSString *const kBasicProfileFamilyNameKey;
                          name:(NSString *)name
                     givenName:(nullable NSString *)givenName
                    familyName:(nullable NSString *)familyName
-                     imageURL:(nullable NSURL *)imageURL;
+                     imageURL:(nullable NSURL *)imageURL NS_DESIGNATED_INITIALIZER;
 
 /// Initialize with id token.
-- (instancetype)initWithIDToken:(OIDIDToken *)idToken;
+- (nullable instancetype)initWithIDToken:(OIDIDToken *)idToken;
 
 @end
 

GoogleSignIn/Sources/GIDSignIn.m

@@ -824,9 +824,9 @@ static NSString *const kConfigOpenIDRealmKey = @"GIDOpenIDRealm";
     [handlerAuthFlow wait];
     
     [self->_profileDataFetcher
-            fetchProfileDataWithAuthState:(OIDAuthState *)authState
-                               completion:^(GIDProfileData *_Nullable profileData,
-                                            NSError *_Nullable error) {
+        fetchProfileDataWithAuthState:(OIDAuthState *)authState
+                           completion:^(GIDProfileData *_Nullable profileData,
+                                        NSError *_Nullable error) {
       if (error) {
         handlerAuthFlow.error = error;
       } else {