Skip to content

Commit a33e46a

Browse files
committed
feat(Auth): Removed deviceNotFound TODO which is not applicable for TOTP (#3074)
1 parent 4f7d9c8 commit a33e46a

File tree

2 files changed

+5
-40
lines changed

2 files changed

+5
-40
lines changed

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/DeviceSRPAuth/InitiateAuthDeviceSRP.swift

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,23 +85,12 @@ struct InitiateAuthDeviceSRP: Action {
8585
func parseResponse(
8686
_ response: SignInResponseBehavior,
8787
with stateData: SRPStateData) -> StateMachineEvent {
88-
89-
90-
//HS: TODO: Combine this logic with responedToAuthChallenge
91-
if let challengeName = response.challengeName {
92-
switch challengeName {
93-
case .devicePasswordVerifier:
94-
return SignInEvent(eventType: .respondDevicePasswordVerifier(stateData, response))
95-
default:
96-
let message = "Unsupported challenge response during DeviceSRPAuth \(challengeName)"
97-
let error = SignInError.unknown(message: message)
98-
return SignInEvent(eventType: .throwAuthError(error))
99-
}
100-
} else {
101-
let message = "Response did not contain challenge info"
102-
let error = SignInError.invalidServiceResponse(message: message)
88+
guard case .devicePasswordVerifier = response.challengeName else {
89+
let message = "Unsupported challenge response during DeviceSRPAuth \(response.challengeName ?? .sdkUnknown("Response did not contain challenge info"))"
90+
let error = SignInError.unknown(message: message)
10391
return SignInEvent(eventType: .throwAuthError(error))
10492
}
93+
return SignInEvent(eventType: .respondDevicePasswordVerifier(stateData, response))
10594
}
10695

10796
}

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/SoftwareTokenSetup/CompleteTOTPSetup.swift

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,7 @@ struct CompleteTOTPSetup: Action {
8181
logVerbose("\(#fileID) Sending event \(responseEvent)",
8282
environment: environment)
8383
await dispatcher.send(responseEvent)
84-
// TODO: HS:
85-
// } catch let error where deviceNotFound(error: error, deviceMetadata: deviceMetadata) {
86-
// logVerbose("\(#fileID) Received device not found \(error)", environment: environment)
87-
// // Remove the saved device details and retry verify challenge
88-
// await DeviceMetadataHelper.removeDeviceMetaData(for: username, with: environment)
89-
// let event = SignInChallengeEvent(
90-
// eventType: .retryVerifyChallengeAnswer(confirmSignEventData)
91-
// )
92-
// logVerbose("\(#fileID) Sending event \(event)", environment: environment)
93-
// await dispatcher.send(event)
84+
9485
} catch let error as SignInError {
9586
logError(error.authError.errorDescription, environment: environment)
9687
let errorEvent = SignInEvent(eventType: .throwAuthError(error))
@@ -107,21 +98,6 @@ struct CompleteTOTPSetup: Action {
10798
}
10899
}
109100

110-
// TODO: HS: Figure out if this is needed
111-
// func deviceNotFound(error: Error, deviceMetadata: DeviceMetadata) -> Bool {
112-
//
113-
// // If deviceMetadata was not send, the error returned is not from device not found.
114-
// if case .noData = deviceMetadata {
115-
// return false
116-
// }
117-
//
118-
// if let serviceError: RespondToAuthChallengeOutputError = error.internalAWSServiceError(),
119-
// case .resourceNotFoundException = serviceError {
120-
// return true
121-
// }
122-
// return false
123-
// }
124-
125101
}
126102

127103
extension CompleteTOTPSetup: CustomDebugDictionaryConvertible {

0 commit comments

Comments
 (0)