Skip to content

Commit 8d67950

Browse files
oldaltonoldalton
authored
Merge pull request #844 from AzureAD/release/1.5.6
Release/1.5.6
2 parents 4f0d329 + c602b1e commit 8d67950

File tree

58 files changed

+941
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+941
-152
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
## Build generated
66
build/
77
DerivedData/
8+
IdentityCore/include/
89

910
## Various settings
1011
*.pbxuser

‎IdentityCore/IdentityCore.xcodeproj/project.pbxproj‎

Lines changed: 264 additions & 2 deletions
Large diffs are not rendered by default.

‎IdentityCore/IdentityCore.xcodeproj/xcshareddata/xcschemes/IdentityCore Mac.xcscheme‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1170"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "D626FF5A1FBA6E9500EE4487"
35+
BuildableName = "libIdentityCore.a"
36+
BlueprintName = "IdentityCore Mac"
37+
ReferencedContainer = "container:IdentityCore.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "D626FF5A1FBA6E9500EE4487"
47-
BuildableName = "libIdentityCore.a"
48-
BlueprintName = "IdentityCore Mac"
49-
ReferencedContainer = "container:IdentityCore.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:IdentityCore.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎IdentityCore/IdentityCore.xcodeproj/xcshareddata/xcschemes/IdentityCore iOS.xcscheme‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1170"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "D68FB4861FBA698A005308BB"
35+
BuildableName = "libIdentityCore.a"
36+
BlueprintName = "IdentityCore iOS"
37+
ReferencedContainer = "container:IdentityCore.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "D68FB4861FBA698A005308BB"
47-
BuildableName = "libIdentityCore.a"
48-
BlueprintName = "IdentityCore iOS"
49-
ReferencedContainer = "container:IdentityCore.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:IdentityCore.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎IdentityCore/IdentityCoreSwift/IdentityCoreSwift.swift‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
//
2+
// Copyright (c) Microsoft Corporation.
3+
// All rights reserved.
4+
//
5+
// This code is licensed under the MIT License.
6+
//
7+
// Permission is hereby granted, free of charge, to any person obtaining a copy
8+
// of this software and associated documentation files(the "Software"), to deal
9+
// in the Software without restriction, including without limitation the rights
10+
// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
11+
// copies of the Software, and to permit persons to whom the Software is
12+
// furnished to do so, subject to the following conditions :
13+
//
14+
// The above copyright notice and this permission notice shall be included in
15+
// all copies or substantial portions of the Software.
16+
//
17+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
// THE SOFTWARE.
24+
25+
26+
import Foundation
27+
/*
28+
the class file must be "open" so that it will be added to SwiftLibararyOne-Swift.h header file
29+
which will be used in Objective C file.
30+
*/
31+
@objc open class SwiftOneFileA: NSObject {
32+
@objc public func testOne() {
33+
}
34+
}

‎IdentityCore/src/broker_operation/request/MSIDBaseBrokerOperationRequest.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@
2626
NS_ASSUME_NONNULL_BEGIN
2727

2828
@interface MSIDBaseBrokerOperationRequest : NSObject
29+
{
30+
@protected
31+
NSUUID *_correlationId;
32+
}
2933

3034
@property (nonatomic, class, readonly) NSString *operation;
35+
@property (nonatomic) NSUUID *correlationId;
3136

3237
- (nullable NSString *)logInfo;
3338

‎IdentityCore/src/broker_operation/request/MSIDBrokerOperationRequest.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ NS_ASSUME_NONNULL_BEGIN
3636
@property (nonatomic, nullable) NSString *clientAppVersion;
3737
@property (nonatomic, nullable) NSString *clientAppName;
3838
@property (nonatomic) MSIDClientSDKType clientSDK;
39-
@property (nonatomic, nullable) NSUUID *correlationId;
4039

4140
+ (BOOL)fillRequest:(MSIDBrokerOperationRequest *)request
4241
keychainAccessGroup:(nullable NSString *)keychainAccessGroup

‎IdentityCore/src/broker_operation/request/account_request/MSIDBrokerOperationSignoutFromDeviceRequest.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
3939
@property (nonatomic) MSIDProviderType providerType;
4040
@property (nonatomic) BOOL signoutFromBrowser;
4141
@property (nonatomic) BOOL clearSSOExtensionCookies;
42+
@property (nonatomic) BOOL wipeAccount;
4243

4344
@end
4445

‎IdentityCore/src/broker_operation/request/account_request/MSIDBrokerOperationSignoutFromDeviceRequest.m‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
NSString *const MSID_SIGNOUT_FROM_BROWSER_KEY = @"signout_from_browser";
3535
NSString *const MSID_CLEAR_SSO_EXT_COOKIES_KEY = @"clear_sso_extension_cookies";
36+
NSString *const MSID_WIPE_ACCOUNT_KEY = @"wipe_account";
3637

3738
@implementation MSIDBrokerOperationSignoutFromDeviceRequest
3839

@@ -67,6 +68,7 @@ - (instancetype)initWithJSONDictionary:(NSDictionary *)json error:(NSError **)er
6768
_providerType = MSIDProviderTypeFromString([json msidStringObjectForKey:MSID_PROVIDER_TYPE_JSON_KEY]);
6869
_signoutFromBrowser = [json msidBoolObjectForKey:MSID_SIGNOUT_FROM_BROWSER_KEY];
6970
_clearSSOExtensionCookies = [json msidBoolObjectForKey:MSID_CLEAR_SSO_EXT_COOKIES_KEY];
71+
_wipeAccount = [json msidBoolObjectForKey:MSID_WIPE_ACCOUNT_KEY];
7072
}
7173

7274
return self;
@@ -94,8 +96,9 @@ - (NSDictionary *)jsonDictionary
9496
}
9597

9698
json[MSID_PROVIDER_TYPE_JSON_KEY] = MSIDProviderTypeToString(self.providerType);
97-
json[MSID_SIGNOUT_FROM_BROWSER_KEY] = @(_signoutFromBrowser);
98-
json[MSID_CLEAR_SSO_EXT_COOKIES_KEY] = @(_clearSSOExtensionCookies);
99+
json[MSID_SIGNOUT_FROM_BROWSER_KEY] = [NSString stringWithFormat:@"%d", (int)_signoutFromBrowser];
100+
json[MSID_CLEAR_SSO_EXT_COOKIES_KEY] = [NSString stringWithFormat:@"%d", (int)_clearSSOExtensionCookies];
101+
json[MSID_WIPE_ACCOUNT_KEY] = [NSString stringWithFormat:@"%d", (int)_wipeAccount];
99102

100103
return json;
101104
}

‎IdentityCore/src/broker_operation/request/token_request/MSIDBrokerOperationBrowserTokenRequest.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ NS_ASSUME_NONNULL_BEGIN
3535
@property (nonatomic, readonly) NSString *bundleIdentifier;
3636
@property (nonatomic, readonly) MSIDAADAuthority *authority;
3737
@property (nonatomic, readonly) NSDictionary *headers;
38-
@property (nonatomic, readonly) NSUUID *correlationId;
3938
@property (nonatomic, readonly) NSData *httpBody;
4039

4140
- (instancetype)initWithRequest:(NSURL *)requestURL

0 commit comments

Comments
 (0)