From 2e1e7baf53bb9fb90b8844a2daba101ae94faf04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Wed, 13 Jun 2018 20:54:56 +0200
Subject: [PATCH] add proxy for local development
---
package.json | 2 +-
proxy.conf.json | 10 ++++++++++
src/app/services/http/authentication.service.ts | 4 ++--
src/app/services/http/comment.service.ts | 2 +-
src/app/services/http/content-answer.service.ts | 2 +-
src/app/services/http/content.service.ts | 2 +-
src/app/services/http/room.service.ts | 2 +-
7 files changed, 17 insertions(+), 7 deletions(-)
create mode 100644 proxy.conf.json
diff --git a/package.json b/package.json
index a4d82c1a2..a14bd54c9 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"license": "MIT",
"scripts": {
"ng": "ng",
- "start": "ng serve",
+ "start": "ng serve --proxy-config proxy.conf.json",
"build": "ng build --prod",
"test": "ng test",
"lint": "ng lint",
diff --git a/proxy.conf.json b/proxy.conf.json
new file mode 100644
index 000000000..c2e9c8823
--- /dev/null
+++ b/proxy.conf.json
@@ -0,0 +1,10 @@
+{
+ "/api": {
+ "target": "http://localhost:8080",
+ "secure": false,
+ "pathRewrite": {
+ "^/api": ""
+ },
+ "logLevel": "debug"
+ }
+}
diff --git a/src/app/services/http/authentication.service.ts b/src/app/services/http/authentication.service.ts
index 6de00a2b4..0e5957249 100644
--- a/src/app/services/http/authentication.service.ts
+++ b/src/app/services/http/authentication.service.ts
@@ -13,8 +13,8 @@ export class AuthenticationService {
private readonly STORAGE_KEY: string = 'USER';
private user = new BehaviorSubject<User>(undefined);
private apiUrl = {
- base: 'https://arsnova-staging.mni.thm.de/api',
- v2: 'https://arsnova-staging.mni.thm.de/api/v2',
+ base: '/api',
+ v2: '/api/v2',
auth: '/auth',
login: '/login',
user: '/user',
diff --git a/src/app/services/http/comment.service.ts b/src/app/services/http/comment.service.ts
index ee399e111..7d8b0e74a 100644
--- a/src/app/services/http/comment.service.ts
+++ b/src/app/services/http/comment.service.ts
@@ -12,7 +12,7 @@ const httpOptions = {
@Injectable()
export class CommentService extends BaseHttpService {
private apiUrl = {
- base: 'https://arsnova-staging.mni.thm.de/api',
+ base: '/api',
comment: '/comment',
find: '/find'
};
diff --git a/src/app/services/http/content-answer.service.ts b/src/app/services/http/content-answer.service.ts
index 0a0ff4b7b..a0d3a9aeb 100644
--- a/src/app/services/http/content-answer.service.ts
+++ b/src/app/services/http/content-answer.service.ts
@@ -13,7 +13,7 @@ const httpOptions = {
@Injectable()
export class ContentAnswerService extends BaseHttpService {
private apiUrl = {
- base: 'https://arsnova-staging.mni.thm.de/api',
+ base: '/api',
answer: '/answer',
text: '/text',
choice: '/choice',
diff --git a/src/app/services/http/content.service.ts b/src/app/services/http/content.service.ts
index 992146196..0ab298dd5 100644
--- a/src/app/services/http/content.service.ts
+++ b/src/app/services/http/content.service.ts
@@ -13,7 +13,7 @@ const httpOptions = {
@Injectable()
export class ContentService extends BaseHttpService {
private apiUrl = {
- base: 'https://arsnova-staging.mni.thm.de/api',
+ base: '/api',
content: '/content',
find: '/find'
};
diff --git a/src/app/services/http/room.service.ts b/src/app/services/http/room.service.ts
index 810bdb6b1..251826004 100644
--- a/src/app/services/http/room.service.ts
+++ b/src/app/services/http/room.service.ts
@@ -13,7 +13,7 @@ const httpOptions = {
@Injectable()
export class RoomService extends BaseHttpService {
private apiUrl = {
- base: 'https://arsnova-staging.mni.thm.de/api',
+ base: '/api',
rooms: '/room',
user: '/user',
findRooms: '/find'
--
GitLab