Merge pull request #13 from IRONICBo/feat/mvp-20240119

Fix: fix redirect url.
goplus · Jan 31, 2024 · 30aeb46 · 30aeb46
2 parents 0fcfb2e + d816e4f
commit 30aeb46
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/cmd/gopcomm/community_yap.gox b/cmd/gopcomm/community_yap.gox
@@ -409,7 +409,7 @@ get "/login", ctx => {
 	// redirectURL := ctx.URL.Query().Get("redirect_url")
 	// Get current request page URL from 
 	// Concatenate the current request page URL from refer
-	redirectURL := fmt.Sprintf("%s/%s", ctx.Request.Referer() + "callback")
+	redirectURL := fmt.Sprintf("%s/%s", ctx.Request.Referer(), "callback")
 
 	loginURL := community.RedirectToCasdoor(redirectURL)
 	ctx.Redirect loginURL, http.StatusFound

diff --git a/cmd/gopcomm/gop_autogen.go b/cmd/gopcomm/gop_autogen.go
@@ -477,7 +477,7 @@ func (this *community) MainEntry() {
 //line cmd/gopcomm/community_yap.gox:407:1
 	this.Get("/login", func(ctx *yap.Context) {
 //line cmd/gopcomm/community_yap.gox:412:1
-		redirectURL := fmt.Sprintf("%s/%s", ctx.Request.Referer()+"callback")
+		redirectURL := fmt.Sprintf("%s/%s", ctx.Request.Referer(), "callback")
 //line cmd/gopcomm/community_yap.gox:414:1
 		loginURL := this.community.RedirectToCasdoor(redirectURL)
 //line cmd/gopcomm/community_yap.gox:415:1

diff --git a/internal/core/community.go b/internal/core/community.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/url"
 	"os"
 	"strconv"
 	"time"
@@ -404,19 +405,23 @@ func casdoorConfigInit() *CasdoorConfig {
 
 func (a *Community) RedirectToCasdoor(redirect string) (loginURL string) {
 	// TODO: Check whitelist from referer
-	ResponseType := "code"
-	Scope := "read"
-	State := "casdoor"
+	responseType := "code"
+	scope := "read"
+	state := "casdoor"
+	redirectEncodeURL := url.QueryEscape(redirect)
+
 	loginURL = fmt.Sprintf(
 		"%s/login/oauth/authorize?client_id=%s&response_type=%s&redirect_uri=%s&scope=%s&state=%s",
 		a.casdoorConfig.endPoint,
 		a.casdoorConfig.clientId,
-		ResponseType,
-		redirect,
-		Scope,
-		State,
+		responseType,
+		redirectEncodeURL,
+		scope,
+		state,
 	)
 
+	fmt.Println("loginURL", loginURL)
+
 	return loginURL
 }