Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix creating OAuth2 auth source from CLI #14116

Merged
merged 7 commits into from
Dec 24, 2020
Merged

Fix creating OAuth2 auth source from CLI #14116

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0109a9b
Fix creating OAuth2 auth source from CLI
Dec 22, 2020
0497101
Fix MR discussions
Dec 23, 2020
6cc8df8
Fix typo
daniil-pankratov Dec 24, 2020
f5d57a9
Fix typo in comment
daniil-pankratov Dec 24, 2020
c9187e2
Merge branch 'master' into master
lunny Dec 24, 2020
5d75e72
Merge branch 'master' into master
zeripath Dec 24, 2020
c8819d2
Change comment
daniil-pankratov Dec 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion models/oauth2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,18 @@ func InitOAuth2() error {
if err := oauth2.Init(x); err != nil {
return err
}
loginSources, _ := GetActiveOAuth2ProviderLoginSources()
return initOAuth2LoginSources()
}

// ResetOAuth2 clears existing OAuth2 providers and loads them from the DB
func ResetOAuth2() error {
oauth2.ClearProviders()
return initOAuth2LoginSources()
}

// initOAuth2LoginSources is used to load and register all active OAuth2 providers
func initOAuth2LoginSources() error {
loginSources, _ := GetActiveOAuth2ProviderLoginSources()
for _, source := range loginSources {
oAuth2Config := source.OAuth2()
err := oauth2.RegisterProvider(source.Name, oAuth2Config.Provider, oAuth2Config.ClientID, oAuth2Config.ClientSecret, oAuth2Config.OpenIDConnectAutoDiscoveryURL, oAuth2Config.CustomURLMapping)
Expand Down
5 changes: 5 additions & 0 deletions modules/auth/oauth2/oauth2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ func RemoveProvider(providerName string) {
delete(goth.GetProviders(), providerName)
}

// ClearProviders clears all OAuth2 providers from the goth lib
func ClearProviders() {
goth.ClearProviders()
}

// used to create different types of goth providers
func createProvider(providerName, providerType, clientID, clientSecret, openIDConnectAutoDiscoveryURL string, customURLMapping *CustomURLMapping) (goth.Provider, error) {
callbackURL := setting.AppURL + "user/oauth2/" + url.PathEscape(providerName) + "/callback"
Expand Down
13 changes: 11 additions & 2 deletions routers/user/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,8 +570,17 @@ func SignInOAuth(ctx *context.Context) {
return
}

err = oauth2.Auth(loginSource.Name, ctx.Req.Request, ctx.Resp)
if err != nil {
if err = oauth2.Auth(loginSource.Name, ctx.Req.Request, ctx.Resp); err != nil {
if strings.Contains(err.Error(), "no provider for ") {
if err = models.ResetOAuth2(); err != nil {
ctx.ServerError("SignIn", err)
lunny marked this conversation as resolved.
Show resolved Hide resolved
return
}
if err = oauth2.Auth(loginSource.Name, ctx.Req.Request, ctx.Resp); err != nil {
ctx.ServerError("SignIn", err)
lunny marked this conversation as resolved.
Show resolved Hide resolved
}
return
}
ctx.ServerError("SignIn", err)
}
// redirect is done in oauth2.Auth
Expand Down