Skip to content

Commit

Permalink
fixed typo in function name
Browse files Browse the repository at this point in the history
  • Loading branch information
twocanoes committed Sep 15, 2023
1 parent 04475b8 commit 8c12d45
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions XCreds/TokenManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ class TokenManager {

let clientID = defaults.string(forKey: PrefKeys.clientID.rawValue)
let keychainAccountAndPassword = try? keychainUtil.findPassword(serviceName: "xcreds local password",accountName:PrefKeys.password.rawValue)
func handleIdpRepsonse(data: Data?, response: URLResponse?, error: Error?, keychainPassword: String) {

func handleIdpResponse(data: Data?, response: URLResponse?, error: Error?, keychainPassword: String) {
guard let data = data else {
print(String(describing: error))
if let error = error {
Expand Down Expand Up @@ -202,7 +203,7 @@ class TokenManager {
}

TCSLogWithMark()
if DefaultsOverride.standardOverride.bool(forKey: PrefKeys.verifyPasswordWithRopg.rawValue) == true, let keychainAccountAndPassword = keychainAccountAndPassword, let keychainPassword = keychainAccountAndPassword.1, let ropgClientSecret = DefaultsOverride.standardOverride.string(forKey: PrefKeys.ropgClientSecret.rawValue), let ropgClientID = DefaultsOverride.standardOverride.string(forKey: PrefKeys.ropgClientID.rawValue) {
if DefaultsOverride.standardOverride.bool(forKey: PrefKeys.shouldVerifyPasswordWithRopg.rawValue) == true, let keychainAccountAndPassword = keychainAccountAndPassword, let keychainPassword = keychainAccountAndPassword.1, let ropgClientSecret = DefaultsOverride.standardOverride.string(forKey: PrefKeys.ropgClientSecret.rawValue), let ropgClientID = DefaultsOverride.standardOverride.string(forKey: PrefKeys.ropgClientID.rawValue) {
TCSLogWithMark("Checking credentials in keychain using ROPG")
let currentUser = PasswordUtils.getCurrentConsoleUserRecord()
guard let userName = currentUser?.recordName else {
Expand All @@ -227,11 +228,12 @@ class TokenManager {
req.httpBody = postData

let task = URLSession.shared.dataTask(with: req) { data, response, error in
handleIdpRepsonse(data: data, response: response, error: error, keychainPassword: keychainPassword)
handleIdpResponse(data: data, response: response, error: error, keychainPassword: keychainPassword)
}

task.resume()
} else if let refreshAccountAndToken = refreshAccountAndToken, let refreshToken = refreshAccountAndToken.1, let clientID = clientID, let keychainAccountAndPassword = keychainAccountAndPassword, let keychainPassword = keychainAccountAndPassword.1 {
}
else if let refreshAccountAndToken = refreshAccountAndToken, let refreshToken = refreshAccountAndToken.1, let clientID = clientID, let keychainAccountAndPassword = keychainAccountAndPassword, let keychainPassword = keychainAccountAndPassword.1 {
TCSLogWithMark("Checking credentials in keychain using refresh token")
var parameters = "grant_type=refresh_token&refresh_token=\(refreshToken)&client_id=\(clientID )"
if let clientSecret = defaults.string(forKey: PrefKeys.clientSecret.rawValue) {
Expand All @@ -245,7 +247,7 @@ class TokenManager {
req.httpBody = postData

let task = URLSession.shared.dataTask(with: req) { data, response, error in
handleIdpRepsonse(data: data, response: response, error: error, keychainPassword: keychainPassword)
handleIdpResponse(data: data, response: response, error: error, keychainPassword: keychainPassword)
}

task.resume()
Expand Down
Binary file not shown.

0 comments on commit 8c12d45

Please sign in to comment.