Skip to content

Commit ca5d21b

Browse files
fidelianawarfidelianawar
committed
Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentication-library-for-objc into fidelianawar/update_ciam_lab6
2 parents 434b3de + fc95538 commit ca5d21b

26 files changed

+1225
-709
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [TBD]:
2+
* Update common core submodule with changes related to upgrade registration.
3+
* Update common core submodule with device register action with token protection hint.
4+
15
## [1.4.1]:
26
* Update Native Auth logging levels for improved clarity and consistency. #2184
37

‎CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ CHANGELOG.md @AzureAD/AppleIdentityTeam @AzureAD/MSAL-ObjC-CIAM
1111
/MSAL/src/native_auth/ @AzureAD/MSAL-ObjC-CIAM
1212
/MSAL/test/unit/native_auth/ @AzureAD/MSAL-ObjC-CIAM
1313
/MSAL/test/integration/native_auth/ @AzureAD/MSAL-ObjC-CIAM
14+
/MSAL/MSAL\ iOS\ Native\ Auth\ E2E\ Tests.xctestplan @AzureAD/MSAL-ObjC-CIAM
15+
/MSAL/NativeAuthEndToEndTestPlan.xctestplan @AzureAD/MSAL-ObjC-CIAM
16+
/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/unit-test-host.xcscheme @AzureAD/MSAL-ObjC-CIAM
17+
/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/unit-test-host-mac.xcscheme @AzureAD/MSAL-ObjC-CIAM
18+
/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL\ iOS\ Native\ Auth\ E2E\ Tests.xcscheme @AzureAD/MSAL-ObjC-CIAM
1419
# For more details about inheritance patterns, or to assign different
1520
# owners for individual file extensions, see:
1621
# https://help.github.com/articles/about-codeowners/

‎MSAL.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MSAL/MSAL iOS Native Auth E2E Tests.xctestplan

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"configurations" : [
3+
{
4+
"id" : "1186CC98-3243-4507-A72B-4E3670FF0E7A",
5+
"name" : "Test Scheme Action",
6+
"options" : {
7+
8+
}
9+
}
10+
],
11+
"defaultOptions" : {
12+
"testRepetitionMode" : "retryOnFailure"
13+
},
14+
"testTargets" : [
15+
{
16+
"target" : {
17+
"containerPath" : "container:MSAL.xcodeproj",
18+
"identifier" : "28CED2E72C21E0F9004320D1",
19+
"name" : "MSAL iOS Native Auth E2E Tests"
20+
}
21+
}
22+
],
23+
"version" : 1
24+
}

‎MSAL/MSAL.xcodeproj/project.pbxproj

Lines changed: 295 additions & 23 deletions
Large diffs are not rendered by default.

‎MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL iOS Native Auth E2E Tests.xcscheme

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1530"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
</BuildAction>
10+
<TestAction
11+
buildConfiguration = "Debug"
12+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
13+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
14+
shouldUseLaunchSchemeArgsEnv = "YES">
15+
<TestPlans>
16+
<TestPlanReference
17+
reference = "container:MSAL iOS Native Auth E2E Tests.xctestplan"
18+
default = "YES">
19+
</TestPlanReference>
20+
</TestPlans>
21+
<Testables>
22+
<TestableReference
23+
skipped = "NO"
24+
parallelizable = "YES">
25+
<BuildableReference
26+
BuildableIdentifier = "primary"
27+
BlueprintIdentifier = "28CED2E72C21E0F9004320D1"
28+
BuildableName = "MSAL iOS Native Auth E2E Tests.xctest"
29+
BlueprintName = "MSAL iOS Native Auth E2E Tests"
30+
ReferencedContainer = "container:MSAL.xcodeproj">
31+
</BuildableReference>
32+
</TestableReference>
33+
</Testables>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
</LaunchAction>
46+
<ProfileAction
47+
buildConfiguration = "Release"
48+
shouldUseLaunchSchemeArgsEnv = "YES"
49+
savedToolIdentifier = ""
50+
useCustomWorkingDirectory = "NO"
51+
debugDocumentVersioning = "YES">
52+
</ProfileAction>
53+
<AnalyzeAction
54+
buildConfiguration = "Debug">
55+
</AnalyzeAction>
56+
<ArchiveAction
57+
buildConfiguration = "Release"
58+
revealArchiveInOrganizer = "YES">
59+
</ArchiveAction>
60+
</Scheme>

‎MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/unit-test-host.xcscheme

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,17 @@
4545
ReferencedContainer = "container:MSAL.xcodeproj">
4646
</BuildableReference>
4747
</TestableReference>
48+
<TestableReference
49+
skipped = "NO"
50+
parallelizable = "YES">
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "28CED2E72C21E0F9004320D1"
54+
BuildableName = "MSAL iOS Native Auth E2E Tests.xctest"
55+
BlueprintName = "MSAL iOS Native Auth E2E Tests"
56+
ReferencedContainer = "container:MSAL.xcodeproj">
57+
</BuildableReference>
58+
</TestableReference>
4859
</Testables>
4960
</TestAction>
5061
<LaunchAction

‎MSAL/NativeAuthEndToEndTestPlan.xctestplan

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
}
6363
],
6464
"defaultOptions" : {
65+
"codeCoverage" : false,
66+
"testRepetitionMode" : "retryOnFailure",
6567
"testTimeoutsEnabled" : true
6668
},
6769
"testTargets" : [

‎MSAL/src/MSALErrorConverter.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ + (void)initialize
7373
@(MSIDErrorNoMainViewController) : @(MSALInternalErrorNoViewController),
7474
@(MSIDErrorAttemptToOpenURLFromExtension): @(MSALInternalErrorAttemptToOpenURLFromExtension),
7575
@(MSIDErrorUINotSupportedInExtension): @(MSALInternalErrorUINotSupportedInExtension),
76-
76+
@(MSIDErrorInsufficientDeviceStrength): @(MSALErrorInsufficientDeviceStrength),
7777
// Broker errors
7878
@(MSIDErrorBrokerResponseNotReceived): @(MSALInternalErrorBrokerResponseNotReceived),
7979
@(MSIDErrorBrokerNoResumeStateFound): @(MSALInternalErrorBrokerNoResumeStateFound),

‎MSAL/src/public/MSALError.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,11 @@ typedef NS_ENUM(NSInteger, MSALError)
177177
The server error happens when server returns server_error
178178
*/
179179
MSALErrorServerError = -50006,
180+
181+
/**
182+
Workplacejoin migrate device registration is required to proceed.
183+
*/
184+
MSALErrorInsufficientDeviceStrength = -50007,
180185
};
181186

182187
/**

0 commit comments

Comments
 (0)