Merge pull request #12 from leozhang2018/fix-port-missing

panxunying · web-flow · commit 96edea27f071 · 2022-03-08T21:43:29.000+08:00
fix(login):fix port missing when login.
diff --git a/custom-web/static/js/main.js b/custom-web/static/js/main.js
@@ -1,5 +1,6 @@
 const hostname = window.location.hostname;
 const protocol = window.location.protocol;
+const port = window.location.port;
 
 // login();
 var dex = new Vue({
@@ -34,7 +35,12 @@ var dex = new Vue({
                     if (roleBinding) {
                         const role = roleBinding.map((item) => item.role);
                         store.set("role", role);
-                        window.location.href = `${protocol}//${hostname}/v1/projects`;
+                        if(port){
+                            window.location.href = `${protocol}//${hostname}:${port}/v1/projects`;
+                        }
+                        else{
+                            window.location.href = `${protocol}//${hostname}/v1/projects`;
+                        }
                     }
                 }
             } 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`const hostname = window.location.hostname;`
`2`	`2`	`const protocol = window.location.protocol;`
	`3`	`+const port = window.location.port;`
`3`	`4`
`4`	`5`	`// login();`
`5`	`6`	`var dex = new Vue({`
`@@ -34,7 +35,12 @@ var dex = new Vue({`
`34`	`35`	`if (roleBinding) {`
`35`	`36`	`const role = roleBinding.map((item) => item.role);`
`36`	`37`	`store.set("role", role);`
`37`		- window.location.href = `${protocol}//${hostname}/v1/projects`;
	`38`	`+ if(port){`
	`39`	+ window.location.href = `${protocol}//${hostname}:${port}/v1/projects`;
	`40`	`+ }`
	`41`	`+ else{`
	`42`	+ window.location.href = `${protocol}//${hostname}/v1/projects`;
	`43`	`+ }`
`38`	`44`	`}`
`39`	`45`	`}`
`40`	`46`	`}`