Removed debug logging. Added logging for Keychain-related errors.

Author: erikdoe

CCMenu/Source/Miscellaneous/Keychain.swift

@@ -50,12 +50,9 @@ class Keychain {
     }
 
     func getPassword(forURL url: URL) throws -> String? {
-        let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "keychain")
         if let password = cache[url.absoluteString] {
-            logger.log("Using cached password for \(url, privacy: .public)")
             return password
         }
-        logger.log("Retrieving password for \(url, privacy: .public) from keychain")
         let query = [
             kSecClass:        kSecClassInternetPassword,
             kSecAttrServer:   try getOrThrow(error: .missingHostErr) { url.host() },
@@ -65,11 +62,6 @@ class Keychain {
             kSecReturnData:   true
         ] as NSDictionary
         let password = try getStringForQuery(query)
-        if let password {
-            logger.log("Got password (length = \(password.count, privacy: .public))")
-        } else {
-            logger.log("Didn't get a password")
-        }
         cache[url.absoluteString] = password
         return password
     }

CCMenu/Source/Pipeline Window/CCTray Sheets/CCTrayPipelineBuilder.swift

@@ -49,7 +49,7 @@ class CCTrayPipelineBuilder: ObservableObject {
                     let newUrl = components.url?.absoluteURL ?? url
                     try Keychain.standard.setPassword(credential.password, forURL: newUrl.absoluteString)
                 } catch {
-                    let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "keychain")
+                    let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "application")
                     logger.error("Error when storing password in keychain: \(error.localizedDescription, privacy: .public)")
                 }
             }

CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubAuthenticator.swift

@@ -5,6 +5,7 @@
  */
 
 import SwiftUI
+import os
 
 @MainActor
 class GitHubAuthenticator: ObservableObject {
@@ -122,8 +123,9 @@ class GitHubAuthenticator: ObservableObject {
         do {
             token = try Keychain.standard.getToken(forService: "GitHub")
         } catch {
-            // TODO: Figure out what to do here – so many errors...
             token = nil
+            let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "application")
+            logger.error("Error when retrieving token from keychain: \(error.localizedDescription, privacy: .public)")
         }
         tokenDescription = token ?? ""
     }
@@ -134,7 +136,8 @@ class GitHubAuthenticator: ObservableObject {
         do {
             try Keychain.standard.setToken(token, forService: "GitHub")
         } catch {
-            // TODO: Figure out what to do here – so many errors...
+            let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "application")
+            logger.error("Error when storing token in keychain: \(error.localizedDescription, privacy: .public)")
         }
     }
 

CCMenu/Source/Server Monitor/CCTrayAPI.swift

@@ -5,7 +5,6 @@
  */
 
 import Foundation
-import os
 
 struct HTTPCredential {
     var user: String
@@ -19,16 +18,11 @@ struct HTTPCredential {
 class CCTrayAPI {
 
     static func requestForProjects(url: URL, credential: HTTPCredential?) -> URLRequest {
-        let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "network")
         var request = URLRequest(url: url)
 
         if let credential {
             let v = URLRequest.basicAuthValue(user: credential.user, password: credential.password)
             request.setValue(v, forHTTPHeaderField: "Authorization")
-            let redacted = v.replacingOccurrences(of: "[A-Za-z0-9=]", with: "*", options: [.regularExpression])
-            logger.log("Making request for url \(url, privacy: .public) with authorization \(redacted, privacy: .public)")
-        } else {
-            logger.log("Making request for url \(url, privacy: .public)")
         }
 
         return request