Merge Main with feature/71 (#81)

* Possible login fix (#72)

Change checks to empty() and movement of try statements

* Adding statement brackets (#73)

* 🔒 Force Single Logout (#77)

Signed-off-by: Luke Tainton <luke@tainton.uk>

* Update assigned-issues-inprogress.yml

Co-authored-by: Luke Tainton <luke@tainton.uk>

.github/workflows/assigned-issues-inprogress.yml

@@ -10,6 +10,6 @@ jobs:
     steps:
     - uses: alex-page/github-project-automation-plus@v0.2.4
       with:
-        project: FHeD v1.0
-        column: In Progress
-        repo-token: ${{ secrets.AUTO_TOKEN }}
+        project: v1.0
+        column: In progress
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

app/public/actions/login.php

@@ -5,6 +5,7 @@
     // Perform the OIDC authentication
     try {
       $oidc->authenticate();
+      $_SESSION['access_token'] = $oidc->requestClientCredentialsToken()->access_token;
       $oidc_user = array(
         'sub' => $oidc->requestUserInfo('sub'),
         'username' => $oidc->requestUserInfo('preferred_username'),

app/public/actions/logout.php

@@ -2,7 +2,7 @@
     $PAGE_NAME = "Logging out...";
     require_once __DIR__ . "/../../includes/prereqs.php";
 
+    $access_token = $_SESSION['access_token'];
     session_destroy();
-
-    header('Location: /');
+    $oidc->signOut($access_token, $_ENV['APP_URL']);
 ?>