Update username max/min lengths
This commit is contained in:
parent
92b8af90e8
commit
99e40c0981
|
@ -35,6 +35,7 @@ import {
|
||||||
} from './conversation/conversation-details/ConversationDetailsIcon';
|
} from './conversation/conversation-details/ConversationDetailsIcon';
|
||||||
import { Spinner } from './Spinner';
|
import { Spinner } from './Spinner';
|
||||||
import { UsernameSaveState } from '../state/ducks/conversationsEnums';
|
import { UsernameSaveState } from '../state/ducks/conversationsEnums';
|
||||||
|
import { MAX_USERNAME, MIN_USERNAME } from '../types/Username';
|
||||||
|
|
||||||
export enum EditState {
|
export enum EditState {
|
||||||
None = 'None',
|
None = 'None',
|
||||||
|
@ -123,26 +124,24 @@ function getUsernameInvalidKey(
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
const min = 3;
|
if (username.length < MIN_USERNAME) {
|
||||||
if (username.length < min) {
|
|
||||||
return {
|
return {
|
||||||
key: 'ProfileEditor--username--check-character-min',
|
key: 'ProfileEditor--username--check-character-min',
|
||||||
replacements: { min },
|
replacements: { min: MIN_USERNAME },
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!/^[0-9a-z_]+$/.test(username)) {
|
if (!/^[0-9a-z_]+$/.test(username)) {
|
||||||
return { key: 'ProfileEditor--username--check-characters' };
|
return { key: 'ProfileEditor--username--check-characters' };
|
||||||
}
|
}
|
||||||
if (/^[0-9]/.test(username)) {
|
if (!/^[a-z_]/.test(username)) {
|
||||||
return { key: 'ProfileEditor--username--check-starting-character' };
|
return { key: 'ProfileEditor--username--check-starting-character' };
|
||||||
}
|
}
|
||||||
|
|
||||||
const max = 25;
|
if (username.length > MAX_USERNAME) {
|
||||||
if (username.length > max) {
|
|
||||||
return {
|
return {
|
||||||
key: 'ProfileEditor--username--check-character-max',
|
key: 'ProfileEditor--username--check-character-max',
|
||||||
replacements: { max },
|
replacements: { max: MAX_USERNAME },
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,79 @@
|
||||||
|
// Copyright 2021 Signal Messenger, LLC
|
||||||
|
// SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
import { assert } from 'chai';
|
||||||
|
|
||||||
|
import * as Username from '../../types/Username';
|
||||||
|
|
||||||
|
describe('Username', () => {
|
||||||
|
describe('getUsernameFromSearch', () => {
|
||||||
|
const { getUsernameFromSearch } = Username;
|
||||||
|
|
||||||
|
it('matches invalid username searches', () => {
|
||||||
|
assert.strictEqual(getUsernameFromSearch('username!'), 'username!');
|
||||||
|
assert.strictEqual(getUsernameFromSearch('1username'), '1username');
|
||||||
|
assert.strictEqual(getUsernameFromSearch('use'), 'use');
|
||||||
|
assert.strictEqual(
|
||||||
|
getUsernameFromSearch('username9012345678901234567'),
|
||||||
|
'username9012345678901234567'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('matches valid username searches', () => {
|
||||||
|
assert.strictEqual(getUsernameFromSearch('username_34'), 'username_34');
|
||||||
|
assert.strictEqual(getUsernameFromSearch('u5ername'), 'u5ername');
|
||||||
|
assert.strictEqual(getUsernameFromSearch('user'), 'user');
|
||||||
|
assert.strictEqual(
|
||||||
|
getUsernameFromSearch('username901234567890123456'),
|
||||||
|
'username901234567890123456'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('matches valid and invalid usernames with @ prefix', () => {
|
||||||
|
assert.strictEqual(getUsernameFromSearch('@username!'), 'username!');
|
||||||
|
assert.strictEqual(getUsernameFromSearch('@1username'), '1username');
|
||||||
|
assert.strictEqual(getUsernameFromSearch('@username_34'), 'username_34');
|
||||||
|
assert.strictEqual(getUsernameFromSearch('@u5ername'), 'u5ername');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('matches valid and invalid usernames with @ suffix', () => {
|
||||||
|
assert.strictEqual(getUsernameFromSearch('username!@'), 'username!');
|
||||||
|
assert.strictEqual(getUsernameFromSearch('1username@'), '1username');
|
||||||
|
assert.strictEqual(getUsernameFromSearch('username_34@'), 'username_34');
|
||||||
|
assert.strictEqual(getUsernameFromSearch('u5ername@'), 'u5ername');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not match something that looks like a phone number', () => {
|
||||||
|
assert.isUndefined(getUsernameFromSearch('+'));
|
||||||
|
assert.isUndefined(getUsernameFromSearch('2223'));
|
||||||
|
assert.isUndefined(getUsernameFromSearch('+3'));
|
||||||
|
assert.isUndefined(getUsernameFromSearch('+234234234233'));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('isValidUsername', () => {
|
||||||
|
const { isValidUsername } = Username;
|
||||||
|
|
||||||
|
it('does not match invalid username searches', () => {
|
||||||
|
assert.isFalse(isValidUsername('username!'));
|
||||||
|
assert.isFalse(isValidUsername('1username'));
|
||||||
|
assert.isFalse(isValidUsername('use'));
|
||||||
|
assert.isFalse(isValidUsername('username9012345678901234567'));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('matches valid usernames', () => {
|
||||||
|
assert.isTrue(isValidUsername('username_34'));
|
||||||
|
assert.isTrue(isValidUsername('u5ername'));
|
||||||
|
assert.isTrue(isValidUsername('_username'));
|
||||||
|
assert.isTrue(isValidUsername('user'));
|
||||||
|
assert.isTrue(isValidUsername('username901234567890123456'));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not match valid and invalid usernames with @ prefix or suffix', () => {
|
||||||
|
assert.isFalse(isValidUsername('@username_34'));
|
||||||
|
assert.isFalse(isValidUsername('@1username'));
|
||||||
|
assert.isFalse(isValidUsername('username_34@'));
|
||||||
|
assert.isFalse(isValidUsername('1username@'));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,23 @@
|
||||||
|
// Copyright 2021 Signal Messenger, LLC
|
||||||
|
// SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
export const MAX_USERNAME = 26;
|
||||||
|
export const MIN_USERNAME = 4;
|
||||||
|
|
||||||
|
export function isValidUsername(searchTerm: string): boolean {
|
||||||
|
return /^[a-z_][0-9a-z_]{3,25}$/.test(searchTerm);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getUsernameFromSearch(searchTerm: string): string | undefined {
|
||||||
|
if (/^[+0-9]+$/.test(searchTerm)) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const match = /^@?(.*?)@?$/.exec(searchTerm);
|
||||||
|
|
||||||
|
if (match && match[1]) {
|
||||||
|
return match[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
return undefined;
|
||||||
|
}
|
Loading…
Reference in New Issue