diff --git a/DefaultsOverride.swift b/DefaultsOverride.swift index 952075ff..9048b9e4 100644 --- a/DefaultsOverride.swift +++ b/DefaultsOverride.swift @@ -68,10 +68,10 @@ public class DefaultsOverride: UserDefaults { let scriptRes=cliTask(prefScriptPath) - if scriptRes.count==0{ - TCSLogErrorWithMark("script did not return anything") - return - } + if scriptRes.count==0{ + TCSLogErrorWithMark("script did not return anything") + return + } TCSLogWithMark() guard let rawData = scriptRes.data(using: .utf8) else { TCSLogErrorWithMark("could not convert raw data"); diff --git a/NomadLogin/LocalCheckAndMigrate.swift b/NomadLogin/LocalCheckAndMigrate.swift index 8f1252bb..94112364 100644 --- a/NomadLogin/LocalCheckAndMigrate.swift +++ b/NomadLogin/LocalCheckAndMigrate.swift @@ -48,9 +48,9 @@ class LocalCheckAndMigrate : NSObject, DSQueryable { else { if let kerberosPrincipalName = kerberosPrincipalName, let foundRecord = try? getUserRecord(kerberosPrincipalNameToFind: kerberosPrincipalName) { - user = foundRecord.recordName + user = foundRecord.recordName + } } - } let shouldPromptToMigrate = DefaultsOverride.standardOverride.bool(forKey: PrefKeys.shouldPromptForMigration.rawValue) // check local user pass to see if user exists diff --git a/Profile Manifest/com.twocanoes.xcreds.plist b/Profile Manifest/com.twocanoes.xcreds.plist index ba2ba56b..0219ce4e 100644 --- a/Profile Manifest/com.twocanoes.xcreds.plist +++ b/Profile Manifest/com.twocanoes.xcreds.plist @@ -5,7 +5,7 @@ pfm_app_url https://github.com/twocanoes/xcreds pfm_description - XCreds 4.1 (6374) OAuth Settings + XCreds 4.1 (6408) OAuth Settings pfm_documentation_url https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences pfm_domain @@ -13,7 +13,7 @@ pfm_format_version 1 pfm_last_modified - 2024-02-24T15:30:20Z + 2024-04-22T17:39:46Z pfm_platforms macOS @@ -1347,6 +1347,6 @@ changing “passwordID” to the correct element ID. If the value you typed into pfm_unique pfm_version - 7 + 8 diff --git a/Shared/Tokens.swift b/Shared/Tokens.swift index c1b308e7..805344a8 100644 --- a/Shared/Tokens.swift +++ b/Shared/Tokens.swift @@ -41,6 +41,10 @@ struct Creds { return (self.accessToken != nil) && (self.refreshToken != nil) } + func hasAccess() -> Bool { + + return (self.accessToken != nil) + } } diff --git a/XCreds/AboutWindow.xib b/XCreds/AboutWindow.xib index b0aff8c6..02647bd5 100644 --- a/XCreds/AboutWindow.xib +++ b/XCreds/AboutWindow.xib @@ -1,8 +1,8 @@ - + - + diff --git a/XCreds/Base.lproj/MainMenu.xib b/XCreds/Base.lproj/MainMenu.xib index c9198d88..656f7dda 100644 --- a/XCreds/Base.lproj/MainMenu.xib +++ b/XCreds/Base.lproj/MainMenu.xib @@ -1,8 +1,8 @@ - + - + @@ -328,14 +328,14 @@ - - + + - - + + diff --git a/XCreds/DesktopLoginWindowController.xib b/XCreds/DesktopLoginWindowController.xib index 8071c182..200ec1c1 100644 --- a/XCreds/DesktopLoginWindowController.xib +++ b/XCreds/DesktopLoginWindowController.xib @@ -1,9 +1,9 @@ - + - - + + diff --git a/XCreds/PreferencesWindow.xib b/XCreds/PreferencesWindow.xib index 58e731ae..e5dec435 100644 --- a/XCreds/PreferencesWindow.xib +++ b/XCreds/PreferencesWindow.xib @@ -1,8 +1,8 @@ - + - + diff --git a/XCreds/ScheduleManager.swift b/XCreds/ScheduleManager.swift index db6cf754..23f82d6b 100644 --- a/XCreds/ScheduleManager.swift +++ b/XCreds/ScheduleManager.swift @@ -171,7 +171,7 @@ class ScheduleManager:TokenManagerFeedbackDelegate, NoMADUserSessionDelegate { } func NoMADAuthenticationFailed(error: NoMADSessionError, description: String) { - TCSLogErrorWithMark("NoMADAuthenticationFailed:\(description)") + TCSLogErrorWithMark("AuthenticationFailed:\(description)") feedbackDelegate?.kerberosTicketCheckFailed(error) } diff --git a/XCreds/TokenManager.swift b/XCreds/TokenManager.swift index e25e01b3..d0a4bb1b 100644 --- a/XCreds/TokenManager.swift +++ b/XCreds/TokenManager.swift @@ -413,15 +413,34 @@ extension TokenManager { func tokenResponse(tokens: OIDCLite.TokenResponse) { TCSLogWithMark("======== tokenResponse =========") - RunLoop.main.perform { + let googleAuth = DefaultsOverride.standardOverride.bool(forKey: PrefKeys.shouldSetGoogleAccessTypeToOffline.rawValue) + let xcredCreds = Creds(password: nil, tokens: tokens) - if xcredCreds.hasAccessAndRefresh(){ + + if xcredCreds.hasAccessAndRefresh() { + TCSLogWithMark("Found access and refresh token") + + } + if googleAuth { + TCSLogWithMark("Found google auth") + + } + if xcredCreds.hasAccess() { + TCSLogWithMark("found access token") + + } + if googleAuth && xcredCreds.hasAccess() { + TCSLogWithMark("Found google auth and access token") + + } + + if xcredCreds.hasAccessAndRefresh() || (googleAuth && xcredCreds.hasAccess()) { self.feedbackDelegate?.credentialsUpdated(xcredCreds) } else { - self.feedbackDelegate?.tokenError("error gettings tokens") + self.feedbackDelegate?.tokenError("error gettings tokens: jsonDict:\(String(describing: tokens.jsonDict?.debugDescription))") } } diff --git a/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift b/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift index c976ea5d..f14883ac 100644 --- a/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift +++ b/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift @@ -735,7 +735,7 @@ extension SignInViewController: NoMADUserSessionDelegate { func NoMADAuthenticationFailed(error: NoMADSessionError, description: String) { updateCredentialsFeedbackDelegate?.kerberosTicketCheckFailed(error) - TCSLogWithMark("NoMADAuthenticationFailed: \(description)") + TCSLogWithMark("AuthenticationFailed: \(description)") // alertTextField.isHidden=false // alertTextField.stringValue = description // if passChanged { diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj index ff04eef4..2151bc32 100644 --- a/xCreds.xcodeproj/project.pbxproj +++ b/xCreds.xcodeproj/project.pbxproj @@ -1409,6 +1409,7 @@ ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Carthage/Build/Mac\""; MACOSX_DEPLOYMENT_TARGET = 11.0; + MARKETING_VERSION = 4.2; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; @@ -1426,6 +1427,7 @@ ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Carthage/Build/Mac\""; MACOSX_DEPLOYMENT_TARGET = 11.0; + MARKETING_VERSION = 4.2; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; @@ -1440,7 +1442,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 6375; + CURRENT_PROJECT_VERSION = 6408; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = UXP6YEHSPW; FRAMEWORK_SEARCH_PATHS = ( @@ -1459,7 +1461,7 @@ "@loader_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1; + MARKETING_VERSION = 4.2; PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.XCredsLoginPlugin; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1477,7 +1479,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 6375; + CURRENT_PROJECT_VERSION = 6408; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = UXP6YEHSPW; FRAMEWORK_SEARCH_PATHS = ( @@ -1496,7 +1498,7 @@ "@loader_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1; + MARKETING_VERSION = 4.2; PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.XCredsLoginPlugin; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1598,7 +1600,7 @@ CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 6375; + CURRENT_PROJECT_VERSION = 6408; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -1615,7 +1617,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1; + MARKETING_VERSION = 4.2; PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.XCreds-Login-Overlay"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1635,7 +1637,7 @@ CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 6375; + CURRENT_PROJECT_VERSION = 6408; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -1652,7 +1654,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1; + MARKETING_VERSION = 4.2; PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.XCreds-Login-Overlay"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1785,7 +1787,7 @@ CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 6375; + CURRENT_PROJECT_VERSION = 6408; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -1808,7 +1810,7 @@ "$(SDKROOT)/usr/lib/system", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1; + MARKETING_VERSION = 4.2; PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.xcreds; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; @@ -1827,7 +1829,7 @@ CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 6375; + CURRENT_PROJECT_VERSION = 6408; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -1850,7 +1852,7 @@ "$(SDKROOT)/usr/lib/system", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1; + MARKETING_VERSION = 4.2; PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.xcreds; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; diff --git a/xCreds.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xCreds.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8514912a..d9b433e8 100644 --- a/xCreds.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/xCreds.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/apple/swift-argument-parser.git", "state": { "branch": null, - "revision": "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a", - "version": "1.2.2" + "revision": "46989693916f56d1186bd59ac15124caef896560", + "version": "1.3.1" } } ] diff --git a/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate index 91003da4..4286f66c 100644 Binary files a/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate and b/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index af741fc3..ea34fbfa 100644 --- a/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -18,53 +18,38 @@ endingLineNumber = "102" landmarkName = "showSignInWindow(force:forceLoginWindowType:)" landmarkType = "7"> - - - - - - - - + + + + + + + +