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

Suppress ExternalLoginUserNotExist error #21504

Merged
merged 8 commits into from
Oct 19, 2022
Merged

Suppress ExternalLoginUserNotExist error #21504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c36999c
Suppress error.
KN4CK3R Oct 18, 2022
9089263
Apply suggestions from code review
6543 Oct 18, 2022
17ba6db
Fix imports.
KN4CK3R Oct 19, 2022
44d12f8
Merge branch 'main' of https://github.com/go-gitea/gitea into fix-21202
KN4CK3R Oct 19, 2022
843c013
Merge branch 'main' into fix-21202
lunny Oct 19, 2022
6e8fccf
Merge branch 'main' into fix-21202
lunny Oct 19, 2022
f13f1d0
Merge branch 'main' into fix-21202
lunny Oct 19, 2022
7beecbd
Merge branch 'main' into fix-21202
zeripath Oct 19, 2022
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
6 changes: 5 additions & 1 deletion routers/web/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package auth

import (
"errors"
"fmt"
"net/http"
"strings"
Expand All @@ -24,6 +25,7 @@ import (
"code.gitea.io/gitea/modules/session"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/modules/web/middleware"
"code.gitea.io/gitea/routers/utils"
Expand Down Expand Up @@ -619,7 +621,9 @@ func handleUserCreated(ctx *context.Context, u *user_model.User, gothUser *goth.
// update external user information
if gothUser != nil {
if err := externalaccount.UpdateExternalUser(u, *gothUser); err != nil {
log.Error("UpdateExternalUser failed: %v", err)
if !errors.Is(err, util.ErrNotExist) {
log.Error("UpdateExternalUser failed: %v", err)
}
}
}

Expand Down
4 changes: 3 additions & 1 deletion routers/web/auth/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,9 @@ func handleOAuth2SignIn(ctx *context.Context, source *auth.Source, u *user_model

// update external user information
if err := externalaccount.UpdateExternalUser(u, gothUser); err != nil {
log.Error("UpdateExternalUser failed: %v", err)
if !errors.Is(err, util.ErrNotExist) {
log.Error("UpdateExternalUser failed: %v", err)
}
}

if err := resetLocale(ctx, u); err != nil {
Expand Down