diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/auth/LoginRequest.java b/wizard-common/src/main/java/org/cobbzilla/wizard/auth/LoginRequest.java index 53e4354..b2cc80e 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/auth/LoginRequest.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/auth/LoginRequest.java @@ -29,8 +29,8 @@ public class LoginRequest { @Getter @Setter @JsonProperty private String password; public boolean hasPassword () { return !empty(password); } - @Getter @Setter @JsonProperty private String secondFactor; - @JsonIgnore public boolean isSecondFactor () { return !empty(secondFactor); } + @Getter @Setter @JsonProperty private String totpToken; + @JsonIgnore public boolean hasTotpToken() { return !empty(totpToken); } @Getter @Setter private String deviceId; @JsonIgnore public boolean hasDevice () { return !empty(deviceId); } @@ -41,7 +41,7 @@ public class LoginRequest { @JsonIgnore @Getter @Setter private String userAgent; public String toString () { - return "{name="+getName()+", password="+mask(password)+", secondFactor="+mask(secondFactor)+", device="+getDevice()+"}"; + return "{name="+getName()+", password="+mask(password)+", secondFactor="+mask(totpToken)+", device="+getDevice()+"}"; } @JsonIgnore public String getDevice() { return hasDevice() ? deviceId + " ("+deviceName+")" : "NOT-SET"; }