fixes

Author: alan-nettica

api/v1/auth/auth.go

@@ -28,6 +28,7 @@ func ApplyRoutes(r *gin.RouterGroup) {
 		g.POST("/login", login)
 		g.GET("/user", user)
 		g.GET("/logout", logout)
+		g.GET("/redirect", redirect)
 	}
 }
 
@@ -550,3 +551,17 @@ func user(c *gin.Context) {
 
 	c.AbortWithStatus(http.StatusUnauthorized)
 }
+
+func redirect(c *gin.Context) {
+	referer := os.Getenv("SERVER")
+
+	url := c.Request.URL.Query().Get("url")
+	if url == "" {
+		c.AbortWithStatus(http.StatusBadRequest)
+		return
+	}
+
+	url = url + "?referer=" + referer
+
+	c.Redirect(http.StatusTemporaryRedirect, url)
+}

ui/src/components/Services.vue

@@ -654,14 +654,10 @@ export default {
                 this.wildServer = this.wildServer.slice(0, -1)
             }
 
-            this.TokenService.setWildServer(this.wildServer)
-            this.wildServer = this.TokenService.getWildServer()
-
 
             this.dialogWilderness = false;
-            
-            var url = this.wildServer + "/?referer=" + window.location.origin
-            window.open( url )
+
+            window.location.replace( window.location.origin + "/api/v1.0/auth/redirect?url=" + this.wildServer)
         },
 
         async createWilderness() {