Merge tag 'fb_https' into develop

Fixed https in node server

Dockerfile

@@ -1,2 +1 @@
 FROM digitallyseamless/nodejs-bower-grunt-runtime
-

bower.json

@@ -38,10 +38,10 @@
     "smalot-bootstrap-datetimepicker": "~2.3.4",
     "js-data-angular": "~3.1.0",
     "ui-select": "angular-ui-select#~0.13.2",
-    "ngInfiniteScroll": "~1.2.1",
     "zeroclipboard": "~2.2.0",
     "ng-clip": "~0.2.6",
-    "satellizer": "~0.13.3"
+    "satellizer": "~0.13.3",
+    "ngInfiniteScroll": "1.2.1"
   },
   "devDependencies": {
     "angular-mocks": ">=1.2.*",

client/app/app.js

@@ -54,7 +54,7 @@ angular.module('dssWebApp', [
         });
         $authProvider.google({
             clientId: '248170132962-5km115budk9h84raa26hdmnnqdj8ivkl.apps.googleusercontent.com',
-            redirectUri: 'http://ext-test.deepsouthsounds.com:9000/',
+            redirectUri: window.location.origin + '/',
             url: '/_a/?backend=google',
         });
         ngClipProvider.setPath("bower_components/zeroclipboard/dist/ZeroClipboard.swf");
@@ -104,35 +104,4 @@ angular.module('dssWebApp', [
         });
     };
 
-    //ensure login before state change
-    $rootScope.$on('$stateChangeStart', function (event, toState, toParams) {
-
-        /*
-        if (!$rootScope.currentUser && Session.getLocalToken() != null && Session.getBackend()) {
-            LoginService.loginUser().then(function (user) {
-                LoginService.getUserProfile()
-                    .then(function (user) {
-                        $rootScope.setCurrentUser(user);
-                        $rootScope.connectSockets();
-                        return $state.go(toState.name, toParams);
-                    });
-            }, function (result) {
-                console.log('Unable to login', result);
-                if (result.code === 403 || result.code === 400 || result.code === 401 || result.code === 500) {
-                    LoginService.logoutUser()
-                        .then(function () {
-                            return $state.go(toState.name, toParams);
-                        });
-                } else {
-                    debugger;
-                    console.error('Ooops');
-                    LoginService.logoutUser()
-                        .then(function () {
-                            return $state.go(toState.name, toParams);
-                        });
-                }
-            });
-            event.preventDefault();
-        }*/
-    });
 });

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

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

client/app/views/mixes/mixes.html

@@ -1,4 +1,4 @@
-<div infinite-scroll="nextPage()" infinite-scroll-distance="0">
+<div infinite-scroll="nextPage()" infinite-scroll-distance="3">
     <div ng-repeat="mix in mixes track by mix.id" class="col-sm-6">
         <dss-audio-player template="views/mixes/mixes.directive.html"></dss-audio-player>
     </div>

client/index.html

@@ -15,7 +15,7 @@
     <meta property="og:site_name" content="Deep South Sounds"/>
     <meta property="og:title" content="Deep South Sounds"/>
     <meta property="og:description" content="Deep house music from the deep south."/>
-    <meta property="og:image" content="http://deepsouthsounds.com/assets/images/dyn/default-avatar-128.png"/>
+    <meta property="og:image" content="http://deepsouthsounds.com/assets/images/dyn/defaulg-avatar-128.pinfing"/>
 
     <!-- build:css(client) app/vendor.css -->
     <!-- bower:css -->
@@ -122,10 +122,10 @@
 <script src="bower_components/js-data-http/dist/js-data-http.js"></script>
 <script src="bower_components/js-data-angular/dist/js-data-angular.js"></script>
 <script src="bower_components/ui-select/dist/select.js"></script>
-<script src="bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js"></script>
 <script src="bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
 <script src="bower_components/ng-clip/src/ngClip.js"></script>
 <script src="bower_components/satellizer/satellizer.js"></script>
+<script src="bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js"></script>
 <!-- endbower -->
 <script src="socket.io-client/socket.io.js"></script>
 <!-- endbuild -->

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dssweb",
-    "version": "3.3.1",
+    "version": "3.4.1",
     "main": "server/app.js",
     "dependencies": {
         "body-parser": "~1.5.0",

server/routes.js

@@ -2,18 +2,24 @@
 var errors = require('./components/errors');
 var http = require('http');
 var url = require('url');
-function _parseUrl(u){
+function _parseUrl(u) {
     var parts = url.parse(u, true, true);
 
-    var path = parts.pathname.split('/').filter(function(arg){
+    var path = parts.pathname.split('/').filter(function (arg) {
         return arg;
     });
-    if (path.length == 2){
+    if (path.length == 2) {
         //probably a mix, reconstruct url and return
         return parts.protocol + "//" + parts.host + "/mix/" + path[1] + "/";
     }
     return u;
 }
+
+function isHttps(u){
+    var parts = url.parse(u, true, true);
+    return parts.protocol === 'https';
+}
+
 module.exports = function (app) {
 
     app.route('/config')
@@ -35,13 +41,14 @@ module.exports = function (app) {
             if (req.headers['user-agent'].indexOf('facebookexternalhit') > -1) {
                 var url = _parseUrl((app.get('apiUrl') + req.path + '/').replace(/([^:]\/)\/+/g, "$1"));
                 console.log('Api url: ' + url);
-                http.get(url, function (api_res) {
+                var fun = isHttps(url) ? https : http;
+                fun.get(url, function (api_res) {
                     var body = '';
-                    api_res.on('data', function(chunk) {
+                    api_res.on('data', function (chunk) {
                         body += chunk;
                     });
-                    api_res.on('end', function() {
-                         res.render('social/facebook/mix', JSON.parse(body));
+                    api_res.on('end', function () {
+                        res.render('social/facebook/mix', JSON.parse(body));
                     });
                 }).on('error', function (e) {
                     console.log("Got error: " + e.message);