wonder/xinfra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add business line permissions and Wayne namespace mapping

Browse Source
This commit is contained in:
mac
2026-07-17 15:02:18 +08:00
parent e1d755b2df
commit d264924d1e
23 changed files with 1343 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/internal/service/wayen.go
+4 -4
View File
@@ -48,7 +48,7 @@ func NewWayenService(cfg config.Config, db *gorm.DB) *WayenService {
}
}
func (s *WayenService) Login(email, username string) (*WayenLoginResult, error) {
func (s *WayenService) Login(email, username, refOverride string) (*WayenLoginResult, error) {
email = strings.TrimSpace(email)
if email == "" {
return nil, ErrWayenEmailMissing
@@ -58,7 +58,7 @@ func (s *WayenService) Login(email, username string) (*WayenLoginResult, error)
oauthLoginURL = strings.TrimSpace(s.cfg.OAuthRedirectURI)
}
if oauthLoginURL != "" && strings.TrimSpace(s.cfg.WayenTargetURL) != "" {
target, err := s.oauthLoginURL(oauthLoginURL, s.cfg.WayenTargetURL)
target, err := s.oauthLoginURL(oauthLoginURL, s.cfg.WayenTargetURL, refOverride)
if err != nil {
return nil, err
}
@@ -111,7 +111,7 @@ func (s *WayenService) Login(email, username string) (*WayenLoginResult, error)
}, nil
}
func (s *WayenService) oauthLoginURL(redirectURI, targetURL string) (string, error) {
func (s *WayenService) oauthLoginURL(redirectURI, targetURL, refOverride string) (string, error) {
parsed, err := url.Parse(strings.TrimSpace(redirectURI))
if err != nil {
return "", err
@@ -124,7 +124,7 @@ func (s *WayenService) oauthLoginURL(redirectURI, targetURL string) (string, err
next.Path = "/sign-in"
}
values := next.Query()
values.Set("ref", defaultConfigValue(s.cfg.WayenOAuthRef, "/portal/namespace/1/app"))
values.Set("ref", defaultConfigValue(refOverride, defaultConfigValue(s.cfg.WayenOAuthRef, "/portal/namespace/1/app")))
next.RawQuery = values.Encode()
query := parsed.Query()
server/internal/service/wayen_test.go
+26 -2
View File
@@ -15,7 +15,7 @@ func TestWayenLoginUsesDedicatedOAuthLoginURL(t *testing.T) {
WayenOAuthRef: "/portal/namespace/1/app",
}, nil)
result, err := service.Login("eastsales@qiniu.com", "eastsales@qiniu.com")
result, err := service.Login("eastsales@qiniu.com", "eastsales@qiniu.com", "")
if err != nil {
t.Fatalf("Login() error = %v", err)
}
@@ -55,7 +55,7 @@ func TestWayenLoginFallsBackToOAuthRedirectURI(t *testing.T) {
WayenTargetURL: "http://218.11.5.223:32000/",
}, nil)
result, err := service.Login("eastsales@qiniu.com", "eastsales@qiniu.com")
result, err := service.Login("eastsales@qiniu.com", "eastsales@qiniu.com", "")
if err != nil {
t.Fatalf("Login() error = %v", err)
}
@@ -67,3 +67,27 @@ func TestWayenLoginFallsBackToOAuthRedirectURI(t *testing.T) {
t.Fatalf("target host = %q, want fallback redirect host", parsed.Host)
}
}
func TestWayenLoginUsesRefOverride(t *testing.T) {
service := NewWayenService(config.Config{
WayenOAuthLoginURL: "http://218.11.5.223:32000/login/oauth2/oauth2",
WayenTargetURL: "http://218.11.5.223:32000/",
WayenOAuthRef: "/portal/namespace/1/app",
}, nil)
result, err := service.Login("eastsales@qiniu.com", "eastsales@qiniu.com", "/portal/namespace/3/app")
if err != nil {
t.Fatalf("Login() error = %v", err)
}
parsed, err := url.Parse(result.TargetURL)
if err != nil {
t.Fatalf("invalid target url: %v", err)
}
parsedNext, err := url.Parse(parsed.Query().Get("next"))
if err != nil {
t.Fatalf("invalid next url: %v", err)
}
if parsedNext.Query().Get("ref") != "/portal/namespace/3/app" {
t.Fatalf("next ref = %q", parsedNext.Query().Get("ref"))
}
}