Merge pull request #149 from android/minor_bug_fixes

Renamed registration functions to be more accurate and fixed string typo in registration

Author: niharika2810

Shrine/app/src/main/java/com/authentication/shrine/CredentialManagerUtils.kt

@@ -49,14 +49,15 @@ class CredentialManagerUtils @Inject constructor(
 ) {
 
     /**
-     * Retrieves a passkey from the credential manager.
+     * Retrieves a passkey or password from the credential manager.
      *
-     * @param creationResult The result of the passkey creation operation.
+     * @param publicKeyCredentialRequestOptions The public key credential request options.
      * @param context The activity context from the Composable, to be used in Credential Manager APIs
-     * @return The [GetCredentialResponse] object containing the passkey, or null if an error occurred.
+     * @return The [GetCredentialResponse] object containing the passkey or password, or null if an
+     * error occurred.
      */
-    suspend fun getPasskey(
-        creationResult: JSONObject,
+    suspend fun getPasskeyOrPassword(
+        publicKeyCredentialRequestOptions: JSONObject,
         context: Context,
     ): GenericCredentialManagerResponse {
         val passkeysEligibility = PasskeysEligibility.isPasskeySupported(context)
@@ -69,7 +70,7 @@ class CredentialManagerUtils @Inject constructor(
             val credentialRequest = GetCredentialRequest(
                 listOf(
                     GetPublicKeyCredentialOption(
-                        creationResult.toString(),
+                        publicKeyCredentialRequestOptions.toString(),
                         null,
                     ),
                     GetPasswordOption(),

Shrine/app/src/main/java/com/authentication/shrine/ui/AuthenticationScreen.kt

@@ -84,14 +84,14 @@ fun AuthenticationScreen(
         )
     }
 
-    val onSignInWithPasskeysRequest = {
+    val onSignInRequest = {
         viewModel.signInWithPasskeysRequest(
             onSuccess = { flag ->
                 createRestoreKey()
                 navigateToHome(flag)
             },
             getPasskey = { jsonObject ->
-                credentialManagerUtils.getPasskey(
+                credentialManagerUtils.getPasskeyOrPassword(
                     context = context,
                     creationResult = jsonObject,
                 )
@@ -112,7 +112,7 @@ fun AuthenticationScreen(
     }
 
     AuthenticationScreen(
-        onSignInWithPasskeysRequest = onSignInWithPasskeysRequest,
+        onSignInRequest = onSignInRequest,
         navigateToRegister = navigateToRegister,
         showErrorDialog = errorDialogViewModel::showErrorDialog,
         uiState = uiState,
@@ -126,14 +126,14 @@ fun AuthenticationScreen(
  * This screen allows the user to authenticate using a username and password, or through passkeys.
  *
  * @param modifier Modifier to be applied to the composable.
- * @param onSignInWithPasskeysRequest Callback to initiate the sign-in with passkeys request.
+ * @param onSignInRequest Callback to initiate the sign-in with passkeys or password request.
  * @param showErrorDialog Method that resets the UI state of the Error Dialog
  * @param navigateToRegister Callback to navigate to the registration screen.
  * @param uiState The current UI state of the authentication screen.
 */
 @Composable
 fun AuthenticationScreen(
-    onSignInWithPasskeysRequest: () -> Unit,
+    onSignInRequest: () -> Unit,
     navigateToRegister: () -> Unit,
     showErrorDialog: () -> Unit,
     uiState: AuthenticationUiState,
@@ -159,7 +159,7 @@ fun AuthenticationScreen(
 
             // Sign In Button
             ShrineButton(
-                onClick = onSignInWithPasskeysRequest,
+                onClick = onSignInRequest,
                 buttonText = stringResource(id = R.string.sign_in),
                 isButtonEnabled = !uiState.isLoading,
             )
@@ -209,7 +209,7 @@ fun AuthenticationScreen(
 fun AuthenticationScreenPreview() {
     ShrineTheme {
         AuthenticationScreen(
-            onSignInWithPasskeysRequest = { },
+            onSignInRequest = { },
             navigateToRegister = { },
             showErrorDialog = { },
             uiState = AuthenticationUiState(),

Shrine/app/src/main/java/com/authentication/shrine/ui/RegisterScreen.kt

@@ -80,7 +80,7 @@ import com.authentication.shrine.ui.viewmodel.RegistrationViewModel
 fun RegisterScreen(
     navigateToHome: (isSignInThroughPasskeys: Boolean) -> Unit,
     onLearnMoreClicked: () -> Unit,
-    onOtherWaysToSignInClicked: () -> Unit,
+    onOtherWaysToSignUpClicked: () -> Unit,
     onBackClicked: () -> Unit,
     viewModel: RegistrationViewModel,
     modifier: Modifier = Modifier,
@@ -124,7 +124,7 @@ fun RegisterScreen(
         fullName = fullName,
         onFullNameChanged = { fullName = it },
         onLearnMoreClicked = onLearnMoreClicked,
-        onOtherWaysToSignInClicked = onOtherWaysToSignInClicked,
+        onOtherWaysToSignUpClicked = onOtherWaysToSignUpClicked,
         onBackClicked = onBackClicked,
         email = email,
         onEmailChanged = { email = it },
@@ -151,7 +151,7 @@ fun RegisterScreen(
     fullName: String,
     onFullNameChanged: (String) -> Unit,
     onLearnMoreClicked: () -> Unit,
-    onOtherWaysToSignInClicked: () -> Unit,
+    onOtherWaysToSignUpClicked: () -> Unit,
     onBackClicked: () -> Unit,
     email: String,
     onEmailChanged: (String) -> Unit,
@@ -187,7 +187,7 @@ fun RegisterScreen(
                 fullName = fullName,
                 onFullNameChanged = onFullNameChanged,
                 onLearnMoreClicked = onLearnMoreClicked,
-                onOtherWaysToSignInClicked = onOtherWaysToSignInClicked,
+                onOtherWaysToSignUpClicked = onOtherWaysToSignUpClicked,
                 email = email,
                 onEmailChanged = onEmailChanged,
                 onPasskeyRegister = onPasskeyRegister,
@@ -224,7 +224,7 @@ private fun RegisterScreenInputSection(
     fullName: String,
     onFullNameChanged: (String) -> Unit,
     onLearnMoreClicked: () -> Unit,
-    onOtherWaysToSignInClicked: () -> Unit,
+    onOtherWaysToSignUpClicked: () -> Unit,
     email: String,
     onEmailChanged: (String) -> Unit,
     onPasskeyRegister: (String) -> Unit,
@@ -282,7 +282,7 @@ private fun RegisterScreenInputSection(
             modifier = Modifier.padding(top = dimensionResource(R.dimen.dimen_standard)),
         )
 
-        PasskeyInformationTab(onLearnMoreClicked, onOtherWaysToSignInClicked)
+        PasskeyInformationTab(onLearnMoreClicked, onOtherWaysToSignUpClicked)
 
         ShrineButton(
             onClick = { onPasskeyRegister(email) },
@@ -297,13 +297,13 @@ private fun RegisterScreenInputSection(
  * Composable for the Passkeys Information Tab UI Element
  *
  * @param onLearnMoreClicked lambda for more information, navigates to an informational screen
- * @param onOtherWaysToSignInClicked lambda for other sign in methods, navigates to
+ * @param onOtherWaysToSignUpClicked lambda for other sign in methods, navigates to
  * @OtherOptionsSignInScreen
  * */
 @Composable
 private fun PasskeyInformationTab(
     onLearnMoreClicked: () -> Unit,
-    onOtherWaysToSignInClicked: () -> Unit,
+    onOtherWaysToSignUpClicked: () -> Unit,
 ) {
     Column(
         modifier = Modifier
@@ -328,8 +328,8 @@ private fun PasskeyInformationTab(
                 )
                 ShrineClickableText(
                     text = "",
-                    clickableText = stringResource(R.string.other_ways_to_sign_in),
-                    onTextClick = onOtherWaysToSignInClicked,
+                    clickableText = stringResource(R.string.other_ways_to_sign_up),
+                    onTextClick = onOtherWaysToSignUpClicked,
                     textStyle = TextStyle(color = Color(0xFF006B5F)),
                 )
             }
@@ -353,7 +353,7 @@ fun RegisterScreenPreview() {
         RegisterScreen(
             onPasskeyRegister = { _ -> },
             onLearnMoreClicked = { },
-            onOtherWaysToSignInClicked = { },
+            onOtherWaysToSignUpClicked = { },
             onBackClicked = { },
             uiState = RegisterUiState(),
             fullName = "",

Shrine/app/src/main/res/values/strings.xml

@@ -68,6 +68,7 @@
     <string name="error">Error</string>
     <string name="nav_host_route">Nav Host Route</string>
     <string name="other_ways_to_sign_in">Other ways to sign in</string>
+    <string name="other_ways_to_sign_up">Other ways to sign up</string>
     <string name="enter_valid_username">Enter valid username</string>
     <string name="asset_statements">[{
         \"include\": \"https://project-sesame-426206.appspot.com/.well-known/assetlinks.json\"