fixed silentoverride issue

twocanoes · Feb 6, 2024 · 253a29c · 253a29c
1 parent dec4a69
commit 253a29c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 34 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.1 (6313) OAuth Settings</string>
+	<string>XCreds 4.1 (6315) 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/Mechanisms/XCredsBaseMechanism.swift b/XCredsLoginPlugIn/Mechanisms/XCredsBaseMechanism.swift
@@ -152,44 +152,42 @@ import OpenDirectory
                     setHint(type: .adminPassword, hint: aPassword)
                     setHint(type: .passwordOverwrite, hint: true)
 
-
-                    allowLogin()
-
                 }
-                let promptPasswordWindowController = VerifyLocalPasswordWindowController()
+                else {
+                    let promptPasswordWindowController = VerifyLocalPasswordWindowController()
 
-                promptPasswordWindowController.showResetText=true
-                promptPasswordWindowController.showResetButton=true
+                    promptPasswordWindowController.showResetText=true
+                    promptPasswordWindowController.showResetButton=true
 
 
-                switch  promptPasswordWindowController.promptForLocalAccountAndChangePassword(username: username, newPassword: password, shouldUpdatePassword: true) {
+                    switch  promptPasswordWindowController.promptForLocalAccountAndChangePassword(username: username, newPassword: password, shouldUpdatePassword: true) {
 
 
-                case .success(let enteredUsernamePassword):
-                    TCSLogWithMark("setting original password to use to unlock keychain later")
+                    case .success(let enteredUsernamePassword):
+                        TCSLogWithMark("setting original password to use to unlock keychain later")
 
-                    if let enteredUsernamePassword = enteredUsernamePassword {
-                        setHint(type: .existingLocalUserPassword, hint:enteredUsernamePassword.password as Any  )
-                    }
+                        if let enteredUsernamePassword = enteredUsernamePassword {
+                            setHint(type: .existingLocalUserPassword, hint:enteredUsernamePassword.password as Any  )
+                        }
 
-                case .resetKeychainRequested(let usernamePasswordCredentials):
-
-                    if let adminUsername = usernamePasswordCredentials?.username, let adminPassword = usernamePasswordCredentials?.password {
-                        setHint(type: .adminUsername, hint:adminUsername )
-                        setHint(type: .adminPassword, hint: adminPassword)
-                        setHint(type: .passwordOverwrite, hint: true)
+                    case .resetKeychainRequested(let usernamePasswordCredentials):
 
-                    }
+                        if let adminUsername = usernamePasswordCredentials?.username, let adminPassword = usernamePasswordCredentials?.password {
+                            setHint(type: .adminUsername, hint:adminUsername )
+                            setHint(type: .adminPassword, hint: adminPassword)
+                            setHint(type: .passwordOverwrite, hint: true)
 
+                        }
 
-                case .userCancelled:
-                    return .failure("user cancelled")
-                case .error(let errMsg):
-                    TCSLogWithMark("Error prompting: \(errMsg)")
-                    return .failure(errMsg)
+
+                    case .userCancelled:
+                        return .failure("user cancelled")
+                    case .error(let errMsg):
+                        TCSLogWithMark("Error prompting: \(errMsg)")
+                        return .failure(errMsg)
+                    }
                 }
 
-                break
             case .accountDoesNotExist:
                 TCSLogWithMark("user account doesn't exist yet")
 

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -1440,7 +1440,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6313;
+				CURRENT_PROJECT_VERSION = 6318;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1477,7 +1477,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6313;
+				CURRENT_PROJECT_VERSION = 6318;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1598,7 +1598,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6313;
+				CURRENT_PROJECT_VERSION = 6318;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1635,7 +1635,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6313;
+				CURRENT_PROJECT_VERSION = 6318;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1785,7 +1785,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6313;
+				CURRENT_PROJECT_VERSION = 6318;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1827,7 +1827,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6313;
+				CURRENT_PROJECT_VERSION = 6318;
 				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>6</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>6</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>