Recent updates to Swift causes getpass to fail in headless terminals

okta · Nov 21, 2023 · 0d07c3f · 0d07c3f
1 parent 4e1ae36
commit 0d07c3f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/Samples/UserPasswordSignIn/UserPasswordSignIn (macOS)/main+Extensions.swift b/Samples/UserPasswordSignIn/UserPasswordSignIn (macOS)/main+Extensions.swift
@@ -15,11 +15,16 @@ import OktaOAuth2
 
 enum UserPasswordError: Error {
     case missingUsername
+    case missingPassword
     case invalidDomain
 }
 
 extension UserPasswordSignIn {
     func promptUsername() throws -> String {
+        if let username {
+            return username
+        }
+
         print("Username: ", terminator: "")
         guard let username = readLine(strippingNewline: true) else {
             throw UserPasswordError.missingUsername
@@ -28,8 +33,15 @@ extension UserPasswordSignIn {
     }
 
     func promptPassword() throws -> String {
-        print("Password: ")
+        if let password {
+            return password
+        }
+
+        print("Password: ", terminator: "")
         let password = String(cString: getpass(""))
+        if password.isEmpty {
+            throw UserPasswordError.missingPassword
+        }
         return password
     }
 

diff --git a/Samples/UserPasswordSignIn/UserPasswordSignIn (macOS)/main.swift b/Samples/UserPasswordSignIn/UserPasswordSignIn (macOS)/main.swift
@@ -31,6 +31,12 @@ struct UserPasswordSignIn: Command {
     @Option(help: "The scopes to use.")
     var scopes: String = "openid profile"
 
+    @Option(help: "Username to use")
+    var username: String?
+
+    @Option(help: "Password")
+    var password: String?
+
     #if swift(>=5.6)
     mutating func run() async throws {
         guard #available(macOS 12, *) else {

diff --git a/Samples/UserPasswordSignIn/UserPasswordSignIn Tests/SignInTests.swift b/Samples/UserPasswordSignIn/UserPasswordSignIn Tests/SignInTests.swift
@@ -52,12 +52,11 @@ class SignInTests: XCTestCase {
         let command = Command(commandPath, arguments: [
             "--issuer", "https://\(domain)/oauth2/default",
             "--client-id", clientId,
-            "--scopes", scopes
+            "--scopes", scopes,
+            "--username", username,
+            "--password", password,
         ])
 
-        command.expect("Username:", response: username)
-        command.expect("Password:", response: password)
-
         try command.run()
 
         XCTAssertEqual(command.output?["Username"], username)