Add learning locker info to deployment env variables

slidewiki · Oct 12, 2018 · 0bc9e97 · 0bc9e97
1 parent d0e0690
commit 0bc9e97
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -52,6 +52,10 @@ export default {
         },
         'recommendation': {
             uri: '${SERVICE_URL_RECOMMENDATION}'
-        }
+        },
+        lrs: {
+            uri: '${SERVICE_LEARNINGLOCKER_API_URL}',
+            basicAuth: '${SERVICE_LEARNINGLOCKER_API_AUTH}',
+        },
     }
 };