diff --git a/.vscode/launch.json b/.vscode/launch.json index fcd9618..0b05e32 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "go", "debugAdapter": "dlv-dap", "request": "launch", - "port": 36633, + "port": 38133, "host": "127.0.0.1", "mode": "exec", "program": "${workspaceFolder}/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service" diff --git a/Makefile b/Makefile index cfab9dc..2b4b6a9 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ VERSION=v1 BIN_PATH=build/sysroot/usr/bin BUILD_PATH=build CUR_DIR=$(PWD) -TAG=v1.2.5 +TAG=v1.4.0 ARCHIVE_PATH=buildzip PACKAGE_NAME=$(OS)-$(ARCHITECHTURE)-nextzenos-user-service-$(TAG) diff --git a/common/version.go b/common/version.go index 535568b..e7ddab1 100644 --- a/common/version.go +++ b/common/version.go @@ -1,4 +1,4 @@ package common -const Version = "1.3.0" +const Version = "1.4.0" const SERVICENAME = "CasaOS-UserService" diff --git a/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service b/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service index cf5ab2e..a47fa75 100755 Binary files a/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service and b/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service differ diff --git a/dist/metadata.json b/dist/metadata.json index 4c6e510..92e0a48 100644 --- a/dist/metadata.json +++ b/dist/metadata.json @@ -1 +1 @@ -{"project_name":"casaos-user-service","tag":"v1.0.0","previous_tag":"","version":"1.0.1","commit":"7c56d5865c9829a6af7fbd6c16a87b3266e9098a","date":"2024-09-30T12:02:33.51552871+07:00","runtime":{"goos":"linux","goarch":"amd64"}} \ No newline at end of file +{"project_name":"casaos-user-service","tag":"v1.0.0","previous_tag":"","version":"1.0.1","commit":"f89d096bc2bb2452772dc54d309c629068dee56b","date":"2024-10-01T11:08:09.593194619+07:00","runtime":{"goos":"linux","goarch":"amd64"}} \ No newline at end of file diff --git a/route/v1/user.go b/route/v1/user.go index 63f01c4..e046d11 100644 --- a/route/v1/user.go +++ b/route/v1/user.go @@ -310,10 +310,12 @@ func OIDCLogin(c *gin.Context) { json := make(map[string]string) c.ShouldBind(&json) state := json["state"] + callBackUrl := fmt.Sprintf("%s/%s", json["baseUrl"], "v1/users/oidc/callback") // w := c.Writer // r := c.Request // setCallbackCookie(w, r, "state", state) // c.Redirect(http.StatusFound, oauth2Config.AuthCodeURL(state)) + oauth2Config.RedirectURL = callBackUrl c.JSON(common_err.SUCCESS, model.Result{ Success: common_err.SUCCESS,