fix: URL concatenation for redirection

Author: dengbinbox

internal/handler/router.go

@@ -50,9 +50,9 @@ func (s *Server) SetupRouter(r *gin.Engine) {
 		webOauthServer.GET("bind/account", s.bindAccount)
 		webOauthServer.GET("bind/account/callback", s.bindAccountCallback)
 		webOauthServer.GET("userinfo", s.userInfoHandler)
-		webOauthServer.GET("login", s.webLoginHandler)
+		webOauthServer.GET("login", s.webLoginHandler) // web login entry point and redirect to custom service
 		webOauthServer.GET("login/callback", s.webLoginCallbackHandler)
-		webOauthServer.GET("login/callback/:service", s.webLoginCallbackHandler)
+		webOauthServer.GET("login/callback/:service", s.webLoginCallbackHandler) // with service param, custom redirect
 		webOauthServer.GET("invite-code", s.getUserInviteCodeHandler)
 	}
 	r.POST("/oidc-auth/api/v1/send/sms", s.SMSHandler)

internal/handler/web_handler.go

@@ -37,10 +37,13 @@ func (s *Server) webLoginHandler(c *gin.Context) {
 
 	// Use inviterCode as state parameter
 	state := inviterCode
-	authURL := providerInstance.GetAuthURL(state, s.BaseURL+constants.WebLoginCallbackURI)
+	var redirectURL = ""
 	if redirectService != "" {
-		authURL = fmt.Sprintf("%s/%s", authURL, redirectService)
+		redirectURL = fmt.Sprintf("%s/%s", s.BaseURL+constants.WebLoginCallbackURI, redirectService)
+	} else {
+		redirectURL = s.BaseURL + constants.WebLoginCallbackURI
 	}
+	authURL := providerInstance.GetAuthURL(state, redirectURL)
 	response.JSONSuccess(c, "", map[string]interface{}{
 		"state":        state,
 		"inviter_code": inviterCode,