feat(authenticator): Add support for TOTP to Authenticator (#114)

Author: mattcreaser

authenticator-screenshots/src/test/java/com/amplifyframework/ui/authenticator/ui/SignInConfirmTotpCodeScreenshots.kt

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amplifyframework.ui.authenticator.ui
+
+import com.amplifyframework.ui.authenticator.ScreenshotTestBase
+import com.amplifyframework.ui.authenticator.SignInConfirmTotpCodeState
+import com.amplifyframework.ui.authenticator.enums.AuthenticatorInitialStep
+import com.amplifyframework.ui.authenticator.enums.AuthenticatorStep
+import com.amplifyframework.ui.authenticator.forms.FieldConfig
+import com.amplifyframework.ui.authenticator.forms.FieldError
+import com.amplifyframework.ui.authenticator.forms.FieldKey
+import com.amplifyframework.ui.authenticator.mockFieldData
+import com.amplifyframework.ui.authenticator.mockFieldState
+import com.amplifyframework.ui.authenticator.mockForm
+import org.junit.Test
+
+class SignInConfirmTotpCodeScreenshots : ScreenshotTestBase() {
+
+    @Test
+    fun default_state() {
+        screenshot {
+            SignInConfirmTotpCode(state = mockSignInConfirmTotpCodeState())
+        }
+    }
+
+    @Test
+    fun invalid_code() {
+        screenshot {
+            SignInConfirmTotpCode(
+                state = mockSignInConfirmTotpCodeState(fieldError = FieldError.ConfirmationCodeIncorrect)
+            )
+        }
+    }
+
+    private fun mockSignInConfirmTotpCodeState(
+        confirmationCode: String = "",
+        fieldError: FieldError? = null
+    ) = object : SignInConfirmTotpCodeState {
+        override val form = mockForm(
+            mockFieldData(
+                config = FieldConfig.Text(FieldKey.ConfirmationCode),
+                state = mockFieldState(content = confirmationCode, error = fieldError)
+            )
+        )
+
+        override fun moveTo(step: AuthenticatorInitialStep) {}
+        override suspend fun confirmSignIn() {}
+        override val step = AuthenticatorStep.SignInConfirmTotpCode
+    }
+}

authenticator-screenshots/src/test/java/com/amplifyframework/ui/authenticator/ui/SignInContinueWithMfaSelectionScreenshots.kt

@@ -0,0 +1,36 @@
+package com.amplifyframework.ui.authenticator.ui
+
+import com.amplifyframework.auth.MFAType
+import com.amplifyframework.ui.authenticator.ScreenshotTestBase
+import com.amplifyframework.ui.authenticator.SignInContinueWithMfaSelectionState
+import com.amplifyframework.ui.authenticator.enums.AuthenticatorInitialStep
+import com.amplifyframework.ui.authenticator.enums.AuthenticatorStep
+import com.amplifyframework.ui.authenticator.forms.FieldConfig
+import com.amplifyframework.ui.authenticator.forms.FieldKey
+import com.amplifyframework.ui.authenticator.mockFieldData
+import com.amplifyframework.ui.authenticator.mockFieldState
+import com.amplifyframework.ui.authenticator.mockForm
+import org.junit.Test
+
+class SignInContinueWithMfaSelectionScreenshots : ScreenshotTestBase() {
+
+    @Test
+    fun default_state() {
+        screenshot {
+            SignInContinueWithMfaSelection(mockSignInContinueWithMfaSelectionState())
+        }
+    }
+
+    private fun mockSignInContinueWithMfaSelectionState() = object : SignInContinueWithMfaSelectionState {
+        override val form = mockForm(
+            mockFieldData(
+                config = FieldConfig.Text(FieldKey.MfaSelection),
+                state = mockFieldState(content = "SMS_MFA")
+            )
+        )
+        override val allowedMfaTypes = MFAType.values().toSet()
+        override fun moveTo(step: AuthenticatorInitialStep) {}
+        override suspend fun continueSignIn() {}
+        override val step = AuthenticatorStep.SignInContinueWithMfaSelection
+    }
+}

authenticator-screenshots/src/test/java/com/amplifyframework/ui/authenticator/ui/SignInContinueWithTotpSetupScreenshots.kt

@@ -0,0 +1,54 @@
+package com.amplifyframework.ui.authenticator.ui
+
+import com.amplifyframework.ui.authenticator.ScreenshotTestBase
+import com.amplifyframework.ui.authenticator.SignInContinueWithTotpSetupState
+import com.amplifyframework.ui.authenticator.enums.AuthenticatorInitialStep
+import com.amplifyframework.ui.authenticator.enums.AuthenticatorStep
+import com.amplifyframework.ui.authenticator.forms.FieldConfig
+import com.amplifyframework.ui.authenticator.forms.FieldError
+import com.amplifyframework.ui.authenticator.forms.FieldKey
+import com.amplifyframework.ui.authenticator.mockFieldData
+import com.amplifyframework.ui.authenticator.mockFieldState
+import com.amplifyframework.ui.authenticator.mockForm
+import org.junit.Test
+
+class SignInContinueWithTotpSetupScreenshots : ScreenshotTestBase() {
+
+    @Test
+    fun default_state() {
+        screenshot {
+            SignInContinueWithTotpSetup(state = mockSignInContinueWithTotpSetupState())
+        }
+    }
+
+    @Test
+    fun invalid_code() {
+        screenshot {
+            SignInContinueWithTotpSetup(
+                state = mockSignInContinueWithTotpSetupState(
+                    confirmationCode = "123456",
+                    fieldError = FieldError.ConfirmationCodeIncorrect
+                )
+            )
+        }
+    }
+
+    private fun mockSignInContinueWithTotpSetupState(
+        confirmationCode: String = "",
+        sharedSecret: String = "secret",
+        setupUri: String = "https://docs.amplify.aws/android/tools/libraries/",
+        fieldError: FieldError? = null
+    ) = object : SignInContinueWithTotpSetupState {
+        override val form = mockForm(
+            mockFieldData(
+                config = FieldConfig.Text(FieldKey.ConfirmationCode),
+                state = mockFieldState(content = confirmationCode, error = fieldError)
+            )
+        )
+        override val sharedSecret = sharedSecret
+        override val setupUri = setupUri
+        override fun moveTo(step: AuthenticatorInitialStep) {}
+        override suspend fun continueSignIn() {}
+        override val step = AuthenticatorStep.SignInContinueWithTotpSetup
+    }
+}

authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmTotpCodeScreenshots_default_state.png

@@ -19,6 +19,7 @@ dependencies {
     implementation(libs.bundles.compose)
     implementation(libs.androidx.lifecycle)
     implementation(libs.androidx.compose.viewmodel)
+    implementation(libs.zxing)
     coreLibraryDesugaring(libs.android.desugar)
 
     testImplementation(projects.testing)

authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmTotpCodeScreenshots_invalid_code.png

@@ -17,8 +17,10 @@ package com.amplifyframework.ui.authenticator
 
 import com.amplifyframework.ui.authenticator.enums.AuthenticatorInitialStep
 import com.amplifyframework.ui.authenticator.forms.SignUpFormBuilder
+import com.amplifyframework.ui.authenticator.options.TotpOptions
 
 internal data class AuthenticatorConfiguration(
     val initialStep: AuthenticatorInitialStep,
-    val signUpForm: SignUpFormBuilder.() -> Unit
+    val signUpForm: SignUpFormBuilder.() -> Unit,
+    val totpOptions: TotpOptions?
 )