diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-03-30 19:21:05 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-03-30 19:21:05 -0400 |
| commit | fd323c81b66cf2099c991cf95bde9d9f4a9c8eb6 (patch) | |
| tree | 0510933ea8768e8a14978fda7ead48334895a6e4 /www/js/app.js | |
| parent | 3d3d7c06f2aad580d8f3def1c18dea2955ec3798 (diff) | |
#193 - resetting cookie - lets see what that does
Former-commit-id: e9eb9d8585a8c2a0f4eeb854a5440cd8b1135653
Diffstat (limited to 'www/js/app.js')
| -rw-r--r-- | www/js/app.js | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/www/js/app.js b/www/js/app.js index 8f299b51..ab4432c4 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -504,9 +504,12 @@ angular.module('zmApp', [ // Also remember you need to add it to .config //------------------------------------------------------------------ .factory('timeoutHttpIntercept', ['$rootScope', '$q', 'zm', '$injector', function ($rootScope, $q, zm, $injector) { - var zmCookie = ""; + $rootScope.zmCookie = ""; return { + + + 'request': function (config) { @@ -525,8 +528,8 @@ angular.module('zmApp', [ } - if (zmCookie) { - config.headers.Cookie = "ZMSESSID=" + zmCookie; + if ($rootScope.zmCookie) { + config.headers.Cookie = "ZMSESSID=" + $rootScope.zmCookie; } else @@ -560,7 +563,7 @@ angular.module('zmApp', [ if (zmSess[1]) { // console.log ("***** SETTING COOKIE TO " + zmCookie); - zmCookie = zmSess[1]; + $rootScope.zmCookie = zmSess[1]; } } } @@ -741,6 +744,8 @@ angular.module('zmApp', [ function doLogin(str) { + + var d = $q.defer(); var statename = $ionicHistory.currentStateName(); @@ -752,6 +757,9 @@ angular.module('zmApp', [ return d.promise; } + + ZMDataModel.zmDebug ("Resetting zmCookie..."); + $rootScope.zmCookie=''; // first try to login, if it works, good // else try to do reachability proceedWithLogin() |