mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-17 02:55:11 +00:00
Merge branch 'master' into new-eventstore
# Conflicts: # go.sum
This commit is contained in:
@@ -2033,8 +2033,8 @@ message UserMultiFactor {
|
||||
|
||||
enum MfaType {
|
||||
MFATYPE_UNSPECIFIED = 0;
|
||||
MFATYPE_SMS = 1;
|
||||
MFATYPE_OTP = 2;
|
||||
MFATYPE_OTP = 1;
|
||||
MFATYPE_U2F = 2;
|
||||
}
|
||||
|
||||
enum MFAState {
|
||||
@@ -3064,6 +3064,7 @@ message LoginPolicy {
|
||||
google.protobuf.Timestamp creation_date = 4;
|
||||
google.protobuf.Timestamp change_date = 5;
|
||||
bool force_mfa = 6;
|
||||
PasswordlessType passwordless_type = 7;
|
||||
}
|
||||
|
||||
message LoginPolicyRequest {
|
||||
@@ -3071,6 +3072,12 @@ message LoginPolicyRequest {
|
||||
bool allow_register = 2;
|
||||
bool allow_external_idp = 3;
|
||||
bool force_mfa = 4;
|
||||
PasswordlessType passwordless_type = 5;
|
||||
}
|
||||
|
||||
enum PasswordlessType {
|
||||
PASSWORDLESSTYPE_NOT_ALLOWED = 0;
|
||||
PASSWORDLESSTYPE_ALLOWED = 1;
|
||||
}
|
||||
|
||||
message IdpProviderID {
|
||||
@@ -3095,6 +3102,7 @@ message LoginPolicyView {
|
||||
google.protobuf.Timestamp creation_date = 5;
|
||||
google.protobuf.Timestamp change_date = 6;
|
||||
bool force_mfa = 7;
|
||||
PasswordlessType passwordless_type = 8;
|
||||
}
|
||||
|
||||
message IdpProviderView {
|
||||
|
||||
Reference in New Issue
Block a user