mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-03-25 13:03:03 -04:00
`Option[T]` currently exposes a method `Value()` which is permitted to be called on an option that has a value, and an option that doesn't have a value. This API is awkward because the behaviour if the option doesn't have a value isn't clear to the caller, and, because almost all accesses end up being `.Has()?` then `OK, use .Value()`. `Get() (bool, T)` is added as a better replacement, which both returns whether the option has a value, and the value if present. Most call-sites are rewritten to this form. `ValueOrZeroValue()` is a direct replacement that has the same behaviour that `Value()` had, but describes the behaviour if the value is missing. In addition to the current API being awkward, the core reason for this change is that `Value()` conflicts with the `Value()` function from the `driver.Valuer` interface. If this interface was implemented, it would allow `Option[T]` to be used to represent a nullable field in an xorm bean struct (requires: https://code.forgejo.org/xorm/xorm/pulls/66). _Note:_ changes are extensive in this PR, but are almost all changes are easy, mechanical transitions from `.Has()` to `.Get()`. All of this work was performed by hand. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [x] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. *The decision if the pull request will be shown in the release notes is up to the mergers / release team.* The content of the `release-notes/<pull request number>.md` file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11218 Reviewed-by: Otto <otto@codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
207 lines
6.2 KiB
Go
207 lines
6.2 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package user
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"forgejo.org/models"
|
|
auth_model "forgejo.org/models/auth"
|
|
user_model "forgejo.org/models/user"
|
|
password_module "forgejo.org/modules/auth/password"
|
|
"forgejo.org/modules/optional"
|
|
"forgejo.org/modules/setting"
|
|
"forgejo.org/modules/structs"
|
|
"forgejo.org/services/mailer"
|
|
)
|
|
|
|
type UpdateOptions struct {
|
|
KeepEmailPrivate optional.Option[bool]
|
|
FullName optional.Option[string]
|
|
Website optional.Option[string]
|
|
Location optional.Option[string]
|
|
Description optional.Option[string]
|
|
Pronouns optional.Option[string]
|
|
AllowGitHook optional.Option[bool]
|
|
AllowImportLocal optional.Option[bool]
|
|
MaxRepoCreation optional.Option[int]
|
|
IsRestricted optional.Option[bool]
|
|
Visibility optional.Option[structs.VisibleType]
|
|
KeepActivityPrivate optional.Option[bool]
|
|
Language optional.Option[string]
|
|
Theme optional.Option[string]
|
|
DiffViewStyle optional.Option[string]
|
|
AllowCreateOrganization optional.Option[bool]
|
|
IsActive optional.Option[bool]
|
|
IsAdmin optional.Option[bool]
|
|
EmailNotificationsPreference optional.Option[string]
|
|
SetLastLogin bool
|
|
RepoAdminChangeTeamAccess optional.Option[bool]
|
|
EnableRepoUnitHints optional.Option[bool]
|
|
KeepPronounsPrivate optional.Option[bool]
|
|
}
|
|
|
|
func UpdateUser(ctx context.Context, u *user_model.User, opts *UpdateOptions) error {
|
|
cols := make([]string, 0, 20)
|
|
|
|
if has, value := opts.KeepEmailPrivate.Get(); has {
|
|
u.KeepEmailPrivate = value
|
|
cols = append(cols, "keep_email_private")
|
|
}
|
|
if has, value := opts.FullName.Get(); has {
|
|
u.FullName = value
|
|
cols = append(cols, "full_name")
|
|
}
|
|
if has, value := opts.Pronouns.Get(); has {
|
|
u.Pronouns = value
|
|
cols = append(cols, "pronouns")
|
|
}
|
|
if has, value := opts.Website.Get(); has {
|
|
u.Website = value
|
|
cols = append(cols, "website")
|
|
}
|
|
if has, value := opts.Location.Get(); has {
|
|
u.Location = value
|
|
cols = append(cols, "location")
|
|
}
|
|
if has, value := opts.Description.Get(); has {
|
|
u.Description = value
|
|
cols = append(cols, "description")
|
|
}
|
|
if has, value := opts.Language.Get(); has {
|
|
u.Language = value
|
|
cols = append(cols, "language")
|
|
}
|
|
if has, value := opts.Theme.Get(); has {
|
|
u.Theme = value
|
|
cols = append(cols, "theme")
|
|
}
|
|
if has, value := opts.DiffViewStyle.Get(); has {
|
|
u.DiffViewStyle = value
|
|
cols = append(cols, "diff_view_style")
|
|
}
|
|
if has, value := opts.EnableRepoUnitHints.Get(); has {
|
|
u.EnableRepoUnitHints = value
|
|
cols = append(cols, "enable_repo_unit_hints")
|
|
}
|
|
if has, value := opts.KeepPronounsPrivate.Get(); has {
|
|
u.KeepPronounsPrivate = value
|
|
cols = append(cols, "keep_pronouns_private")
|
|
}
|
|
if has, value := opts.AllowGitHook.Get(); has {
|
|
u.AllowGitHook = value
|
|
cols = append(cols, "allow_git_hook")
|
|
}
|
|
if has, value := opts.AllowImportLocal.Get(); has {
|
|
u.AllowImportLocal = value
|
|
cols = append(cols, "allow_import_local")
|
|
}
|
|
if has, value := opts.MaxRepoCreation.Get(); has {
|
|
u.MaxRepoCreation = value
|
|
cols = append(cols, "max_repo_creation")
|
|
}
|
|
if has, value := opts.IsActive.Get(); has {
|
|
u.IsActive = value
|
|
cols = append(cols, "is_active")
|
|
}
|
|
if has, value := opts.IsRestricted.Get(); has {
|
|
u.IsRestricted = value
|
|
cols = append(cols, "is_restricted")
|
|
}
|
|
if has, value := opts.IsAdmin.Get(); has {
|
|
if !value && user_model.IsLastAdminUser(ctx, u) {
|
|
return models.ErrDeleteLastAdminUser{UID: u.ID}
|
|
}
|
|
u.IsAdmin = value
|
|
cols = append(cols, "is_admin")
|
|
}
|
|
if has, value := opts.Visibility.Get(); has {
|
|
if !u.IsOrganization() && !setting.Service.AllowedUserVisibilityModesSlice.IsAllowedVisibility(value) {
|
|
return fmt.Errorf("visibility mode not allowed: %s", value.String())
|
|
}
|
|
u.Visibility = value
|
|
cols = append(cols, "visibility")
|
|
}
|
|
if has, value := opts.KeepActivityPrivate.Get(); has {
|
|
u.KeepActivityPrivate = value
|
|
cols = append(cols, "keep_activity_private")
|
|
}
|
|
if has, value := opts.AllowCreateOrganization.Get(); has {
|
|
u.AllowCreateOrganization = value
|
|
cols = append(cols, "allow_create_organization")
|
|
}
|
|
if has, value := opts.RepoAdminChangeTeamAccess.Get(); has {
|
|
u.RepoAdminChangeTeamAccess = value
|
|
cols = append(cols, "repo_admin_change_team_access")
|
|
}
|
|
if has, value := opts.EmailNotificationsPreference.Get(); has {
|
|
u.EmailNotificationsPreference = value
|
|
cols = append(cols, "email_notifications_preference")
|
|
}
|
|
if opts.SetLastLogin {
|
|
u.SetLastLogin()
|
|
cols = append(cols, "last_login_unix")
|
|
}
|
|
|
|
return user_model.UpdateUserCols(ctx, u, cols...)
|
|
}
|
|
|
|
type UpdateAuthOptions struct {
|
|
LoginSource optional.Option[int64]
|
|
LoginName optional.Option[string]
|
|
Password optional.Option[string]
|
|
MustChangePassword optional.Option[bool]
|
|
ProhibitLogin optional.Option[bool]
|
|
}
|
|
|
|
func UpdateAuth(ctx context.Context, u *user_model.User, opts *UpdateAuthOptions) error {
|
|
if has, value := opts.LoginSource.Get(); has {
|
|
source, err := auth_model.GetSourceByID(ctx, value)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
u.LoginType = source.Type
|
|
u.LoginSource = source.ID
|
|
}
|
|
if has, value := opts.LoginName.Get(); has {
|
|
u.LoginName = value
|
|
}
|
|
|
|
if has, value := opts.Password.Get(); has && (u.IsLocal() || u.IsOAuth2()) {
|
|
password := value
|
|
|
|
if len(password) < setting.MinPasswordLength {
|
|
return password_module.ErrMinLength
|
|
}
|
|
if !password_module.IsComplexEnough(password) {
|
|
return password_module.ErrComplexity
|
|
}
|
|
if err := password_module.IsPwned(ctx, password); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := u.SetPassword(password); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if has, value := opts.MustChangePassword.Get(); has {
|
|
u.MustChangePassword = value
|
|
}
|
|
if has, value := opts.ProhibitLogin.Get(); has {
|
|
u.ProhibitLogin = value
|
|
}
|
|
|
|
if err := user_model.UpdateUserCols(ctx, u, "login_type", "login_source", "login_name", "passwd", "passwd_hash_algo", "salt", "must_change_password", "prohibit_login"); err != nil {
|
|
return err
|
|
}
|
|
|
|
if opts.Password.Has() {
|
|
return mailer.SendPasswordChange(u)
|
|
}
|
|
|
|
return nil
|
|
}
|