From b30d3db3a0c2f8473f816233aeb780cdc6a2162c Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Sat, 3 Mar 2018 09:32:01 +0100 Subject: [PATCH] Tidy --- .../lib/Lemonldap/NG/Common/Session/REST.pm | 11 +++++----- .../lib/Lemonldap/NG/Manager/U2F.pm | 21 ++++++++++--------- lemonldap-ng-manager/site/coffee/u2f.coffee | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm index 0e251325b..e156f1398 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm @@ -61,16 +61,15 @@ sub delU2FKey { my $id = $req->params('sessionId') or return $self->sendError( $req, 'sessionId is missing', 400 ); - # Try to read session my $session = $self->getApacheSession( $mod, $id ) or return $self->sendError( $req, undef, 400 ); - + # Delete U2F key attributs and update session - $session->data->{_u2fKeyHandle} = ''; - $session->data->{_u2fUserKey} = ''; - $session->update( \%{$session->data} ); - + $session->data->{_u2fKeyHandle} = ''; + $session->data->{_u2fUserKey} = ''; + $session->update( \%{ $session->data } ); + Lemonldap::NG::Handler::PSGI::Main->localUnlog( $req, $id ); if ( $session->error ) { return $self->sendError( $req, $session->error, 200 ); diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/U2F.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/U2F.pm index d85c2fd37..73cb736c5 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/U2F.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/U2F.pm @@ -27,26 +27,27 @@ use constant defaultRoute => 'u2f.html#/persistent'; sub addRoutes { my ( $self, $conf ) = @_; - -# Remote Procedure Call are defined in Lemonldap::NG::Common::Session::REST + # Remote Procedure Call are defined in Lemonldap::NG::Common::Session::REST # HTML template $self->addRoute( 'u2f.html', undef, ['GET'] ) # READ - ->addRoute( u2f => { ':sessionType' => 'sessions' }, - ['GET'] ) - - # DELETE U2F KEY ATTRIBUTS + ->addRoute( + u2f => { ':sessionType' => 'sessions' }, + ['GET'] + ) + + # DELETE U2F KEY ATTRIBUTS ->addRoute( u2f => { ':sessionType' => { ':sessionId' => 'delU2FKey' } }, ['DELETE'] ); - # UPDATE U2F KEY ATTRIBUTS + # UPDATE U2F KEY ATTRIBUTS # ->addRoute( - # u2f => { ':sessionType' => { ':sessionId' => { ':updateSession' } }, - # ['PUT'] - #); + # u2f => { ':sessionType' => { ':sessionId' => { ':updateSession' } }, + # ['PUT'] + #); $self->setTypes($conf); diff --git a/lemonldap-ng-manager/site/coffee/u2f.coffee b/lemonldap-ng-manager/site/coffee/u2f.coffee index 4de95deee..e19d9fa60 100644 --- a/lemonldap-ng-manager/site/coffee/u2f.coffee +++ b/lemonldap-ng-manager/site/coffee/u2f.coffee @@ -150,7 +150,7 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location', #$scope.currentScope.remove() $scope.waiting = false $scope.showT = true - + # Open node $scope.stoggle = (scope) -> node = scope.$modelValue -- GitLab