summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-08-11 16:32:07 +0200
committerSimon Rettberg2015-08-11 16:32:07 +0200
commit3a91f090eab386ea37f8c4379f27a26378fbaa04 (patch)
treed3ae74dbd17e81a8183cb81518458142b5c0a77f /dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
parent[server] Create proper path for file download (diff)
downloadtutor-module-3a91f090eab386ea37f8c4379f27a26378fbaa04.tar.gz
tutor-module-3a91f090eab386ea37f8c4379f27a26378fbaa04.tar.xz
tutor-module-3a91f090eab386ea37f8c4379f27a26378fbaa04.zip
[client] Improve authentication handling
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/Config.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/Config.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java b/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
index 928b38d1..db384ecf 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
@@ -306,9 +306,10 @@ public class Config {
* @param satAddress
* @param satToken
*/
- public static void saveCurrentSession(String satAddress, String satToken) {
+ public static void saveCurrentSession(String satAddress, String satToken, String masterToken) {
setString("session.address", satAddress);
setString("session.token", satToken);
+ setString("session.mastertoken", masterToken);
}
/**
@@ -318,8 +319,8 @@ public class Config {
*/
public static SavedSession getSavedSession() {
SavedSession session = new SavedSession(getString("session.address", ""), getString("session.token",
- ""));
- if (session.token.isEmpty() || session.address.isEmpty())
+ ""), getString("session.mastertoken", ""));
+ if (session.token.isEmpty() || session.address.isEmpty() || session.masterToken.isEmpty())
return null;
return session;
}
@@ -401,10 +402,12 @@ public class Config {
public static class SavedSession {
public final String address;
public final String token;
+ public final String masterToken;
- public SavedSession(String address, String token) {
+ public SavedSession(String address, String token, String masterToken) {
this.address = address;
this.token = token;
+ this.masterToken = masterToken;
}
}