cleaned up ropg login code

twocanoes · Dec 27, 2023 · e9b1268 · e9b1268
1 parent 32ad7b3
commit e9b1268
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 47 deletions.
diff --git a/XCreds/AppDelegate.swift b/XCreds/AppDelegate.swift
@@ -8,16 +8,8 @@
 import Cocoa
 
 @main
-class AppDelegate: NSObject, NSApplicationDelegate, DSQueryable, TokenManagerFeedbackDelegate {
-    func tokenError(_ err: String) {
-
-    }
-
-    func credentialsUpdated(_ credentials: Creds) {
-
-    }
-
-
+class AppDelegate: NSObject, NSApplicationDelegate, DSQueryable {
+
     @IBOutlet weak var loginPasswordWindow: NSWindow!
     @IBOutlet var window: NSWindow!
     var mainController:MainController?
@@ -32,11 +24,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, DSQueryable, TokenManagerFee
             TCSLogWithMark("Build \(build)")
 
         }
-let tm = TokenManager()
-        tm.feedbackDelegate=self
-        tm.oidc().requestTokenWithROPG(ropgUsername:"fred@twocanoes.com", ropgPassword: "ChairBook1!")
-//
-//
         DistributedNotificationCenter.default().addObserver(self, selector: #selector(screenLocked(_:)), name:NSNotification.Name("com.apple.screenIsLocked") , object: nil)
 
         DistributedNotificationCenter.default().addObserver(self, selector: #selector(screenUnlocked(_:)), name:NSNotification.Name("com.apple.screenIsUnlocked") , object: nil)

diff --git a/XCreds/MainController.swift b/XCreds/MainController.swift
@@ -89,7 +89,7 @@ class MainController: NSObject, NoMADUserSessionDelegate, TokenManagerFeedbackDe
 
 
     func tokenError(_ err: String) {
-        print(err)
+        TCSLogWithMark("Token error: \(err)")
     }
 
     func NoMADAuthenticationSucceded() {

diff --git a/XCreds/TokenManager.swift b/XCreds/TokenManager.swift
@@ -26,7 +26,8 @@ protocol TokenManagerFeedbackDelegate {
 }
 class TokenManager: OIDCLiteDelegate,DSQueryable {
     func authFailure(message: String) {
-
+        TCSLogWithMark("authFailure: \(message)")
+        feedbackDelegate?.tokenError(message)
     }
 
     struct UserAccountInfo {
@@ -188,7 +189,7 @@ class TokenManager: OIDCLiteDelegate,DSQueryable {
                 completion(.error("no username for oidc config"))
                 return
             }
-            oidc().requestTokenWithROPG(ropgUsername: username, ropgPassword: keychainPassword)
+            oidc().requestTokenWithROPG(username: username, password: keychainPassword)
 
         }
         else if let refreshAccountAndToken = refreshAccountAndToken, let refreshToken = refreshAccountAndToken.1 {
@@ -208,8 +209,6 @@ class TokenManager: OIDCLiteDelegate,DSQueryable {
         guard let idToken = credentials.idToken else {
             TCSLogErrorWithMark("invalid idToken")
             throw ProcessTokenResult.error("invalid idToken")
-            //            mechanismDelegate.denyLogin(message:"The identity token is invalid")
-            //            return
         }
 
         let array = idToken.components(separatedBy: ".")

diff --git a/XCreds/WebViewController.swift b/XCreds/WebViewController.swift
@@ -12,7 +12,7 @@ import OIDCLite
 
 class WebViewController: NSViewController, TokenManagerFeedbackDelegate {
     func credentialsUpdated(_ credentials: Creds) {
-
+        TCSLogWithMark()
     }
 
     @IBOutlet weak var refreshTitleTextField: NSTextField?

diff --git a/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift b/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift
@@ -17,13 +17,15 @@ let checkADLog = OSLog(subsystem: "menu.nomad.login.ad", category: "CheckADMech"
 @objc class SignInViewController: NSViewController, DSQueryable, TokenManagerFeedbackDelegate {
 
     func tokenError(_ err:String){
-
+        TCSLogWithMark("Token error: \(err)")
+        authFail()
     }
 
     func credentialsUpdated(_ credentials:Creds){
         TCSLogWithMark()
         if mechanismDelegate?.setupHints(fromCredentials: credentials, password: passString ) == false {
             TCSLogWithMark("error setting up hints")
+            authFail()
         }
 
     }
@@ -260,7 +262,7 @@ let checkADLog = OSLog(subsystem: "menu.nomad.login.ad", category: "CheckADMech"
             tokenManager.feedbackDelegate=self
 
             shortName = strippedUsername
-            tokenManager.oidc().requestTokenWithROPG(ropgUsername: strippedUsername, ropgPassword: passString)
+            tokenManager.oidc().requestTokenWithROPG(username: strippedUsername, password: passString)
             return
 
 

diff --git a/XCredsLoginPlugIn/Mechanisms/XCredsBaseMechanism.swift b/XCredsLoginPlugIn/Mechanisms/XCredsBaseMechanism.swift
@@ -182,7 +182,8 @@ import OpenDirectory
             return true
         }
         catch TokenManager.ProcessTokenResult.error(let msg){
-            denyLogin(message: msg)
+            TCSLogWithMark("invalid idToken:\(msg)")
+            denyLogin(message: nil)
             return false
         }
         catch {
@@ -297,7 +298,7 @@ import OpenDirectory
     func denyLogin(message: String?) {
         TCSLogErrorWithMark("***************** DENYING LOGIN ********************");
 
-        if let message  = message {
+        if let message = message {
             setStickyContextString(type: "ErrorMessage", value: message)
         }
 

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -1410,7 +1410,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6141;
+				CURRENT_PROJECT_VERSION = 6163;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1447,7 +1447,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6141;
+				CURRENT_PROJECT_VERSION = 6163;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1568,7 +1568,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6141;
+				CURRENT_PROJECT_VERSION = 6163;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1605,7 +1605,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6141;
+				CURRENT_PROJECT_VERSION = 6163;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1755,7 +1755,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6141;
+				CURRENT_PROJECT_VERSION = 6163;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1797,7 +1797,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6141;
+				CURRENT_PROJECT_VERSION = 6163;
 				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/xcdebugger/Breakpoints_v2.xcbkptlist b/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -4,22 +4,6 @@
    type = "1"
    version = "2.0">
    <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E1EA521E-AF06-45D9-98E9-8460A2C7CC2C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "XCreds/AppDelegate.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "17"
-            endingLineNumber = "17"
-            landmarkName = "credentialsUpdated(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent