Us425261 browser based authentication

MASFoundation.xcodeproj/project.pbxproj

@@ -293,6 +293,10 @@
 		A4F671331BAFC345000E2223 /* NSString+MASPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = A4F671311BAFC345000E2223 /* NSString+MASPrivate.m */; };
 		A858C6651D0978A6001FB9AD /* MASOTPService.h in Headers */ = {isa = PBXBuildFile; fileRef = A858C6631D0978A6001FB9AD /* MASOTPService.h */; };
 		A858C6661D0978A6001FB9AD /* MASOTPService.m in Sources */ = {isa = PBXBuildFile; fileRef = A858C6641D0978A6001FB9AD /* MASOTPService.m */; };
+		C81CC3CC1FC2EA190058718E /* MASBrowserBasedAuthentication.h in Headers */ = {isa = PBXBuildFile; fileRef = C81CC3CA1FC2EA190058718E /* MASBrowserBasedAuthentication.h */; };
+		C81CC3CD1FC2EA190058718E /* MASBrowserBasedAuthentication.m in Sources */ = {isa = PBXBuildFile; fileRef = C81CC3CB1FC2EA190058718E /* MASBrowserBasedAuthentication.m */; };
+		C81CC3D01FC2EFBB0058718E /* UIAlertController+MAS.h in Headers */ = {isa = PBXBuildFile; fileRef = C81CC3CE1FC2EFBB0058718E /* UIAlertController+MAS.h */; };
+		C81CC3D11FC2EFBB0058718E /* UIAlertController+MAS.m in Sources */ = {isa = PBXBuildFile; fileRef = C81CC3CF1FC2EFBB0058718E /* UIAlertController+MAS.m */; };
 		CB0A8ADF1D01F64F00B1DCCC /* MASProximityLogin.h in Headers */ = {isa = PBXBuildFile; fileRef = CB0A8ADD1D01F64F00B1DCCC /* MASProximityLogin.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CB0A8AE01D01F64F00B1DCCC /* MASProximityLogin.m in Sources */ = {isa = PBXBuildFile; fileRef = CB0A8ADE1D01F64F00B1DCCC /* MASProximityLogin.m */; };
 		CB0B58591E258C2A00BC0163 /* MASAuthorizationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = CB0B58571E258C2A00BC0163 /* MASAuthorizationResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -720,6 +724,10 @@
 		A4F671311BAFC345000E2223 /* NSString+MASPrivate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+MASPrivate.m"; sourceTree = "<group>"; };
 		A858C6631D0978A6001FB9AD /* MASOTPService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASOTPService.h; sourceTree = "<group>"; };
 		A858C6641D0978A6001FB9AD /* MASOTPService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASOTPService.m; sourceTree = "<group>"; };
+		C81CC3CA1FC2EA190058718E /* MASBrowserBasedAuthentication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MASBrowserBasedAuthentication.h; sourceTree = "<group>"; };
+		C81CC3CB1FC2EA190058718E /* MASBrowserBasedAuthentication.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MASBrowserBasedAuthentication.m; sourceTree = "<group>"; };
+		C81CC3CE1FC2EFBB0058718E /* UIAlertController+MAS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIAlertController+MAS.h"; sourceTree = "<group>"; };
+		C81CC3CF1FC2EFBB0058718E /* UIAlertController+MAS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIAlertController+MAS.m"; sourceTree = "<group>"; };
 		CB0A8ADD1D01F64F00B1DCCC /* MASProximityLogin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASProximityLogin.h; sourceTree = "<group>"; };
 		CB0A8ADE1D01F64F00B1DCCC /* MASProximityLogin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASProximityLogin.m; sourceTree = "<group>"; };
 		CB0B58571E258C2A00BC0163 /* MASAuthorizationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASAuthorizationResponse.h; sourceTree = "<group>"; };
@@ -1348,6 +1356,8 @@
 				CBA3EB2D1E945F2400E64D9D /* MASClaims.m */,
 				CB1FD1491FB23701000AFA25 /* MASSharedStorage.h */,
 				CB1FD14A1FB23701000AFA25 /* MASSharedStorage.m */,
+				C81CC3CA1FC2EA190058718E /* MASBrowserBasedAuthentication.h */,
+				C81CC3CB1FC2EA190058718E /* MASBrowserBasedAuthentication.m */,
 			);
 			path = models;
 			sourceTree = "<group>";
@@ -1402,6 +1412,8 @@
 		A4F6712F1BAFC321000E2223 /* categories */ = {
 			isa = PBXGroup;
 			children = (
+				C81CC3CE1FC2EFBB0058718E /* UIAlertController+MAS.h */,
+				C81CC3CF1FC2EFBB0058718E /* UIAlertController+MAS.m */,
 				CB1907ED1C1794F400A5EF16 /* MASIKeyChainStore+MASPrivate.h */,
 				CB1907EE1C1794F400A5EF16 /* MASIKeyChainStore+MASPrivate.m */,
 				A483C1FF1BE6D0C5007572CE /* CBCentralManager+MASPrivate.h */,
@@ -1724,9 +1736,11 @@
 				105B2F4B1CA6B3EA0005A2D0 /* ripemd.h in Headers */,
 				A46F49F11C2F5FC500A4C370 /* MASINTULocationRequestDefines.h in Headers */,
 				CB5E4C641C1D1B56001B3B8A /* MASGetURLRequest.h in Headers */,
+				C81CC3CC1FC2EA190058718E /* MASBrowserBasedAuthentication.h in Headers */,
 				105B2F471CA6B3EA0005A2D0 /* pqueue.h in Headers */,
 				105B2F371CA6B3EA0005A2D0 /* kssl.h in Headers */,
 				105B2F511CA6B3EA0005A2D0 /* srtp.h in Headers */,
+				C81CC3D01FC2EFBB0058718E /* UIAlertController+MAS.h in Headers */,
 				CBFA70F41F1ED5D6006D025D /* MASSecurityPolicy.h in Headers */,
 				CBD25AF51E78C47C00DFB47F /* JWTCryptoKeyExtractor.h in Headers */,
 				105B2F5F1CA6B3EA0005A2D0 /* x509_vfy.h in Headers */,
@@ -2092,6 +2106,7 @@
 				A4150EFC1BF16EE200037E27 /* MASKeyChainService.m in Sources */,
 				A47F12811C1D73530008E3F2 /* MASBluetoothPeripheral.m in Sources */,
 				CBD25B061E78C47C00DFB47F /* JWTCoding+VersionThree.m in Sources */,
+				C81CC3D11FC2EFBB0058718E /* UIAlertController+MAS.m in Sources */,
 				CBD25AED1E78C47C00DFB47F /* JWTAlgorithmDataHolderChain.m in Sources */,
 				A46F49DA1C2F5FC500A4C370 /* MASINetworkActivityIndicatorManager.m in Sources */,
 				A4831AAE1BD1A551007B4AE6 /* MASConfiguration.m in Sources */,
@@ -2152,6 +2167,7 @@
 				A46F49C51C2F5FC500A4C370 /* MASIHTTPRequestOperation.m in Sources */,
 				A4150E701BF1643900037E27 /* MASIJSONResponseSerializer+MASPrivate.m in Sources */,
 				A417BA521BF033C300EC9BCB /* CLLocation+MASPrivate.m in Sources */,
+				C81CC3CD1FC2EA190058718E /* MASBrowserBasedAuthentication.m in Sources */,
 				69B7DF6D1F96756B0056DD3A /* MASRequest+MASPrivate.m in Sources */,
 				A4831AB21BD1A551007B4AE6 /* MASFile.m in Sources */,
 				CB0B585A1E258C2A00BC0163 /* MASAuthorizationResponse.m in Sources */,

MASFoundation/Classes/MAS.h

@@ -111,6 +111,16 @@
 
 
 
+/**
+ * Sets Bool indicator of Browser Based Authentication (templatized login) enabled or not for authorization process.
+ * By default, it is disabled.
+
+ @param enable BOOL value indicating whether Browser Based Authentication is enabled or not.
+ */
++ (void)enableBrowserBasedAuthentication:(BOOL)enable;
+
+
+
 /**
  *  Sets the gateway monitoring block defined by the GatewayMonitorStatusBlock type.
  *  This block will be triggered when any change to the current monitoring status

MASFoundation/Classes/MAS.m

@@ -92,6 +92,12 @@ + (void)setOTPCredentialsBlock:(MASOTPCredentialsBlock)oneTimePassword
 }
 
 
++ (void)enableBrowserBasedAuthentication:(BOOL)enable
+{
+    [MASModelService setBrowserBasedAuthentication:enable];
+}
+
+
 + (void)setGatewayMonitor:(MASGatewayMonitorStatusBlock)monitor
 {
     [MASNetworkingService setGatewayMonitor:monitor];

MASFoundation/Classes/MASConstants.h

@@ -465,6 +465,10 @@ typedef NS_ENUM(NSInteger, MASFoundationErrorCode)
     MASFoundationErrorCodeJWTUnexpectedClassType = 170002,
     MASFoundationErrorCodeJWTSerializationError = 170003,
 
+    //
+    // Browser Based Login
+    //
+    MASFoundationErrorCodeBBANotEnabled = 180000,
     //
     //  SharedStorage
     //

MASFoundation/Classes/_private_/categories/NSError+MASPrivate.h

@@ -644,9 +644,17 @@
 /**
  *  Create MASFoundationErrorDomainLocal NSError for MASFoundationErrorCodeProximityLoginInvalidAuthorizeURL.
  *
- *  @return REturns an NSError instance with the domain MASFoundationErrorDomainLocal and
+ *  @return Returns an NSError instance with the domain MASFoundationErrorDomainLocal and
  *  error MASFoundationErrorCodeProximityLoginInvalidAuthorizeURL
  */
 + (NSError *)errorProximityLoginInvalidAuthroizeURL;
 
+
+/**
+ * Create MASFoundationErrorDomainLocal NSError for MASFoundationErrorCodeBBANotEnabled.
+ *
+ * @return Returns an NSError instance with the domain MASFoundationErrorDomainLocal and
+ * error MASFoundationErrorCodeBBANotEnabled
+ */
++ (NSError *)errorBrowserBasedAuthenticaionNotEnabled;
 @end

MASFoundation/Classes/_private_/categories/NSError+MASPrivate.m

@@ -835,6 +835,11 @@ + (NSError *)errorProximityLoginInvalidAuthroizeURL
 }
 
 
++ (NSError *)errorBrowserBasedAuthenticaionNotEnabled
+{
+    return [self errorForFoundationCode:MASFoundationErrorCodeBBANotEnabled errorDomain:MASFoundationErrorDomainLocal];
+}
+
 # pragma mark - Foundation Errors Private
 
 + (MASFoundationErrorCode)foundationErrorCodeForApiCode:(MASApiErrorCode)apiCode
@@ -1113,7 +1118,11 @@ + (NSString *)descriptionForFoundationErrorCode:(MASFoundationErrorCode)errorCod
         //  Shared Storage
         //
         case MASFoundationErrorCodeSharedStorageNotNilKey: return @"Data key cannot be nil or empty string.";
-
+
+        //
+        // Browser Based Authentication
+        //
+        case MASFoundationErrorCodeBBANotEnabled : return @"MAS Browser Based Authentication is Not Enabled";
         //
         // Default
         //

MASFoundation/Classes/_private_/categories/UIAlertController+MAS.h

@@ -0,0 +1,23 @@
+//
+//  UIAlertController+MAS.h
+//  MASFoundation
+//
+//  Created by nimma01 on 11/10/17.
+//  Copyright © 2017 CA Technologies. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIAlertController (MAS)
+
+///--------------------------------------
+/// @name Public
+///-------------------------------------
+
+# pragma mark - Public
+
+/**
+ * Retrieve the currently visible UIViewController.
+ */
++ (UIViewController *)rootViewController;
+@end

MASFoundation/Classes/_private_/categories/UIAlertController+MAS.m

@@ -0,0 +1,59 @@
+//
+//  UIAlertController+MAS.m
+//  MASFoundation
+//
+//  Created by nimma01 on 11/10/17.
+//  Copyright © 2017 CA Technologies. All rights reserved.
+//
+
+#import "UIAlertController+MAS.h"
+#import "MASUser.h"
+@implementation UIAlertController (MAS)
+
+# pragma mark - Error Alert
+
++ (UIViewController *) presentedViewController:(id)viewController
+{
+    if ([viewController isKindOfClass:[UINavigationController class]])
+    {
+        UINavigationController *navigationController = (UINavigationController *)viewController;
+        return [self presentedViewController:navigationController.topViewController];
+    }
+    if ([viewController isKindOfClass:[UIViewController class]])
+    {
+        if ([viewController presentedViewController])
+        {
+            if ([[viewController presentedViewController] isKindOfClass:[UINavigationController class]])
+            {
+                UINavigationController *navigationController = (UINavigationController *)[viewController presentedViewController];
+
+                if (navigationController.isBeingDismissed)
+                {
+                    return viewController;
+                }
+            }
+
+            return [self presentedViewController:[viewController presentedViewController]];
+        }
+        else {
+            return viewController;
+        }
+    }
+    else if ([viewController isKindOfClass:[UITabBarController class]])
+    {
+        UITabBarController *tabBarController = (UITabBarController *)viewController;
+        return [self presentedViewController:tabBarController.presentedViewController];
+    }
+    else {
+        return nil;
+    }
+}
+
+
+# pragma mark - Public
+
++ (UIViewController *)rootViewController
+{
+    return [self presentedViewController:[UIApplication sharedApplication].keyWindow.rootViewController];
+}
+@end

MASFoundation/Classes/_private_/services/MASServiceRegistry.h

@@ -187,4 +187,15 @@ typedef NS_ENUM(NSInteger, MASRegistryState)
 - (BOOL)uiServiceWillHandleOTPChannelSelection:(NSArray *)supportedChannels
                             otpGenerationBlock:(MASOTPGenerationBlock)generationBlock;
 
+
+/**
+ * Calling this method will attempt to launch a browser which handles the user authentication steps.
+ * For this method to handle authentication it requires browser based login to be enabled.
+ * @see enableBrowserBasedAuthentication
+ *
+ * @param bbaLoginBlock The MASAuthCredentialsBlock to receive login result.
+ * @return Return YES if handled, NO if not.
+ */
+-(BOOL)browserBasedLoginWillHandleAuthentication : (MASAuthCredentialsBlock)bbaLoginBlock;
+
 @end

MASFoundation/Classes/_private_/services/MASServiceRegistry.m

@@ -15,6 +15,8 @@
 #import "MASConfigurationService.h"
 #import "MASModelService.h"
 #import "MASService.h"
+#import "MASServiceRegistry.h"
+#import "MASBrowserBasedAuthentication.h"
 
 
 //
@@ -932,4 +934,17 @@ - (BOOL)uiServiceWillHandleOTPChannelSelection:(NSArray *)supportedChannels
     return YES;
 }
 
+
+-(BOOL)browserBasedLoginWillHandleAuthentication : (MASAuthCredentialsBlock)bbaLoginBlock
+{
+    if(![MASModelService browserBasedAuthentication])
+    {
+        return NO;
+    }
+
+    [[MASBrowserBasedAuthentication sharedInstance] loadWebLoginTemplate:bbaLoginBlock];
+    return YES;
+
+}
+
 @end

MASFoundation/Classes/_private_/services/model/MASModelService.h

@@ -82,6 +82,25 @@
 - (void)setUserObject:(MASUser *)user;
 
 
+
+/**
+ * Sets the browser based authentication property. Default is NO.
+ *
+ * @param browserBasedLogin The state of browser based authentication.
+ * If this is set to true, a URL which has a templatized login is launched in a browser and this would disable the Social Login, Proximity Login and also prevents the launch of MASUI.
+ */
++ (void)setBrowserBasedAuthentication:(BOOL)browserBasedAuthentication;
+
+
+
+/**
+ * The current state of browser based login.
+ *
+ * @return BOOL value is returned.
+ */
++ (BOOL)browserBasedAuthentication;
+
+
 ///--------------------------------------
 /// @name Application
 ///--------------------------------------

MASFoundation/Classes/_private_/services/model/MASModelService.m

@@ -30,6 +30,7 @@ @interface MASModelService ()
 
 @property (nonatomic, strong, readwrite) MASAuthenticationProviders *currentProviders;
 
+
 @end
 
 
@@ -38,8 +39,7 @@ @implementation MASModelService
 static MASGrantFlow _grantFlow_ = MASGrantFlowClientCredentials;
 static MASUserLoginWithUserCredentialsBlock _userLoginBlock_ = nil;
 static MASUserAuthCredentialsBlock _userAuthCredentialsBlock_ = nil;
-
-
+static BOOL _isBrowserBasedAuthentication_ = NO;
 # pragma mark - Properties
 
 
@@ -71,6 +71,19 @@ - (void)setUserObject:(MASUser *)user
     _currentUser = user;
 }
 
+
++ (void)setBrowserBasedAuthentication : (BOOL)browserBasedAuthentication
+{
+    _isBrowserBasedAuthentication_ = browserBasedAuthentication;
+}
+
+
++ (BOOL)browserBasedAuthentication
+{
+    return _isBrowserBasedAuthentication_;
+}
+
+
 # pragma mark - Shared Service
 
 + (instancetype)sharedService
@@ -367,7 +380,7 @@ - (void)retrieveAuthenticationProviders:(MASObjectResponseErrorBlock)completion
     //
     // If the user was already authenticated, we don't have to retrieve the authentication provider
     //
-    if (([MASApplication currentApplication].isAuthenticated && [MASApplication currentApplication].authenticationStatus == MASAuthenticationStatusLoginWithUser) || [MASAccess currentAccess].isSessionLocked)
+    if (([MASApplication currentApplication].isAuthenticated && [MASApplication currentApplication].authenticationStatus == MASAuthenticationStatusLoginWithUser) || [MASAccess currentAccess].isSessionLocked || _isBrowserBasedAuthentication_)
     {
 
         //
@@ -906,9 +919,15 @@ - (void)registerDeviceWithCompletion:(MASCompletionErrorBlock)completion
                  @"\n\n********************************************************\n\n\n");
 
             //
-            // If the UI handling framework is present and will handle this stop here
+            // If the UI handling framework or browser based login is present and will handle this stop here
             //
             MASServiceRegistry *serviceRegistry = [MASServiceRegistry sharedRegistry];
+
+            if([serviceRegistry browserBasedLoginWillHandleAuthentication:authCredentialsBlock])
+            {
+                return;
+            }
+
             if([serviceRegistry uiServiceWillHandleWithAuthCredentialsBlock:authCredentialsBlock])
             {
                 return;
@@ -1712,6 +1731,11 @@ - (void)loginUsingUserCredentials:(MASCompletionErrorBlock)completion
     // If the UI handling framework is present and will handle this stop here
     //
     MASServiceRegistry *serviceRegistry = [MASServiceRegistry sharedRegistry];
+    if([serviceRegistry browserBasedLoginWillHandleAuthentication:authCredentialsBlock])
+    {
+        return;
+    }
+
     if([serviceRegistry uiServiceWillHandleWithAuthCredentialsBlock:authCredentialsBlock])
     {
         return;