From 97cc33394d5bdc1ec49525569431e17b412c8e16 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Mon, 25 Nov 2024 18:10:51 +0200 Subject: [PATCH 1/3] UI: Improvement validation message on JWT security settings --- .../admin/security-settings.component.html | 22 ++++++++++--------- .../admin/security-settings.component.ts | 4 ++-- .../assets/locale/locale.constant-ar_AE.json | 2 -- .../assets/locale/locale.constant-en_US.json | 4 ++-- .../assets/locale/locale.constant-es_ES.json | 2 -- .../assets/locale/locale.constant-lt_LT.json | 2 -- .../assets/locale/locale.constant-nl_BE.json | 2 -- .../assets/locale/locale.constant-pl_PL.json | 2 -- .../assets/locale/locale.constant-zh_CN.json | 2 -- 9 files changed, 16 insertions(+), 26 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html index bdb422f856..1e2af17ba7 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html +++ b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html @@ -229,14 +229,14 @@
- + admin.jwt.issuer-name {{ 'admin.jwt.issuer-name-required' | translate }} - + admin.jwt.signings-key
-
+
admin.jwt.expiration-time + min="60"/> + {{ 'admin.jwt.expiration-time-required' | translate }} - - {{ 'admin.jwt.expiration-time-pattern' | translate }} + + {{ 'admin.jwt.expiration-time-max' | translate }} {{ 'admin.jwt.expiration-time-min' | translate }} - + admin.jwt.refresh-expiration-time + min="900"/> + {{ 'admin.jwt.refresh-expiration-time-required' | translate }} - - {{ 'admin.jwt.refresh-expiration-time-pattern' | translate }} + + {{ 'admin.jwt.refresh-expiration-time-max' | translate }} {{ 'admin.jwt.refresh-expiration-time-min' | translate }} diff --git a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts index 712e2bb358..01eff581a5 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts @@ -99,8 +99,8 @@ export class SecuritySettingsComponent extends PageComponent implements HasConfi this.jwtSecuritySettingsFormGroup = this.fb.group({ tokenIssuer: ['', Validators.required], tokenSigningKey: ['', [Validators.required, this.base64Format]], - tokenExpirationTime: [0, [Validators.required, Validators.pattern('[0-9]*'), Validators.min(60)]], - refreshTokenExpTime: [0, [Validators.required, Validators.pattern('[0-9]*'), Validators.min(900)]] + tokenExpirationTime: [0, [Validators.required, Validators.min(60), Validators.max(2147483647)]], + refreshTokenExpTime: [0, [Validators.required, Validators.min(900), Validators.max(2147483647)]] }, {validators: this.refreshTokenTimeGreatTokenTime.bind(this)}); this.jwtSecuritySettingsFormGroup.get('tokenExpirationTime').valueChanges.subscribe( () => this.jwtSecuritySettingsFormGroup.get('refreshTokenExpTime').updateValueAndValidity({onlySelf: true}) diff --git a/ui-ngx/src/assets/locale/locale.constant-ar_AE.json b/ui-ngx/src/assets/locale/locale.constant-ar_AE.json index 0afd671082..a00efd798e 100644 --- a/ui-ngx/src/assets/locale/locale.constant-ar_AE.json +++ b/ui-ngx/src/assets/locale/locale.constant-ar_AE.json @@ -488,11 +488,9 @@ "signings-key-base64": "يجب أن يكون مفتاح التوقيع بتنسيق base64.", "expiration-time": "وقت انتهاء صلاحية الرمز (ثانية)", "expiration-time-required": "وقت انتهاء صلاحية الرمز مطلوب.", - "expiration-time-pattern": "يجب أن يكون وقت انتهاء صلاحية الرمز عددًا صحيحًا موجبًا.", "expiration-time-min": "الحد الأدنى للوقت هو 60 ثانية (1 دقيقة).", "refresh-expiration-time": "وقت انتهاء صلاحية رمز التحديث (ثانية)", "refresh-expiration-time-required": "وقت انتهاء صلاحية رمز التحديث مطلوب.", - "refresh-expiration-time-pattern": "يجب أن يكون وقت انتهاء صلاحية رمز التحديث عددًا صحيحًا موجبًا.", "refresh-expiration-time-min": "الحد الأدنى للوقت هو 900 ثانية (15 دقيقة).", "refresh-expiration-time-less-token": "يجب أن يكون وقت رمز التحديث أكبر من وقت الرمز.", "generate-key": "توليد المفتاح", diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 405f4ae9d3..6f288f3db5 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -524,11 +524,11 @@ "signings-key-base64": "Signing key must be base64 format.", "expiration-time": "Token expiration time (sec)", "expiration-time-required": "Token expiration time is required.", - "expiration-time-pattern": "Token expiration time be a positive integer.", + "expiration-time-max": "Maximal time is 2147483647 seconds (68 years).", "expiration-time-min": "Minimum time is 60 seconds (1 minute).", "refresh-expiration-time": "Refresh token expiration time (sec)", "refresh-expiration-time-required": "Refresh token expiration time is required.", - "refresh-expiration-time-pattern": "Refresh token expiration time be a positive integer.", + "refresh-expiration-time-max": "Maximal time is 2147483647 seconds (68 years).", "refresh-expiration-time-min": "Minimum time is 900 seconds (15 minute).", "refresh-expiration-time-less-token": "Refresh token time must be greater token time.", "generate-key": "Generate key", diff --git a/ui-ngx/src/assets/locale/locale.constant-es_ES.json b/ui-ngx/src/assets/locale/locale.constant-es_ES.json index f653e7179a..61b708222b 100644 --- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json +++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json @@ -437,11 +437,9 @@ "signings-key-base64": "La clave de firma debe estar en formato base64.", "expiration-time": "Caducidad del token (en segundos)", "expiration-time-required": "Se requiere caducidad del token.", - "expiration-time-pattern": "La caducidad debe ser un número entero positivo.", "expiration-time-min": "El tiempo mínimo debe ser al menos de 60 segundos (1 minuto).", "refresh-expiration-time": "Caducidad del token de actualización (en segundos)", "refresh-expiration-time-required": "Se requiere especificar caducidad del token de actualización.", - "refresh-expiration-time-pattern": "La caducidad debe ser un número entero positivo.", "refresh-expiration-time-min": "El tiempo mínimo es de 900 segundos (15 minutos).", "refresh-expiration-time-less-token": "El tiempo de actualización debe ser mayor al de caducidad.", "generate-key": "Generar clave", diff --git a/ui-ngx/src/assets/locale/locale.constant-lt_LT.json b/ui-ngx/src/assets/locale/locale.constant-lt_LT.json index cb3a96f989..11c737bab4 100644 --- a/ui-ngx/src/assets/locale/locale.constant-lt_LT.json +++ b/ui-ngx/src/assets/locale/locale.constant-lt_LT.json @@ -463,11 +463,9 @@ "signings-key-base64": "Signing key must be base64 format.", "expiration-time": "Token expiration time (sec)", "expiration-time-required": "Token expiration time is required.", - "expiration-time-pattern": "Token expiration time be a positive integer.", "expiration-time-min": "Minimum time is 60 seconds (1 minute).", "refresh-expiration-time": "Refresh token expiration time (sec)", "refresh-expiration-time-required": "Refresh token expiration time is required.", - "refresh-expiration-time-pattern": "Refresh token expiration time be a positive integer.", "refresh-expiration-time-min": "Minimum time is 900 seconds (15 minute).", "refresh-expiration-time-less-token": "Refresh token time must be greater token time.", "generate-key": "Generate key", diff --git a/ui-ngx/src/assets/locale/locale.constant-nl_BE.json b/ui-ngx/src/assets/locale/locale.constant-nl_BE.json index c16c9c5e40..85e75092b6 100644 --- a/ui-ngx/src/assets/locale/locale.constant-nl_BE.json +++ b/ui-ngx/src/assets/locale/locale.constant-nl_BE.json @@ -431,11 +431,9 @@ "signings-key-base64": "De ondertekeningssleutel moet de base64-indeling hebben.", "expiration-time": "Vervaltijd token (sec)", "expiration-time-required": "De vervaltijd van het token is vereist.", - "expiration-time-pattern": "De vervaltijd van het token is een positief geheel getal.", "expiration-time-min": "De minimale tijd is 60 seconden (1 minuut).", "refresh-expiration-time": "Vervaltijd token vernieuwen (sec)", "refresh-expiration-time-required": "De vervaltijd van het vernieuwingstoken is vereist.", - "refresh-expiration-time-pattern": "De vervaltijd van het token vernieuwen is een positief geheel getal.", "refresh-expiration-time-min": "De minimale tijd is 900 seconden (15 minuten).", "refresh-expiration-time-less-token": "De tokentijd voor vernieuwen moet een grotere tokentijd zijn.", "generate-key": "Sleutel genereren", diff --git a/ui-ngx/src/assets/locale/locale.constant-pl_PL.json b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json index ac27313248..af95c71be0 100644 --- a/ui-ngx/src/assets/locale/locale.constant-pl_PL.json +++ b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json @@ -463,11 +463,9 @@ "signings-key-base64": "Klucz podpisujący musi być w formacie base64.", "expiration-time": "Czas ważności tokena (s)", "expiration-time-required": "Czas ważności tokena jest wymagany.", - "expiration-time-pattern": "Czas ważności tokena musi być dodatnią liczbą całkowitą.", "expiration-time-min": "Minimalny czas to 60 sekund (1 minuta).", "refresh-expiration-time": "Czas wygaśnięcia tokena odświeżenia (s)", "refresh-expiration-time-required": "Czas ważności tokena odświeżania jest wymagany.", - "refresh-expiration-time-pattern": "Czas wygaśnięcia tokena odświeżenia powinien być dodatnią liczbą całkowitą.", "refresh-expiration-time-min": "Minimalny czas to 900 sekund (15 minut).", "refresh-expiration-time-less-token": "Czas odświeżania tokenu musi być dłuższy.", "generate-key": "Wygeneruj klucz", diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json index ac302a78bb..112911820e 100644 --- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json +++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json @@ -504,11 +504,9 @@ "signings-key-base64": "签名密钥必须是Base64格式。", "expiration-time": "令牌过期时间（秒）", "expiration-time-required": "令牌过期时间是必填。", - "expiration-time-pattern": "令牌过期时间必须是一个正整数。", "expiration-time-min": "最小时间为60秒（1分钟）。", "refresh-expiration-time": "刷新令牌过期时间（秒）", "refresh-expiration-time-required": "刷新令牌过期时间必填。", - "refresh-expiration-time-pattern": "刷新令牌的过期时间必须是一个正整数。", "refresh-expiration-time-min": "最小时间为900秒（15分钟）。", "refresh-expiration-time-less-token": "刷新令牌时间必须大于令牌过期时间。", "generate-key": "生成密钥", From fc8ededea2a7a7d4c61840df971b927f750a2583 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Mon, 25 Nov 2024 18:21:21 +0200 Subject: [PATCH 2/3] UI: Fixed typo --- .../modules/home/pages/admin/security-settings.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html index 1e2af17ba7..fc5010e7a1 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html +++ b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html @@ -259,8 +259,8 @@
-
- +
+ admin.jwt.expiration-time Date: Fri, 29 Nov 2024 18:44:21 +0200 Subject: [PATCH 3/3] UI: Change translation --- ui-ngx/src/assets/locale/locale.constant-en_US.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 6f288f3db5..676c0ce0ce 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -524,11 +524,11 @@ "signings-key-base64": "Signing key must be base64 format.", "expiration-time": "Token expiration time (sec)", "expiration-time-required": "Token expiration time is required.", - "expiration-time-max": "Maximal time is 2147483647 seconds (68 years).", + "expiration-time-max": "Maximum allowed time is 2147483647 seconds(68 years).", "expiration-time-min": "Minimum time is 60 seconds (1 minute).", "refresh-expiration-time": "Refresh token expiration time (sec)", "refresh-expiration-time-required": "Refresh token expiration time is required.", - "refresh-expiration-time-max": "Maximal time is 2147483647 seconds (68 years).", + "refresh-expiration-time-max": "Maximum allowed time is 2147483647 seconds (68 years).", "refresh-expiration-time-min": "Minimum time is 900 seconds (15 minute).", "refresh-expiration-time-less-token": "Refresh token time must be greater token time.", "generate-key": "Generate key",