Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-31 22:51:25 -05:00
Code Issues Activity

fix(phrases,shared): only allow lowercase letters, numbers and hyphens in subdomains (#5332)

Browse source
This commit is contained in:
Charles Zhao 2024-01-30 12:33:08 +08:00 • committed by GitHub
parent 4414139b32
commit 50f8756721
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/phrases/src/locales/de/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/en/translation/admin-console/protected-app.ts
View file

@ -26,7 +26,7 @@ const protected_app = {
domain_required: 'Subdomain is required',
domain_in_use: 'This subdomain name is already in use.',
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
url_required: 'Origin URL is required.',
invalid_url:
"Invalid Origin URL format: Use http:// or https://. Note: '/routes' is not currently supported.",

2
packages/phrases/src/locales/es/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/fr/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/it/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/ja/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/ko/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/pl-pl/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/pt-br/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/pt-pt/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/ru/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/tr-tr/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/zh-cn/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/zh-hk/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/phrases/src/locales/zh-tw/translation/admin-console/protected-app.ts
View file

@ -46,7 +46,7 @@ const protected_app = {
domain_in_use: 'This subdomain name is already in use.',
/** UNTRANSLATED */
invalid_domain_format:
"Invalid subdomain format: use only lowercase letters, hyphens '-', and underscores '_'.",
"Invalid subdomain format: use only lowercase letters, numbers, and hyphens '-'.",
/** UNTRANSLATED */
url_required: 'Origin URL is required.',
/** UNTRANSLATED */

2
packages/shared/src/utils/sub-domain.test.ts
View file

@ -14,5 +14,7 @@ describe('isValidSubdomain()', () => {
expect(isValidSubdomain('-a1')).toBe(false);
expect(isValidSubdomain('a1-')).toBe(false);
expect(isValidSubdomain('a1.b')).toBe(false);
expect(isValidSubdomain('a_b')).toBe(false);
expect(isValidSubdomain('aBc')).toBe(false);
});
});

2
packages/shared/src/utils/sub-domain.ts
View file

@ -4,4 +4,4 @@
* @returns boolean indicating whether the subdomain is valid
*/
export const isValidSubdomain = (subdomain: string): boolean =>
/^([\da-z]([\da-z-]{0,61}[\da-z])?)$/i.test(subdomain);
/^([\da-z]([\da-z-]{0,61}[\da-z])?)$/.test(subdomain);