dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7026 from YevhenBondarenko/fix/2fa

Browse Source
This commit is contained in:
Andrew Shvayka 2022-08-02 20:09:57 +03:00 committed by GitHub
commit 61f575be0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/src/main/java/org/thingsboard/server/service/security/auth/mfa/provider/impl/OtpBasedTwoFaProvider.java
View File

@ -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.auth.mfa.provider.TwoFaProvider;
import org.thingsboard.server.service.security.model.SecurityUser; import org.thingsboard.server.service.security.model.SecurityUser;
import java.io.Serializable;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public abstract class OtpBasedTwoFaProvider<C extends OtpBasedTwoFaProviderConfig, A extends OtpBasedTwoFaAccountConfig> implements TwoFaProvider<C, A> { 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 @Data
public static class Otp { public static class Otp implements Serializable {
private final long timestamp; private final long timestamp;
private final String value; private final String value;
private final OtpBasedTwoFaAccountConfig accountConfig; private final OtpBasedTwoFaAccountConfig accountConfig;

4
common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TwoFaAccountConfig.java
View File

@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import lombok.Data; import lombok.Data;
import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType; import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType;
import java.io.Serializable;
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
@JsonTypeInfo( @JsonTypeInfo(
use = JsonTypeInfo.Id.NAME, 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) @Type(name = "BACKUP_CODE", value = BackupCodeTwoFaAccountConfig.class)
}) })
@Data @Data
public abstract class TwoFaAccountConfig { public abstract class TwoFaAccountConfig implements Serializable {
private boolean useByDefault; private boolean useByDefault;