From 9fe5abd7d695dd4f5da81f8da5da507d553a2581 Mon Sep 17 00:00:00 2001 From: Bart Wesselink Date: Mon, 2 Jan 2023 15:59:03 +0100 Subject: [PATCH] Ignore domain hint on iOS. --- .../nl/recognize/msauthplugin/MsAuthPluginTest.java | 1 + ios/Plugin/Plugin.swift | 7 ++++++- ios/Podfile.lock | 12 ++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/android/src/test/java/nl/recognize/msauthplugin/MsAuthPluginTest.java b/android/src/test/java/nl/recognize/msauthplugin/MsAuthPluginTest.java index 0a21747..063d47e 100644 --- a/android/src/test/java/nl/recognize/msauthplugin/MsAuthPluginTest.java +++ b/android/src/test/java/nl/recognize/msauthplugin/MsAuthPluginTest.java @@ -36,6 +36,7 @@ class MsAuthPluginTest { public static final String KEY_HASH = "cmFuZG9tLWtleS1oYXNoLW9idGFpbmVkLWZyb20tYXp1cmU="; public static final String TENANT = "f6785b1e-7ae8-4c41-8b72-d418f03cc1d7"; public static final String CLIENT_ID = "3892f330-5945-4db6-9167-4d5e644ab840"; + public static final String DOMAIN_HINT = "recognize.nl"; public static final String ID_TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"; diff --git a/ios/Plugin/Plugin.swift b/ios/Plugin/Plugin.swift index 105070b..50bd3f1 100644 --- a/ios/Plugin/Plugin.swift +++ b/ios/Plugin/Plugin.swift @@ -111,7 +111,12 @@ public class MsAuthPlugin: CAPPlugin { do { let authority = authorityType == .aad ? try MSALAADAuthority(url: authorityURL) : try MSALB2CAuthority(url: authorityURL) - let msalConfiguration = MSALPublicClientApplicationConfig(clientId: clientId, domainHint: domainHint, redirectUri: nil, authority: authority) + + if (domainHint != nil) { + print("Warning: domain hint is currently not supported on iOS.") + } + + let msalConfiguration = MSALPublicClientApplicationConfig(clientId: clientId, redirectUri: nil, authority: authority) msalConfiguration.knownAuthorities = [authority] return try MSALPublicClientApplication(configuration: msalConfiguration) } catch { diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0938291..32c26be 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,7 +1,7 @@ PODS: - - Capacitor (3.2.2): + - Capacitor (4.3.0): - CapacitorCordova - - CapacitorCordova (3.2.2) + - CapacitorCordova (4.3.0) - MSAL (1.1.19): - MSAL/app-lib (= 1.1.19) - MSAL/app-lib (1.1.19) @@ -22,10 +22,10 @@ EXTERNAL SOURCES: :path: "../node_modules/@capacitor/ios" SPEC CHECKSUMS: - Capacitor: aa4514ca225c6818f269d5c5d4d010d6eddddde7 - CapacitorCordova: bdb13b0c6c1d51f5a421a59b78222b24e852d826 + Capacitor: 5534f805df231c76164e1d63119bff7b4eac6cd5 + CapacitorCordova: 19a82a3b91fbeb9bdd049729551edc3cd7e5e648 MSAL: 0a4993a743aa45147c78c698e0412d00cb005c1a -PODFILE CHECKSUM: 42bf7b15755196452a35e4da759c35bbca9bfc3d +PODFILE CHECKSUM: f6274e5f60bf7be2dab2cca23d5c22f5d9f33c9e -COCOAPODS: 1.10.1 +COCOAPODS: 1.11.2