fixed edge case when not showing xcreds login when logging out

twocanoes · Nov 12, 2022 · 3447f7b · 3447f7b
1 parent 570576b
commit 3447f7b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/XCredsLoginPlugIn/LoginProgressWindowController.swift b/XCredsLoginPlugIn/LoginProgressWindowController.swift
@@ -16,7 +16,7 @@ class LoginProgressWindowController: NSWindowController {
 
         NotificationCenter.default.addObserver(forName: NSNotification.Name("hideProgress"), object:nil, queue: nil) { notification in
 
-            TCSLogWithMark("gotnotification")
+            TCSLogWithMark("Got notified to hide progress.")
             self.window?.close()
 
         }

diff --git a/XCredsLoginPlugIn/Mechanisms/XCredsLoginMechanism.swift b/XCredsLoginPlugIn/Mechanisms/XCredsLoginMechanism.swift
@@ -98,15 +98,17 @@ import Cocoa
             return
         }
         let isReturning = FileManager.default.fileExists(atPath: "/tmp/xcreds_return")
+        TCSLogWithMark("Verifying if we should show cloud login.")
+
         if isReturning == false, UserDefaults.standard.bool(forKey: PrefKeys.shouldShowCloudLoginByDefault.rawValue) == false {
             setContextString(type: kAuthorizationEnvironmentUsername, value: SpecialUsers.standardLoginWindow.rawValue)
+            TCSLogWithMark("marking to show standard login window")
 
             allowLogin()
             return
         }
-        if isReturning == true {
-            try? FileManager.default.removeItem(atPath: "/tmp/xcreds_return")
-        }
+        TCSLogWithMark("Showing XCreds Login Window")
+
         NSApp.activate(ignoringOtherApps: true)
 
         webViewController = LoginWebViewController(windowNibName: NSNib.Name("LoginWebView"))

diff --git a/XCredsLoginPlugIn/Mechanisms/XCredsPowerControlMechanism.swift b/XCredsLoginPlugIn/Mechanisms/XCredsPowerControlMechanism.swift
@@ -20,6 +20,18 @@ class XCredsPowerControlMechanism: XCredsBaseMechanism {
 
     @objc override func run() {
         TCSLogWithMark("PowerControl mech starting")
+
+        if FileManager.default.fileExists(atPath: "/tmp/xcreds_return")==true{
+            TCSLogWithMark("xcreds_return exists, removing")
+
+            do{
+                try FileManager.default.removeItem(atPath: "/tmp/xcreds_return")
+            }
+            catch {
+                TCSLogWithMark("Error removing xcreds_return \(error.localizedDescription)")
+            }
+        }
+
         if AuthorizationDBManager.shared.rightExists(right: "loginwindow:login"){
             TCSLogWithMark("setting standard login back to XCreds login")
             let _ = AuthorizationDBManager.shared.replace(right:"loginwindow:login", withNewRight: "XCredsLoginPlugin:LoginWindow")
@@ -32,7 +44,6 @@ class XCredsPowerControlMechanism: XCredsBaseMechanism {
         }
 
 
-
         switch userName {
         case SpecialUsers.sleep.rawValue:
             TCSLogWithMark("Sleeping system.")

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -893,7 +893,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3327;
+				CURRENT_PROJECT_VERSION = 3335;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -924,7 +924,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3327;
+				CURRENT_PROJECT_VERSION = 3335;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -983,7 +983,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3327;
+				CURRENT_PROJECT_VERSION = 3335;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1013,7 +1013,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3327;
+				CURRENT_PROJECT_VERSION = 3335;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1156,7 +1156,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3327;
+				CURRENT_PROJECT_VERSION = 3335;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1185,7 +1185,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3327;
+				CURRENT_PROJECT_VERSION = 3335;
 				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