fixed enabing window state with AD

twocanoes · Jan 14, 2024 · 24d17c9 · 24d17c9
1 parent b4ffa8f
commit 24d17c9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/Profile Manifest/com.twocanoes.xcreds.plist b/Profile Manifest/com.twocanoes.xcreds.plist
@@ -5,7 +5,7 @@
 	<key>pfm_app_url</key>
 	<string>https://github.com/twocanoes/xcreds</string>
 	<key>pfm_description</key>
-	<string>XCreds 4.0 (6233) OAuth Settings</string>
+	<string>XCreds 4.0 (6234) OAuth Settings</string>
 	<key>pfm_documentation_url</key>
 	<string>https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences</string>
 	<key>pfm_domain</key>

diff --git a/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift b/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift
@@ -239,17 +239,17 @@ protocol UpdateCredentialsFeedbackProtocol {
         passwordTextField.shake(self)
         alertTextField.isHidden=false
         alertTextField.stringValue = message ?? "Authentication Failed"
-        loginStartedUI()
+        setLoginWindowState(enabled: true)
     }
 
     /// Simple toggle to change the state of the NoLo window UI between active and inactive.
-    fileprivate func loginStartedUI() {
+    fileprivate func setLoginWindowState(enabled:Bool) {
         TCSLogWithMark()
-        signIn.isEnabled = !signIn.isEnabled
+        signIn.isEnabled = enabled
         TCSLogWithMark()
-        usernameTextField.isEnabled = !usernameTextField.isEnabled
-        passwordTextField.isEnabled = !passwordTextField.isEnabled
-        localOnlyCheckBox.isEnabled = !localOnlyCheckBox.isEnabled
+        usernameTextField.isEnabled = enabled
+        passwordTextField.isEnabled = enabled
+        localOnlyCheckBox.isEnabled = enabled
 
         TCSLogWithMark()
     }
@@ -278,7 +278,8 @@ protocol UpdateCredentialsFeedbackProtocol {
             TCSLogWithMark("No password entered")
             return
         }
-        loginStartedUI()
+        setLoginWindowState(enabled: false)
+
         TCSLogWithMark()
         updateLoginWindowInfo()
         TCSLogWithMark()
@@ -761,7 +762,8 @@ extension SignInViewController: NoMADUserSessionDelegate {
             let res = showResetUI()
 
             if res == false { //user cancelled so enable UI
-                loginStartedUI()
+                setLoginWindowState(enabled: true)
+
             }
             return
         case .OffDomain:
@@ -778,7 +780,7 @@ extension SignInViewController: NoMADUserSessionDelegate {
 
         default:
             TCSLogErrorWithMark("NoMAD Login Authentication failed with: \(description)")
-            loginStartedUI()
+//            loginStartedUI()
                 authFail(description)
 //
             return

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -1436,7 +1436,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6233;
+				CURRENT_PROJECT_VERSION = 6239;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1473,7 +1473,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6233;
+				CURRENT_PROJECT_VERSION = 6239;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1594,7 +1594,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6233;
+				CURRENT_PROJECT_VERSION = 6239;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1631,7 +1631,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6233;
+				CURRENT_PROJECT_VERSION = 6239;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1781,7 +1781,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6233;
+				CURRENT_PROJECT_VERSION = 6239;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1823,7 +1823,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6233;
+				CURRENT_PROJECT_VERSION = 6239;
 				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>8</integer>
+			<integer>7</integer>
 		</dict>
 		<key>authrights.xcscheme_^#shared#^_</key>
 		<dict>
@@ -42,7 +42,7 @@
 		<key>test.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>8</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>