FEAT #13695 TIME 1:45 front logout cas

src/core/controllers/AuthenticationController.php

@@ -313,10 +313,9 @@ class AuthenticationController
         $loggingMethod = CoreConfigModel::getLoggingMethod();
 
         if ($loggingMethod['id'] == 'cas') {
-            AuthenticationController::casDisconnection();
+            $res = AuthenticationController::casDisconnection();
         }
-
-        return $response->withStatus(204);
+        return $response->withJson(['logoutUrl' => $res['logoutUrl'], 'redirectUrl' => $res['redirectUrl']]);
     }
 
     private static function standardConnection(array $args)
@@ -461,9 +460,8 @@ class AuthenticationController
         }
         \phpCAS::setFixedServiceURL(UrlController::getCoreUrl() . 'dist/index.html');
         \phpCAS::setNoClearTicketsFromUrl();
-        \phpCAS::logout();
-
-        return true;
+        $logoutUrl = \phpCAS::getServerLogoutURL();
+        return ['logoutUrl' => $logoutUrl, 'redirectUrl' => UrlController::getCoreUrl() . 'dist/index.html'];
     }
 
     public function getRefreshedToken(Request $request, Response $response)

src/frontend/service/auth.service.ts

@@ -5,6 +5,7 @@ import { LocalStorageService } from './local-storage.service';
 import { NotificationService } from './notification/notification.service';
 import { HeaderService } from './header.service';
 import { Observable, Subject } from 'rxjs';
+import { tap } from 'rxjs/operators';
 
 @Injectable({
     providedIn: 'root'
@@ -89,11 +90,28 @@ export class AuthService {
     }
 
     async logout(cleanUrl: boolean = true) {
+        if (['cas', 'keycloak'].indexOf(this.authMode) > -1) {
+            this.SsoLogout(cleanUrl);
+        } else {
+            this.redirectAfterLogout(cleanUrl);
+            await this.router.navigate(['/login']);
+        }
+    }
+
+    SsoLogout(cleanUrl: boolean = true) {
+        this.http.get('../rest/authenticate/logout').pipe(
+            tap(async (data: any) => {
+                this.redirectAfterLogout(cleanUrl);
+                window.location.href = data.logoutUrl + '?service=' + encodeURI(data.redirectUrl);
+            })
+        ).subscribe();
+    }
+
+    redirectAfterLogout(cleanUrl: boolean = true) {
         if (this.getToken() !== null && cleanUrl) {
             this.cleanUrl(JSON.parse(atob(this.getToken().split('.')[1])).user.id);
         }
         this.headerService.setUser();
-        await this.router.navigate(['/login']);
         this.clearTokens();
     }