-
Notifications
You must be signed in to change notification settings - Fork 119
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into liveness-facefit-server-timeout
- Loading branch information
Showing
55 changed files
with
3,020 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
176 changes: 176 additions & 0 deletions
176
...o/src/androidTest/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPluginTOTPTests.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| /* | ||
| * 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.auth.cognito | ||
|
|
||
| import android.content.Context | ||
| import androidx.test.core.app.ApplicationProvider | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import com.amplifyframework.auth.AuthUserAttribute | ||
| import com.amplifyframework.auth.AuthUserAttributeKey | ||
| import com.amplifyframework.auth.MFAType | ||
| import com.amplifyframework.auth.cognito.helpers.value | ||
| import com.amplifyframework.auth.cognito.test.R | ||
| import com.amplifyframework.auth.options.AuthSignUpOptions | ||
| import com.amplifyframework.auth.result.step.AuthSignInStep | ||
| import com.amplifyframework.core.AmplifyConfiguration | ||
| import com.amplifyframework.core.category.CategoryConfiguration | ||
| import com.amplifyframework.core.category.CategoryType | ||
| import com.amplifyframework.testutils.sync.SynchronousAuth | ||
| import dev.robinohs.totpkt.otp.totp.TotpGenerator | ||
| import dev.robinohs.totpkt.otp.totp.timesupport.generateCode | ||
| import java.util.Random | ||
| import java.util.UUID | ||
| import java.util.concurrent.CountDownLatch | ||
| import java.util.concurrent.TimeUnit | ||
| import org.junit.After | ||
| import org.junit.Assert | ||
| import org.junit.Before | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| @RunWith(AndroidJUnit4::class) | ||
| class AWSCognitoAuthPluginTOTPTests { | ||
|
|
||
| private lateinit var authPlugin: AWSCognitoAuthPlugin | ||
| private lateinit var synchronousAuth: SynchronousAuth | ||
| private val password = UUID.randomUUID().toString() | ||
| private val userName = "testUser${Random().nextInt()}" | ||
| private val email = "$userName@testdomain.com" | ||
|
|
||
| @Before | ||
| fun setup() { | ||
| val context = ApplicationProvider.getApplicationContext<Context>() | ||
| val config = AmplifyConfiguration.fromConfigFile(context, R.raw.amplifyconfiguration_totp) | ||
| val authConfig: CategoryConfiguration = config.forCategoryType(CategoryType.AUTH) | ||
| val authConfigJson = authConfig.getPluginConfig("awsCognitoAuthPlugin") | ||
| authPlugin = AWSCognitoAuthPlugin() | ||
| authPlugin.configure(authConfigJson, context) | ||
| synchronousAuth = SynchronousAuth.delegatingTo(authPlugin) | ||
| signUpNewUser(userName, password, email) | ||
| synchronousAuth.signOut() | ||
| } | ||
|
|
||
| @After | ||
| fun tearDown() { | ||
| synchronousAuth.deleteUser() | ||
| } | ||
|
|
||
| /* | ||
| * This test signs up a new user and goes thru successful MFA Setup process. | ||
| * */ | ||
| @Test | ||
| fun mfa_setup() { | ||
| val result = synchronousAuth.signIn(userName, password) | ||
| Assert.assertEquals(AuthSignInStep.CONTINUE_SIGN_IN_WITH_TOTP_SETUP, result.nextStep.signInStep) | ||
| val otp = TotpGenerator().generateCode( | ||
| result.nextStep.totpSetupDetails!!.sharedSecret.toByteArray(), | ||
| System.currentTimeMillis() | ||
| ) | ||
| synchronousAuth.confirmSignIn(otp) | ||
| val currentUser = synchronousAuth.currentUser | ||
| Assert.assertEquals(userName.lowercase(), currentUser.username) | ||
| } | ||
|
|
||
| /* | ||
| * This test signs up a new user, enter incorrect MFA code during verification and | ||
| * then enter correct OTP code to successfully set TOTP MFA. | ||
| * */ | ||
| @Test | ||
| fun mfasetup_with_incorrect_otp() { | ||
| val result = synchronousAuth.signIn(userName, password) | ||
| Assert.assertEquals(AuthSignInStep.CONTINUE_SIGN_IN_WITH_TOTP_SETUP, result.nextStep.signInStep) | ||
| try { | ||
| synchronousAuth.confirmSignIn("123456") | ||
| } catch (e: Exception) { | ||
| Assert.assertEquals("Code mismatch", e.cause?.message) | ||
| val otp = TotpGenerator().generateCode( | ||
| result.nextStep.totpSetupDetails!!.sharedSecret.toByteArray(), | ||
| System.currentTimeMillis() | ||
| ) | ||
| synchronousAuth.confirmSignIn(otp) | ||
| val currentUser = synchronousAuth.currentUser | ||
| Assert.assertEquals(userName.lowercase(), currentUser.username) | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * This test signs up a new user, successfully setup MFA, sign-out and then goes thru sign-in with TOTP. | ||
| * */ | ||
| @Test | ||
| fun signIn_with_totp_after_mfa_setup() { | ||
| val result = synchronousAuth.signIn(userName, password) | ||
| Assert.assertEquals(AuthSignInStep.CONTINUE_SIGN_IN_WITH_TOTP_SETUP, result.nextStep.signInStep) | ||
| val otp = TotpGenerator().generateCode( | ||
| result.nextStep.totpSetupDetails!!.sharedSecret.toByteArray() | ||
| ) | ||
| synchronousAuth.confirmSignIn(otp) | ||
| synchronousAuth.signOut() | ||
|
|
||
| val signInResult = synchronousAuth.signIn(userName, password) | ||
| Assert.assertEquals(AuthSignInStep.CONFIRM_SIGN_IN_WITH_TOTP_CODE, signInResult.nextStep.signInStep) | ||
| val otpCode = TotpGenerator().generateCode( | ||
| result.nextStep.totpSetupDetails!!.sharedSecret.toByteArray(), | ||
| System.currentTimeMillis() + 30 * 1000 // 30 sec is added to generate new OTP code | ||
| ) | ||
| synchronousAuth.confirmSignIn(otpCode) | ||
| val currentUser = synchronousAuth.currentUser | ||
| Assert.assertEquals(userName.lowercase(), currentUser.username) | ||
| } | ||
|
|
||
| /* | ||
| * This test signs up a new user, successfully setup MFA, update user attribute to add phone number, | ||
| * sign-out the user, goes thru MFA selection flow during sign-in, select TOTP MFA type, | ||
| * successfully sign-in using TOTP | ||
| * */ | ||
| @Test | ||
| fun select_mfa_type() { | ||
| val result = synchronousAuth.signIn(userName, password) | ||
| Assert.assertEquals(AuthSignInStep.CONTINUE_SIGN_IN_WITH_TOTP_SETUP, result.nextStep.signInStep) | ||
| val otp = TotpGenerator().generateCode( | ||
| result.nextStep.totpSetupDetails!!.sharedSecret.toByteArray() | ||
| ) | ||
| synchronousAuth.confirmSignIn(otp) | ||
| synchronousAuth.updateUserAttribute(AuthUserAttribute(AuthUserAttributeKey.phoneNumber(), "+19876543210")) | ||
| updateMFAPreference(MFAPreference.ENABLED, MFAPreference.ENABLED) | ||
| synchronousAuth.signOut() | ||
| val signInResult = synchronousAuth.signIn(userName, password) | ||
| Assert.assertEquals(AuthSignInStep.CONTINUE_SIGN_IN_WITH_MFA_SELECTION, signInResult.nextStep.signInStep) | ||
| val totpSignInResult = synchronousAuth.confirmSignIn(MFAType.TOTP.value) | ||
| Assert.assertEquals(AuthSignInStep.CONFIRM_SIGN_IN_WITH_TOTP_CODE, totpSignInResult.nextStep.signInStep) | ||
| val otpCode = TotpGenerator().generateCode( | ||
| result.nextStep.totpSetupDetails!!.sharedSecret.toByteArray(), | ||
| System.currentTimeMillis() + 30 * 1000 // 30 sec is added to generate new OTP code | ||
| ) | ||
| synchronousAuth.confirmSignIn(otpCode) | ||
| val currentUser = synchronousAuth.currentUser | ||
| Assert.assertEquals(userName.lowercase(), currentUser.username) | ||
| } | ||
|
|
||
| private fun signUpNewUser(userName: String, password: String, email: String) { | ||
| val options = AuthSignUpOptions.builder() | ||
| .userAttributes( | ||
| listOf( | ||
| AuthUserAttribute(AuthUserAttributeKey.email(), email) | ||
| ) | ||
| ).build() | ||
| synchronousAuth.signUp(userName, password, options) | ||
| } | ||
|
|
||
| private fun updateMFAPreference(sms: MFAPreference, totp: MFAPreference) { | ||
| val latch = CountDownLatch(1) | ||
| authPlugin.updateMFAPreference(sms, totp, { latch.countDown() }, { latch.countDown() }) | ||
| latch.await(5, TimeUnit.SECONDS) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.