Merge branch 'v2.0' into findUser

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Notifications.pm

@@ -244,7 +244,8 @@ sub notifications {
 sub notification {
     my ( $self, $req, $id, $type ) = @_;
     my $backend = $self->{notificationStorage};
-    $self->logger->debug("Notification storage: $backend");
+    $self->logger->debug("Notification storage backend: $backend");
+    $self->logger->debug("Notification id: $id");
 
     if ( $type eq 'actives' ) {
         my ( $uid, $ref ) = ( $id =~ /([^_]+?)_(.+)/ );
@@ -256,7 +257,7 @@ sub notification {
                 $req,
                 {
                     result => 0,
-                    error  => "Active otification $ref not found for user $uid"
+                    error  => "Active notification $ref not found for user $uid"
                 }
             );
         }
@@ -272,13 +273,16 @@ sub notification {
         $ref = decode_base64($ref) if ( $backend eq 'File' );
         my $n = $self->notifAccess->getAccepted( $uid, $ref );
         unless ($n) {
-            $self->userLogger->notice(
-                "Done notification $ref not found for user $uid");
+            my $msg =
+              $ref && $uid
+              ? "Done notification $ref not found for user $uid"
+              : 'Done notification not found';
+            $self->userLogger->notice($msg);
             return $self->sendJSONresponse(
                 $req,
                 {
                     result => 0,
-                    error  => "Done notification $ref not found for user $uid"
+                    error  => $msg
                 }
             );
         }

lemonldap-ng-manager/site/coffee/notifications.coffee

@@ -205,10 +205,9 @@ llapp.controller 'NotificationsExplorerCtrl', [ '$scope', '$translator', '$locat
 		$scope.waiting = true
 		$scope.currentScope = scope
 		node = scope.$modelValue
-		notificationId = node.notification
+		notificationId = node.notification.replace(/#/g, '_')
 		if $scope.type == 'actives'
-			node.reference.replace(/#/, '_')
-			notificationId = "#{node.uid}_" + node.reference.replace(/#/, '_')
+			notificationId = "#{node.uid}_#{node.reference}"
 		$http.get("#{scriptname}notifications/#{$scope.type}/#{notificationId}").then (response) ->
 			$scope.currentNotification =
 				uid: node.uid

lemonldap-ng-manager/site/htdocs/static/js/notifications.js

@@ -247,10 +247,9 @@
         $scope.waiting = true;
         $scope.currentScope = scope;
         node = scope.$modelValue;
-        notificationId = node.notification;
+        notificationId = node.notification.replace(/#/g, '_');
         if ($scope.type === 'actives') {
-          node.reference.replace(/#/, '_');
-          notificationId = (node.uid + "_") + node.reference.replace(/#/, '_');
+          notificationId = node.uid + "_" + node.reference;
         }
         $http.get(scriptname + "notifications/" + $scope.type + "/" + notificationId).then(function(response) {
           var e, notif;

lemonldap-ng-portal/MANIFEST

@@ -557,6 +557,7 @@ t/32-Auth-and-issuer-OIDC-implicit.t
 t/32-Auth-and-issuer-OIDC-sorted.t
 t/32-CAS-10.t
 t/32-CAS-Macros.t
+t/32-CAS-Prefix.t
 t/32-OIDC-ClaimTypes.t
 t/32-OIDC-Code-Flow-with-2F-UpgradeOnly.t
 t/32-OIDC-Code-Flow-with-2F.t
@@ -582,11 +583,11 @@ t/35-SOAP-config-backend.t
 t/35-SOAP-sessions-with-SOAP-server.t
 t/36-Combination-Kerberos-or-Demo.t
 t/36-Combination-Password.t
-t/36-Combination.t
 t/36-Combination-with-Choice.t
 t/36-Combination-with-over.t
 t/36-Combination-with-token.t
 t/36-Combination-with-TOTP.t
+t/36-Combination.t
 t/37-CAS-App-to-SAML-IdP-POST-with-WAYF.t
 t/37-CAS-App-to-SAML-IdP-POST.t
 t/37-Issuer-Timeout.t
@@ -623,9 +624,9 @@ t/43-MailPasswordReset-Combination-LDAP.t
 t/43-MailPasswordReset-Combination.t
 t/43-MailPasswordReset-DBI.t
 t/43-MailPasswordReset-LDAP.t
-t/43-MailPasswordReset.t
 t/43-MailPasswordReset-with-captcha.t
 t/43-MailPasswordReset-with-token.t
+t/43-MailPasswordReset.t
 t/44-CertificateResetByMail-Demo.t
 t/44-CertificateResetByMail-LDAP.t
 t/50-IssuerGet.t