@raketa-cloud/admin 0.0.74 → 0.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",

package/src/setupAuthentication.js

@@ -6,13 +6,17 @@ import AuthHelper from "./helpers/AuthHelper";
 function getAuthBearer(c) {
   const authHeader = c.req.header("Authorization") || "";
 
-  return authHeader.replace("Bearer ", "");
+  return authHeader.replace("Bearer", "").trim();
 }
 
 const setupAuthentication = (app, config) => {
   app.use(async (c, next) => {
     const token = getCookie(c, AuthHelper.cookie_key) || getAuthBearer(c);
 
+    if (!token) {
+      return c.redirect("/login");
+    }
+
     const status = AuthHelper.isAuthenticated({ path: c.req.path, token });
 
     if (!status) {
@@ -67,7 +71,6 @@ const setupAuthentication = (app, config) => {
 
   app.get("/logout", (c) => {
     deleteCookie(c, AuthHelper.cookie_key);
-    deleteCookie(c, config.remoteConfig.cookie_key);
     return c.redirect("/login");
   });
 
@@ -79,26 +82,31 @@ const setupAuthentication = (app, config) => {
       return c.redirect("/login");
     }
 
-    setCookie(c, config.remoteConfig.cookie_key, token, {
-      path: "/",
-      httpOnly: true,
-      secure: true,
-      domain: config.remoteConfig.domain,
-    });
-
-    return c.redirect([config.remoteConfig.host, c.req.query().redirect_to].join(""));
+    // TODO: Figure out how to change this so it is secure!
+    return c.redirect(
+      [
+        config.remoteConfig.remoteLogin,
+        "?redirect_to=",
+        c.req.query().redirect_to,
+        "&page_snapshot=",
+        token,
+      ].join("")
+    );
   });
 
   app.get("/profile", (c) => {
     const token = getAuthBearer(c);
 
-    // TODO: Here we may update the Gateway API to have the check dinamically done in the backend!
+    // TODO: Here we may update the Gateway API to have the check dynamically done in the backend!
     if (AuthHelper.verifyJWT(token)) {
-      c.res.status = 200;
       return c.json({ message: "OK" });
     } else {
-      c.res.status = 401;
-      return c.res.json({ message: "Unauthorized" });
+      return new Response("Unauthorized", {
+        status: 401,
+        headers: {
+          Authenticate: 'error="invalid_token"',
+        },
+      });
     }
   });
 };