diff options
author | Simon Rettberg | 2023-02-24 16:37:36 +0100 |
---|---|---|
committer | Simon Rettberg | 2023-02-24 16:37:36 +0100 |
commit | 677ef4ddbe7e4727303d799a415543cb65426a76 (patch) | |
tree | 3eae0b9422a91d58d6d084eb8ced4a3e252e40be /src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java | |
parent | Fix comment (diff) | |
download | masterserver-677ef4ddbe7e4727303d799a415543cb65426a76.tar.gz masterserver-677ef4ddbe7e4727303d799a415543cb65426a76.tar.xz masterserver-677ef4ddbe7e4727303d799a415543cb65426a76.zip |
Allow connecting a new session to a one-time access code
(Add support for browser-based login flow)
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java b/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java index 9c86ea7..3dff32f 100644 --- a/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java +++ b/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java @@ -2,7 +2,9 @@ package org.openslx.imagemaster.localrpc; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.openslx.bwlp.thrift.iface.AuthorizationError; import org.openslx.bwlp.thrift.iface.Role; +import org.openslx.bwlp.thrift.iface.TAuthorizationException; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.imagemaster.util.Util; @@ -17,9 +19,15 @@ public class JsonUser private String lastName = null; private String mail = null; private String role = null; + private String status; + private String error; + + private String accessCode; public UserInfo toUser() { + if ( !"ok".equals( status ) ) + return null; Role role; try { role = Role.valueOf( this.role ); @@ -35,4 +43,16 @@ public class JsonUser return ui; } + public TAuthorizationException toException() + { + if ( "ok".equals( status ) ) + return null; + return new TAuthorizationException( AuthorizationError.GENERIC_ERROR, this.error ); + } + + public String accessCode() + { + return this.accessCode; + } + } |