coolaj86
/
walnut_launchpad.html
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no clue

This commit is contained in:
Jon Lambson 2017-08-28 11:05:42 -06:00
parent c01fb9d53f
commit 5e1f9f9179
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/app.js
View File

@ -117,21 +117,26 @@ app.run(['$rootScope', '$state', 'Auth', '$location', function($rootScope, $stat
$rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) { $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) {
var requiresLogin = toState.data.requiresLogin; var requiresLogin = toState.data.requiresLogin;
toState.data.session = $location.search(); toState.data.session = $location.search();
var urlParams = $location.search();
console.log('DUDDDDDDDEEEEEE ->', urlParams);
$rootScope.redirectedURL = toState.url; $rootScope.redirectedURL = toState.url;
$rootScope.urlArray.push($rootScope.redirectedURL); $rootScope.urlArray.push($rootScope.redirectedURL);
if ($rootScope.urlArray.length > 1) { if ($rootScope.urlArray.length > 1) {
$rootScope.redirectedURL = $rootScope.urlArray[0]; $rootScope.redirectedURL = $rootScope.urlArray[0];
$rootScope.urlArray = []; $rootScope.urlArray = [];
} }
console.log('stuff here ->', toState);
if (requiresLogin && !Auth.isLoggedIn()) { if (requiresLogin && !Auth.isLoggedIn()) {
event.preventDefault(); event.preventDefault();
console.log('stuff here ->', toState); console.log('stuff here ->', toState);
if (!angular.equals(toState.data.session, {})) { if (!angular.equals(toState.data.session, {})) {
var sess = toState.data.session.access_token; var sess = toState.data.session.access_token;
console.log('WHERE', $rootScope.redirectedURL ); 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) Auth.add(sess)
$state.go("app." + $rootScope.redirectedURL); console.log('da ');
} }
console.log('WHERE', $rootScope.redirectedURL ); console.log('WHERE', $rootScope.redirectedURL );
$state.go('splash-page', { 'toState': toState.name }); $state.go('splash-page', { 'toState': toState.name });

5
js/controllers/login-controller.js
View File

@ -102,6 +102,11 @@ app.controller('loginCtrl', [
subject: subject subject: subject
, scope: [ 'domains@oauth3.org', 'domains', 'dns@oauth3.org', 'dns', 'www@daplie.com' ] , scope: [ 'domains@oauth3.org', 'domains', 'dns@oauth3.org', 'dns', 'www@daplie.com' ]
}).then(function (session) { }).then(function (session) {
console.log('SESSION BRO -> ', session);
console.log('SESSION TOKEN -> ', session.token);
console.log('SESSION REFRESH TOKEN -> ', session.refresh);
console.log('SESSION ISSUER -> ', session.token.iss);
console.log('SESSION AUDIENCE -> ', session.token.aud);
session.subject = subject; session.subject = subject;
session.issuer = issuer; session.issuer = issuer;
Auth.add(session); Auth.add(session);