Require username to match email user at signup

sipb · May 7, 2024 · 453fb65 · 453fb65
1 parent ccf4da9
commit 453fb65
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/server/public/model/user.go b/server/public/model/user.go
@@ -350,6 +350,10 @@ func (u *User) IsValid() *AppError {
 		return InvalidUserError("email", u.Id, u.Email)
 	}
 
+	if u.Username != strings.Split(u.Email, "@")[0] {
+		return InvalidUserError("username", u.Id, u.Username)
+	}
+
 	if utf8.RuneCountInString(u.Nickname) > UserNicknameMaxRunes {
 		return InvalidUserError("nickname", u.Id, u.Nickname)
 	}

diff --git a/webapp/channels/src/components/signup/signup.tsx b/webapp/channels/src/components/signup/signup.tsx
@@ -551,6 +551,12 @@ const Signup = ({onCustomizeHeader}: SignupProps) => {
             telemetryEvents.errors.push({field: 'username', rule: 'not_provided'});
             isValid = false;
         }
+        if (providedUsername != providedEmail.split('@')[0]) {
+            //const errorMessage = formatMessage({id: 'signup_user_completed.mismatch', defaultMessage: 'Your username must match your email (before the "@")'});
+            const errorMessage = 'Your username must match your email (before the "@")';
+            setNameError(errorMessage);
+            isValid = false;
+        }
 
         const providedPassword = passwordInput.current?.value ?? '';
         const {error, telemetryErrorIds} = isValidPassword(providedPassword, getPasswordConfig(config), intl);

diff --git a/webapp/channels/src/utils/post_utils.ts b/webapp/channels/src/utils/post_utils.ts
@@ -63,7 +63,7 @@ export function isFromWebhook(post: Post): boolean {
 }
 
 export function isFromBot(post: Post): boolean {
-    return post.props && post.props.from_bot === 'true';
+    return post.props && post.props.from_bot === 'true' && post.props.from_zephyr != 'true';
 }
 
 export function isPostOwner(state: GlobalState, post: Post): boolean {
@@ -632,7 +632,10 @@ export function areConsecutivePostsBySameUser(post: Post, previousPost: Post): b
     }
     return post.user_id === previousPost.user_id && // The post is by the same user
         post.create_at - previousPost.create_at <= Posts.POST_COLLAPSE_TIMEOUT && // And was within a short time period
-        !(post.props && post.props.from_webhook) && !(previousPost.props && previousPost.props.from_webhook) && // And neither is from a webhook
+        (
+            (!(post.props && post.props.from_webhook) && !(previousPost.props && previousPost.props.from_webhook)) || // And neither is from a webhook
+            (post.props && previousPost.props && post.props.override_username == previousPost.props.override_username) // or they're from the same overridden user
+        ) &&
         !isSystemMessage(post) && !isSystemMessage(previousPost); // And neither is a system message
 }