修改获取SSO登入登出URL方法

services/sso/client.go

@@ -1,11 +1,8 @@
 package sso
 
 import (
-	"fmt"
 	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk"
 	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
-	"net/url"
-	"strings"
 )
 
 const (
@@ -17,8 +14,8 @@ var HOST = requests.Host{
 	Func: func(s string, area string) string {
 		host := map[string]string{
 			requests.RELEASE: "sso.gaore.com.hk",
-			requests.PRE:     "sso.gaore.com",
+			requests.PRE:     "sso.gaore.com.hk",
-			requests.TEST:    "sso.gaore.com",
+			requests.TEST:    "sso.gaore.com.hk",
 		}
 		if s, ok := host[s]; ok {
 			return s
@@ -57,34 +54,6 @@ func (c *Client) SearchUser(req *SearchUserRequest) (response *SearchUserRespons
 	return
 }
 
-func (c *Client) GetLoginUrl(redirectUrl string, env ...string) string {
-	uri := fmt.Sprintf("/admin/main/login?ident=%s&redirectUrl=%s", c.ident, url.QueryEscape(redirectUrl))
-	scheme, host := c.getSchemeAndHost(env...)
-	return fmt.Sprintf("%s://%s%s", scheme, host, uri)
-}
-
-func (c *Client) GetLogout(env ...string) string {
-	uri := fmt.Sprintf("/admin/main/logout?ident=%s&redirectUrl=", c.ident)
-	scheme, host := c.getSchemeAndHost(env...)
-	return fmt.Sprintf("%s://%s%s", scheme, host, uri)
-}
-
-func (c Client) getSchemeAndHost(env ...string) (scheme, host string) {
-	rEnv := requests.RELEASE
-	if len(env) >= 1 {
-		rEnv = env[0]
-	}
-	host = HOST.Func(rEnv, "")
-
-	if rEnv == requests.RELEASE {
-		scheme = requests.HTTPS
-	} else {
-		scheme = requests.HTTP
-	}
-	scheme = strings.ToLower(scheme)
-	return
-}
-
 func NewClientWithAccessKey(accesskey, secrect, source string) (client *Client, err error) {
 	client = &Client{}
 	client.ident = source

services/sso/client_test.go

@@ -1,13 +1,11 @@
 package sso
 
 import (
-	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
 	"testing"
 )
 
 func TestLoginUrl(t *testing.T) {
-	c, _ := NewClientWithAccessKey("stat.gaore.com.hk", "", "stat_gaore_com_hk")
+	t.Log(GetLoginUrl("stat.gaore.com.hk", "http://stat.gaore.com.hk/web/user/login"))
-	t.Log(c.GetLoginUrl("http://stat.gaore.com.hk/web/user/login", requests.TEST))
 }
 
 func TestClient_CodeAuth(t *testing.T) {

services/sso/url.go

@@ -0,0 +1,27 @@
+package sso
+
+import (
+	"fmt"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"net/url"
+	"strings"
+)
+
+func GetLoginUrl(ident string, redirectUrl string, env ...string) string {
+	uri := fmt.Sprintf("/admin/main/login?ident=%s&redirectUrl=%s", ident, url.QueryEscape(redirectUrl))
+	scheme, host := getSchemeAndHost(env...)
+	return fmt.Sprintf("%s://%s%s", scheme, host, uri)
+}
+
+func GetLogout(ident string, env ...string) string {
+	uri := fmt.Sprintf("/admin/main/logout?ident=%s&redirectUrl=", ident)
+	scheme, host := getSchemeAndHost(env...)
+	return fmt.Sprintf("%s://%s%s", scheme, host, uri)
+}
+
+func getSchemeAndHost(env ...string) (scheme, host string) {
+	env = append(env, requests.RELEASE)
+	host = HOST.Func(env[0], "")
+	scheme = strings.ToLower(requests.HTTPS)
+	return
+}