✨ authorize call returns auth response with JWT token

Author: blakek

ios/OAuthManager/OAuth1Client.m

@@ -48,7 +48,7 @@ - (void) authorizeWithUrl:(NSString *)providerName
             return;
         }
 
-        onSuccess(account);
+        onSuccess(account, responses[1]);
     }];
     return;
 }

ios/OAuthManager/OAuth2Client.m

@@ -54,7 +54,8 @@ - (void) authorizeWithUrl:(NSString *)providerName
         }
 
         NSLog(@"Success!: %@", account);
-        onSuccess(account);
+        
+        onSuccess(account, responses[1]);
     }];
 }
 
@@ -80,7 +81,7 @@ - (void) reauthenticateWithHandler:(NSString *) providerName
             return;
         }
 
-        onSuccess(account);
+        onSuccess(account, response);
     }];
 }
 

ios/OAuthManager/OAuthClient.m

@@ -70,7 +70,7 @@ - (void) clearPendingAccount
             return;
         }
 
-        onSuccess(account);
+        onSuccess(account, response);
     };
 }
 

ios/OAuthManager/OAuthManager.m

@@ -360,16 +360,25 @@ - (NSDictionary *) getConfigForProvider:(NSString *)name
     [client authorizeWithUrl:providerName
                          url:callbackUrl
                          cfg:cfg
-                   onSuccess:^(DCTAuthAccount *account) {
-                      NSLog(@"on success called with account: %@", account);
+                   onSuccess:^(DCTAuthAccount *account, DCTAuthResponse *response) {
+                       NSLog(@"on success called with account: %@", account);
+                       NSLog(@"on success called with response: %@", response);
                        NSDictionary *accountResponse = [manager getAccountResponse:account cfg:cfg];
+                       
+                       NSDictionary *json = [NSJSONSerialization JSONObjectWithData:response.data options:kNilOptions error:nil];
+                       NSString *idToken = [json valueForKey:@"id_token"];
+                       NSDictionary *authResponse = [OAuthManager decodeWithToken:idToken];
+                       NSLog(@"auth response data: %@", authResponse);
+                       
                        _pendingAuthentication = NO;
                        [manager removePending:client];
                        [[manager accountStore] saveAccount:account]; // <~
 
                        callback(@[[NSNull null], @{
-                                      @"status": @"ok",
-                                      @"response": accountResponse
+                                      @"authResponse": authResponse,
+                                      @"idToken": idToken,
+                                      @"response": accountResponse,
+                                      @"status": @"ok"
                                       }]);
                    } onError:^(NSError *error) {
                        NSLog(@"Error in authorizeWithUrl: %@", error);
@@ -526,6 +535,42 @@ - (DCTAuthAccount *) accountForProvider:(NSString *) providerName
     }
 }
 
++(NSData *) base64DecodeWithString:(NSString *) string {
+    string = [[string stringByReplacingOccurrencesOfString:@"-" withString:@"+"]
+              stringByReplacingOccurrencesOfString:@"_" withString:@"/"];
+    
+    int size = [string length] % 4;
+    NSMutableString *segment = [[NSMutableString alloc] initWithString:string];
+    for (int i = 0; i < size; i++) {
+        [segment appendString:@"="];
+    }
+    
+    return [[NSData alloc] initWithBase64EncodedString:segment options:0];
+}
+
++(NSDictionary *) decodeWithToken:(NSString *)token {
+    NSArray *segments = [token componentsSeparatedByString:@"."];
+    if([segments count] != 3) {
+        return nil;
+    }
+    
+    // All segments should be base64
+    NSString *headerSeg = segments[0];
+    NSString *payloadSeg = segments[1];
+    
+    // Decode and parse header and payload JSON
+    NSDictionary *header = [NSJSONSerialization JSONObjectWithData:[self base64DecodeWithString:headerSeg] options:NSJSONReadingMutableLeaves error:nil];
+    if (header == nil) {
+        return nil;
+    }
+    NSDictionary *payload = [NSJSONSerialization JSONObjectWithData:[self base64DecodeWithString:payloadSeg] options:NSJSONReadingMutableLeaves error:nil];
+    if (payload == nil) {
+        return nil;
+    }
+    
+    return payload;
+}
+
 - (NSDictionary *) credentialForAccount:(NSString *)providerName
                                                 cfg:(NSDictionary *)cfg
 {

ios/OAuthManager/OAuthManagerConstants.h

@@ -20,7 +20,7 @@ enum _runtime_error
 
 #define QUICK_ERROR(error_code, error_description) [NSError errorWithDomain:NSStringFromClass([self class]) code:error_code userInfo:[NSDictionary dictionaryWithObject:error_description forKey:NSLocalizedDescriptionKey]];
 
-typedef void(^AuthManagerCompletionBlock)(DCTAuthAccount *account);
+typedef void(^AuthManagerCompletionBlock)(DCTAuthAccount *account, DCTAuthResponse *response);
 typedef void(^AuthManagerErrorBlock)(NSError *error);
 
 #endif /* OAuthManagerConstants_h */