diff --git a/js/app.js b/js/app.js index f8da0cf..798cdd0 100644 --- a/js/app.js +++ b/js/app.js @@ -118,28 +118,24 @@ app.run(['$rootScope', '$state', 'Auth', '$location', function($rootScope, $stat var requiresLogin = toState.data.requiresLogin; toState.data.session = $location.search(); var urlParams = $location.search(); - console.log('DUDDDDDDDEEEEEE ->', urlParams); $rootScope.redirectedURL = toState.url; $rootScope.urlArray.push($rootScope.redirectedURL); if ($rootScope.urlArray.length > 1) { $rootScope.redirectedURL = $rootScope.urlArray[0]; $rootScope.urlArray = []; } -console.log('stuff here ->', toState); if (requiresLogin && !Auth.isLoggedIn()) { event.preventDefault(); console.log('stuff here ->', toState); if (!angular.equals(toState.data.session, {})) { - var sess = toState.data.session.access_token; - console.log('WHERE', $rootScope.redirectedURL ); - // $state.go("app." + $rootScope.redirectedURL); - } - if ('access_token' in urlParams && 'refresh_token' in urlParams && 'issuer' in urlParams && 'audience' in urlParams) { - Auth.add(sess) - console.log('da '); + if ('access_token' in urlParams && 'refresh_token' in urlParams && 'issuer' in urlParams && 'audience' in urlParams) { + Auth.add(urlParams) + console.log('CURRENT SESSION IS: ',Auth.sessions); + } } + console.log('WHERE', $rootScope.redirectedURL ); - $state.go('splash-page', { 'toState': toState.name }); + // $state.go('splash-page', { 'toState': toState.name }); } }); }]); diff --git a/js/services/auth-service.js b/js/services/auth-service.js index 7331351..caf8580 100644 --- a/js/services/auth-service.js +++ b/js/services/auth-service.js @@ -22,6 +22,7 @@ app.factory('Auth', [ return Auth.sessions || false; } , add: function (session) { + console.log(session); var obj = JSON.parse(localStorage.getItem(dapSessions) || 'null') || {}; var dapName = 'dap-' + session.subject + '|' + session.issuer; @@ -69,6 +70,8 @@ app.factory('Auth', [ return Auth.session; } , get: function (session) { + console.log('mother fucking'); + console.log(session); if (!session) { return $q.resolve(null); } @@ -78,6 +81,7 @@ app.factory('Auth', [ } var name = session.token.sub + '@' + session.token.iss; + console.log('NAME', name); var promise; var sess;