[bug] Build 6023 LocalAD - cancelling Change Password prompt breaks l…

…ogin fields. #129
twocanoes · Dec 16, 2023 · be30097 · be30097
1 parent 42002e6
commit be30097
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift b/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift
@@ -118,7 +118,7 @@ let checkADLog = OSLog(subsystem: "menu.nomad.login.ad", category: "CheckADMech"
         }
     }
 
-    fileprivate func showResetUI() {
+    fileprivate func showResetUI() -> Bool {
         TCSLogWithMark()
 
         let changePasswordWindowController = UpdatePasswordWindowController.init(windowNibName: NSNib.Name("UpdatePasswordWindowController"))
@@ -141,7 +141,7 @@ let checkADLog = OSLog(subsystem: "menu.nomad.login.ad", category: "CheckADMech"
 
             if response == .cancel {
                 isDone = true
-                return
+                return false
             }
 
             if let pass = changePasswordWindowController.password {
@@ -150,7 +150,7 @@ let checkADLog = OSLog(subsystem: "menu.nomad.login.ad", category: "CheckADMech"
             guard let session = nomadSession else {
 
                 TCSLogWithMark("invalid session")
-                return
+                return false
             }
             session.oldPass = passString
             session.newPass = newPassword
@@ -164,7 +164,7 @@ let checkADLog = OSLog(subsystem: "menu.nomad.login.ad", category: "CheckADMech"
             isDone = true
 //            delegate?.setHint(type: .migratePass, hint: migrateUIPass)
 //            completeLogin(authResult: .allow)
-            return
+            return true
 
         }
 
@@ -682,7 +682,11 @@ extension SignInViewController: NoMADUserSessionDelegate {
 //            authFail()
 //            delegate?.denyLogin(message:"Password is expired or requires change")
 
-            showResetUI()
+            let res = showResetUI()
+
+            if res == false { //user cancelled so enable UI
+                loginStartedUI()
+            }
             return
         case .OffDomain:
             TCSLogErrorWithMark("OffDomain")
@@ -788,7 +792,7 @@ extension SignInViewController: NoMADUserSessionDelegate {
         } else {
             authFail()
 //            alertText.stringValue = "Not authorized to login."
-            showResetUI()
+//            showResetUI()
         }
     }
 

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -1299,7 +1299,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6041;
+				CURRENT_PROJECT_VERSION = 6042;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1337,7 +1337,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6041;
+				CURRENT_PROJECT_VERSION = 6042;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1457,7 +1457,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6041;
+				CURRENT_PROJECT_VERSION = 6042;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1494,7 +1494,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6041;
+				CURRENT_PROJECT_VERSION = 6042;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1644,7 +1644,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6041;
+				CURRENT_PROJECT_VERSION = 6042;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1685,7 +1685,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6041;
+				CURRENT_PROJECT_VERSION = 6042;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcschemes/xcschememanagement.plist b/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -32,7 +32,7 @@
 		<key>auth_mech_fixup.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>8</integer>
 		</dict>
 		<key>authrights.xcscheme_^#shared#^_</key>
 		<dict>
@@ -42,7 +42,7 @@
 		<key>test.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>7</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>