mirror of
https://github.com/go-vikunja/vikunja.git
synced 2026-07-21 17:37:54 -05:00
kolaenteandkolaente
46b07a019c
Pull the business logic out of the v1 current-user account/settings handlers
into reusable functions so both v1 and the upcoming v2 handlers call one
implementation. No behavior change — the v1 handlers keep their HTTP-layer
quirks (input binding, validation, error mapping); only orchestration moves.
Homes are forced by the import graph:
- shared.GetAuthProviderName (new pkg/routes/api/shared, above openid+user so it
can combine both without a cycle; routes-only helper)
- user.ChangeUserEmail (CheckUserCredentials + UpdateEmail, both in user)
- models.ChangeUserPassword (needs models.DeleteAllUserSessions; user can't import models)
- models.UpdateUserGeneralSettings / UpdateUserAvatarProvider
(need avatar.FlushAllCaches; user can't import avatar)
The general settings get a single shared wire struct, models.UserGeneralSettings
(tagged for both swaggo/govalidator and Huma): it is the update request body and
the nested settings on GET /user for v1 (replacing v1's UserSettings) and v2.
ExtraSettingsLinks is readOnly — populated from the user on read, ignored on
write. A dedicated struct is required because user.User's settings fields are
json:"-" so they don't leak when it is embedded in other responses.
55 lines
1.8 KiB
Go
55 lines
1.8 KiB
Go
// Vikunja is a to-do list application to facilitate your life.
|
|
// Copyright 2018-present Vikunja and contributors. All rights reserved.
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
// Package shared holds helpers used by both the v1 and v2 route packages. It
|
|
// sits above the auth/user modules in the import graph, so it can combine them
|
|
// without creating a cycle.
|
|
package shared
|
|
|
|
import (
|
|
"code.vikunja.io/api/pkg/modules/auth/openid"
|
|
"code.vikunja.io/api/pkg/user"
|
|
)
|
|
|
|
// GetAuthProviderName resolves the human-readable name of the source a user
|
|
// authenticated with: "local"/"ldap" for those issuers, otherwise the
|
|
// configured OpenID provider whose issuer URL matches the user's. Returns ""
|
|
// when no provider matches.
|
|
func GetAuthProviderName(u *user.User) (string, error) {
|
|
switch u.Issuer {
|
|
case user.IssuerLocal:
|
|
return "local", nil
|
|
case user.IssuerLDAP:
|
|
return "ldap", nil
|
|
}
|
|
|
|
providers, err := openid.GetAllProviders()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
for _, provider := range providers {
|
|
issuerURL, err := provider.Issuer()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if issuerURL == u.Issuer {
|
|
return provider.Name, nil
|
|
}
|
|
}
|
|
|
|
return "", nil
|
|
}
|