Move authority migration to common core

IdentityCore/src/MSIDAADNetworkConfiguration.h

@@ -0,0 +1,39 @@
+// 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 <Foundation/Foundation.h>
+#import "MSIDAADEndpointProviding.h"
+
+@interface MSIDAADNetworkConfiguration : NSObject
+
+@property (class, nullable) MSIDAADNetworkConfiguration *defaultConfiguration;
+
+@property (nonatomic, nonnull) id<MSIDAADEndpointProviding> endpointProvider;
+
+@property (nonatomic, nullable) NSString *aadApiVersion;
+
+@property (nonatomic, nullable) NSString *aadAuthorityDiscoveryApiVersion;
+
+@property (nonatomic, nullable) NSString *drsDiscoveryApiVersion;
+
+@end

IdentityCore/src/MSIDAADNetworkConfiguration.m

@@ -0,0 +1,62 @@
+// 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 "MSIDAADNetworkConfiguration.h"
+#import "MSIDAADEndpointProvider.h"
+
+static MSIDAADNetworkConfiguration *s_defaultConfiguration;
+
+@implementation MSIDAADNetworkConfiguration
+
++ (void)initialize
+{
+    if (self == [MSIDAADNetworkConfiguration self])
+    {
+        s_defaultConfiguration = [MSIDAADNetworkConfiguration new];
+    }
+}
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self)
+    {
+        _endpointProvider = [MSIDAADEndpointProvider new];
+        _aadAuthorityDiscoveryApiVersion = @"1.1";
+        _drsDiscoveryApiVersion = @"1.0";
+    }
+
+    return self;
+}
+
++ (MSIDAADNetworkConfiguration *)defaultConfiguration
+{
+    return s_defaultConfiguration;
+}
+
++ (void)setDefaultConfiguration:(MSIDAADNetworkConfiguration *)defaultConfiguration
+{
+    s_defaultConfiguration = defaultConfiguration;
+}
+
+@end

IdentityCore/src/MSIDADFSType.h

@@ -0,0 +1,28 @@
+// 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.
+
+typedef NS_ENUM(NSInteger, MSIDADFSType)
+{
+    MSIDADFSTypeOnPrems,
+    MSIDADFSTypeCloud
+};

IdentityCore/src/MSIDError.h

@@ -106,7 +106,8 @@ typedef NS_ENUM(NSInteger, MSIDErrorCode)
      =========================================================
      */
     // Authority validation response failure
-    MSIDErrorAuthorityValidation  = -51500,
+    MSIDErrorAuthorityValidation            = -51500,
+    MSIDErrorAuthorityValidationWebFinger   = -51501,
 
     /*!
      =========================================================

IdentityCore/src/MSIDOAuth2Constants.h

@@ -26,8 +26,6 @@ extern NSString *const MSID_OAUTH2_AUTHORIZATION;
 extern NSString *const MSID_OAUTH2_AUTHORIZATION_CODE;
 extern NSString *const MSID_OAUTH2_AUTHORIZATION_URI;
 extern NSString *const MSID_OAUTH2_AUTHORITY;
-extern NSString *const MSID_OAUTH2_AUTHORIZE_SUFFIX;
-extern NSString *const MSID_OAUTH2_V2_AUTHORIZE_SUFFIX;
 extern NSString *const MSID_OAUTH2_BEARER;
 extern NSString *const MSID_OAUTH2_CLIENT_ID;
 extern NSString *const MSID_OAUTH2_CLAIMS;
@@ -45,7 +43,6 @@ extern NSString *const MSID_OAUTH2_SCOPE;
 extern NSString *const MSID_OAUTH2_STATE;
 extern NSString *const MSID_OAUTH2_SUB_ERROR;
 extern NSString *const MSID_OAUTH2_TOKEN;
-extern NSString *const MSID_OAUTH2_TOKEN_SUFFIX;
 extern NSString *const MSID_OAUTH2_INSTANCE_DISCOVERY_SUFFIX;
 extern NSString *const MSID_OAUTH2_TOKEN_TYPE;
 extern NSString *const MSID_OAUTH2_LOGIN_HINT;
@@ -118,3 +115,5 @@ extern NSString *const MSID_REFRESH_TOKEN_CACHE_TYPE;
 extern NSString *const MSID_LEGACY_TOKEN_CACHE_TYPE;
 extern NSString *const MSID_ID_TOKEN_CACHE_TYPE;
 extern NSString *const MSID_GENERAL_TOKEN_CACHE_TYPE;
+
+extern NSString *const MSID_OPENID_CONFIGURATION_SUFFIX;

IdentityCore/src/MSIDOAuth2Constants.m

@@ -22,11 +22,10 @@
 // THE SOFTWARE.
 
 #import "MSIDOAuth2Constants.h"
+#import "MSIDAADNetworkConfiguration.h"
 
 NSString *const MSID_OAUTH2_ACCESS_TOKEN       = @"access_token";
 NSString *const MSID_OAUTH2_AUTHORIZATION      = @"authorization";
-NSString *const MSID_OAUTH2_AUTHORIZE_SUFFIX   = @"/oauth2/authorize";
-NSString *const MSID_OAUTH2_V2_AUTHORIZE_SUFFIX   = @"/oauth2/v2.0/authorize";
 NSString *const MSID_OAUTH2_AUTHORITY           = @"authority";
 NSString *const MSID_OAUTH2_AUTHORIZATION_CODE = @"authorization_code";
 NSString *const MSID_OAUTH2_AUTHORIZATION_URI  = @"authorization_uri";
@@ -47,7 +46,6 @@
 NSString *const MSID_OAUTH2_STATE              = @"state";
 NSString *const MSID_OAUTH2_SUB_ERROR          = @"suberror";
 NSString *const MSID_OAUTH2_TOKEN              = @"token";
-NSString *const MSID_OAUTH2_TOKEN_SUFFIX       = @"/oauth2/token";
 NSString *const MSID_OAUTH2_INSTANCE_DISCOVERY_SUFFIX = @"common/discovery/instance";
 NSString *const MSID_OAUTH2_TOKEN_TYPE         = @"token_type";
 NSString *const MSID_OAUTH2_LOGIN_HINT         = @"login_hint";
@@ -119,3 +117,5 @@
 NSString *const MSID_LEGACY_TOKEN_CACHE_TYPE             = @"legacysingleresourcetoken";
 NSString *const MSID_ID_TOKEN_CACHE_TYPE                 = @"idtoken";
 NSString *const MSID_GENERAL_TOKEN_CACHE_TYPE            = @"token";
+
+NSString *const MSID_OPENID_CONFIGURATION_SUFFIX         = @".well-known/openid-configuration";

IdentityCore/src/network/MSIDAADEndpointProvider.h

@@ -0,0 +1,29 @@
+// 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 <Foundation/Foundation.h>
+#import "MSIDAADEndpointProviding.h"
+
+@interface MSIDAADEndpointProvider : NSObject <MSIDAADEndpointProviding>
+
+@end

IdentityCore/src/network/MSIDAADEndpointProvider.m

@@ -0,0 +1,92 @@
+// 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 "MSIDAADEndpointProvider.h"
+#import "MSIDAADNetworkConfiguration.h"
+
+@implementation MSIDAADEndpointProvider
+
+#pragma mark - MSIDEndpointProviderProtocol
+
+- (NSURL *)oauth2AuthorizeEndpointWithUrl:(NSURL *)baseUrl
+{
+    __auto_type apiVersion = [self aadApiVersionWithDelimiter];
+
+    return [baseUrl URLByAppendingPathComponent:[NSString stringWithFormat:@"/oauth2/%@authorize", apiVersion]];
+}
+
+- (NSURL *)oauth2TokenEndpointWithUrl:(NSURL *)baseUrl
+{
+    __auto_type apiVersion = [self aadApiVersionWithDelimiter];
+
+    return [baseUrl URLByAppendingPathComponent:[NSString stringWithFormat:@"/oauth2/%@token", apiVersion]];
+}
+
+- (NSURL *)drsDiscoveryEndpointWithDomain:(NSString *)domain adfsType:(MSIDADFSType)type
+{
+    if (type == MSIDADFSTypeOnPrems)
+    {
+        return [NSURL URLWithString:
+                [NSString stringWithFormat:@"https://enterpriseregistration.%@/enrollmentserver/contract", domain.lowercaseString]];
+    }
+    else if (type == MSIDADFSTypeCloud)
+    {
+        return [NSURL URLWithString:
+                [NSString stringWithFormat:@"https://enterpriseregistration.windows.net/%@/enrollmentserver/contract", domain.lowercaseString]];
+    }
+
+    return nil;
+}
+
+- (NSURL *)webFingerDiscoveryEndpointWithIssuer:(NSURL *)issuer
+{
+    return [NSURL URLWithString:[NSString stringWithFormat:@"https://%@/.well-known/webfinger", issuer.host]];
+}
+
+- (NSURL *)openIdConfigurationEndpointWithUrl:(NSURL *)baseUrl
+{
+    if (!baseUrl) return nil;
+
+    __auto_type apiVersion = [self aadApiVersionWithDelimiter];
+    __auto_type path = [NSString stringWithFormat:@"%@%@", apiVersion, MSID_OPENID_CONFIGURATION_SUFFIX];
+
+    return [baseUrl URLByAppendingPathComponent:path];
+}
+
+- (NSURL *)aadAuthorityDiscoveryEndpointWithHost:(NSString *)host
+{
+    __auto_type trustedAuthority = [[NSURL alloc] initWithString:[NSString stringWithFormat:@"https://%@", host]];
+    return [trustedAuthority URLByAppendingPathComponent:MSID_OAUTH2_INSTANCE_DISCOVERY_SUFFIX];
+}
+
+#pragma mark - Private
+
+- (NSString *)aadApiVersionWithDelimiter
+{
+    __auto_type apiVersion = MSIDAADNetworkConfiguration.defaultConfiguration.aadApiVersion ?: @"";
+    __auto_type delimiter = MSIDAADNetworkConfiguration.defaultConfiguration.aadApiVersion ? @"/" : @"";
+
+    return [NSString stringWithFormat:@"%@%@", apiVersion, delimiter];
+}
+
+@end

IdentityCore/src/network/MSIDAADEndpointProviding.h

@@ -0,0 +1,42 @@
+// 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 <Foundation/Foundation.h>
+#import "MSIDADFSType.h"
+
+@protocol MSIDAADEndpointProviding <NSObject>
+
+- (NSURL *)oauth2AuthorizeEndpointWithUrl:(NSURL *)baseUrl;
+
+- (NSURL *)oauth2TokenEndpointWithUrl:(NSURL *)baseUrl;
+
+- (NSURL *)drsDiscoveryEndpointWithDomain:(NSString *)domain adfsType:(MSIDADFSType)type;
+
+- (NSURL *)webFingerDiscoveryEndpointWithIssuer:(NSURL *)issuer;
+
+- (NSURL *)openIdConfigurationEndpointWithUrl:(NSURL *)baseUrl;
+
+- (NSURL *)aadAuthorityDiscoveryEndpointWithHost:(NSString *)host;
+
+
+@end