Merge pull request #443 from hpcloud/session-name

LGTM
cloudfoundry · Jul 8, 2016 · 1144ce2 · 1144ce2
2 parents fb63b0d + e4cfc1a
commit 1144ce2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/app/api/account/account.api.js b/src/app/api/account/account.api.js
@@ -42,6 +42,7 @@
     this.$httpParamSerializer = $httpParamSerializer;
     this.$q = $q;
     this.$cookies = $cookies;
+    this.sessionName = 'stackato-console-session';
   }
 
   angular.extend(AccountApi.prototype, {
@@ -83,13 +84,19 @@
      * @public
      */
     verifySession: function () {
-      if (this.$cookies.get('portal-session')) {
+      if (this.$cookies.get(this.sessionName)) {
         return this.$http.get('/pp/v1/auth/session/verify');
       }
-      return this.$q(function (resolve, reject) {
-        reject({});
-      });
+      return this.$q.reject(this.sessionName + ' cookie missing!');
+    },
+
+    userInfo: function () {
+      if (this.$cookies.get(this.sessionName)) {
+        return this.$http.get('/pp/v1/userinfo');
+      }
+      return this.$q.reject(this.sessionName + ' cookie missing!');
     }
+
   });
 
 })();
diff --git a/src/app/model/account/account.model.js b/src/app/model/account/account.model.js
@@ -155,7 +155,8 @@
      * @private
      */
     onLoggedOut: function () {
-      this.$cookies.remove('portal-session');
+      var sessionName = this.apiManager.retrieve('app.api.account').sessionName;
+      this.$cookies.remove(sessionName);
       this.loggedIn = false;
       delete this.data;
     }