Andrew Shvayka
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
2 deletions
-
application/src/main/java/org/thingsboard/server/service/security/auth/mfa/provider/impl/OtpBasedTwoFaProvider.java
-
common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TwoFaAccountConfig.java
|
|
|
@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.security.model.mfa.provider.OtpBasedTw |
|
|
|
import org.thingsboard.server.service.security.auth.mfa.provider.TwoFaProvider; |
|
|
|
import org.thingsboard.server.service.security.model.SecurityUser; |
|
|
|
|
|
|
|
import java.io.Serializable; |
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
|
|
|
public abstract class OtpBasedTwoFaProvider<C extends OtpBasedTwoFaProviderConfig, A extends OtpBasedTwoFaAccountConfig> implements TwoFaProvider<C, A> { |
|
|
|
@ -67,7 +68,7 @@ public abstract class OtpBasedTwoFaProvider<C extends OtpBasedTwoFaProviderConfi |
|
|
|
|
|
|
|
|
|
|
|
@Data |
|
|
|
public static class Otp { |
|
|
|
public static class Otp implements Serializable { |
|
|
|
private final long timestamp; |
|
|
|
private final String value; |
|
|
|
private final OtpBasedTwoFaAccountConfig accountConfig; |
|
|
|
|
|
|
|
@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; |
|
|
|
import lombok.Data; |
|
|
|
import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType; |
|
|
|
|
|
|
|
import java.io.Serializable; |
|
|
|
|
|
|
|
@JsonIgnoreProperties(ignoreUnknown = true) |
|
|
|
@JsonTypeInfo( |
|
|
|
use = JsonTypeInfo.Id.NAME, |
|
|
|
@ -34,7 +36,7 @@ import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProvi |
|
|
|
@Type(name = "BACKUP_CODE", value = BackupCodeTwoFaAccountConfig.class) |
|
|
|
}) |
|
|
|
@Data |
|
|
|
public abstract class TwoFaAccountConfig { |
|
|
|
public abstract class TwoFaAccountConfig implements Serializable { |
|
|
|
|
|
|
|
private boolean useByDefault; |
|
|
|
|
|
|
|
|