zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Add token request to login credentials and "Stay Signed In" checkbox

Browse Source
This commit is contained in:
Kai S. K. Engelbart
2020-09-19 09:13:04 +02:00
parent ec6b67099f
commit 31cb22035b
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
common/src/main/java/envoy/data/LoginCredentials.java
View File

@ -20,16 +20,18 @@ import java.time.Instant;
public final class LoginCredentials implements Serializable {
private final String identifier, password, clientVersion;
private final boolean registration, token;
private final boolean registration, token, requestToken;
private final Instant lastSync;
private static final long serialVersionUID = 3;
private static final long serialVersionUID = 4;
private LoginCredentials(String identifier, String password, boolean registration, boolean token, String clientVersion, Instant lastSync) {
private LoginCredentials(String identifier, String password, boolean registration, boolean token, boolean requestToken, String clientVersion,
Instant lastSync) {
this.identifier = identifier;
this.password = password;
this.registration = registration;
this.token = token;
this.requestToken = requestToken;
this.clientVersion = clientVersion;
this.lastSync = lastSync;
}
@ -39,13 +41,14 @@ public final class LoginCredentials implements Serializable {
*
* @param identifier the identifier of the user
* @param password the password of the user
* @param requestToken requests the server to generate an authentication token
* @param clientVersion the version of the client sending these credentials
* @param lastSync the timestamp of the last synchronization
* @return the created login credentials
* @since Envoy Common v0.2-beta
*/
public static LoginCredentials login(String identifier, String password, String clientVersion, Instant lastSync) {
return new LoginCredentials(identifier, password, false, false, clientVersion, lastSync);
public static LoginCredentials login(String identifier, String password, boolean requestToken, String clientVersion, Instant lastSync) {
return new LoginCredentials(identifier, password, false, false, requestToken, clientVersion, lastSync);
}
/**
@ -59,7 +62,7 @@ public final class LoginCredentials implements Serializable {
* @since Envoy Common v0.2-beta
*/
public static LoginCredentials loginWithToken(String identifier, String token, String clientVersion, Instant lastSync) {
return new LoginCredentials(identifier, token, false, true, clientVersion, lastSync);
return new LoginCredentials(identifier, token, false, true, false, clientVersion, lastSync);
}
/**
@ -67,21 +70,23 @@ public final class LoginCredentials implements Serializable {
*
* @param identifier the identifier of the user
* @param password the password of the user
* @param requestToken requests the server to generate an authentication token
* @param clientVersion the version of the client sending these credentials
* @param lastSync the timestamp of the last synchronization
* @return the created login credentials
* @since Envoy Common v0.2-beta
*/
public static LoginCredentials registration(String identifier, String password, String clientVersion, Instant lastSync) {
return new LoginCredentials(identifier, password, true, false, clientVersion, lastSync);
public static LoginCredentials registration(String identifier, String password, boolean requestToken, String clientVersion, Instant lastSync) {
return new LoginCredentials(identifier, password, true, false, requestToken, clientVersion, lastSync);
}
@Override
public String toString() {
return String.format("LoginCredentials[identifier=%s,registration=%b,token=%b,clientVersion=%s,lastSync=%s]",
return String.format("LoginCredentials[identifier=%s,registration=%b,token=%b,requestToken=%b,clientVersion=%s,lastSync=%s]",
identifier,
registration,
token,
requestToken,
clientVersion,
lastSync);
}
@ -112,6 +117,12 @@ public final class LoginCredentials implements Serializable {
*/
public boolean usesToken() { return token; }
/**
* @return {@code true} if the server should generate a new authentication token
* @since Envoy Common v0.2-beta
*/
public boolean requestToken() { return requestToken; }
/**
* @return the version of the client sending these credentials
* @since Envoy Common v0.1-beta
@ -119,7 +130,7 @@ public final class LoginCredentials implements Serializable {
public String getClientVersion() { return clientVersion; }
/**
* @return the time stamp of the last synchronization
* @return the timestamp of the last synchronization
* @since Envoy Common v0.2-beta
*/
public Instant getLastSync() { return lastSync; }