May 2014 - Pollen-commits - mailman.cloud.codelutin.com

03/04: Fix Header Accept-Language value, Add Session Token in header
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit c49a891ec0bb111d0a023b12eb0592c46b926d2b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 16:59:15 2014 +0200 Fix Header Accept-Language value, Add Session Token in header --- pollen-ui-angular/src/main/webapp/js/app.js | 18 ++++++++++++- .../src/main/webapp/js/controllers/userCtrl.js | 15 +++++++---- pollen-ui-angular/src/main/webapp/js/services.js | 31 +++++++--------------- 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index d7e72ee..abd0c0a 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -20,14 +20,30 @@ */ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'ui.bootstrap', 'ngCookies']) .config(['$httpProvider', '$cookiesProvider', function($httpProvider, $cookies) { + // edit header for locale and sessionToken + $httpProvider.interceptors.push('httpRequestInterceptor'); + + // edit content-type for send data to the server $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; //$httpProvider.defaults.headers.put['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; +}]) +.factory('httpRequestInterceptor', ['$cookies', function ($cookies) { + // set locale with browser preference + // default : en if (!angular.isDefined($cookies.locale)) { var locale = navigator.language || navigator.userLanguage || 'en'; $cookies.locale = locale.substring(0,2); } - $httpProvider.defaults.headers.common['Accept-Language'] = $cookies.locale; + + + return { + request: function($config) { + $config.headers['Accept-Language'] = $cookies.locale; + $config.headers['X-Pollen-Session-Token'] = $cookies.sessionToken; + return $config; + } + }; }]) .config(['$routeProvider', function($routeProvider) { 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 a484de4..b99340b 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -29,18 +29,23 @@ $scope.submit = function () { if ($scope.data.user.password == $scope.data.user.password2) { User.add({}, $scope.data.user, function (data) { - }, function (error) { - $scope.restError = error.data; - }); + }, function (error) { + $scope.restError = error.data; + }); } } }]) -.controller('UserLoginCtrl', ['$scope', 'UserLogin', function ($scope, UserLogin) { +.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'User','$cookies', function ($scope, UserLogin, User,$cookies) { if (!angular.isDefined($scope.data)) { $scope.data = {user:{}}; } $scope.login = function () { - UserLogin.login({}, $scope.data.user); + UserLogin.login({}, $scope.data.user, function (data) { + User.get({userId: data.id}, function (user) { + $scope.currentUser = user; + }) + $cookies.sessionToken = data.permission; + }); } }]) \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index eb4c5c4..7c163ea 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -20,18 +20,7 @@ */ angular.module('pollenServices', ['ngResource']) -.factory('RestInfo', ['$cookies', function ($cookies) { - var query = ''; - - if (angular.isDefined($cookies.token)) { - query += '&permission='+$cookies.token; - } - - return query; - -}]) - -.factory('Poll', ['$resource', 'RestInfo', function ($resource, RestInfo) { +.factory('Poll', ['$resource', function ($resource) { return $resource(conf.restURL+'/polls/:pollId/:cmd', {pollId:'@id'}, { 'add' : { method : 'POST', @@ -45,15 +34,15 @@ angular.module('pollenServices', ['ngResource']) 'update' : { method : 'POST', transformRequest : function (data, headersGetter) { - return 'poll='+encodeURIComponent(JSON.stringify(data))+RestInfo; + return 'poll='+encodeURIComponent(JSON.stringify(data)); } } }); }]) -.factory('PollChoice', ['$resource', 'RestInfo', function ($resource, RestInfo) { +.factory('PollChoice', ['$resource', function ($resource) { var transformParam = function (data) { - return 'choice='+encodeURIComponent(JSON.stringify(data))+RestInfo; + return 'choice='+encodeURIComponent(JSON.stringify(data)); }; return $resource(conf.restURL+'/polls/:pollId/choices/:choiceId', {choiceId : '@id'}, @@ -75,9 +64,9 @@ angular.module('pollenServices', ['ngResource']) ); }]) -.factory('PollVote', ['$resource', 'RestInfo', function ($resource, RestInfo) { +.factory('PollVote', ['$resource', function ($resource) { var transformParam = function (data) { - return 'vote='+encodeURIComponent(JSON.stringify(data))+RestInfo; + return 'vote='+encodeURIComponent(JSON.stringify(data)); }; return $resource(conf.restURL+'/polls/:pollId/votes/:voteId', {voteId : '@id'}, @@ -99,9 +88,9 @@ angular.module('pollenServices', ['ngResource']) ); }]) -.factory('User', ['$resource', 'RestInfo', function ($resource, RestInfo) { +.factory('User', ['$resource', function ($resource) { var transformParam = function (data) { - return 'user='+encodeURIComponent(JSON.stringify(data))+'&generatePassword=false'+RestInfo; + return 'user='+encodeURIComponent(JSON.stringify(data))+'&generatePassword=false'; } return $resource(conf.restURL+'/users/:userId', {userId : '@id'}, { @@ -122,7 +111,7 @@ angular.module('pollenServices', ['ngResource']) ); }]) -.factory('UserLogin', ['$resource', 'RestInfo', function ($resource, RestInfo) { +.factory('UserLogin', ['$resource', function ($resource) { var transformParam = function (data) { var query = 'login='+encodeURIComponent(data.login); query += '&password='+encodeURIComponent(data.password); @@ -132,7 +121,7 @@ angular.module('pollenServices', ['ngResource']) } else { query += "false"; } - return query+RestInfo; + return query; } return $resource(conf.restURL+'/login', {}, { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/04: change style form register
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 128cf0a206e438617e564e9206063ab986f15759 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 15:09:52 2014 +0200 change style form register --- .../src/main/webapp/partials/user-register.html | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 93c5dc0..3557b89 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -19,33 +19,43 @@ #L% --> <div> - <form ng-submit="submit()"> + <form ng-submit="submit()" class="form-horizontal"> <div class="form-group"> - <label for="formName"> + <label for="formName" class="col-sm-4 text-right"> Nom d'utilisateur : <info-error error="restError.login[0]" data="data.user.login"></info-error> </label> - <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/> + <div class="col-sm-8"> + <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/> + </div> </div> <div class="form-group"> - <label for="formEmail"> + <label for="formEmail" class="col-sm-4 text-right"> E-Mail : <info-error error="restError.email[0]" data="data.user.email"></info-error> </label> - <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> + <div class="col-sm-8"> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> + </div> </div> <div class="form-group"> - <label for="formPassword">Mot de passe :</label> - <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> + <label for="formPassword" class="col-sm-4 text-right"> + Mot de passe : + </label> + <div class="col-sm-8"> + <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> + </div> </div> <div class="form-group"> - <label for="formPassword2"> + <label for="formPassword2" class="col-sm-4 text-right"> Confirmation : <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> </label> - <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> + <div class="col-sm-8"> + <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> + </div> </div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/04: change fonction name for save and delete poll
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 0e7fbcdc3ee0fda1700d6a17cac60a377e6fd11f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 15:08:35 2014 +0200 change fonction name for save and delete poll --- .../src/main/webapp/js/controllers/pollCtrl.js | 14 +++++++------- pollen-ui-angular/src/main/webapp/partials/big-poll.html | 12 +++++++----- .../src/main/webapp/partials/inline-poll.html | 4 ++-- pollen-ui-angular/src/main/webapp/partials/poll.html | 10 ++++++---- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index e4227df..a607ec8 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -181,7 +181,7 @@ angular.module('pollControllers', []) } initPoll(); - $scope.save = function () { + $scope.savePoll = function () { var poll = angular.copy($scope.data.poll); poll.choice = angular.copy($scope.data.choices); Poll.add(poll, function (data) { @@ -198,7 +198,7 @@ angular.module('pollControllers', []) }); } - $scope.delete = function () { + $scope.deletePoll = function () { $scope.data.poll = initPoll(); } @@ -229,7 +229,7 @@ angular.module('pollControllers', []) } $scope.deleteChoice = function (choice) { - PollChoice.delete({pollId:$routeParams.pollId, permission:$routeParams.token, choiceId: choice.id}, function () { + PollChoice.remove({pollId:$routeParams.pollId, permission:$routeParams.token, choiceId: choice.id}, function () { $scope.globalVariables.saved = true; var index = $scope.data.choices.indexOf(choice); if (index > -1) { @@ -247,12 +247,12 @@ angular.module('pollControllers', []) PollChoice.query({pollId:$routeParams.pollId}).$promise.then(function (choices) { $scope.data.choices = choices; $scope.data.vote = {}; - $scope.data.vote.choices = $scope.data.choices; + $scope.data.vote.choice = $scope.data.choices; }); } initPoll(); - $scope.save = function () { + $scope.savePoll = function () { $scope.data.poll.$update({permission:$routeParams.token}, function (data) { $scope.globalVariables.saved = true; }, function (error) { @@ -271,8 +271,8 @@ angular.module('pollControllers', []) } } - $scope.delete = function () { - $scope.data.poll.$delete({permission:$routeParams.token}, function() { + $scope.deletePoll = function () { + $scope.data.poll.$remove({permission:$routeParams.token}, function() { $location.path('/'); }); } diff --git a/pollen-ui-angular/src/main/webapp/partials/big-poll.html b/pollen-ui-angular/src/main/webapp/partials/big-poll.html index ea0c8f5..66c5901 100644 --- a/pollen-ui-angular/src/main/webapp/partials/big-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/big-poll.html @@ -52,15 +52,17 @@ </div> </div> <p collapse="!globalVariables.editMode && !showChoiceDesc" edit-me="showEditChoiceDesc" ng-hide="showEditChoiceDesc">{{choice.description}}</p> - <p ng-show="globalVariables.editMode && showEditChoiceDesc"><textarea ng-model="choice.description" focus-me="showEditChoiceDesc" ng-blur="showEditChoiceDesc = false" auto-save="saveChoice(choice)" cols="80" rows="8"></textarea></p> + <p ng-show="globalVariables.editMode && showEditChoiceDesc"> + <textarea ng-model="choice.description" focus-me="showEditChoiceDesc" ng-blur="showEditChoiceDesc = false" auto-save="saveChoice(choice)" cols="80" rows="8"></textarea> + </p> </div> <div class="col-sm-2 pollChoiceInput"> - <input type="checkbox" ng-model="vote.choice[$index].value"/> + <input type="checkbox" ng-model="data.vote.choice[$index].voteValue" name="{{data.vote.choice[$index].choiceId}}"/> </div> </div> -<div class="row pollBigChoice" ng-if="globalVariables.editMode"> +<div class="row pollBigChoice"> <div class="col-sm-10"> - <button class="btn btn-info btn-large" ng-click="addChoice()">Ajouter un choix</button> + <button class="btn btn-info btn-large" ng-click="addChoice()" ng-if="globalVariables.editMode" >Ajouter un choix</button> </div> <div class="col-sm-2"> <button ng-click="inlineVersion()" class="btn btn-default">inline version</button> @@ -68,6 +70,6 @@ </div> <div class="pollBigVote"> - <input type="text" placeholder="Votre Nom" ng-model="vote.name"/> + <input type="text" placeholder="Votre Nom" ng-model="data.vote.voterName"/> <button class="btn btn-primary" ng-click="voter()">Voter</button> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 840a498..b3d0f9d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -24,7 +24,7 @@ <table>  <tr> - <td><button ng-if="globalVariables.editMode" ng-click="bigVersion()" class="btn btn-default" >Big version</button></td> + <td><button ng-click="bigVersion()" class="btn btn-default" >Big version</button></td> <td ng-repeat="choice in data.choices" class="pollChoice pollAnim" ng-mouseenter="showEditHover = true" ng-mouseleave="showEditHover = false"> <div ng-if="choice.choiceType == 'TEXT'" edit-me="showEdit" > <div ng-hide="showEdit && !globalVariables.voted" class="fixe-input" title="{{choice.description}}"> @@ -55,7 +55,7 @@ <info-error error="data.vote.restError.voterName" data="data.vote.voteName"></info-error> </td> <td ng-repeat="choice in data.vote.choice" class="pollChoice"> - <input type="checkbox" name="{{choice.choice.topiaId}}" ng-model="choice.voteValue" /> + <input type="checkbox" name="{{choice.choiceId}}" ng-model="choice.voteValue" /> </td> <td> <input class="btn btn-primary btn-large" type="button" value="Vote" ng-click="voter()" /> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index d6403df..6a676ba 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -39,7 +39,7 @@ </h1> <h1 ng-show="showEditTitle"> - <input type="text" class="form-control" focus-me="showEditTitle" ng-model="data.poll.title" ng-exit="showEditTitle = false" auto-save="save()" required/> + <input type="text" class="form-control" focus-me="showEditTitle" ng-model="data.poll.title" ng-exit="showEditTitle = false" auto-save="savePoll()" required/> </h1> </div> @@ -49,7 +49,9 @@ <div ng-show="showEditDesc" class="pollDesc"> <textarea id="descEditor" data-ck-editor ng-model="data.poll.description"></textarea> - <input type="button" value="Return" class="btn btn-primary" ng-click="showEditDesc = false; save()"/> +  + <input type="button" value="Return" class="btn btn-primary" ng-click="showEditDesc = false;" ng-show="globalVariables.create"/> + <input type="button" value="Return" class="btn btn-primary" ng-click="showEditDesc = false; savePoll()" ng-show="globalVariables.edit"/> </div> <div id="poll"> @@ -67,13 +69,13 @@ <div ng-if="globalVariables.create"> <hr/> <button type="button" class="btn btn-default" ng-model="globalVariables.editMode" btn-checkbox>Mode Edition</button> - <button class="btn btn-primary" ng-click="save()">Sauvegarder</button> + <button class="btn btn-primary" ng-click="savePoll()">Sauvegarder</button> </div> <div ng-if="globalVariables.edit"> <hr/> <button type="button" class="btn btn-default" ng-model="globalVariables.editMode" btn-checkbox>Mode Edition</button> - <button class="btn btn-danger" ng-click="delete();">Supprimer</button> + <button class="btn btn-danger" ng-click="deletePoll();">Supprimer</button> </div> </form> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix typo
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit e8a287731ff6d2929d8139880653b8cb6ddbc70d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 20 16:06:41 2014 +0200 fix typo --- .../java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java index 23997c0..664a251 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java @@ -83,7 +83,7 @@ public class PollenRestApiRequestFilter extends WebMotionFilter { protected PollenRestApiRequestContext prepareRequestContext(HttpContext context) throws PollenInvalidSessionTokenException { - Locale locale = getUSerLocale(context); + Locale locale = getUserLocale(context); PollenRestApiApplicationContext applicationContext = PollenRestApiApplicationContext.getApplicationContext(context.getServletContext()); @@ -130,7 +130,7 @@ public class PollenRestApiRequestFilter extends WebMotionFilter { } - protected Locale getUSerLocale(HttpContext context) { + protected Locale getUserLocale(HttpContext context) { String language = context.getHeader(HttpContext.HEADER_LANGUAGE); if (log.isInfoEnabled()) { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: use a header to get session token
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 95b1136bd7eecc54695515ed15ea11a28481df2a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 20 16:05:13 2014 +0200 use a header to get session token --- .../chorem/pollen/rest/api/PollenRestApiRequestFilter.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java index 201e809..23997c0 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java @@ -50,10 +50,10 @@ import java.util.Map; */ public class PollenRestApiRequestFilter extends WebMotionFilter { - public static final String REQUEST_SESSION_TOKEN_PARAMETER = "sessionToken"; - public static final String REQUEST_PERMISSION_PARAMETER = "permission"; + public static final String REQUEST_HEADER_SESSION_TOKEN = "X-Pollen-Session-Token"; + /** Logger. */ private static final Log log = LogFactory.getLog(PollenRestApiRequestFilter.class); @@ -112,15 +112,13 @@ public class PollenRestApiRequestFilter extends WebMotionFilter { SecurityService securityService = requestContext.getSecurityService(); // --- get session token (from request parameters) --- // - Map<String, String[]> parameters = context.getParameters(); - String[] strings = parameters.get(REQUEST_SESSION_TOKEN_PARAMETER); - String authParam = strings == null || strings.length < 1 ? null : strings[0]; + String sessionTokenHeader = context.getHeader(REQUEST_HEADER_SESSION_TOKEN); - SessionToken sessionToken = securityService.getSessionTokenByToken(authParam); + SessionToken sessionToken = securityService.getSessionTokenByToken(sessionTokenHeader); // --- get mainPrincipal (from request parameters) --- // - parameters = context.getParameters(); - strings = parameters.get(REQUEST_PERMISSION_PARAMETER); + Map<String, String[]> parameters = context.getParameters(); + String[] strings = parameters.get(REQUEST_PERMISSION_PARAMETER); String credentialParam = strings == null || strings.length < 1 ? null : strings[0]; PollenPrincipal mainPrincipal = securityService.getPollenPrincipalByPermissionToken(credentialParam); -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: change login result
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 368368a140a18b3cdb09a4190dae531b54138e6c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 20 15:47:40 2014 +0200 change login result --- .../src/main/java/org/chorem/pollen/services/bean/CreateBeanRef.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/CreateBeanRef.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/CreateBeanRef.java index 033c029..eebd8f7 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/CreateBeanRef.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/CreateBeanRef.java @@ -74,7 +74,7 @@ public class CreateBeanRef implements Serializable { } public void fromEntity(SessionToken result) { - setId(result.getTopiaId()); + setId(result.getPollenUser().getTopiaId()); setPermission(result.getPollenToken().getToken()); } -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: catch error in form register
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 3a94b7726c8d92593e58351b2961c1cb2b40cee0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 14:33:43 2014 +0200 catch error in form register --- .../src/main/webapp/js/controllers/userCtrl.js | 11 ++++++++++- .../src/main/webapp/partials/user-register.html | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) 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 a41f7a0..a484de4 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -20,9 +20,18 @@ */ angular.module('userControllers', []) .controller('UserRegisterCtrl', ['$scope', 'User', function ($scope, User) { + + if (!angular.isDefined($scope.data)) { + $scope.data = {}; + } + $scope.data.user = {login:'', email:'', password:'', password2:''}; + $scope.submit = function () { if ($scope.data.user.password == $scope.data.user.password2) { - User.add({}, $scope.data.user); + User.add({}, $scope.data.user, function (data) { + }, function (error) { + $scope.restError = error.data; + }); } } }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 66ee85e..93c5dc0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -21,12 +21,18 @@ <div> <form ng-submit="submit()"> <div class="form-group"> - <label for="formName">Nom d'utilisateur : </label> + <label for="formName"> + Nom d'utilisateur : + <info-error error="restError.login[0]" data="data.user.login"></info-error> + </label> <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/> </div> <div class="form-group"> - <label for="formEmail">E-Mail :</label> + <label for="formEmail"> + E-Mail : + <info-error error="restError.email[0]" data="data.user.email"></info-error> + </label> <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> </div> @@ -35,7 +41,10 @@ <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> <div class="form-group"> - <label for="formPassword2">Confirmation :</label> + <label for="formPassword2"> + Confirmation : + <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> + </label> <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> </div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: make login works
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit dbae913f3ba7c7e24c7fb00a2c7783089ec5e458 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 20 11:57:37 2014 +0200 make login works --- pollen-rest-api/src/main/resources/mapping | 6 +-- .../org/chorem/pollen/rest/api/AuthApiTest.java | 62 ++++++++++++++++++++++ .../service/security/PollenSecurityRealm.java | 13 +++-- .../services/service/security/SecurityService.java | 4 +- 4 files changed, 76 insertions(+), 9 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index 501239a..6f70b40 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -27,9 +27,9 @@ GET /v1/doc DocApi.showMapping # AuthApi -POST /v1/login AuthApi.login -GET /v1/lostpassword/{token} AuthApi.lostPassword -GET /v1/logout AuthApi.logout +POST,PUT /v1/login AuthApi.login +GET /v1/lostpassword/{token} AuthApi.lostPassword +GET /v1/logout AuthApi.logout # ChoiceApi diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java new file mode 100644 index 0000000..cebcedc --- /dev/null +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java @@ -0,0 +1,62 @@ +package org.chorem.pollen.rest.api; + +import org.apache.http.client.fluent.Request; +import org.apache.http.client.fluent.Response; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.net.URISyntaxException; + +import static org.junit.Assert.assertNotNull; + +/** + * Created on 5/20/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class AuthApiTest extends AbstractPollenRestApiTest { + + @Test + public void login() throws URISyntaxException, IOException { + + Request request = createRequest("/v1/login") + .addParameter("login", "admin") + .addParameter("password", "admin") + .Post(); + + String content = request.execute().returnContent().asString(); + showTestResult(content); + assertNotNull(content); + + } + + @Test + public void badLogin() throws URISyntaxException, IOException { + + Request request = createRequest("/v1/login") + .addParameter("login", "admin" + System.nanoTime()) + .addParameter("password", "admin" + System.nanoTime()) + .Post(); + + Response response = request.execute(); + int statusCode = response.returnResponse().getStatusLine().getStatusCode(); + Assert.assertEquals(401, statusCode); + + } + + @Test + public void badPassword() throws URISyntaxException, IOException { + + Request request = createRequest("/v1/login") + .addParameter("login", "admin") + .addParameter("password", "admin" + System.nanoTime()) + .Post(); + + Response response = request.execute(); + int statusCode = response.returnResponse().getStatusLine().getStatusCode(); + Assert.assertEquals(401, statusCode); + + } +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java index ba936b7..f873a75 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java @@ -33,7 +33,9 @@ import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; +import org.apache.shiro.util.SimpleByteSource; import org.chorem.pollen.persistence.PollenTopiaPersistenceContext; +import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.services.PollenApplicationContext; /** @@ -77,22 +79,23 @@ public class PollenSecurityRealm extends AuthorizingRealm { UsernamePasswordToken upToken = (UsernamePasswordToken) token; String username = upToken.getUsername(); - PollenTopiaPersistenceContext persistenceContext = applicationContext.newPersistenceContext(); try { - boolean loginExists = persistenceContext.getPollenUserDao().loginExists(username); + PollenUser pollenUser = + persistenceContext.getPollenUserDao().forLoginEquals(username).findUniqueOrNull(); - if (!loginExists) { + if (pollenUser == null) { throw new AuthenticationException(); } - char[] password = upToken.getPassword(); + String salt = pollenUser.getSalt(); SimpleAuthenticationInfo result = - new SimpleAuthenticationInfo(username, password, getName()); + new SimpleAuthenticationInfo(username, pollenUser.getPassword(), new SimpleByteSource(salt), getName()); return result; + } finally { persistenceContext.closeContext(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index 5d7241b..bc1b27c 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -67,7 +67,9 @@ public class SecurityService extends PollenServiceSupport { Subject subject = getSubject(); UsernamePasswordToken token = new UsernamePasswordToken(login, password); - token.setRememberMe(rememberMe); + if (rememberMe != null) { + token.setRememberMe(rememberMe); + } try { subject.login(token); -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/04: fix register user
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 4ebfd721564a4e2bddec00f5d6e60cc79c6d3628 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 11:24:39 2014 +0200 fix register user --- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 4 +++- pollen-ui-angular/src/main/webapp/js/services.js | 2 +- pollen-ui-angular/src/main/webapp/partials/user-register.html | 10 ++++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index f7b1041..d7e72ee 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bootstrap', 'ngCookies']) +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'ui.bootstrap', 'ngCookies']) .config(['$httpProvider', '$cookiesProvider', function($httpProvider, $cookies) { $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; //$httpProvider.defaults.headers.put['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; 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 f354db9..a41f7a0 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -21,7 +21,9 @@ angular.module('userControllers', []) .controller('UserRegisterCtrl', ['$scope', 'User', function ($scope, User) { $scope.submit = function () { - User.add({}, $scope.data.user); + if ($scope.data.user.password == $scope.data.user.password2) { + User.add({}, $scope.data.user); + } } }]) diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index fab77a5..eb4c5c4 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -101,7 +101,7 @@ angular.module('pollenServices', ['ngResource']) .factory('User', ['$resource', 'RestInfo', function ($resource, RestInfo) { var transformParam = function (data) { - return 'user='+encodeURIComponent(JSON.stringify(data))+RestInfo; + return 'user='+encodeURIComponent(JSON.stringify(data))+'&generatePassword=false'+RestInfo; } return $resource(conf.restURL+'/users/:userId', {userId : '@id'}, { diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index e70496f..66ee85e 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -31,6 +31,16 @@ </div> <div class="form-group"> + <label for="formPassword">Mot de passe :</label> + <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> + </div> + <div class="form-group"> + <label for="formPassword2">Confirmation :</label> + <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> + </div> + + + <div class="form-group"> <button class="btn btn-primary" type="submit">Envoyer</button> </div> </form> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/04: delete conflit on ui conf.js
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 5a8c8fd26e2c8bf107f88bc5b3ded42720d4e65b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 19 16:37:02 2014 +0200 delete conflit on ui conf.js --- .gitignore | 1 + pollen-ui-angular/src/main/webapp/js/app.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2d3ae13..63b6d4a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ atlassian-ide-plugin.xml target/* */target/* +pollen-ui-angular/src/main/webapp/js/conf.js diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 477cb3b..f7b1041 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -<<<<<<< HEAD angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bootstrap', 'ngCookies']) .config(['$httpProvider', '$cookiesProvider', function($httpProvider, $cookies) { $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0