Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix value of User.IsRestricted to default setting when oauth2 user auto registration; (#17839)

Browse source
This commit is contained in:
Galen Suen 2021-11-28 11:27:48 +08:00 committed by GitHub
parent 72d82c5b6f
commit fbadc1a198
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
routers/web/user/auth.go
View file

@ -681,13 +681,14 @@ func SignInOAuthCallback(ctx *context.Context) {
return return
} }
u = &user_model.User{ u = &user_model.User{
Name: getUserName(&gothUser), Name: getUserName(&gothUser),
FullName: gothUser.Name, FullName: gothUser.Name,
Email: gothUser.Email, Email: gothUser.Email,
IsActive: !setting.OAuth2Client.RegisterEmailConfirm, IsActive: !setting.OAuth2Client.RegisterEmailConfirm,
LoginType: login.OAuth2, LoginType: login.OAuth2,
LoginSource: loginSource.ID, LoginSource: loginSource.ID,
LoginName: gothUser.UserID, LoginName: gothUser.UserID,
IsRestricted: setting.Service.DefaultUserIsRestricted,
} }
if !createAndHandleCreatedUser(ctx, base.TplName(""), nil, u, &gothUser, setting.OAuth2Client.AccountLinking != setting.OAuth2AccountLinkingDisabled) { if !createAndHandleCreatedUser(ctx, base.TplName(""), nil, u, &gothUser, setting.OAuth2Client.AccountLinking != setting.OAuth2AccountLinkingDisabled) {