Skip to content

Commit

Permalink
added more logging
Browse files Browse the repository at this point in the history
  • Loading branch information
@twocanoes
twocanoes committed Sep 25, 2024
1 parent 404b451 commit e4c539b
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 33 deletions.
1 change: 0 additions & 1 deletion XCreds Login Overlay/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import AppKit
@main
class App {
static func main() {
sleep(5)
_ = NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv)
}
}
Expand Down
2 changes: 1 addition & 1 deletion XCreds/DesktopLoginWindowController.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<wkPreferences key="preferences" javaScriptCanOpenWindowsAutomatically="NO"/>
</wkWebViewConfiguration>
</wkWebView>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="YnV-QC-aTR">
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="YnV-QC-aTR">
<rect key="frame" x="0.0" y="562" width="628" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="JzN-tR-KJo"/>
Expand Down
20 changes: 11 additions & 9 deletions XCreds/MainController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,34 +88,35 @@ class MainController: NSObject, UpdateCredentialsFeedbackProtocol {

}
func showSignInWindow(force:Bool=false, forceLoginWindowType:LoginWindowType?=nil ) {
TCSLogWithMark()
if isLocalOnlyAccount()==true && force==false{
TCSLogWithMark()
return
}


if let webViewController = windowController.webViewController{
TCSLogWithMark()
webViewController.webView.isHidden=true
}
scheduleManager.setNextCheckTime()

var forceUsernamePassword = false
var forceCloudPassword = false

if let forceLoginWindowType = forceLoginWindowType {

if forceLoginWindowType == .cloud {
forceCloudPassword = true
}
else {
TCSLogWithMark()
if forceLoginWindowType == .usernamePassword {
TCSLogWithMark()
forceUsernamePassword = true
}
}
if forceUsernamePassword == false && (DefaultsOverride.standardOverride.value(forKey: PrefKeys.discoveryURL.rawValue) != nil && DefaultsOverride.standardOverride.value(forKey: PrefKeys.clientID.rawValue) != nil && DefaultsOverride.standardOverride.bool(forKey: PrefKeys.shouldUseROPGForMenuLogin.rawValue) == false) {
TCSLogWithMark()
windowController.window!.makeKeyAndOrderFront(self)

if let webViewController = windowController.webViewController{
webViewController.webView.isHidden=false

TCSLogWithMark()
windowController.webViewController.updateCredentialsFeedbackDelegate=self
windowController.webViewController?.loadPage()
}
Expand All @@ -127,6 +128,7 @@ class MainController: NSObject, UpdateCredentialsFeedbackProtocol {
{
if let webView = windowController.webViewController?.webView {
webView.isHidden=true
TCSLogWithMark()
}

if let window = windowController.window{
Expand All @@ -136,15 +138,15 @@ class MainController: NSObject, UpdateCredentialsFeedbackProtocol {
if signInViewController == nil {
signInViewController = SignInViewController(nibName: "LocalUsersViewController", bundle:bundle)
}

TCSLogWithMark()
signInViewController?.isInUserSpace = true
signInViewController?.updateCredentialsFeedbackDelegate=self
guard let signInViewController = signInViewController else {
return
}

if let contentView = window.contentView {

TCSLogWithMark()
windowController.webViewController.webView.isHidden=true
signInViewController.view.wantsLayer=true

Expand Down
10 changes: 6 additions & 4 deletions XCredsLoginPlugIn/LoginWindow/ControlsViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,15 @@ class ControlsViewController: NSViewController, NSPopoverDelegate {
override func awakeFromNib() {
TCSLogWithMark()
super.awakeFromNib()
let licenseState = LicenseChecker().currentLicenseState()
NSEvent.addLocalMonitorForEvents(matching: .flagsChanged, handler: commandKey(evt:))
self.trialVersionStatusTextField?.isHidden = false
NSEvent.addLocalMonitorForEvents(matching: .keyDown, handler: keyDown(key:))
NSEvent.addLocalMonitorForEvents(matching: .keyUp, handler: keyUp(key:))

setupSystemInfoButton()
NSEvent.addLocalMonitorForEvents(matching: .flagsChanged, handler: commandKey(evt:))


let licenseState = LicenseChecker().currentLicenseState()
self.trialVersionStatusTextField?.isHidden = false

switch licenseState {

case .valid(let secRemaining):
Expand Down
32 changes: 16 additions & 16 deletions xCreds.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1685,7 +1685,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.xcreds.XCreds-AutoFill";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1724,7 +1724,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.xcreds.XCreds-AutoFill";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1762,7 +1762,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.xcreds.XCreds-AutoFill.XCreds-AutoFill-Extension";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1797,7 +1797,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.xcreds.XCreds-AutoFill.XCreds-AutoFill-Extension";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -1816,7 +1816,7 @@
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Carthage/Build/Mac\"";
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
Expand All @@ -1835,7 +1835,7 @@
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Carthage/Build/Mac\"";
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
Expand Down Expand Up @@ -1869,7 +1869,7 @@
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.XCredsLoginPlugin;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1906,7 +1906,7 @@
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.XCredsLoginPlugin;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1957,7 +1957,7 @@
DEVELOPMENT_TEAM = UXP6YEHSPW;
ENABLE_HARDENED_RUNTIME = YES;
MACOSX_DEPLOYMENT_TARGET = 13.3;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "auth_mech_fixup/auth_mech_fixup-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand All @@ -1973,7 +1973,7 @@
DEVELOPMENT_TEAM = UXP6YEHSPW;
ENABLE_HARDENED_RUNTIME = YES;
MACOSX_DEPLOYMENT_TARGET = 13.3;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "auth_mech_fixup/auth_mech_fixup-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand All @@ -1989,7 +1989,7 @@
DEVELOPMENT_TEAM = UXP6YEHSPW;
ENABLE_HARDENED_RUNTIME = YES;
MACOSX_DEPLOYMENT_TARGET = 13.3;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
Expand All @@ -2004,7 +2004,7 @@
DEVELOPMENT_TEAM = UXP6YEHSPW;
ENABLE_HARDENED_RUNTIME = YES;
MACOSX_DEPLOYMENT_TARGET = 13.3;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
Expand Down Expand Up @@ -2035,7 +2035,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.XCreds-Login-Overlay";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -2072,7 +2072,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.twocanoes.XCreds-Login-Overlay";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -2230,7 +2230,7 @@
"$(SDKROOT)/usr/lib/system",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.xcreds;
PRODUCT_NAME = "$(TARGET_NAME)";
STRIP_INSTALLED_PRODUCT = NO;
Expand Down Expand Up @@ -2274,7 +2274,7 @@
"$(SDKROOT)/usr/lib/system",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1;
PRODUCT_BUNDLE_IDENTIFIER = com.twocanoes.xcreds;
PRODUCT_NAME = "$(TARGET_NAME)";
STRIP_INSTALLED_PRODUCT = NO;
Expand Down
Binary file modified ...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
36 changes: 34 additions & 2 deletions xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,43 @@
filePath = "XCredsLoginPlugIn/LoginWindow/ControlsViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "211"
endingLineNumber = "211"
startingLineNumber = "213"
endingLineNumber = "213"
landmarkName = "awakeFromNib()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C914B123-86E9-48C1-AACD-9B9D587307C2"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "XCreds/MainController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "129"
endingLineNumber = "129"
landmarkName = "showSignInWindow(force:forceLoginWindowType:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "404A1FC9-B3DA-4BAA-A0DB-AB650F08CD89"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "XCreds/MainController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "91"
endingLineNumber = "91"
landmarkName = "showSignInWindow(force:forceLoginWindowType:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

0 comments on commit e4c539b

Please sign in to comment.