diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java index feac0c4e9926ffabdf27fad4ff2c1620d8b0b680..e046f7358f4a199e018e2e9ce7961032a799bff7 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java @@ -1,8 +1,14 @@ package unipotsdam.gf.config; +import unipotsdam.gf.core.management.user.User; + public class GFRocketChatConfig { - public static final String ROCKET_CHAT_LINK = "https://rocket.farm.uni-potsdam.de/"; + public static final String ROCKET_CHAT_API_LINK = "http://rocketchat.westeurope.cloudapp.azure.com/api/v1/"; + public static final String ADMIN_USERNAME = ""; - public static final String ADMIN_PASSWORD = ""; + public static final String ADMIN_TOKEN = ""; + + public static final User TEST_USER = new User("username", "password", "email", + "rocketChatUserName", false); } diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/User.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/User.java index db40d181c17ccbaaf05df91e89b253ad4eba35fb..1018afde89d4f472f1398e5fb7433aa22c27152d 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/User.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/User.java @@ -28,6 +28,11 @@ public class User { "", "", isStudent); } + public User(String name, String password, String email, String rocketChatUsername, Boolean isStudent) { + this(name, password, email, "", rocketChatUsername, "", + "", "", isStudent); + } + public User(String name, String password, String email, String token, String rocketChatUsername, String rocketChatAuthToken, String rocketChatPersonalAccessToken, String rocketChatUserId, Boolean isStudent) { diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java index 8081ca7670653620428c6fa6e7b88eae7a7a5b5d..0e3e73087a52a6580c7695307a36a475f9983562 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java @@ -103,7 +103,6 @@ public class CommunicationDummyService implements ICommunication { .post(GFRocketChatConfig.ROCKET_CHAT_API_LINK + "login") .body(rocketChatAuth) .asObject(RocketChatResponse.class); - // TODO: add Error class which holds Errors and posts them int status = response.getStatus(); if (status == Response.Status.UNAUTHORIZED.getStatusCode() || status == Response.Status.BAD_REQUEST.getStatusCode()) { return false;