Fix project - integrate fixed MSID #1213
Conversation
ADAL/ADAL.xcodeproj/project.pbxproj
Outdated
| @@ -1208,6 +1212,7 @@ | |||
| isa = PBXFrameworksBuildPhase; | |||
| buildActionMask = 2147483647; | |||
| files = ( | |||
| 96285D7C20D87DF8004CA4BD /* SafariServices.framework in Frameworks */, | |||
There was a problem hiding this comment.
it personally feels a bit weird to include SafariServices in ADAL if system webview won't be publicly available in ADAL. Can we do some conditional compilation so that we don't force SafariServices to be included without customers benefiting from it?
other fixes after error code update
| 96AC69391E70E184008183A7 /* ADAutoResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 96AC69381E70E184008183A7 /* ADAutoResultViewController.m */; }; | ||
| 96B9F03E20DDD411006C806C /* GSS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96B9F03D20DDD411006C806C /* GSS.framework */; }; |
There was a problem hiding this comment.
just making sure that this was added only to macOS target :)
There was a problem hiding this comment.
Yes, confirmed :)
ADAL/ADAL.xcodeproj/project.pbxproj
Outdated
| @@ -965,8 +967,12 @@ | |||
| 94DD18E11C5ACFBF00F80C62 /* ADAL-Unit-Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ADAL-Unit-Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; | |||
| 960E93721E296CC2008036C0 /* ADURLSessionDemux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADURLSessionDemux.h; sourceTree = "<group>"; }; | |||
| 960E93731E296CC2008036C0 /* ADURLSessionDemux.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADURLSessionDemux.m; sourceTree = "<group>"; }; | |||
| 96285D7020D87760004CA4BD /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/SafariServices.framework; sourceTree = DEVELOPER_DIR; }; | |||
There was a problem hiding this comment.
Do we still need it here with conditional inclusion?
There was a problem hiding this comment.
It's just in the project file as a tombstone, but I will remove it manually :)
| @@ -3562,13 +3576,15 @@ | |||
| baseConfigurationReference = D6CF4EB01FC370BF00CD70C5 /* adal__framework__ios.xcconfig */; | |||
| buildSettings = { | |||
| GCC_OPTIMIZATION_LEVEL = 0; | |||
| GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; | |||
There was a problem hiding this comment.
should this go to xconfig instead?
There was a problem hiding this comment.
It used to indicate DEBUG=1, I think it should be fine as is.
| // Interactive flow | ||
| @(MSIDErrorAuthorizationFailed) : @(AD_ERROR_SERVER_AUTHORIZATION_CODE), | ||
| @(MSIDErrorUserCancel) : @(AD_ERROR_UI_USER_CANCEL), | ||
| @(MSIDErrorSessionCanceledProgramatically) : @(AD_ERROR_UNEXPECTED), |
There was a problem hiding this comment.
This currently produces AD_ERROR_UI_USER_CANCEL in ADAL (not very logical, but let's not break it), please change :)
| @(MSIDErrorServerOauth) : @(AD_ERROR_SERVER_OAUTH), | ||
| @(MSIDErrorServerInvalidResponse) : @(AD_ERROR_SERVER_INVALID_RESPONSE), | ||
| @(MSIDErrorServerRefreshTokenRejected) : @(AD_ERROR_SERVER_REFRESH_TOKEN_REJECTED), | ||
| @(MSIDErrorServerInvalidRequest) :@(AD_ERROR_DEVELOPER_INVALID_ARGUMENT), |
There was a problem hiding this comment.
Is there possibly a better corresponding ADAL error code?
There was a problem hiding this comment.
AD_ERROR_SERVER_OAUTH should be more accurate.
Project file was broken, now it is fixed.
AzureAD/microsoft-authentication-library-common-for-objc#155
update after error code PR AzureAD/microsoft-authentication-library-common-for-objc#153
add extra config to disable system web view