Merge branch 'dev' into kasong/2914053-common-interface

Author: Kai Song

IdentityCore/IdentityCore.xcodeproj/project.pbxproj

@@ -104,5 +104,3 @@ extern NSString * _Nonnull const MSID_CREATE_NEW_URL_SESSION;
 extern NSString * _Nonnull const MSID_HTTP_CONNECTION_VALUE;
 extern NSString * _Nonnull const MSID_FORCE_REFRESH_KEY;
 
-extern BOOL MSID_SUPPRESS_CAMERA_CONSENT_PROMPT_IN_WEBVIEW;
-

IdentityCore/src/MSIDBrokerConstants.h

@@ -104,6 +104,3 @@
 // Http header
 NSString *const MSID_HTTP_CONNECTION = @"Connection";
 NSString *const MSID_HTTP_CONNECTION_VALUE = @"close";
-
-// Non-constant
-BOOL MSID_SUPPRESS_CAMERA_CONSENT_PROMPT_IN_WEBVIEW = NO;

IdentityCore/src/MSIDBrokerConstants.m

@@ -179,4 +179,10 @@ typedef NS_ENUM(NSInteger, MSIDPlatformSequenceIndex)
     MSIDPlatformSequenceIndexLast = MSIDPlatformSequenceIndexBrowserCore,
 };
 
+extern NSString * _Nonnull const MSID_BROWSER_RESPONSE_SWITCH_BROWSER;
+extern NSString * _Nonnull const MSID_BROWSER_RESPONSE_SWITCH_BROWSER_RESUME;
+
+extern NSString * _Nonnull const MSID_FLIGHT_USE_V2_WEB_RESPONSE_FACTORY;
+extern NSString * _Nonnull const MSID_FLIGHT_SUPPORT_DUNA_CBA;
+
 #define METHODANDLINE   [NSString stringWithFormat:@"%s [Line %d]", __PRETTY_FUNCTION__, __LINE__]

IdentityCore/src/MSIDConstants.h

@@ -73,4 +73,11 @@
 
 NSString *const MSID_BROWSER_NATIVE_MESSAGE_ACCOUNT_ID_KEY = @"accountId";
 
+NSString *const MSID_BROWSER_RESPONSE_SWITCH_BROWSER = @"switch_browser";
+NSString *const MSID_BROWSER_RESPONSE_SWITCH_BROWSER_RESUME = @"switch_browser_resume";
+
+NSString *const MSID_FLIGHT_USE_V2_WEB_RESPONSE_FACTORY = @"use_v2_web_response_factory";
+NSString *const MSID_FLIGHT_SUPPORT_DUNA_CBA = @"support_duna_cba";
+
+
 #define METHODANDLINE   [NSString stringWithFormat:@"%s [Line %d]", __PRETTY_FUNCTION__, __LINE__]

IdentityCore/src/MSIDConstants.m

@@ -1,3 +1,4 @@
+//
 // Copyright (c) Microsoft Corporation.
 // All rights reserved.
 //
@@ -19,29 +20,25 @@
 // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// THE SOFTWARE.  
+
 
-#ifndef MSIDCertAuthHandler_iOS_h
-#define MSIDCertAuthHandler_iOS_h
+#import <Foundation/Foundation.h>
 
-#import "MSIDCertAuthHandler.h"
+NS_ASSUME_NONNULL_BEGIN
 
-@interface MSIDCertAuthHandler (iOS)
+@protocol MSIDFlightManagerInterface <NSObject>
 
-#if TARGET_OS_IPHONE && !MSID_EXCLUDE_SYSTEMWV
+- (BOOL)boolForKey:(NSString *)flightKey;
 
-+ (void)setRedirectUriPrefix:(NSString *)prefix
-                   forScheme:(NSString *)scheme;
+@end
 
-+ (void)setUseAuthSession:(BOOL)useAuthSession;
-+ (void)setUseLastRequestURL:(BOOL)useLastRequestURL;
+@interface MSIDFlightManager : NSObject <MSIDFlightManagerInterface>
 
-// These are for cert auth challenge for iOS
-+ (void)setCustomActivities:(NSArray<UIActivity *> *)activities;
-+ (BOOL)completeCertAuthChallenge:(NSURL *)endUrl;
-+ (BOOL)isCertAuthInProgress;
+@property (nonatomic) id<MSIDFlightManagerInterface> flightProvider;
 
-#endif
++ (instancetype)sharedInstance;
 
 @end
-#endif /* MSIDCertAuthHandler_mac_h */
+
+NS_ASSUME_NONNULL_END

…geHandlers/ios/MSIDCertAuthHandler+iOS.h IdentityCore/src/MSIDFlightManager.hIdentityCore/src/webview/embeddedWebview/challangeHandlers/ios/MSIDCertAuthHandler+iOS.h renamed to IdentityCore/src/MSIDFlightManager.h IdentityCore/src/webview/embeddedWebview/challangeHandlers/ios/MSIDCertAuthHandler+iOS.h renamed to IdentityCore/src/MSIDFlightManager.h

@@ -0,0 +1,50 @@
+//
+// Copyright (c) Microsoft Corporation.
+// All rights reserved.
+//
+// This code is licensed under the MIT License.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files(the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions :
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.  
+
+
+#import "MSIDFlightManager.h"
+
+@implementation MSIDFlightManager
+
++ (instancetype)sharedInstance
+{
+    static MSIDFlightManager *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[self.class alloc] init];
+    });
+    
+    return sharedInstance;
+}
+
+#pragma mark - MSIDFlightManagerInterface
+
+- (BOOL)boolForKey:(nonnull NSString *)flightKey 
+{
+    if (self.flightProvider) { return [self.flightProvider boolForKey:flightKey]; }
+    
+    return NO;
+}
+
+@end

IdentityCore/src/MSIDFlightManager.m

@@ -53,15 +53,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
-#if !EXCLUDE_FROM_MSALCPP
-
-- (void)trackPerfTelemetryWithLastRequest:(MSIDLastRequestTelemetry *)telemetry
-                         requestStartDate:(NSDate *)requestStartDate
-                            telemetryType:(NSString *)telemetryType;
-
-#endif
-
-
 @end
 
 NS_ASSUME_NONNULL_END

IdentityCore/src/broker_operation/response/MSIDBrokerNativeAppOperationResponse.h

@@ -124,29 +124,4 @@ - (NSDictionary *)jsonDictionary
     return json;
 }
 
-#if !EXCLUDE_FROM_MSALCPP
-
-- (void)trackPerfTelemetryWithLastRequest:(MSIDLastRequestTelemetry *)telemetry
-                         requestStartDate:(NSDate *)requestStartDate
-                            telemetryType:(NSString *)telemetryType
-{
-    if (!requestStartDate)
-    {
-        MSID_LOG_WITH_CTX(MSIDLogLevelError, nil, @"trackPerfTelemetryWithLastRequest called with nil request start date");
-        return;
-    }
-    
-    NSDate *responseDate = [NSDate date];
-    NSTimeInterval totalTime = [responseDate timeIntervalSinceDate:requestStartDate];
-    NSTimeInterval ipcRequestTime = self.requestReceivedTimeStamp ? [self.requestReceivedTimeStamp timeIntervalSinceDate:requestStartDate] : 0;
-    NSTimeInterval ipcResponseTime = self.responseGenerationTimeStamp ? [responseDate timeIntervalSinceDate:self.responseGenerationTimeStamp] : 0;
-    
-    [telemetry trackSSOExtensionPerformanceWithType:telemetryType
-                                    totalPerfNumber:totalTime
-                               ipcRequestPerfNumber:ipcRequestTime
-                              ipcResponsePerfNumber:ipcResponseTime];
-}
-
-#endif
-
 @end

IdentityCore/src/broker_operation/response/MSIDBrokerNativeAppOperationResponse.m

@@ -58,10 +58,11 @@ - (MSIDWebviewResponse *)responseWithResultURL:(NSURL *)url
                                          error:(NSError *__autoreleasing*)error
 {
     return [factory oAuthResponseWithURL:url
-                       requestState:self.state
-                 ignoreInvalidState:self.ignoreInvalidState
-                            context:context
-                              error:error];
+                            requestState:self.state
+                      ignoreInvalidState:self.ignoreInvalidState
+                          endRedirectUri:self.endRedirectUrl
+                                 context:context
+                                   error:error];
 }
 
 @end