Merge pull request #125 from AzureAD/jason/embeddedWebview

Embedded Webview

Author: jasoncoolmax

IdentityCore/IdentityCore.xcodeproj/project.pbxproj

@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import "MSIDContants.h"
+#import "MSIDConstants.h"
 
 NSString *const MSID_PLATFORM_KEY               = @"x-client-SKU";
 NSString *const MSID_VERSION_KEY                = @"x-client-Ver";

IdentityCore/src/MSIDContants.h renamed to IdentityCore/src/MSIDConstants.h

@@ -23,7 +23,7 @@
 
 #import "MSIDDeviceId.h"
 #import "MSIDVersion.h"
-#import "MSIDContants.h"
+#import "MSIDConstants.h"
 #import "MSIDOAuth2Constants.h"
 
 #if !TARGET_OS_IPHONE

IdentityCore/src/MSIDContants.m renamed to IdentityCore/src/MSIDConstants.m

@@ -70,6 +70,26 @@ typedef NS_ENUM(NSInteger, MSIDErrorCode)
     MSIDErrorInvalidGrant = -51016,
     MSIDErrorInvalidScope = -51017,
     MSIDErrorInvalidParameter = -51018,
+    MSIDErrorUserCancel = -51019,
+    /*!
+     The authentication request was cancelled programmatically.
+     */
+    MSIDErrorSessionCanceled = -51020,
+    /*!
+     An interactive authentication session is already running with the
+     SafariViewController visible. Another authentication session can not be
+     launched yet.
+     */
+    MSIDErrorInteractiveSessionAlreadyRunning = -51021,
+    /*!
+     An interactive authentication session failed to start.
+     */
+    MSIDErrorInteractiveSessionStartFailure = -51022,
+    
+    MSIDErrorNoMainViewController = -51023,
+    MSIDServerNonHttpsRedirect = -51024,
+    
+    MSIDErrorUnsupportedFunctionality = -51025,
 
     /*!
      The user or application failed to authenticate in the interactive flow.
@@ -78,43 +98,24 @@ typedef NS_ENUM(NSInteger, MSIDErrorCode)
      */
     MSIDErrorAuthorizationFailed = -52020,
 
-    /*!
-     The state returned by the server does not match the state that was sent to
-     the server at the beginning of the authorization attempt.
-     */
-    MSIDErrorInvalidState = -52501,
     /*!
      Interaction required errors occur because of a wide variety of errors
      returned by the authentication service.
      */
     MSIDErrorMismatchedUser             = -52101,
     MSIDErrorNoAuthorizationResponse    = -52102,
     MSIDErrorBadAuthorizationResponse   = -52103,
-
 
-    MSIDErrorUserCancel = -51019,
-    /*!
-     The authentication request was cancelled programmatically.
-     */
-    MSIDErrorSessionCanceled = -51020,
-    /*!
-     An interactive authentication session is already running with the
-     SafariViewController visible. Another authentication session can not be
-     launched yet.
-     */
-    MSIDErrorInteractiveSessionAlreadyRunning = -51021,
     /*!
-     An interactive authentication session failed to start.
+     The state returned by the server does not match the state that was sent to
+     the server at the beginning of the authorization attempt.
      */
-    MSIDErrorInteractiveSessionStartFailure = -51022,
-    
-    MSIDErrorUnsupportedFunctionality = -51018,
+    MSIDErrorInvalidState = -52501,
 
     MSIDErrorCodeFirst = MSIDErrorInternal,
-    MSIDErrorCodeLast = MSIDErrorUnsupportedFunctionality
+    MSIDErrorCodeLast = MSIDErrorInvalidState
 };
 
 extern NSError *MSIDCreateError(NSString *domain, NSInteger code, NSString *errorDescription, NSString *oauthError, NSString *subError, NSError *underlyingError, NSUUID *correlationId, NSDictionary *additionalUserInfo);
 
 extern MSIDErrorCode MSIDErrorCodeForOAuthError(NSString *oauthError, MSIDErrorCode defaultCode);
-

IdentityCore/src/MSIDDeviceId.m

@@ -43,6 +43,7 @@
 @property (readwrite) NSDictionary<NSString *, NSString *> *sliceParameters;
 @property (readwrite) NSString *promptBehavior;
 @property (readwrite) NSString *claims;
+@property (readwrite) NSDictionary<NSString *, NSString *> *customHeaders;
 
 // State verifier: Recommended verifier for state value of the response.
 //  Set to YES to stop if verifying state fails
@@ -59,6 +60,11 @@
 // Priority start URL
 @property (readwrite) NSURL *explicitStartURL;
 
+#if TARGET_OS_IPHONE
+@property (weak) UIViewController *parentController;
+@property (readwrite)UIModalPresentationStyle presentationType;
+#endif
+
 - (instancetype)initWithAuthorizationEndpoint:(NSURL *)authorizationEndpoint
                                   redirectUri:(NSString *)redirectUri
                                      clientId:(NSString *)clientId
@@ -68,5 +74,4 @@
                                   verifyState:(BOOL)verifyState
                                    enablePkce:(BOOL)enablePkce;
 
-
 @end

IdentityCore/src/MSIDError.h

@@ -29,7 +29,7 @@
 #import "MSIDDeviceId.h"
 #import "NSDictionary+MSIDExtensions.h"
 #import "MSIDVersion.h"
-#import "MSIDContants.h"
+#import "MSIDConstants.h"
 
 static NSTimeInterval const s_defaultTimeoutInterval = 300;
 

IdentityCore/src/configuration/webview/MSIDWebviewConfiguration.h

@@ -399,5 +399,3 @@ - (MSIDWebviewFactory *)webviewFactory
 }
 
 @end
-
-

IdentityCore/src/network/request_configurator/MSIDAADRequestConfigurator.m

@@ -54,4 +54,5 @@
 - (BOOL)verifyRequestState:(NSString *)requestState
                responseURL:(NSURL *)url
                      error:(NSError **)error;
+- (NSString *)generateStateValue;
 @end

IdentityCore/src/oauth2/MSIDOauth2Factory.m

@@ -29,14 +29,30 @@
 #import "MSIDSystemWebviewController.h"
 #import "MSIDPkce.h"
 #import "NSOrderedSet+MSIDExtensions.h"
+#import "MSIDOAuth2EmbeddedWebviewController.h"
 
 @implementation MSIDWebviewFactory
 
 #pragma mark - Webview creation
 
 - (MSIDWebviewSession *)embeddedWebviewSessionFromConfiguration:(MSIDWebviewConfiguration *)configuration customWebview:(WKWebView *)webview context:(id<MSIDRequestContext>)context
 {
-    return nil;
+    NSString *state = [self generateStateValue];
+    NSURL *startURL = [self startURLFromConfiguration:configuration requestState:state];
+    NSURL *redirectURL = [NSURL URLWithString:configuration.redirectUri];
+    
+    MSIDOAuth2EmbeddedWebviewController *embeddedWebviewController
+    = [[MSIDOAuth2EmbeddedWebviewController alloc] initWithStartURL:startURL
+                                                             endURL:redirectURL
+                                                            webview:webview
+                                                      configuration:configuration
+                                                            context:context];
+    
+    MSIDWebviewSession *session = [[MSIDWebviewSession alloc] initWithWebviewController:embeddedWebviewController
+                                                                                factory:self
+                                                                           requestState:state
+                                                                            verifyState:configuration.verifyState];
+    return session;
 }
 
 #if TARGET_OS_IPHONE