mirror of
https://codeberg.org/davrot/forgejo.git
synced 2025-06-20 17:00:02 +02:00
79becbb010
- Currently the options `pubkey` and `twofa` only consider TOTP and GPG keys respectively. Adjust the code to also consider WebAuthn credentials and SSH keys. - While adding the new unified functions I noticed that certain places also benefited from using these unified functions and took the liberty (where it was either a trivial translation or it was covered under testing) to use the new unified functions. - Resolves forgejo/forgejo#7658 - Adds unit and integration tests. Documentation PR: https://codeberg.org/forgejo/docs/pulls/1166 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7693 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-committed-by: Gusted <postmaster@gusted.xyz>
21 lines
486 B
Go
21 lines
486 B
Go
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
package auth
|
|
|
|
import (
|
|
"context"
|
|
)
|
|
|
|
// HasTwoFactorByUID returns true if the user has TOTP or WebAuthn enabled for
|
|
// their account.
|
|
func HasTwoFactorByUID(ctx context.Context, userID int64) (bool, error) {
|
|
hasTOTP, err := HasTOTPByUID(ctx, userID)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
if hasTOTP {
|
|
return true, nil
|
|
}
|
|
|
|
return HasWebAuthnRegistrationsByUID(ctx, userID)
|
|
}
|