fixed idtoken required values causing failure

twocanoes · Jul 22, 2022 · de5dd6a · de5dd6a
1 parent bb90624
commit de5dd6a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/XCreds/TokenManager.swift b/XCreds/TokenManager.swift
@@ -21,10 +21,10 @@ struct RefreshTokenResponse: Codable {
 }
 
 struct IDToken:Codable {
-    let iss, sub,aud,name,given_name,family_name:String
+    let iss,sub,aud:String
     let iat, exp:Int
     let email:String?
-    let unique_name:String?
+    let unique_name, given_name,family_name,name:String?
 
     enum CodingKeys: String, CodingKey {
         case iss,sub,aud,name,given_name,family_name,email,iat,exp, unique_name

diff --git a/XCredsLoginPlugIn/LoginWindow/LoginWebViewController.swift b/XCredsLoginPlugIn/LoginWindow/LoginWebViewController.swift
@@ -99,7 +99,8 @@ class LoginWebViewController: WebViewController {
 
             }
             catch {
-                TCSLogWithMark("error decoding idtoken")
+                TCSLogWithMark("error decoding idtoken:")
+                TCSLogWithMark("Token:\(body)")
                 delegate.denyLogin()
                 return
 
@@ -109,7 +110,7 @@ class LoginWebViewController: WebViewController {
 
 
             if idTokenObject.email != nil {
-                emailString=idTokenObject.email!
+                emailString=idTokenObject.email!.lowercased()
             }
             else if idTokenObject.unique_name != nil {
                 emailString=idTokenObject.unique_name!
@@ -120,7 +121,7 @@ class LoginWebViewController: WebViewController {
                 return
 
             }
-            guard let tUsername = emailString.components(separatedBy: "@").first else {
+            guard let tUsername = emailString.components(separatedBy: "@").first?.lowercased() else {
                 TCSLogWithMark("email address invalid")
                 delegate.denyLogin()
                 return

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -856,7 +856,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3006;
+				CURRENT_PROJECT_VERSION = 3009;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -886,7 +886,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3006;
+				CURRENT_PROJECT_VERSION = 3009;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -944,7 +944,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3006;
+				CURRENT_PROJECT_VERSION = 3009;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -974,7 +974,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3006;
+				CURRENT_PROJECT_VERSION = 3009;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1117,7 +1117,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3006;
+				CURRENT_PROJECT_VERSION = 3009;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1146,7 +1146,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3006;
+				CURRENT_PROJECT_VERSION = 3009;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;

diff --git a/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate