From 8bcf21563f0e86b3c6d8a4ee17602eeb294ea436 Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Sat, 30 Jan 2016 15:09:36 +0000 Subject: [PATCH] Fixed google redirect --- client/app/app.js | 2 +- client/app/services/auth/login.service.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/client/app/app.js b/client/app/app.js index b436a1d..7121419 100755 --- a/client/app/app.js +++ b/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"); diff --git a/client/app/services/auth/login.service.js b/client/app/services/auth/login.service.js index 3c8ecdb..10d1ded 100644 --- a/client/app/services/auth/login.service.js +++ b/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; + */ } });