diff --git a/package.nix b/package.nix index 4bd3704..4d4f526 100644 --- a/package.nix +++ b/package.nix @@ -21,17 +21,6 @@ rev = "main"; hash = "sha256-2yapZOSOop/ng8MNjZcuJIr7Qu9rZfeHlH8h0ljN4aE="; }; - # deployment_pipeline = python3Packages.buildPythonPackage { - # pname = "deployment_pipeline"; - # version = "0.1.0"; - # pyproject = true; - # src = vpn_source; - # nativeBuildInputs = with python3Packages; [ - # setuptools - # wheel - # ]; - # doCheck = false; - # }; deployment_pipeline = pkgs.callPackage local_source {}; in python3Packages.buildPythonApplication { diff --git a/src/controllers/adminTokenController.js b/src/controllers/adminTokenController.js index 7492372..bc865d2 100644 --- a/src/controllers/adminTokenController.js +++ b/src/controllers/adminTokenController.js @@ -12,6 +12,7 @@ // this is redirecting to authelia, despite being a "safe ip" exports.handleTokenRedirect = (req, res, next) => { + return next(); const { token } = req.params; if (req.isAuthenticated || !token) return next(); @@ -33,4 +34,5 @@ res.set("Content-Type", "text/html"); res.customRedirect(adminLoginUrl, 301); console.log("test"); + next(); }; diff --git a/src/middleware/authCheck.js b/src/middleware/authCheck.js index 831ad72..fd1533c 100644 --- a/src/middleware/authCheck.js +++ b/src/middleware/authCheck.js @@ -17,16 +17,21 @@ if (req.oidc.isAuthenticated()) { // Pull data directly from the encrypted session cookie // No network calls, no Map lookups, no staleness - const user = await req.oidc.fetchUserInfo(); - const claims = req.oidc.idTokenClaims; - const oidcNonce = claims.nonce; + try { + const user = await req.oidc.fetchUserInfo(); + const claims = req.oidc.idTokenClaims; + const oidcNonce = claims.nonce; - res.locals.session = { - // claims, - isAuthenticated: true, - nonce: oidcNonce, - ...user, - }; + res.locals.session = { + // claims, + isAuthenticated: true, + nonce: oidcNonce, + ...user, + }; + } catch (e) { + // This should clear the session when i get around to it + return next(); + } } next();