From cd706f86cebb8a6ec6df4798a80cc984bb6eb405 Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Thu, 13 Aug 2020 20:17:51 +0100 Subject: [PATCH] Main Merge into bug/78 (#80) * :lock: Force Single Logout (#77) Signed-off-by: Luke Tainton * Update assigned-issues-inprogress.yml Co-authored-by: Luke Tainton --- .github/workflows/assigned-issues-inprogress.yml | 6 +++--- app/public/actions/login.php | 1 + app/public/actions/logout.php | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/assigned-issues-inprogress.yml b/.github/workflows/assigned-issues-inprogress.yml index defa967..67de8d7 100644 --- a/.github/workflows/assigned-issues-inprogress.yml +++ b/.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 }} diff --git a/app/public/actions/login.php b/app/public/actions/login.php index 0598f9d..38fdcc1 100644 --- a/app/public/actions/login.php +++ b/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'), diff --git a/app/public/actions/logout.php b/app/public/actions/logout.php index 6bca8f6..8bbceb7 100644 --- a/app/public/actions/logout.php +++ b/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']); ?>