From 0bc9e97a00bc11447b1830c4fab9798376c9ab91 Mon Sep 17 00:00:00 2001
From: Kostis Pristouris <kprist@gmail.com>
Date: Fri, 12 Oct 2018 17:50:24 +0300
Subject: [PATCH] Add learning locker info to deployment env variables

---
 Dockerfile                            | 2 ++
 actions/user/userprofile/fetchUser.js | 1 -
 configs/microservices.sample.js       | 2 +-
 docker-compose.yml                    | 2 ++
 microservices.js.template             | 6 +++++-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0e7565e4d..e799deed4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,6 +41,8 @@ ENV SERVICE_URL_DECK= \
     SERVICE_URL_SIGNALING= \
     SERVICE_URL_QUESTION= \
     SERVICE_URL_NLP= \
+    SERVICE_LEARNINGLOCKER_API_URL= \
+    SERVICE_LEARNINGLOCKER_API_AUTH= \
     SERVICE_USER_PRIVATE_RECAPTCHA_KEY= \
     SERVICE_USER_PUBLIC_RECAPTCHA_KEY= \
     SERVICE_USER_APIKEY= \
diff --git a/actions/user/userprofile/fetchUser.js b/actions/user/userprofile/fetchUser.js
index e3b4572b5..990c896b1 100644
--- a/actions/user/userprofile/fetchUser.js
+++ b/actions/user/userprofile/fetchUser.js
@@ -45,7 +45,6 @@ export default function fetchUser(context, payload, done) {
                 return;
             }
         } else {
-            console.log(payload.params);
             if(!isEmpty(payload.params.category)){
                 if(context.getStore(UserProfileStore).username === payload.params.username
                     || payload.params.category === 'playlists')  // allow route /{username}/playlists
diff --git a/configs/microservices.sample.js b/configs/microservices.sample.js
index cb82d6a92..1557cf07a 100644
--- a/configs/microservices.sample.js
+++ b/configs/microservices.sample.js
@@ -88,7 +88,7 @@ export default {
             uri: 'http://slidewiki.imp.bg.ac.rs'
         },
         'lrs': {
-            uri: 'https://learninglocker.experimental.slidewiki.org',
+            uri: 'https://api.learninglocker.experimental.slidewiki.org',
             basicAuth :'MWEwNTkwMTg5M2Y4ZjIyZTY4ZThkMzhlYWE0NDZkZjAxZWUyNjdhODo2YjE5MzAxODhmZWM0OTg0ZjE1YzVhODI1Njg2NTY5NDk5YzRmODEz'
         },
     }
diff --git a/docker-compose.yml b/docker-compose.yml
index bb1cbd8cb..c8a451fbc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,6 +23,8 @@ slidewikiplatform:
     - SERVICE_URL_QUESTION=https://questionservice.experimental.slidewiki.org
     - SERVICE_URL_NLP=https://nlpservice.experimental.slidewiki.org
     - SERVICE_URL_RECOMMENDATION=http://slidewiki.imp.bg.ac.rs
+    - SERVICE_LEARNINGLOCKER_API_URL=https://api.learninglocker.experimental.slidewiki.org
+    - SERVICE_LEARNINGLOCKER_API_AUTH=MWEwNTkwMTg5M2Y4ZjIyZTY4ZThkMzhlYWE0NDZkZjAxZWUyNjdhODo2YjE5MzAxODhmZWM0OTg0ZjE1YzVhODI1Njg2NTY5NDk5YzRmODEz
     - SERVICE_VAR_IMPORT_HOST=importservice.experimental.slidewiki.org
     - SERVICE_USER_APIKEY=2cbc621f86e97189239ee8c4c80b10b3a935b8a9f5db3def7b6a3ae7c4b75cb5
     - SERVICE_USER_PRIVATE_RECAPTCHA_KEY=6LdNLyYTAAAAAFMC0J_zuVI1b9lXWZjPH6WLe-vJ
diff --git a/microservices.js.template b/microservices.js.template
index 55d4f490f..5a22301ce 100644
--- a/microservices.js.template
+++ b/microservices.js.template
@@ -52,6 +52,10 @@ export default {
         },
         'recommendation': {
             uri: '${SERVICE_URL_RECOMMENDATION}'
-        }
+        },
+        lrs: {
+            uri: '${SERVICE_LEARNINGLOCKER_API_URL}',
+            basicAuth: '${SERVICE_LEARNINGLOCKER_API_AUTH}',
+        },
     }
 };