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

3 years ago · fbadc1a198
parent 72d82c5b6f
commit fbadc1a198
1 changed files with 8 additions and 7 deletions
--- a/routers/web/user/auth.go
+++ b/routers/web/user/auth.go
@ -681,13 +681,14 @@ func SignInOAuthCallback(ctx *context.Context) {
 				return
 			}
 			u = &user_model.User{
-				Name:        getUserName(&gothUser),
-				FullName:    gothUser.Name,
-				Email:       gothUser.Email,
-				IsActive:    !setting.OAuth2Client.RegisterEmailConfirm,
-				LoginType:   login.OAuth2,
-				LoginSource: loginSource.ID,
-				LoginName:   gothUser.UserID,
+				Name:         getUserName(&gothUser),
+				FullName:     gothUser.Name,
+				Email:        gothUser.Email,
+				IsActive:     !setting.OAuth2Client.RegisterEmailConfirm,
+				LoginType:    login.OAuth2,
+				LoginSource:  loginSource.ID,
+				LoginName:    gothUser.UserID,
+				IsRestricted: setting.Service.DefaultUserIsRestricted,
 			}

 			if !createAndHandleCreatedUser(ctx, base.TplName(""), nil, u, &gothUser, setting.OAuth2Client.AccountLinking != setting.OAuth2AccountLinkingDisabled) {