Fix callback for nested signIn or addScopes (#29)

* fix calling callback on addScopes

* fixes due review

Author: AntonKozlovskyi

GoogleSignIn/Sources/GIDSignIn.m

@@ -390,9 +390,9 @@ - (void)signInWithOptions:(GIDSignInInternalOptions *)options {
         [self authenticateWithOptions:options];
       } else {
         if (options.callback) {
+          self->_currentOptions = nil;
           dispatch_async(dispatch_get_main_queue(), ^{
             options.callback(self->_currentUser, nil);
-            self->_currentOptions = nil;
           });
         }
       }
@@ -522,9 +522,9 @@ - (void)authenticateWithOptions:(GIDSignInInternalOptions *)options {
                                          code:kGIDSignInErrorCodeHasNoAuthInKeychain
                                      userInfo:nil];
     if (options.callback) {
+      self->_currentOptions = nil;
       dispatch_async(dispatch_get_main_queue(), ^{
         options.callback(nil, error);
-        self->_currentOptions = nil;
       });
     }
     return;
@@ -690,9 +690,10 @@ - (void)addCompletionCallback:(GIDAuthFlow *)authFlow {
   [authFlow addCallback:^() {
     GIDAuthFlow *handlerAuthFlow = weakAuthFlow;
     if (self->_currentOptions.callback) {
+      GIDSignInCallback callback = self->_currentOptions.callback;
+      self->_currentOptions = nil;
       dispatch_async(dispatch_get_main_queue(), ^{
-        self->_currentOptions.callback(self->_currentUser, handlerAuthFlow.error);
-        self->_currentOptions = nil;
+        callback(self->_currentUser, handlerAuthFlow.error);
       });
     }
   }];