Browse Source

Apply DefaultUserIsRestricted in CreateUser

pull/19310/head
Jimmy Praet 3 years ago
parent
commit
9020faa3ce
  1. 1
      models/user/user.go
  2. 1
      routers/web/auth/auth.go
  3. 1
      routers/web/auth/oauth.go

1
models/user/user.go

@ -637,6 +637,7 @@ func CreateUser(u *User, overwriteDefault ...*CreateUserOverwriteOptions) (err e
u.EmailNotificationsPreference = setting.Admin.DefaultEmailNotification u.EmailNotificationsPreference = setting.Admin.DefaultEmailNotification
u.MaxRepoCreation = -1 u.MaxRepoCreation = -1
u.Theme = setting.UI.DefaultTheme u.Theme = setting.UI.DefaultTheme
u.IsRestricted = u.IsRestricted || setting.Service.DefaultUserIsRestricted
// overwrite defaults if set // overwrite defaults if set
if len(overwriteDefault) != 0 && overwriteDefault[0] != nil { if len(overwriteDefault) != 0 && overwriteDefault[0] != nil {

1
routers/web/auth/auth.go

@ -511,7 +511,6 @@ func SignUpPost(ctx *context.Context) {
Email: form.Email, Email: form.Email,
Passwd: form.Password, Passwd: form.Password,
IsActive: !(setting.Service.RegisterEmailConfirm || setting.Service.RegisterManualConfirm), IsActive: !(setting.Service.RegisterEmailConfirm || setting.Service.RegisterManualConfirm),
IsRestricted: setting.Service.DefaultUserIsRestricted,
} }
if !createAndHandleCreatedUser(ctx, tplSignUp, form, u, nil, false) { if !createAndHandleCreatedUser(ctx, tplSignUp, form, u, nil, false) {

1
routers/web/auth/oauth.go

@ -874,7 +874,6 @@ func SignInOAuthCallback(ctx *context.Context) {
LoginType: auth.OAuth2, LoginType: auth.OAuth2,
LoginSource: authSource.ID, LoginSource: authSource.ID,
LoginName: gothUser.UserID, LoginName: gothUser.UserID,
IsRestricted: setting.Service.DefaultUserIsRestricted,
} }
setUserGroupClaims(authSource, u, &gothUser) setUserGroupClaims(authSource, u, &gothUser)

Loading…
Cancel
Save