Merge pull request #723 from AzureAD/oldalton/fixed_ntlm_prompt_keywindow

Fixed NTLM crash when app has no keywindow

Author: oldalton

IdentityCore/src/webview/embeddedWebview/challangeHandlers/MSIDNTLMHandler.m

@@ -53,7 +53,7 @@ + (BOOL)handleChallenge:(NSURLAuthenticationChallenge *)challenge
         MSID_LOG_INFO(nil, @"Attempting to handle NTLM challenge");
         MSID_LOG_INFO_PII(nil, @"Attempting to handle NTLM challenge host: %@", challenge.protectionSpace.host);
 
-        [MSIDNTLMUIPrompt presentPrompt:^(NSString *username, NSString *password, BOOL cancel)
+        [MSIDNTLMUIPrompt presentPromptWithWebView:webview completion:^(NSString *username, NSString *password, BOOL cancel)
          {
              if (cancel)
              {

IdentityCore/src/webview/embeddedWebview/ui/MSIDNTLMUIPrompt.h

@@ -23,9 +23,11 @@
 
 #import <Foundation/Foundation.h>
 
+@class WKWebView;
+
 @interface MSIDNTLMUIPrompt : NSObject
 
-+ (void)presentPrompt:(void (^)(NSString *username, NSString *password, BOOL cancel))completionHandler;
++ (void)presentPromptWithWebView:(WKWebView *)webview completion:(void (^)(NSString *username, NSString *password, BOOL cancel))completionHandler;
 + (void)dismissPrompt;
 
 @end

IdentityCore/src/webview/embeddedWebview/ui/ios/MSIDNTLMUIPrompt.m

@@ -25,6 +25,7 @@
 #import "MSIDAppExtensionUtil.h"
 #import "UIApplication+MSIDExtensions.h"
 #import "MSIDMainThreadUtil.h"
+#import <WebKit/WebKit.h>
 
 @implementation MSIDNTLMUIPrompt
 
@@ -42,9 +43,8 @@ + (void)dismissPrompt
     }];
 }
 
-+ (void)presentPrompt:(void (^)(NSString *username, NSString *password, BOOL cancel))block
++ (void)presentPromptWithWebView:(__unused WKWebView *)webview completion:(void (^)(NSString *username, NSString *password, BOOL cancel))block
 {
-    
     if ([MSIDAppExtensionUtil isExecutingInAppExtension])
     {
         block(nil, nil, YES);

IdentityCore/src/webview/embeddedWebview/ui/mac/MSIDNTLMUIPrompt.m

@@ -25,6 +25,7 @@
 #import "MSIDNTLMUIPrompt.h"
 #import "MSIDCredentialCollectionController.h"
 #import "MSIDMainThreadUtil.h"
+#import <WebKit/WebKit.h>
 
 @interface MSIDNTLMUIPrompt ()
 
@@ -46,7 +47,7 @@ + (void)dismissPrompt
     }];
 }
 
-+ (void)presentPrompt:(void (^)(NSString *username, NSString *password, BOOL cancel))completionHandler
++ (void)presentPromptWithWebView:(WKWebView *)webview completion:(void (^)(NSString *username, NSString *password, BOOL cancel))completionHandler
 {
     [MSIDMainThreadUtil executeOnMainThreadIfNeeded:^{
         NSAlert *alert = [NSAlert new];
@@ -62,7 +63,9 @@ + (void)presentPrompt:(void (^)(NSString *username, NSString *password, BOOL can
 
         [[alert window] setInitialFirstResponder:view.usernameField];
 
-        [alert beginSheetModalForWindow:[NSApp keyWindow] completionHandler:^(NSModalResponse returnCode)
+        NSWindow *window = webview.window ? webview.window : [NSApp keyWindow];
+        
+        [alert beginSheetModalForWindow:window completionHandler:^(NSModalResponse returnCode)
          {
              // The first button being added is "Login" button
              if (returnCode == NSAlertFirstButtonReturn)

IdentityCore/tests/MSIDLoggerTests.m

@@ -43,7 +43,9 @@ - (void)setUp
 
 - (void)testLog_whenLogLevelNothingMessageValid_shouldNotThrow
 {
+    [self keyValueObservingExpectationForObject:[MSIDTestLogger sharedLogger] keyPath:@"callbackInvoked" expectedValue:@1];
     XCTAssertNoThrow([[MSIDLogger sharedLogger] logLevel:MSIDLogLevelNothing context:nil correlationId:nil isPII:NO format:@"Message"]);
+    [self waitForExpectationsWithTimeout:1 handler:nil];
 }
 
 - (void)testLog_whenLogLevelErrorMessageNil_shouldNotThrow