Added clearSession iOS Safari Method

Added clearSession JS wrapper
auth0 · Jul 20, 2017 · 5fb74c3 · 5fb74c3
1 parent 08b408a
commit 5fb74c3
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 28 deletions.
diff --git a/ios/A0Auth0.m b/ios/A0Auth0.m
@@ -13,6 +13,7 @@
 @interface A0Auth0 () <SFSafariViewControllerDelegate>
 @property (weak, nonatomic) SFSafariViewController *last;
 @property (copy, nonatomic) RCTResponseSenderBlock sessionCallback;
+@property (copy, nonatomic) RCTResponseSenderBlock didLoadCallback;
 @end
 
 @implementation A0Auth0
@@ -29,35 +30,49 @@ - (dispatch_queue_t)methodQueue
 }
 
 RCT_EXPORT_METHOD(showUrl:(NSString *)urlString callback:(RCTResponseSenderBlock)callback) {
-    NSURL *url = [NSURL URLWithString:urlString];
-    UIWindow *window = [[UIApplication sharedApplication] keyWindow];
-    SFSafariViewController *controller = [[SFSafariViewController alloc] initWithURL:url];
-    controller.delegate = self;
-    [self terminateWithError:RCTMakeError(@"Only one Safari can be visible", nil, nil) dismissing:YES animated:NO];
-    [window.rootViewController presentViewController:controller animated:YES completion:nil];
-    self.last = controller;
+    [self presentSafariWithURL:[NSURL URLWithString:urlString]];
     self.sessionCallback = callback;
 }
 
+RCT_EXPORT_METHOD(clearSession:(NSString *)domain federated:(BOOL)federated callback:(RCTResponseSenderBlock)callback) {
+    NSString *urlString = [NSString stringWithFormat:@"https://%@/v2/logout", domain];
+    if (federated) { urlString = [urlString stringByAppendingString:@"?federated"]; }
+    [self presentSafariWithURL:[NSURL URLWithString:urlString]];
+    __weak A0Auth0 *weakSelf = self;
+    self.didLoadCallback = ^void(NSArray *response) {
+        [weakSelf.last.presentingViewController dismissViewControllerAnimated:NO completion:nil];
+        callback(response);
+    };
+}
+
 RCT_EXPORT_METHOD(oauthParameters:(RCTResponseSenderBlock)callback) {
     callback(@[[self generateOAuthParameters]]);
 }
 
 - (NSDictionary *)constantsToExport {
-  return @{ @"bundleIdentifier": [[NSBundle mainBundle] bundleIdentifier] };
+    return @{ @"bundleIdentifier": [[NSBundle mainBundle] bundleIdentifier] };
 }
 
 #pragma mark - Internal methods
 
+- (void)presentSafariWithURL:(NSURL *)url {
+    UIWindow *window = [[UIApplication sharedApplication] keyWindow];
+    SFSafariViewController *controller = [[SFSafariViewController alloc] initWithURL:url];
+    controller.delegate = self;
+    [self terminateWithError:RCTMakeError(@"Only one Safari can be visible", nil, nil) dismissing:YES animated:NO];
+    [window.rootViewController presentViewController:controller animated:YES completion:nil];
+    self.last = controller;
+}
+
 - (void)terminateWithError:(id)error dismissing:(BOOL)dismissing animated:(BOOL)animated {
     RCTResponseSenderBlock callback = self.sessionCallback ? self.sessionCallback : ^void(NSArray *_unused) {};
     if (dismissing) {
         [self.last.presentingViewController dismissViewControllerAnimated:animated
-                                                        completion:^{
-                                                            if (error) {
-                                                                callback(@[error]);
-                                                            }
-                                                        }];
+                                                               completion:^{
+                                                                   if (error) {
+                                                                       callback(@[error]);
+                                                                   }
+                                                               }];
     } else if (error) {
         callback(@[error]);
     }
@@ -70,8 +85,8 @@ - (NSString *)randomValue {
     int result __attribute__((unused)) = SecRandomCopyBytes(kSecRandomDefault, 32, data.mutableBytes);
     NSString *value = [[[[data base64EncodedStringWithOptions:0]
                          stringByReplacingOccurrencesOfString:@"+" withString:@"-"]
-                         stringByReplacingOccurrencesOfString:@"/" withString:@"_"]
-                         stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"="]];
+                        stringByReplacingOccurrencesOfString:@"/" withString:@"_"]
+                       stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"="]];
     return value;
 }
 
@@ -101,31 +116,33 @@ - (NSString *)sign:(NSString*)value {
 
 - (NSDictionary *)generateOAuthParameters {
     NSString *verifier = [self randomValue];
-    NSString *bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
     return @{
-        @"verifier": verifier,
-        @"code_challenge": [self sign:verifier],
-        @"code_challenge_method": @"S256",
-        @"state": [self randomValue]
-    };
+             @"verifier": verifier,
+             @"code_challenge": [self sign:verifier],
+             @"code_challenge_method": @"S256",
+             @"state": [self randomValue]
+             };
 }
 
 #pragma mark - SFSafariViewControllerDelegate
 
 - (void)safariViewControllerDidFinish:(SFSafariViewController *)controller {
     NSDictionary *error = @{
-        @"error": @"a0.session.user_cancelled",
-        @"error_description": @"User cancelled the Auth"
-    };
+                            @"error": @"a0.session.user_cancelled",
+                            @"error_description": @"User cancelled the Auth"
+                            };
     [self terminateWithError:error dismissing:NO animated:NO];
 }
 
 - (void)safariViewController:(SFSafariViewController *)controller didCompleteInitialLoad:(BOOL)didLoadSuccessfully {
-    if (!didLoadSuccessfully) {
+    if (self.didLoadCallback) {
+        didLoadSuccessfully ? self.didLoadCallback(@[[NSNull null]]) : self.didLoadCallback(@[@{@"error": @"failed to clear session"}]);
+        self.didLoadCallback = nil;
+    } else if (!didLoadSuccessfully) {
         NSDictionary *error = @{
-            @"error": @"a0.session.failed_load",
-            @"error_description": @"Failed to load authorize url"
-        };
+                                @"error": @"a0.session.failed_load",
+                                @"error_description": @"Failed to load authorize url"
+                                };
         [self terminateWithError:error dismissing:YES animated:YES];
     }
 }

diff --git a/webauth/index.js b/webauth/index.js
@@ -96,4 +96,21 @@ export default class WebAuth {
           });
       });
   }
+
+  /**
+   *  Removes Auth0 session and optionally remove the Identity Provider session.
+   *  In iOS it will use `SFSafariViewController`
+   *
+   * @param {Object} parameters parameters to send
+   * @param {Bool} [parameters.federated] Optionally remove the IdP session.
+   * @returns {Callback}
+   * @see https://auth0.com/docs/logout
+   *
+   * @memberof WebAuth
+   */
+  clearSession(options = {}, callback) {
+    const { clientId, domain, client, agent } = this;
+    const federated = options.federated || false;
+    A0Auth0.clearSession(domain, federated, callback);
+  }
 }