From 8807144ed9157286156c9eb012d9300020a9dfdc Mon Sep 17 00:00:00 2001
From: csg01123119 <csg01123119@alibaba-inc.com>
Date: Sun, 4 Feb 2024 16:22:27 +0800
Subject: [PATCH] feat: login url Must start with http:// or https://

---
 app/main/auth/login.html | 58 +++++++++++++++++++++++++---------------
 app/main/auth/login.js   |  5 ++--
 node/i18n/en-US.js       |  1 +
 node/i18n/ja-JP.js       |  1 +
 node/i18n/zh-CN.js       |  1 +
 5 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/app/main/auth/login.html b/app/main/auth/login.html
index bd0dd037..8d8bc818 100644
--- a/app/main/auth/login.html
+++ b/app/main/auth/login.html
@@ -115,16 +115,23 @@
                 ng-if="eptplType=='customize'"
                 ng-class="{'has-error':!form1.endpoint.$valid}"
               >
-                <input
-                  type="text"
-                  required
-                  ng-model="item.eptpl"
-                  ng-pattern="/^http(s)?\:\/\//"
-                  class="form-control"
-                  id="endpoint"
-                  name="endpoint"
-                  placeholder="http(s)://"
-                />
+                  <div
+                    uib-tooltip="{{'https.tooltip'|translate}}"
+                    tooltip-is-open="!form1.endpoint.$valid"
+                    tooltip-placement="top"
+                    style="width: 100%;"
+                    >
+                      <input
+                        type="text"
+                        required
+                        ng-model="item.eptpl"
+                        ng-pattern="/^http(s)?\:\/\//"
+                        class="form-control"
+                        id="endpoint"
+                        name="endpoint"
+                        placeholder="http(s)://"
+                      />
+                  </div>
               </div>
               <!--// cname -->
               <div
@@ -134,16 +141,23 @@
                 ng-if="eptplType=='cname'"
                 ng-class="{'has-error':!form1.cname.$valid}"
               >
-                <input
-                  type="text"
-                  required
-                  ng-model="item.eptplcname"
-                  ng-pattern="/^http(s)?\:\/\//"
-                  class="form-control"
-                  id="cname"
-                  name="cname"
-                  placeholder="http(s)://"
-                />
+                <div
+                    uib-tooltip="{{'https.tooltip'|translate}}"
+                    tooltip-is-open="!form1.cname.$valid"
+                    tooltip-placement="top"
+                    style="width: 100%;"
+                    >
+                      <input
+                        type="text"
+                        required
+                        ng-model="item.eptplcname"
+                        ng-pattern="/^http(s)?\:\/\//"
+                        class="form-control"
+                        id="cname"
+                        name="cname"
+                        placeholder="http(s)://"
+                      />
+                  </div>
               </div>
             </div>
           </div>
@@ -187,7 +201,7 @@
           </div>
 
           <div
-            ng-if="item.id.indexOf('STS.')==0"
+            ng-if="item.id && item.id.indexOf('STS.') == 0"
             class="form-group has-feedback"
             ng-class="{'has-error': !form1.stoken.$valid }"
           >
@@ -273,7 +287,7 @@
 
           <div
             class="form-group"
-            ng-if="item.osspath && item.eptpl.indexOf('{region}')!=-1"
+            ng-if="item.osspath && item.eptpl && item.eptpl.indexOf('{region}') != -1"
           >
             <label for="input4" class="col-sm-4 control-label">
               <!-- <span class="red">*</span> -->
diff --git a/app/main/auth/login.js b/app/main/auth/login.js
index 69f70cd9..8ae1d0fd 100644
--- a/app/main/auth/login.js
+++ b/app/main/auth/login.js
@@ -67,8 +67,9 @@ angular.module('web').controller('loginCtrl', [
     });
 
     $scope.$watch('item.eptpl', function(v) {
-      $scope.eptplType =
-        v.indexOf('{region}.aliyuncs.com') !== -1 ? 'default' : 'customize';
+      if (v) {
+        $scope.eptplType = v.indexOf('{region}.aliyuncs.com') !== -1 ? 'default' : 'customize';
+      }
     });
 
     $scope.$watch('gtab', function(v) {
diff --git a/node/i18n/en-US.js b/node/i18n/en-US.js
index 02e95b88..25839daf 100644
--- a/node/i18n/en-US.js
+++ b/node/i18n/en-US.js
@@ -523,4 +523,5 @@ module.exports = {
 
   "goto.create.role": "Go to create a role",
   "restore.days.tips.7": "Validity range 1-7 days",
+  "https.tooltip": "Invalid URL. Must start with 'http://' or 'https://'."
 };
diff --git a/node/i18n/ja-JP.js b/node/i18n/ja-JP.js
index b95ca641..8b661710 100644
--- a/node/i18n/ja-JP.js
+++ b/node/i18n/ja-JP.js
@@ -527,4 +527,5 @@ module.exports = {
 
   "goto.create.role": "ロールの作成",
   "restore.days.tips.7": "有効期限 1～7日",
+  "https.tooltip": "URLは'http://'または'https://'で始まる必要があります"
 };
diff --git a/node/i18n/zh-CN.js b/node/i18n/zh-CN.js
index de404e07..aef73d70 100644
--- a/node/i18n/zh-CN.js
+++ b/node/i18n/zh-CN.js
@@ -504,4 +504,5 @@ module.exports = {
 
   "goto.create.role": "去创建角色",
   "restore.days.tips.7": "有效期范围1-7天",
+  "https.tooltip": "URL必须以'http://'或'https://'开头"
 };