From fafa25a7b51b734e5172fc3b80295b418e663535 Mon Sep 17 00:00:00 2001 From: David Mosbach Date: Sat, 3 Feb 2024 21:10:24 +0000 Subject: [PATCH] chore(auth): auto start oauth2 mock server in develop --- shell.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shell.nix b/shell.nix index 4b114f966..c02c51c19 100644 --- a/shell.nix +++ b/shell.nix @@ -62,6 +62,7 @@ let type cleanup_minio &>/dev/null && cleanup_minio type cleanup_maildev &>/dev/null && cleanup_maildev [[ -z "$OAUTH2_PGDIR" ]] || source ${killOauth2DB}/bin/killOauth2DB + [[ -z "$OAUTH2_PGHOST" ]] || pkill oauth2-mock-ser [ -f "''${basePath}/.develop.env" ] && rm -vf "''${basePath}/.develop.env" set +x @@ -74,6 +75,7 @@ let if [[ -z "$OAUTH2_PGHOST" ]]; then set -xe source ${mkOauth2DB}/bin/mkOauth2DB + ${oauth2MockServer}/bin/oauth2-mock-server& set +xe fi @@ -300,7 +302,7 @@ in pkgs.mkShell { OAUTH2_TEST_USERS = ./test/Database/test-users.yaml; OAUTH2_SERVER_PORT = 9443; OAUTH2_DB_PORT = 9444; - nativeBuildInputs = [develop inDevelop killallUni2work diffRunning oauth2MockServer] + nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] ++ (with pkgs; [ stack nodejs-14_x postgresql_12 openldap exiftool memcached minio minio-client gup reuse pre-commit