This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 2698fa6235dcc9372e01d44a70e439a82ef15aa8 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed May 21 11:36:19 2014 +0200 change cookies to localStorage --- pollen-ui-angular/src/main/webapp/js/app.js | 15 ++++++----- .../src/main/webapp/js/controllers/userCtrl.js | 6 ++--- pollen-ui-angular/src/main/webapp/js/services.js | 30 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index abd0c0a..73cdd56 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -28,20 +28,23 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC //$httpProvider.defaults.headers.put['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; }]) -.factory('httpRequestInterceptor', ['$cookies', function ($cookies) { +.factory('httpRequestInterceptor', ['SessionToken', 'SessionLocale', function (SessionToken, SessionLocale) { // set locale with browser preference // default : en - if (!angular.isDefined($cookies.locale)) { + if (SessionLocale.get() == '') { var locale = navigator.language || navigator.userLanguage || 'en'; - $cookies.locale = locale.substring(0,2); + SessionLocale.save(locale.substring(0,2)); } return { request: function($config) { - $config.headers['Accept-Language'] = $cookies.locale; - $config.headers['X-Pollen-Session-Token'] = $cookies.sessionToken; - return $config; + var token = SessionToken.get(); + $config.headers['Accept-Language'] = SessionLocale.get(); + if (token != '') { + $config.headers['X-Pollen-Session-Token'] = token; + } + return $config; } }; }]) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index ba64d3f..328a94a 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,7 +36,7 @@ } }]) -.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User','$cookies', function ($scope, UserLogin, UserLogout, User,$cookies) { +.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionToken', function ($scope, UserLogin, UserLogout, User, SessionToken) { if (!angular.isDefined($scope.data)) { $scope.data = {user:{}}; } @@ -45,13 +45,13 @@ User.get({userId: data.id}, function (user) { $scope.currentUser = user; }) - $cookies.sessionToken = data.permission; + SessionToken.save(data.permission); }); } $scope.logout = function () { UserLogout.logout(function (data) { - delete $cookies.sessionToken; + SessionToken.remove(); delete $scope.currentUser; }) } diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 34abfe5..0cd8443 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -142,4 +142,34 @@ angular.module('pollenServices', ['ngResource']) method: 'GET' } }) +}]) + + +.factory('SessionToken', [function () { + var storageId='sessionTokenStorage'; + return { + get: function () { + return localStorage.getItem(storageId) || ''; + }, + save: function (token) { + localStorage.setItem(storageId, token); + }, + remove: function () { + localStorage.setItem(storageId, ''); + } + } +}]) +.factory('SessionLocale', [function () { + var storageId='sessionLocaleStorage'; + return { + get: function () { + return localStorage.getItem(storageId) || ''; + }, + save: function (token) { + localStorage.setItem(storageId, token); + }, + remove: function () { + localStorage.setItem(storageId, ''); + } + } }]) \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.