Fixes clang warnings for Auth (#848)

* Fixes clang warnings for Auth

* Addresses comments

1 files changed, 24 insertions, 22 deletions

diff --git a/Firebase/Auth/Source/FIRAuth.m b/Firebase/Auth/Source/FIRAuth.m
index ebca6c8..0f3705f 100644
--- a/Firebase/Auth/Source/FIRAuth.m
+++ b/Firebase/Auth/Source/FIRAuth.m
@@ -436,7 +436,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
       NSError *error;
       if ([strongSelf getUser:&user error:&error]) {
         [strongSelf updateCurrentUser:user byForce:NO savingToDisk:NO error:&error];
-        _lastNotifiedUserToken = user.rawAccessToken;
+        self->_lastNotifiedUserToken = user.rawAccessToken;
       } else {
         FIRLogError(kFIRLoggerAuth, @"I-AUT000001",
                     @"Error loading saved user when starting up: %@", error);
@@ -486,7 +486,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
 - (FIRUser *)currentUser {
   __block FIRUser *result;
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
-    result = _currentUser;
+    result = self->_currentUser;
   });
   return result;
 }
@@ -497,7 +497,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
     FIRCreateAuthURIRequest *request =
         [[FIRCreateAuthURIRequest alloc] initWithIdentifier:email
                                                 continueURI:@"http://www.google.com/"
-                                       requestConfiguration:_requestConfiguration];
+                                       requestConfiguration:self->_requestConfiguration];
     [FIRAuthBackend createAuthURI:request callback:^(FIRCreateAuthURIResponse *_Nullable response,
                                                      NSError *_Nullable error) {
       if (completion) {
@@ -743,14 +743,14 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
   dispatch_async(FIRAuthGlobalWorkQueue(), ^{
     FIRAuthDataResultCallback decoratedCallback =
         [self signInFlowAuthDataResultCallbackByDecoratingCallback:completion];
-    if (_currentUser.anonymous) {
+    if (self->_currentUser.anonymous) {
       FIRAdditionalUserInfo *additionalUserInfo =
           [[FIRAdditionalUserInfo alloc] initWithProviderID:nil
                                                     profile:nil
                                                    username:nil
                                                   isNewUser:NO];
       FIRAuthDataResult *authDataResult =
-          [[FIRAuthDataResult alloc] initWithUser:_currentUser
+          [[FIRAuthDataResult alloc] initWithUser:self->_currentUser
                                additionalUserInfo:additionalUserInfo];
       decoratedCallback(authDataResult, nil);
       return;
@@ -784,8 +784,8 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
   dispatch_async(FIRAuthGlobalWorkQueue(), ^{
     FIRAuthResultCallback decoratedCallback =
         [self signInFlowAuthResultCallbackByDecoratingCallback:completion];
-    if (_currentUser.anonymous) {
-      decoratedCallback(_currentUser, nil);
+    if (self->_currentUser.anonymous) {
+      decoratedCallback(self->_currentUser, nil);
       return;
     }
     [self internalSignInAnonymouslyWithCompletion:^(FIRSignUpNewUserResponse *_Nullable response,
@@ -889,7 +889,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
     FIRResetPasswordRequest *request =
         [[FIRResetPasswordRequest alloc] initWithOobCode:code
                                              newPassword:newPassword
-                                    requestConfiguration:_requestConfiguration];
+                                    requestConfiguration:self->_requestConfiguration];
     [FIRAuthBackend resetPassword:request callback:^(FIRResetPasswordResponse *_Nullable response,
                                                      NSError *_Nullable error) {
       if (completion) {
@@ -910,7 +910,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
     FIRResetPasswordRequest *request =
     [[FIRResetPasswordRequest alloc] initWithOobCode:code
                                          newPassword:nil
-                                requestConfiguration:_requestConfiguration];
+                                requestConfiguration:self->_requestConfiguration];
     [FIRAuthBackend resetPassword:request callback:^(FIRResetPasswordResponse *_Nullable response,
                                                      NSError *_Nullable error) {
       if (completion) {
@@ -951,7 +951,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
 - (void)applyActionCode:(NSString *)code completion:(FIRApplyActionCodeCallback)completion {
   dispatch_async(FIRAuthGlobalWorkQueue(), ^ {
     FIRSetAccountInfoRequest *request =
-        [[FIRSetAccountInfoRequest alloc] initWithRequestConfiguration:_requestConfiguration];
+        [[FIRSetAccountInfoRequest alloc] initWithRequestConfiguration:self->_requestConfiguration];
     request.OOBCode = code;
     [FIRAuthBackend setAccountInfo:request callback:^(FIRSetAccountInfoResponse *_Nullable response,
                                                       NSError *_Nullable error) {
@@ -999,7 +999,8 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
     FIRGetOOBConfirmationCodeRequest *request =
         [FIRGetOOBConfirmationCodeRequest passwordResetRequestWithEmail:email
                                                      actionCodeSettings:actionCodeSettings
-                                                   requestConfiguration:_requestConfiguration];
+                                                   requestConfiguration:self->_requestConfiguration
+        ];
     [FIRAuthBackend getOOBConfirmationCode:request
                                   callback:^(FIRGetOOBConfirmationCodeResponse *_Nullable response,
                                              NSError *_Nullable error) {
@@ -1015,7 +1016,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
 - (BOOL)signOut:(NSError *_Nullable __autoreleasing *_Nullable)error {
   __block BOOL result = YES;
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
-    if (!_currentUser) {
+    if (!self->_currentUser) {
       return;
     }
     result = [self updateCurrentUser:nil byForce:NO savingToDisk:YES error:error];
@@ -1068,7 +1069,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
     [_listenerHandles addObject:handle];
   }
   dispatch_async(dispatch_get_main_queue(), ^{
-    listener(self, self.currentUser);
+    listener(self, self->_currentUser);
   });
   return handle;
 }
@@ -1082,7 +1083,8 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
 
 - (void)useAppLanguage {
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
-    _requestConfiguration.languageCode = [NSBundle mainBundle].preferredLocalizations.firstObject;
+    self->_requestConfiguration.languageCode =
+        [NSBundle mainBundle].preferredLocalizations.firstObject;
   });
 }
 
@@ -1092,17 +1094,17 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
 
 - (void)setLanguageCode:(nullable NSString *)languageCode {
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
-    _requestConfiguration.languageCode = [languageCode copy];
+    self->_requestConfiguration.languageCode = [languageCode copy];
   });
 }
 
 - (NSString *)additionalFrameworkMarker {
-  return _requestConfiguration.additionalFrameworkMarker;
+  return self->_requestConfiguration.additionalFrameworkMarker;
 }
 
 - (void)setAdditionalFrameworkMarker:(NSString *)additionalFrameworkMarker {
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
-    _requestConfiguration.additionalFrameworkMarker = [additionalFrameworkMarker copy];
+    self->_requestConfiguration.additionalFrameworkMarker = [additionalFrameworkMarker copy];
   });
 }
 
@@ -1110,7 +1112,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
 - (NSData *)APNSToken {
   __block NSData *result = nil;
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
-    result = _tokenManager.token.data;
+    result = self->_tokenManager.token.data;
   });
   return result;
 }
@@ -1121,20 +1123,20 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
 
 - (void)setAPNSToken:(NSData *)token type:(FIRAuthAPNSTokenType)type {
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
-    _tokenManager.token = [[FIRAuthAPNSToken alloc] initWithData:token type:type];
+    self->_tokenManager.token = [[FIRAuthAPNSToken alloc] initWithData:token type:type];
   });
 }
 
 - (void)handleAPNSTokenError:(NSError *)error {
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
-    [_tokenManager cancelWithError:error];
+    [self->_tokenManager cancelWithError:error];
   });
 }
 
 - (BOOL)canHandleNotification:(NSDictionary *)userInfo {
   __block BOOL result = NO;
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
-    result = [_notificationManager canHandleNotification:userInfo];
+    result = [self->_notificationManager canHandleNotification:userInfo];
   });
   return result;
 }
@@ -1142,7 +1144,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
 - (BOOL)canHandleURL:(NSURL *)URL {
   __block BOOL result = NO;
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
-    result = [_authURLPresenter canHandleURL:URL];
+    result = [self->_authURLPresenter canHandleURL:URL];
   });
   return result;
 }