@raketa-cloud/admin 0.0.66 → 0.0.67

package/package.json

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

package/src/HonoAdapter.js

@@ -36,13 +36,17 @@ export default class HonoAdapter extends Adapter {
     this.globalConfig = config;
 
     // TODO: Pass in a path to redirect to after login?
-    setupAuthentication(router, {
-      remote: {
-        domain: "localhost",
-        host: "http://localhost:3000",
-        cookie_key: "cms-starter-slim",
+    setupAuthentication(
+      router,
+      {
+        remote: {
+          domain: "localhost",
+          host: "http://localhost:3000",
+          cookie_key: "cms-starter-slim",
+        },
       },
-    });
+      config
+    );
 
     router.get("/", (c) => {
       return c.redirect("/en");
@@ -121,6 +125,7 @@ export default class HonoAdapter extends Adapter {
           resourceConfig: resourceConfig,
           adminJwt: ctx.authentication.token,
           remoteConfig: { ...this.globalConfig.remoteConfig },
+          globalConfig: this.globalConfig,
         };
 
         ctx.logger.info(

package/src/buildResourcePath.js

@@ -0,0 +1,22 @@
+export default function buildResourcePath({
+  prefix_map,
+  resource,
+  resourceType,
+  locale,
+  defaultLocale,
+}) {
+  const prefix = prefix_map[resourceType];
+
+  if (!prefix) {
+    throw new Error(`Unknown resource type: ${resourceType}`);
+  }
+
+  return [
+    locale === defaultLocale ? "" : `/${locale}`,
+    prefix,
+    "/",
+    resource.slug,
+  ]
+    .join("")
+    .replace("//", "/");
+}

package/src/cloud/RaketaClient.js

@@ -96,11 +96,16 @@ export default class RaketaClient {
   }
 
   query(query, variables = {}) {
-    return this.gqlRequest(this.getConfig().instanceURL, query, variables, {
-      "x-raketa-project": this.getConfig().project,
-      "x-raketa-service": this.getConfig().service,
-      "x-raketa-identity": this.token,
-    });
+    return this.gqlRequest(
+      `${this.getConfig().cloud.gateway_url}/dispatch`,
+      query,
+      variables,
+      {
+        "x-raketa-project": this.getConfig().cloud.gateway_project,
+        "x-raketa-service": this.getConfig().cloud.dxp_service_private,
+        "x-raketa-identity": this.token,
+      }
+    );
   }
 
   formatErrors(errors, generalErrorTo = null) {

package/src/helpers/AuthHelper.js

@@ -26,18 +26,23 @@ const AuthHelper = {
     return false;
   },
 
-  getGoogleURL: () => {
-    const {
-      GATEWAY_SOCIAL_AUTH_URL: url,
-      GATEWAY_PROJECT: project,
-      GATEWAY_PRIMARY_USER_POOL: user_pool,
-      ADMIN_LOGIN_CALLBACK_URL: callback_url,
-    } = process.env;
-
-    if ([url, project, user_pool, callback_url].join() === "")
+  getGoogleURL: ({
+    gateway_url,
+    gateway_project,
+    gateway_user_pool,
+    auth_callback_url,
+  }) => {
+    if (
+      [
+        gateway_url,
+        gateway_project,
+        gateway_user_pool,
+        auth_callback_url,
+      ].join() === ""
+    )
       throw new Error("Invalid ENVs for authentication configuration");
 
-    return `${url}/${project}/${user_pool}/google?return_to=${callback_url}`;
+    return `${gateway_url}/users/auth/${gateway_project}/${gateway_user_pool}/google?return_to=${auth_callback_url}`;
   },
 };
 

package/src/index.js

@@ -11,6 +11,7 @@ export { default as routeSettings } from "./routeSettings";
 export { default as setupCloud } from "./setupCloud";
 export { default as routeStandard } from "./routeStandard";
 export { default as routeCategoriesModule } from "./routeCategoriesModule";
+export { default as buildResourcePath } from "./buildResourcePath";
 
 export { default as RaketaClient } from "./cloud/RaketaClient";
 export { default as Redirects } from "./cloud/Redirects";

package/src/setupAuthentication.js

@@ -9,7 +9,7 @@ function getAuthBearer(c) {
   return authHeader.replace("Bearer ", "");
 }
 
-const setupAuthentication = (app, opts) => {
+const setupAuthentication = (app, opts, config) => {
   app.use(async (c, next) => {
     const token = getCookie(c, AuthHelper.cookie_key) || getAuthBearer(c);
 
@@ -28,7 +28,13 @@ const setupAuthentication = (app, opts) => {
   });
 
   app.get("/login", async (c) => {
-    const googleURL = AuthHelper.getGoogleURL();
+    const googleURL = AuthHelper.getGoogleURL({
+      gateway_url: config.cloud.gateway_url,
+      gateway_project: config.cloud.gateway_project,
+      gateway_user_pool: config.cloud.gateway_user_pool,
+      auth_callback_url: config.cloud.auth_callback_url,
+    });
+
     const templatePath = `${currentPath}/views/_auth/login.ejs`;
 
     const rendered = await ejs.renderFile(templatePath, {

package/src/views/layouts/application.ejs

@@ -18,15 +18,15 @@
 </head>
 
 <script>
-  var RAKETA_IMAGES_API_KEY = "<%= process.env.IMAGES_API_KEY %>";
+  var RAKETA_IMAGES_API_KEY = "<%= _context.globalConfig.cloud.images_api_key %>";
 </script>
 
 <script src="https://storage.googleapis.com/cdn-raketa-cloud/js/raketa-image-picker-webcomponent.umd.js"></script>
 
 <script>
-  var FILE_PICKER_GATEWAY_DISPATCH_URL = "<%= process.env.GATEWAY_DISPATCH_URL %>";
-  var FILE_PICKER_GATEWAY_PROJECT = "<%= process.env.GATEWAY_PROJECT %>";
-  var FILE_PICKER_DXP_PRIVATE_SERVICE = "<%= process.env.DXP_PRIVATE_SERVICE %>";
+  var FILE_PICKER_GATEWAY_DISPATCH_URL = "<%= _context.globalConfig.cloud.gatway_url %>/dispatch";
+  var FILE_PICKER_GATEWAY_PROJECT = "<%= _context.globalConfig.cloud.gateway_project %>";
+  var FILE_PICKER_DXP_PRIVATE_SERVICE = "<%= _context.globalConfig.cloud.dxp_service_private %>";
   var FILE_PICKER_JWT_TOKEN = "<%= _context.adminJwt %>";
 </script>
 
@@ -218,4 +218,4 @@
   </script>
 </body>
 
-</html>
+</html>