Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use FirstName & LastName fields for registration. #69

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Use FirstName & LastName fields for registration. #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/dev/passwordless/sampleapp/AddCredentialFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import dagger.hilt.android.AndroidEntryPoint
import dev.passwordless.android.PasswordlessClient
import dev.passwordless.android.utils.PasswordlessUtils
import dev.passwordless.sampleapp.auth.Session
import dev.passwordless.sampleapp.contracts.AddCredentialRequest
import dev.passwordless.sampleapp.contracts.UserRegisterRequest
import dev.passwordless.sampleapp.databinding.FragmentAddCredentialBinding
import dev.passwordless.sampleapp.yourbackend.YourBackendHttpClient
Expand Down Expand Up @@ -54,8 +55,7 @@ class AddCredentialFragment : Fragment() {
val alias = binding.aliasEditText.text.toString()
val username = session.getUsername()!!
try {
val response =
httpClient.register(UserRegisterRequest(username, alias)).body()?.token!!
val response = httpClient.addCredential(session.getUserId()!!, AddCredentialRequest(alias)).body()?.token!!
passwordless.register(
response,
alias + username
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/dev/passwordless/sampleapp/RegisterFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,14 @@ class RegisterFragment : Fragment() {
lifecycleScope.launch {
val alias = binding.aliasEditText.text.toString()
val username = binding.usernameEditText.text.toString()
val firstName = binding.firstNameEditText.text.toString()
val lastName = binding.lastNameEditText.text.toString()
try {
val responseToken =
httpClient.register(UserRegisterRequest(username, alias)).body()?.token!!
val registerRequest = UserRegisterRequest(username, alias, firstName, lastName)
val responseToken = httpClient.register(registerRequest).body()?.token!!
_passwordless.register(
responseToken,
alias + username
) { success, exception, result ->
alias + username) { success, exception, result ->
if (success) {
Toast.makeText(context, result.toString(), Toast.LENGTH_SHORT).show()
} else {
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/dev/passwordless/sampleapp/contracts/AddCredentialResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package dev.passwordless.sampleapp.contracts

data class AddCredentialResponse(val token: String)
4 changes: 3 additions & 1 deletion app/src/main/java/dev/passwordless/sampleapp/contracts/UserRegisterRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ package dev.passwordless.sampleapp.contracts

data class UserRegisterRequest(
val username:String,
val alias: String
val alias: String,
val firstName: String,
val lastName: String
)
5 changes: 5 additions & 0 deletions app/src/main/java/dev/passwordless/sampleapp/yourbackend/YourBackendHttpClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package dev.passwordless.sampleapp.yourbackend

import dev.passwordless.sampleapp.contracts.AddCredentialRequest
import dev.passwordless.sampleapp.contracts.AddCredentialResponse
import dev.passwordless.sampleapp.contracts.CredentialResponse
import dev.passwordless.sampleapp.contracts.RegisterTokenResponse
import dev.passwordless.sampleapp.contracts.UserLoginRequest
Expand All @@ -17,4 +19,7 @@ interface YourBackendHttpClient {

@GET("/users/{userId}/credentials")
suspend fun getCredentials(@Path("userId") userId: String): Response<List<CredentialResponse>>

@POST("/users/{userId}/credentials")
suspend fun addCredential(@Path("userId") userId: String, @Body request: AddCredentialRequest): Response<AddCredentialResponse>
}
30 changes: 27 additions & 3 deletions app/src/main/res/layout/fragment_register.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,36 @@

<EditText
android:id="@+id/usernameEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:ems="10"
android:gravity="center"
android:hint="@string/username_hint"
android:inputType="text"
android:maxLength="20" />

<EditText
android:id="@+id/firstNameEditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:ems="10"
android:hint="@string/username_hint"
android:inputType="text" />
android:gravity="center"
android:hint="@string/firstname_hint"
android:inputType="text"
android:maxLength="30" />

<EditText
android:id="@+id/lastNameEditText"
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:ems="10"
android:hint="@string/lastname_hint"
android:inputType="text"
android:maxLength="30" />

<LinearLayout
android:gravity="center"
Expand All @@ -38,7 +61,8 @@
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/alias_hint"
android:inputType="text" />
android:inputType="text"
android:maxLength="20" />

<TextView
android:gravity="center"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<string name="app_name">Passwordless.dev Android Sample</string>
<string name="action_settings">Settings</string>

<!-- Strings used for fragments for navigation -->
<string name="register_fragment_label">Registration</string>
<string name="login_fragment_label">Login</string>
<string name="credentials_fragment_label">Credentials</string>
Expand All @@ -12,6 +11,8 @@
<string name="previous">Previous</string>

<string name="username_hint">Username</string>
<string name="firstname_hint">First Name</string>
<string name="lastname_hint">Last Name</string>
<string name="alias">Alias</string>
<string name="alias_hint">Alias (optional)</string>
<string name="alias_hint_description">When \'alias\' is left empty, your credential will be discoverable. You won\'t have to enter the \'alias\' value entered previously to log in.</string>
Expand Down