From 69a6783e443b1f48a213ded664b6eef195256243 Mon Sep 17 00:00:00 2001
From: Jon Lambson <jon.lambson@daplie.com>
Date: Mon, 28 Aug 2017 16:18:33 -0600
Subject: [PATCH] almost

---
 js/app.js                          | 27 ++++++++++++++-------------
 js/controllers/login-controller.js |  5 -----
 js/services/auth-service.js        |  3 ---
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/js/app.js b/js/app.js
index 4b4b198..7649ed4 100644
--- a/js/app.js
+++ b/js/app.js
@@ -117,25 +117,26 @@ app.run(['$rootScope', '$state', 'Auth', '$location', function($rootScope, $stat
   $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) {
     var requiresLogin = toState.data.requiresLogin;
     toState.data.session = $location.search();
-    var urlParams = $location.search();
     $rootScope.redirectedURL = toState.url;
+    var query = $location.search();
     $rootScope.urlArray.push($rootScope.redirectedURL);
-    if ($rootScope.urlArray.length > 1) {
-      $rootScope.redirectedURL = $rootScope.urlArray[0];
-      $rootScope.urlArray = [];
-    }
+    // if ($rootScope.urlArray.length > 1) {
+    //   $rootScope.redirectedURL = $rootScope.urlArray[0];
+    //   $rootScope.urlArray = [];
+    // }
     if (requiresLogin && !Auth.isLoggedIn()) {
       event.preventDefault();
-      console.log('stuff here ->', toState);
+      toState.data.session.token = OAUTH3.jwt.decode(query.access_token);
+      toState.data.session.refresh = OAUTH3.jwt.decode(query.refresh_token);
       if (!angular.equals(toState.data.session, {})) {
-        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);
-        }
+        // if ('access_token' in urlParams && 'refresh_token' in urlParams && 'issuer' in urlParams && 'audience' in urlParams) {
+          Auth.add(query);
+          console.log('go here', $rootScope.redirectedURL);
+          $state.go('app.'+$rootScope.redirectedURL)
+          // $location.path($rootScope.redirectedURL);
+        // }
       }
-
-      console.log('WHERE', $rootScope.redirectedURL );
-      $state.go('splash-page', { 'toState': toState.name });
+      // $state.go('splash-page', { 'toState': toState.name });
     }
   });
 }]);
diff --git a/js/controllers/login-controller.js b/js/controllers/login-controller.js
index 0ca7d7e..2e13dde 100644
--- a/js/controllers/login-controller.js
+++ b/js/controllers/login-controller.js
@@ -102,11 +102,6 @@ app.controller('loginCtrl', [
       subject: subject
     , scope: [ 'domains@oauth3.org', 'domains', 'dns@oauth3.org', 'dns', 'www@daplie.com' ]
     }).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.issuer = issuer;
       Auth.add(session);
diff --git a/js/services/auth-service.js b/js/services/auth-service.js
index 8f6a09b..40f0936 100644
--- a/js/services/auth-service.js
+++ b/js/services/auth-service.js
@@ -22,7 +22,6 @@ app.factory('Auth', [
       return Auth.sessions || false;
     }
   , add: function (session) {
-    console.log('what ya adding');
     console.log(session);
       var obj = JSON.parse(localStorage.getItem(dapSessions) || 'null') || {};
       var dapName = 'dap-' + session.subject + '|' + session.issuer;
@@ -71,8 +70,6 @@ app.factory('Auth', [
       return Auth.session;
     }
   , get: function (session) {
-    console.log('session:::::::');
-    console.log(session);
       if (!session) {
         return $q.resolve(null);
       }