From 498667c3121933d8e9e281590382cee8f8720045 Mon Sep 17 00:00:00 2001
From: Martin Staehr <software@mstaehr.net>
Date: Mon, 24 Sep 2018 23:11:38 +0200
Subject: [PATCH] #63 add new fields to rocket chat config
---
.../java/unipotsdam/gf/config/GFRocketChatConfig.java | 10 ++++++++--
.../java/unipotsdam/gf/core/management/user/User.java | 5 +++++
.../service/CommunicationDummyService.java | 1 -
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java
index feac0c4e..e046f735 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 db40d181..1018afde 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 8081ca76..0e3e7308 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;
--
GitLab