From 0c15295023b9102d40bc7cee84a1c8cd9e8e1121 Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Mon, 10 Aug 2020 21:43:58 +0100 Subject: [PATCH 1/4] Roadmap #1 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7ffdb8e..9997779 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,7 @@ # FHeD The Free HelpDesk is the one-stop shop for all of your IT-related needs. It is a barebones helpdesk system aimed at individuals and small businesses. + +# Roadmap +- [x] ~~Create framework.~~ +- [x] ~~Create database creation on install script.~~ -- 2.49.1 From 9b3f94eafcbdc5d0e3c7d04d04e816c28a0e6431 Mon Sep 17 00:00:00 2001 From: Luke Tainton Date: Mon, 10 Aug 2020 22:13:42 +0100 Subject: [PATCH 2/4] :bug: Users table issue - fix exception catch blocks Signed-off-by: Luke Tainton --- app/public/actions/login.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/public/actions/login.php b/app/public/actions/login.php index aad4408..bdfe7fe 100644 --- a/app/public/actions/login.php +++ b/app/public/actions/login.php @@ -13,7 +13,7 @@ 'email' => $oidc->requestUserInfo('email'), ); } catch (Jumbojett\OpenIDConnectClientException $e) { - echo("Error during OpenID Connect authentication: " . $e->getMessage() . "
"); + $alert = array("danger", "Error during OpenID Connect authentication: " . $e->getMessage()); } // Check if the user already exists @@ -23,7 +23,7 @@ $user_exist_sql->execute(); $result = $user_exist_sql->setFetchMode(PDO::FETCH_ASSOC); // If user doesn't exist, $result will be null } catch (PDOException $e) { - echo("Error: " . $e->getMessage() . "
"); + $alert = array("danger", "Error during check for user record: " . $e->getMessage()); } if ($result != null) { @@ -38,7 +38,7 @@ $sql->bindParam(':email', $oidc_user['email']); $sql->execute(); } catch (PDOException $e) { - echo("Error running SQL (Update existing user):
" . $e->getMessage() . "
"); + $alert = array("danger", "Error during existing user record update: " . $e->getMessage()); } } else { // User doesn't already exist @@ -52,7 +52,7 @@ $sql->bindParam(':email', $oidc_user['email']); $sql->execute(); } catch (PDOException $e) { - echo("Error running SQL (Add new user):
" . $e->getMessage() . "
"); + $alert = array("danger", "Error during creation of new user record: " . $e->getMessage()); } } -- 2.49.1 From db38b22a2375c96f3ca579025248cb54da19db7c Mon Sep 17 00:00:00 2001 From: Luke Tainton Date: Mon, 10 Aug 2020 22:25:27 +0100 Subject: [PATCH 3/4] Create assigned-issues-inprogress.yml --- .github/workflows/assigned-issues-inprogress.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/assigned-issues-inprogress.yml diff --git a/.github/workflows/assigned-issues-inprogress.yml b/.github/workflows/assigned-issues-inprogress.yml new file mode 100644 index 0000000..93dc564 --- /dev/null +++ b/.github/workflows/assigned-issues-inprogress.yml @@ -0,0 +1,15 @@ +name: Run project automation tasks + +on: + issues: + types: [assigned] + +jobs: + issues-inprogress: + runs-on: ubuntu-latest + steps: + - uses: alex-page/github-project-automation-plus@v0.2.4 + with: + project: FHeD v1.0 + column: In Progress + repo-token: ${{ secrets.GITHUB_TOKEN }} -- 2.49.1 From 1624b1bef21d763433e89f3427f6d469b22415a2 Mon Sep 17 00:00:00 2001 From: Luke Tainton Date: Mon, 10 Aug 2020 22:32:18 +0100 Subject: [PATCH 4/4] :construction: Replace token Signed-off-by: Luke Tainton --- .github/workflows/assigned-issues-inprogress.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/assigned-issues-inprogress.yml b/.github/workflows/assigned-issues-inprogress.yml index 93dc564..defa967 100644 --- a/.github/workflows/assigned-issues-inprogress.yml +++ b/.github/workflows/assigned-issues-inprogress.yml @@ -12,4 +12,4 @@ jobs: with: project: FHeD v1.0 column: In Progress - repo-token: ${{ secrets.GITHUB_TOKEN }} + repo-token: ${{ secrets.AUTO_TOKEN }} -- 2.49.1