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 77abe0c..b1677e7 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 @@ -32,10 +32,8 @@ public class LoginRequest { @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); } - - @Getter @Setter private String deviceName; + @Getter @Setter private String device; + @JsonIgnore public boolean hasDevice () { return !empty(device); } // optional - server-side resource can fill this in for other server-side code to use @JsonIgnore @Getter @Setter private String userAgent; @@ -44,7 +42,5 @@ public class LoginRequest { return "{name="+getName()+", password="+mask(password)+", totpToken="+mask(totpToken)+", device="+getDevice()+"}"; } - @JsonIgnore public String getDevice() { return hasDevice() ? deviceId + " ("+deviceName+")" : "NOT-SET"; } - public String mask(String value) { return empty(value) ? "NOT-SET" : "SET"; } }