github.com/opengist
1
0
Fork 0
mirror of https://github.com/thomiceli/opengist synced 2025-02-21 17:19:34 +01:00
Code Releases Wiki Activity

Merge pull request #21 from josefandersson/oath-respect-external-url-config

Browse Source 
Respect ExternalUrl for OAuth
This commit is contained in:
Thomas Miceli 2023-05-01 02:03:24 +02:00 committed by GitHub
commit 713b5d623e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/web/auth.go
View File

@ -231,7 +231,13 @@ func oauth(ctx echo.Context) error {
} }
giteaUrl := trimGiteaUrl() giteaUrl := trimGiteaUrl()
httpDomain := httpProtocol + "://" + ctx.Request().Host
var opengistUrl string
if config.C.ExternalUrl != "" {
opengistUrl = config.C.ExternalUrl
} else {
opengistUrl = httpProtocol + "://" + ctx.Request().Host
}
switch provider { switch provider {
case "github": case "github":
@ -239,7 +245,7 @@ func oauth(ctx echo.Context) error {
github.New( github.New(
config.C.GithubClientKey, config.C.GithubClientKey,
config.C.GithubSecret, config.C.GithubSecret,
httpDomain+"/oauth/github/callback"), opengistUrl+"/oauth/github/callback"),
) )
case "gitea": case "gitea":
@ -247,7 +253,7 @@ func oauth(ctx echo.Context) error {
gitea.NewCustomisedURL( gitea.NewCustomisedURL(
config.C.GiteaClientKey, config.C.GiteaClientKey,
config.C.GiteaSecret, config.C.GiteaSecret,
httpDomain+"/oauth/gitea/callback", opengistUrl+"/oauth/gitea/callback",
giteaUrl+"/login/oauth/authorize", giteaUrl+"/login/oauth/authorize",
giteaUrl+"/login/oauth/access_token", giteaUrl+"/login/oauth/access_token",
giteaUrl+"/api/v1/user"), giteaUrl+"/api/v1/user"),