Merge pull request #7432 from ByeongsuPark/feature/bspark/enhancement-7111-trim-username

bmarty · web-flow · commit 31a0a049b140 · 2023-01-10T14:38:56.000+01:00
Add trim to username input when sign-in
diff --git a/changelog.d/7111.misc b/changelog.d/7111.misc
@@ -0,0 +1 @@
+Add trim to username input on the app side and SDK side when sign-in
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
@@ -69,7 +69,7 @@ internal class DefaultLoginWizard(
             )
         } else {
             PasswordLoginParams.userIdentifier(
-                    user = login,
+                    user = login.trim(),
                     password = password,
                     deviceDisplayName = initialDeviceName,
                     deviceId = deviceId
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -685,7 +685,7 @@ class LoginViewModel @AssistedInject constructor(
             currentJob = viewModelScope.launch {
                 try {
                     safeLoginWizard.login(
-                            action.username,
+                            action.username.trim(),
                             action.password,
                             action.initialDeviceName
                     )

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Add trim to username input on the app side and SDK side when sign-in`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ internal class DefaultLoginWizard(`
`69`	`69`	`)`
`70`	`70`	`} else {`
`71`	`71`	`PasswordLoginParams.userIdentifier(`
`72`		`- user = login,`
	`72`	`+ user = login.trim(),`
`73`	`73`	`password = password,`
`74`	`74`	`deviceDisplayName = initialDeviceName,`
`75`	`75`	`deviceId = deviceId`
Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ class LoginViewModel @AssistedInject constructor(`
`685`	`685`	`currentJob = viewModelScope.launch {`
`686`	`686`	`try {`
`687`	`687`	`safeLoginWizard.login(`
`688`		`- action.username,`
	`688`	`+ action.username.trim(),`
`689`	`689`	`action.password,`
`690`	`690`	`action.initialDeviceName`
`691`	`691`	`)`