Merge tag '3.4.2' into develop

3.4.2

.dockerignore

@@ -0,0 +1,5 @@
+.git/
+node_modules/
+client/
+.tmp/
+npm-debug.log

Dockerfile

@@ -1 +1,8 @@
-FROM digitallyseamless/nodejs-bower-grunt-runtime
+FROM fergalmoran/node
+
+ENV NODE_ENV production
+
+WORKDIR /app/dist/
+ADD dist /app/dist/
+ENV NODE_ENV production
+CMD ["npm", "start"]

client/app/app.js

@@ -50,12 +50,13 @@ angular.module('dssWebApp', [
             popupOptions: {width: 580, height: 400}
         });
         $authProvider.twitter({
-            url: '_a/?backend=twitter'
+            url: '_a/?backend=twitter',
+            redirectUri: window.location.origin + '/',
         });
         $authProvider.google({
-            clientId: '248170132962-5km115budk9h84raa26hdmnnqdj8ivkl.apps.googleusercontent.com',
+            clientId: '248170132962-gljba6svm1l8q73acmfc3ihkgp4orbnr.apps.googleusercontent.com',
             redirectUri: window.location.origin + '/',
-            url: '/_a/?backend=google',
+            url: '/_a/?backend=google'
         });
         ngClipProvider.setPath("bower_components/zeroclipboard/dist/ZeroClipboard.swf");
 

client/app/services/auth/login.service.js

@@ -76,8 +76,6 @@ angular.module('dssWebApp')
         }
 
         function logoutUser() {
-            return $q.resolve();
-            /*
             var defer = $q.defer();
             $auth.logout()
                 .then(function(){
@@ -85,6 +83,5 @@ angular.module('dssWebApp')
                 });
 
             return defer.promise;
-            */
         }
     });

server/config/environment/development.js

@@ -8,6 +8,6 @@ module.exports = {
 
     seedDB: true,
     redisHost: 'localhost',
-    apiUrl: 'http://ext-test.deepsouthsounds.com:8001',
+    apiUrl: 'https://ext-test.deepsouthsounds.com:8001',
     radioUrl: 'http://localhost:8000'
 };