f8b471ace1
Fixes #28660 Fixes an admin api bug related to `user.LoginSource` Fixed `/user/emails` response not identical to GitHub api This PR unifies the user update methods. The goal is to keep the logic only at one place (having audit logs in mind). For example, do the password checks only in one method not everywhere a password is updated. After that PR is merged, the user creation should be next.
66 lines
1.9 KiB
Go
66 lines
1.9 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package user
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"code.gitea.io/gitea/modules/context"
|
|
"code.gitea.io/gitea/modules/optional"
|
|
api "code.gitea.io/gitea/modules/structs"
|
|
"code.gitea.io/gitea/modules/web"
|
|
"code.gitea.io/gitea/services/convert"
|
|
user_service "code.gitea.io/gitea/services/user"
|
|
)
|
|
|
|
// GetUserSettings returns user settings
|
|
func GetUserSettings(ctx *context.APIContext) {
|
|
// swagger:operation GET /user/settings user getUserSettings
|
|
// ---
|
|
// summary: Get user settings
|
|
// produces:
|
|
// - application/json
|
|
// responses:
|
|
// "200":
|
|
// "$ref": "#/responses/UserSettings"
|
|
ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx.Doer))
|
|
}
|
|
|
|
// UpdateUserSettings returns user settings
|
|
func UpdateUserSettings(ctx *context.APIContext) {
|
|
// swagger:operation PATCH /user/settings user updateUserSettings
|
|
// ---
|
|
// summary: Update user settings
|
|
// parameters:
|
|
// - name: body
|
|
// in: body
|
|
// schema:
|
|
// "$ref": "#/definitions/UserSettingsOptions"
|
|
// produces:
|
|
// - application/json
|
|
// responses:
|
|
// "200":
|
|
// "$ref": "#/responses/UserSettings"
|
|
|
|
form := web.GetForm(ctx).(*api.UserSettingsOptions)
|
|
|
|
opts := &user_service.UpdateOptions{
|
|
FullName: optional.FromPtr(form.FullName),
|
|
Description: optional.FromPtr(form.Description),
|
|
Website: optional.FromPtr(form.Website),
|
|
Location: optional.FromPtr(form.Location),
|
|
Language: optional.FromPtr(form.Language),
|
|
Theme: optional.FromPtr(form.Theme),
|
|
DiffViewStyle: optional.FromPtr(form.DiffViewStyle),
|
|
KeepEmailPrivate: optional.FromPtr(form.HideEmail),
|
|
KeepActivityPrivate: optional.FromPtr(form.HideActivity),
|
|
}
|
|
if err := user_service.UpdateUser(ctx, ctx.Doer, opts); err != nil {
|
|
ctx.InternalServerError(err)
|
|
return
|
|
}
|
|
|
|
ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx.Doer))
|
|
}
|