From 6d0c2f51f34b3fb4331d05ba856f40d6b78fecd0 Mon Sep 17 00:00:00 2001
From: Yogi_Wang <yawang@vmware.com>
Date: Wed, 8 May 2019 00:40:47 +0800
Subject: [PATCH] Move redirectUrl tip,fix pattern with endpoint,fix incorrect
 tip message for invalid input of OIDC scope

Signed-off-by: Yogi_Wang <yawang@vmware.com>
---
 src/portal/src/app/config/auth/config-auth.component.html | 6 +++---
 src/portal/src/app/config/auth/config-auth.component.scss | 4 +---
 src/portal/src/i18n/lang/en-us-lang.json                  | 1 +
 src/portal/src/i18n/lang/es-es-lang.json                  | 1 +
 src/portal/src/i18n/lang/fr-fr-lang.json                  | 1 +
 src/portal/src/i18n/lang/pt-br-lang.json                  | 1 +
 src/portal/src/i18n/lang/zh-cn-lang.json                  | 1 +
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/portal/src/app/config/auth/config-auth.component.html b/src/portal/src/app/config/auth/config-auth.component.html
index 354570e5f..1c637df9f 100644
--- a/src/portal/src/app/config/auth/config-auth.component.html
+++ b/src/portal/src/app/config/auth/config-auth.component.html
@@ -322,7 +322,6 @@
     </section>
 
     <section class="form-block" *ngIf="showOIDC">
-        <div class="oidc-tip">{{ 'CONFIG.OIDC.OIDC_REDIREC_URL' | translate}} <span>{{redirectUrl}}/c/oidc/callback</span></div>
         <div class="form-group">
             <label for="oidcName" class="required">{{'CONFIG.OIDC.OIDC_PROVIDER' | translate}}</label>
             <label for="oidcName" aria-haspopup="true" role="tooltip"
@@ -348,7 +347,7 @@
                 class="tooltip tooltip-validation tooltip-lg tooltip-top-right">
                 <input name="oidcEndpoint" type="text" #oidcEndpointInput="ngModel" required
                     [(ngModel)]="currentConfig.oidc_endpoint.value" id="oidcEndpoint" size="40"
-                    [disabled]="disabled(currentConfig.oidc_endpoint)" pattern="^([hH][tT]{2}[pP][sS])(.*?)*$">
+                    [disabled]="disabled(currentConfig.oidc_endpoint)" pattern="^([hH][tT]{2}[pP][sS]:\/\/)(.*?)*$">
                 <span class="tooltip-content">
                     {{'TOOLTIP.OIDC_ENDPOIT_FORMAT' | translate}}
                 </span>
@@ -394,7 +393,7 @@
                     [(ngModel)]="currentConfig.oidc_scope.value" id="oidcScope" size="40" required
                     [disabled]="disabled(currentConfig.oidc_scope)" pattern="^(\w+,){0,}openid(,\w+){0,}$">
                 <span class="tooltip-content">
-                    {{'TOOLTIP.ITEM_REQUIRED' | translate}}
+                    {{'TOOLTIP.SCOPE_REQUIRED' | translate}}
                 </span>
             </label>
             <a href="javascript:void(0)" role="tooltip" aria-haspopup="true"
@@ -416,6 +415,7 @@
                 <span class="tooltip-content">{{'TOOLTIP.OIDC_VERIFYCERT' | translate}}</span>
             </a>
         </div>
+        <div class="oidc-tip">{{ 'CONFIG.OIDC.OIDC_REDIREC_URL' | translate}} <span>{{redirectUrl}}/c/oidc/callback</span></div>
     </section>
 </form>
 <div>
diff --git a/src/portal/src/app/config/auth/config-auth.component.scss b/src/portal/src/app/config/auth/config-auth.component.scss
index fcfec2514..3a0ff7f5b 100644
--- a/src/portal/src/app/config/auth/config-auth.component.scss
+++ b/src/portal/src/app/config/auth/config-auth.component.scss
@@ -16,7 +16,5 @@ clr-tooltip {
     top: -5px;
 }
 .oidc-tip {
-    position: absolute;
-    top: 170px;
-    color: rgb(210, 74, 112);
+    color: rgb(10, 74, 112);
 }
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
index 4d624672f..d0e1d1a48 100644
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@@ -75,6 +75,7 @@
         "SIGN_UP_MAIL": "Email is only used for resetting your password.",
         "SIGN_UP_REAL_NAME": "First and last name",
         "ITEM_REQUIRED": "Field is required.",
+        "SCOPE_REQUIRED": "Field is required and should be in scope format.",
         "NUMBER_REQUIRED": "Field is required and should be numbers.",
         "PORT_REQUIRED": "Field is required and should be valid port number.",
         "CRON_REQUIRED": "Field is required and should be in cron format.",
diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
index 2dc683b0c..0e765e347 100644
--- a/src/portal/src/i18n/lang/es-es-lang.json
+++ b/src/portal/src/i18n/lang/es-es-lang.json
@@ -75,6 +75,7 @@
         "SIGN_UP_MAIL": "La dirección de email solamente se utilizar para restablecer la contraseña.",
         "SIGN_UP_REAL_NAME": "Nombre y apellidos",
         "ITEM_REQUIRED": "Campo obligatorio.",
+        "SCOPE_REQUIRED": "Field is required and should be in scope format.",
         "NUMBER_REQUIRED": "El campo es obligatorio y debería ser un número.",
         "PORT_REQUIRED": "El campo es obligatorio y debería ser un número de puerto válido.",
         "CRON_REQUIRED": "El campo es obligatorio y debe estar en formato cron.",
diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
index daebf3df3..c5cc95047 100644
--- a/src/portal/src/i18n/lang/fr-fr-lang.json
+++ b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -72,6 +72,7 @@
         "SIGN_UP_MAIL": "L'email n'est utilisé que pour réinitialiser votre mot de passe.",
         "SIGN_UP_REAL_NAME": "Prénom et nom",
         "ITEM_REQUIRED": "Le champ est obligatoire.",
+        "SCOPE_REQUIRED": "Field is required and should be in scope format.",
         "NUMBER_REQUIRED": "Le champ est obligatoire et doit être numérique.",
         "PORT_REQUIRED": "Le champ est obligatoire et doit être un numéro de port valide.",
         "CRON_REQUIRED": "Le champ est obligatoire et doit être au format cron.",
diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
index 4cef6484d..c514150f9 100644
--- a/src/portal/src/i18n/lang/pt-br-lang.json
+++ b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -75,6 +75,7 @@
         "SIGN_UP_MAIL": "Email é apenas utilizado para redefinir a senha.",
         "SIGN_UP_REAL_NAME": "Primeiro e último nome",
         "ITEM_REQUIRED": "Campo é obrigatório.",
+        "SCOPE_REQUIRED": "Field is required and should be in scope format.",
         "NUMBER_REQUIRED": "Campo é obrigatório e deve ser numerico.",
         "PORT_REQUIRED": "Campo é obrigatório e deve ser um número de porta válido.",
         "CRON_REQUIRED": "O campo é obrigatório e deve estar no formato cron.",
diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
index 0efd3e2ba..fe730eb8d 100644
--- a/src/portal/src/i18n/lang/zh-cn-lang.json
+++ b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -75,6 +75,7 @@
         "SIGN_UP_MAIL": "邮件地址仅用来重置您的密码。",
         "SIGN_UP_REAL_NAME": "全名",
         "ITEM_REQUIRED": "此项为必填项。",
+        "SCOPE_REQUIRED": "此项为必填项且为scope格式。",
         "NUMBER_REQUIRED": "此项为必填项且为数字。",
         "PORT_REQUIRED": "此项为必填项且为合法端口号。",
         "CRON_REQUIRED": "此项为必填项且为cron格式。",