@getstrata/bootstrap 0.2.21 → 0.2.23

package/dist/entries/membershipService.js

@@ -1,10 +1,5 @@
 // @bun
 // ../../src/core/contracts/di.ts
-var requiredDependencyKeys = [
-  "container",
-  "cache",
-  "storage"
-];
 function getRequiredDependency(dependencies, key) {
   const dependency = dependencies[key];
   if (dependency === undefined) {
@@ -12,23 +7,10 @@ function getRequiredDependency(dependencies, key) {
   }
   return dependency;
 }
-function assertAppDependenciesComplete(dependencies) {
-  for (const key of requiredDependencyKeys) {
-    getRequiredDependency(dependencies, key);
-  }
-}
-function resolveService(dependencies, token) {
-  return dependencies.container.resolve(token);
-}
 
 // ../../src/core/contracts/serviceTokens.ts
-var CORE_CONFIG_TOKEN = "core.config";
-var CORE_CACHE_TOKEN = "core.cache";
-var CORE_QUEUE_TOKEN = "core.queue";
-var CORE_EVENT_BUS_TOKEN = "core.eventBus";
 var CORE_POLICY_GATE_TOKEN = "core.policyGate";
 var CORE_AUTH_TOKEN = "core.auth";
-var CORE_TOKEN_SERVICE_TOKEN = "core.tokenService";
 
 // ../../src/core/logging/logger.ts
 class Logger {
@@ -79,10 +61,6 @@ function readStoredApplicationContext() {
   }
   return activeContext;
 }
-function setActiveApplicationContext(context) {
-  activeContext = context;
-  globalThis[APPLICATION_CONTEXT_KEY] = context;
-}
 function requireActiveApplicationContext() {
   const context = readStoredApplicationContext();
   if (!context) {
@@ -93,24 +71,12 @@ function requireActiveApplicationContext() {
 function resolveApplicationCache() {
   return getRequiredDependency(requireActiveApplicationContext().dependencies, "cache");
 }
-function resolveApplicationQueue() {
-  return requireActiveApplicationContext().container.resolve(CORE_QUEUE_TOKEN);
-}
-function resolveApplicationEventBus() {
-  return requireActiveApplicationContext().container.resolve(CORE_EVENT_BUS_TOKEN);
-}
 function resolveApplicationAuth() {
   return requireActiveApplicationContext().container.resolve(CORE_AUTH_TOKEN);
 }
 function resolveApplicationPolicyGate() {
   return requireActiveApplicationContext().container.resolve(CORE_POLICY_GATE_TOKEN);
 }
-function resolveApplicationConfig() {
-  return requireActiveApplicationContext().config;
-}
-function resolveApplicationLogger() {
-  return appLogger;
-}
 function resolveApplicationDependencies() {
   return requireActiveApplicationContext().dependencies;
 }

package/dist/entries/providers/view.js

@@ -79,16 +79,16 @@ function htmlResponse(html, init = {}) {
     }
   });
 }
-// ../../src/core/contracts/serviceTokens.ts
-var CORE_CONFIG_TOKEN = "core.config";
-var CORE_CACHE_TOKEN = "core.cache";
-var CORE_QUEUE_TOKEN = "core.queue";
-var CORE_EVENT_BUS_TOKEN = "core.eventBus";
-var CORE_POLICY_GATE_TOKEN = "core.policyGate";
-var CORE_AUTH_TOKEN = "core.auth";
-var CORE_TOKEN_SERVICE_TOKEN = "core.tokenService";
-
 // ../../src/bootstrap/config.ts
+import {
+  CORE_AUTH_TOKEN,
+  CORE_CACHE_TOKEN,
+  CORE_CONFIG_TOKEN,
+  CORE_EVENT_BUS_TOKEN,
+  CORE_POLICY_GATE_TOKEN,
+  CORE_QUEUE_TOKEN,
+  CORE_TOKEN_SERVICE_TOKEN
+} from "@getstrata/core/contracts/serviceTokens.ts";
 var APP_PORT_CONFIG_KEY = "app.port";
 var CACHE_TTL_MS_CONFIG_KEY = "cache.ttlMs";
 var CACHE_MAX_ENTRIES_CONFIG_KEY = "cache.maxEntries";

package/dist/entries/providers.js

@@ -43,16 +43,16 @@ function resolveAbilitiesForRole(role) {
   return [...MEMBER_ABILITIES];
 }
 
-// ../../src/core/contracts/serviceTokens.ts
-var CORE_CONFIG_TOKEN = "core.config";
-var CORE_CACHE_TOKEN = "core.cache";
-var CORE_QUEUE_TOKEN = "core.queue";
-var CORE_EVENT_BUS_TOKEN = "core.eventBus";
-var CORE_POLICY_GATE_TOKEN = "core.policyGate";
-var CORE_AUTH_TOKEN = "core.auth";
-var CORE_TOKEN_SERVICE_TOKEN = "core.tokenService";
-
 // ../../src/bootstrap/config.ts
+import {
+  CORE_AUTH_TOKEN,
+  CORE_CACHE_TOKEN,
+  CORE_CONFIG_TOKEN,
+  CORE_EVENT_BUS_TOKEN,
+  CORE_POLICY_GATE_TOKEN,
+  CORE_QUEUE_TOKEN,
+  CORE_TOKEN_SERVICE_TOKEN
+} from "@getstrata/core/contracts/serviceTokens.ts";
 var APP_PORT_CONFIG_KEY = "app.port";
 var CACHE_TTL_MS_CONFIG_KEY = "cache.ttlMs";
 var CACHE_MAX_ENTRIES_CONFIG_KEY = "cache.maxEntries";
@@ -3244,116 +3244,77 @@ function createAppQueue(driver, redisUrl, failedJobs = createFailedJobService(),
   });
 }
 
-// ../../src/core/contracts/di.ts
-var requiredDependencyKeys = [
-  "container",
-  "cache",
-  "storage"
-];
-function getRequiredDependency(dependencies, key) {
-  const dependency = dependencies[key];
-  if (dependency === undefined) {
-    throw new Error(`Required dependency "${key}" is not registered.`);
-  }
-  return dependency;
-}
-function assertAppDependenciesComplete(dependencies) {
-  for (const key of requiredDependencyKeys) {
-    getRequiredDependency(dependencies, key);
+// ../../src/bootstrap/applicationRegistry.ts
+import {
+  resolveApplicationAuth,
+  resolveApplicationCache,
+  resolveApplicationConfig,
+  resolveApplicationDependencies,
+  resolveApplicationEventBus,
+  resolveApplicationLogger,
+  resolveApplicationPolicyGate,
+  resolveApplicationQueue,
+  setActiveApplicationContext
+} from "@getstrata/core/runtime/applicationRegistry.ts";
+
+// ../../src/bootstrap/discoverModules.ts
+import { readdirSync as readdirSync2 } from "fs";
+import { join as join2 } from "path";
+import { pathToFileURL as pathToFileURL2 } from "url";
+var DISCOVER_MODULES_STATE_KEY = Symbol.for("@getstrata/discoverModulesState");
+function readDiscoverModulesState() {
+  const existing = globalThis[DISCOVER_MODULES_STATE_KEY];
+  if (existing) {
+    return existing;
   }
+  const state = { appModules: [] };
+  globalThis[DISCOVER_MODULES_STATE_KEY] = state;
+  return state;
 }
-function resolveService(dependencies, token) {
-  return dependencies.container.resolve(token);
+function configureModulesDirectory(modulesDir) {
+  readDiscoverModulesState().configuredModulesDir = modulesDir;
 }
-
-// ../../src/core/logging/logger.ts
-class Logger {
-  channel;
-  constructor(channel = "app") {
-    this.channel = channel;
-  }
-  write(level, message, context = {}) {
-    const entry = {
-      level,
-      channel: this.channel,
-      message,
-      timestamp: new Date().toISOString(),
-      ...context
-    };
-    const line = JSON.stringify(entry);
-    if (level === "error") {
-      console.error(line);
-      return;
-    }
-    console.log(line);
+function resolveModulesDirectory(options) {
+  const state = readDiscoverModulesState();
+  if (options?.modulesDir) {
+    return options.modulesDir;
   }
-  debug(message, context) {
-    this.write("debug", message, context);
-  }
-  info(message, context) {
-    this.write("info", message, context);
-  }
-  warn(message, context) {
-    this.write("warn", message, context);
-  }
-  error(message, context) {
-    this.write("error", message, context);
+  if (state.configuredModulesDir) {
+    return state.configuredModulesDir;
   }
+  return join2(import.meta.dir, "../modules");
 }
-var appLogger = new Logger("app");
-
-// ../../src/core/runtime/applicationRegistry.ts
-var APPLICATION_CONTEXT_KEY = Symbol.for("@getstrata/applicationContext");
-var activeContext;
-function readStoredApplicationContext() {
-  if (activeContext) {
-    return activeContext;
-  }
-  const globalContext = globalThis[APPLICATION_CONTEXT_KEY];
-  if (globalContext) {
-    activeContext = globalContext;
+async function loadDiscoveredModules(options) {
+  const modulesDirectory = resolveModulesDirectory(options);
+  let moduleNames;
+  try {
+    moduleNames = readdirSync2(modulesDirectory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return [];
+    }
+    throw error;
   }
-  return activeContext;
-}
-function setActiveApplicationContext(context) {
-  activeContext = context;
-  globalThis[APPLICATION_CONTEXT_KEY] = context;
+  const modules = await Promise.all(moduleNames.map(async (moduleName) => {
+    const moduleUrl = pathToFileURL2(join2(modulesDirectory, moduleName, "index.ts")).href;
+    const loaded = await import(moduleUrl);
+    return loaded.default;
+  }));
+  return modules.filter((module) => module?.name !== undefined).sort((left, right) => (left.order ?? 100) - (right.order ?? 100));
 }
-function requireActiveApplicationContext() {
-  const context = readStoredApplicationContext();
-  if (!context) {
-    throw new Error("The application context has not been bootstrapped.");
+async function ensureModulesLoaded(options) {
+  const state = readDiscoverModulesState();
+  if (state.appModules.length > 0) {
+    return state.appModules;
   }
-  return context;
-}
-function resolveApplicationCache() {
-  return getRequiredDependency(requireActiveApplicationContext().dependencies, "cache");
-}
-function resolveApplicationQueue() {
-  return requireActiveApplicationContext().container.resolve(CORE_QUEUE_TOKEN);
-}
-function resolveApplicationEventBus() {
-  return requireActiveApplicationContext().container.resolve(CORE_EVENT_BUS_TOKEN);
-}
-function resolveApplicationAuth() {
-  return requireActiveApplicationContext().container.resolve(CORE_AUTH_TOKEN);
-}
-function resolveApplicationPolicyGate() {
-  return requireActiveApplicationContext().container.resolve(CORE_POLICY_GATE_TOKEN);
-}
-function resolveApplicationConfig() {
-  return requireActiveApplicationContext().config;
-}
-function resolveApplicationLogger() {
-  return appLogger;
-}
-function resolveApplicationDependencies() {
-  return requireActiveApplicationContext().dependencies;
+  state.modulesReady ??= loadDiscoveredModules(options).then((modules) => {
+    state.appModules.splice(0, state.appModules.length, ...modules);
+    return state.appModules;
+  });
+  return state.modulesReady;
 }
-// ../../src/bootstrap/discoverModules.ts
-var appModules = [];
 function discoverModules() {
-  return appModules;
+  return readDiscoverModulesState().appModules;
 }
 
 // ../../src/bootstrap/cache/modelCacheTags.ts
@@ -3650,10 +3611,92 @@ class DispatchWebhookJob extends Job {
 }
 var dispatchWebhookJob_default = DispatchWebhookJob;
 
+// ../../src/core/contracts/di.ts
+function getRequiredDependency(dependencies, key) {
+  const dependency = dependencies[key];
+  if (dependency === undefined) {
+    throw new Error(`Required dependency "${key}" is not registered.`);
+  }
+  return dependency;
+}
+
+// ../../src/core/contracts/serviceTokens.ts
+var CORE_POLICY_GATE_TOKEN2 = "core.policyGate";
+var CORE_AUTH_TOKEN2 = "core.auth";
+
+// ../../src/core/logging/logger.ts
+class Logger {
+  channel;
+  constructor(channel = "app") {
+    this.channel = channel;
+  }
+  write(level, message, context = {}) {
+    const entry = {
+      level,
+      channel: this.channel,
+      message,
+      timestamp: new Date().toISOString(),
+      ...context
+    };
+    const line = JSON.stringify(entry);
+    if (level === "error") {
+      console.error(line);
+      return;
+    }
+    console.log(line);
+  }
+  debug(message, context) {
+    this.write("debug", message, context);
+  }
+  info(message, context) {
+    this.write("info", message, context);
+  }
+  warn(message, context) {
+    this.write("warn", message, context);
+  }
+  error(message, context) {
+    this.write("error", message, context);
+  }
+}
+var appLogger = new Logger("app");
+
+// ../../src/core/runtime/applicationRegistry.ts
+var APPLICATION_CONTEXT_KEY = Symbol.for("@getstrata/applicationContext");
+var activeContext;
+function readStoredApplicationContext() {
+  if (activeContext) {
+    return activeContext;
+  }
+  const globalContext = globalThis[APPLICATION_CONTEXT_KEY];
+  if (globalContext) {
+    activeContext = globalContext;
+  }
+  return activeContext;
+}
+function requireActiveApplicationContext() {
+  const context = readStoredApplicationContext();
+  if (!context) {
+    throw new Error("The application context has not been bootstrapped.");
+  }
+  return context;
+}
+function resolveApplicationCache2() {
+  return getRequiredDependency(requireActiveApplicationContext().dependencies, "cache");
+}
+function resolveApplicationAuth2() {
+  return requireActiveApplicationContext().container.resolve(CORE_AUTH_TOKEN2);
+}
+function resolveApplicationPolicyGate2() {
+  return requireActiveApplicationContext().container.resolve(CORE_POLICY_GATE_TOKEN2);
+}
+function resolveApplicationDependencies2() {
+  return requireActiveApplicationContext().dependencies;
+}
+
 // ../../src/bootstrap/queue/defaultJobs.ts
 function registerDefaultJobs() {
   jobRegistry.register("cache.invalidate-tags", () => {
-    return new invalidateCacheTagsJob_default(resolveApplicationCache());
+    return new invalidateCacheTagsJob_default(resolveApplicationCache2());
   });
   jobRegistry.register("webhook.dispatch", () => new dispatchWebhookJob_default);
 }
@@ -3674,7 +3717,7 @@ var queue_default = queueProvider;
 
 // ../../src/core/storage/storage.ts
 import { mkdir, readFile, unlink, writeFile } from "fs/promises";
-import { dirname, join as join2 } from "path";
+import { dirname, join as join3 } from "path";
 var {S3Client } = globalThis.Bun;
 
 class LocalStorageDriver {
@@ -3686,7 +3729,7 @@ class LocalStorageDriver {
     return this.rootDirectory ?? process.env.STORAGE_PATH ?? "storage";
   }
   resolvePath(path) {
-    return join2(this.resolveRootDirectory(), path.replace(/^\/+/, ""));
+    return join3(this.resolveRootDirectory(), path.replace(/^\/+/, ""));
   }
   async put(path, contents) {
     const absolutePath = this.resolvePath(path);
@@ -3819,9 +3862,9 @@ function currentRequestMeta() {
 }
 
 // ../../src/core/view/etaViewEngine.ts
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import { Eta } from "eta";
-var DEFAULT_VIEWS_DIRECTORY = join3(process.cwd(), "resources/views");
+var DEFAULT_VIEWS_DIRECTORY = join4(process.cwd(), "resources/views");
 var DEFAULT_LAYOUT = "layouts/app.eta";
 
 class EtaViewEngine {

package/dist/entries/queue/defaultJobs.js

@@ -385,11 +385,6 @@ function readSharedJobRegistry() {
 var jobRegistry = readSharedJobRegistry();
 
 // ../../src/core/contracts/di.ts
-var requiredDependencyKeys = [
-  "container",
-  "cache",
-  "storage"
-];
 function getRequiredDependency(dependencies, key) {
   const dependency = dependencies[key];
   if (dependency === undefined) {
@@ -397,23 +392,10 @@ function getRequiredDependency(dependencies, key) {
   }
   return dependency;
 }
-function assertAppDependenciesComplete(dependencies) {
-  for (const key of requiredDependencyKeys) {
-    getRequiredDependency(dependencies, key);
-  }
-}
-function resolveService(dependencies, token) {
-  return dependencies.container.resolve(token);
-}
 
 // ../../src/core/contracts/serviceTokens.ts
-var CORE_CONFIG_TOKEN = "core.config";
-var CORE_CACHE_TOKEN = "core.cache";
-var CORE_QUEUE_TOKEN = "core.queue";
-var CORE_EVENT_BUS_TOKEN = "core.eventBus";
 var CORE_POLICY_GATE_TOKEN = "core.policyGate";
 var CORE_AUTH_TOKEN = "core.auth";
-var CORE_TOKEN_SERVICE_TOKEN = "core.tokenService";
 
 // ../../src/core/logging/logger.ts
 class Logger {
@@ -464,10 +446,6 @@ function readStoredApplicationContext() {
   }
   return activeContext;
 }
-function setActiveApplicationContext(context) {
-  activeContext = context;
-  globalThis[APPLICATION_CONTEXT_KEY] = context;
-}
 function requireActiveApplicationContext() {
   const context = readStoredApplicationContext();
   if (!context) {
@@ -478,24 +456,12 @@ function requireActiveApplicationContext() {
 function resolveApplicationCache() {
   return getRequiredDependency(requireActiveApplicationContext().dependencies, "cache");
 }
-function resolveApplicationQueue() {
-  return requireActiveApplicationContext().container.resolve(CORE_QUEUE_TOKEN);
-}
-function resolveApplicationEventBus() {
-  return requireActiveApplicationContext().container.resolve(CORE_EVENT_BUS_TOKEN);
-}
 function resolveApplicationAuth() {
   return requireActiveApplicationContext().container.resolve(CORE_AUTH_TOKEN);
 }
 function resolveApplicationPolicyGate() {
   return requireActiveApplicationContext().container.resolve(CORE_POLICY_GATE_TOKEN);
 }
-function resolveApplicationConfig() {
-  return requireActiveApplicationContext().config;
-}
-function resolveApplicationLogger() {
-  return appLogger;
-}
 function resolveApplicationDependencies() {
   return requireActiveApplicationContext().dependencies;
 }

package/dist/entries/web/routing.js

@@ -68,11 +68,6 @@ class PreconditionFailedError extends HttpError {
 }
 
 // ../../src/core/contracts/di.ts
-var requiredDependencyKeys = [
-  "container",
-  "cache",
-  "storage"
-];
 function getRequiredDependency(dependencies, key) {
   const dependency = dependencies[key];
   if (dependency === undefined) {
@@ -80,23 +75,10 @@ function getRequiredDependency(dependencies, key) {
   }
   return dependency;
 }
-function assertAppDependenciesComplete(dependencies) {
-  for (const key of requiredDependencyKeys) {
-    getRequiredDependency(dependencies, key);
-  }
-}
-function resolveService(dependencies, token) {
-  return dependencies.container.resolve(token);
-}
 
 // ../../src/core/contracts/serviceTokens.ts
-var CORE_CONFIG_TOKEN = "core.config";
-var CORE_CACHE_TOKEN = "core.cache";
-var CORE_QUEUE_TOKEN = "core.queue";
-var CORE_EVENT_BUS_TOKEN = "core.eventBus";
 var CORE_POLICY_GATE_TOKEN = "core.policyGate";
 var CORE_AUTH_TOKEN = "core.auth";
-var CORE_TOKEN_SERVICE_TOKEN = "core.tokenService";
 
 // ../../src/core/logging/logger.ts
 class Logger {
@@ -147,10 +129,6 @@ function readStoredApplicationContext() {
   }
   return activeContext;
 }
-function setActiveApplicationContext(context) {
-  activeContext = context;
-  globalThis[APPLICATION_CONTEXT_KEY] = context;
-}
 function requireActiveApplicationContext() {
   const context = readStoredApplicationContext();
   if (!context) {
@@ -161,24 +139,12 @@ function requireActiveApplicationContext() {
 function resolveApplicationCache() {
   return getRequiredDependency(requireActiveApplicationContext().dependencies, "cache");
 }
-function resolveApplicationQueue() {
-  return requireActiveApplicationContext().container.resolve(CORE_QUEUE_TOKEN);
-}
-function resolveApplicationEventBus() {
-  return requireActiveApplicationContext().container.resolve(CORE_EVENT_BUS_TOKEN);
-}
 function resolveApplicationAuth() {
   return requireActiveApplicationContext().container.resolve(CORE_AUTH_TOKEN);
 }
 function resolveApplicationPolicyGate() {
   return requireActiveApplicationContext().container.resolve(CORE_POLICY_GATE_TOKEN);
 }
-function resolveApplicationConfig() {
-  return requireActiveApplicationContext().config;
-}
-function resolveApplicationLogger() {
-  return appLogger;
-}
 function resolveApplicationDependencies() {
   return requireActiveApplicationContext().dependencies;
 }
@@ -195,6 +161,10 @@ function isEtagEnabled() {
 function formatWeakEtag(digest) {
   return `W/"${digest}"`;
 }
+function computeEtagFromJson(data) {
+  const digest = nonCryptographicDigest(JSON.stringify(data)).slice(0, 32);
+  return formatWeakEtag(digest);
+}
 function etagFromResource(resource) {
   const version = resource.updated_at ?? resource.created_at ?? "";
   const versionText = version instanceof Date ? version.toISOString() : version ? String(version) : "0";
@@ -409,6 +379,15 @@ function resolveRegisterRateLimit() {
 }
 
 // ../../src/bootstrap/config.ts
+import {
+  CORE_AUTH_TOKEN as CORE_AUTH_TOKEN2,
+  CORE_CACHE_TOKEN,
+  CORE_CONFIG_TOKEN,
+  CORE_EVENT_BUS_TOKEN as CORE_EVENT_BUS_TOKEN2,
+  CORE_POLICY_GATE_TOKEN as CORE_POLICY_GATE_TOKEN2,
+  CORE_QUEUE_TOKEN as CORE_QUEUE_TOKEN2,
+  CORE_TOKEN_SERVICE_TOKEN
+} from "@getstrata/core/contracts/serviceTokens.ts";
 var APP_PORT_CONFIG_KEY = "app.port";
 var CACHE_TTL_MS_CONFIG_KEY = "cache.ttlMs";
 var CACHE_MAX_ENTRIES_CONFIG_KEY = "cache.maxEntries";
@@ -430,7 +409,7 @@ class HttpKernel {
     this.dependencies = dependencies;
   }
   globalMiddleware() {
-    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN);
+    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN2);
     return [
       createCorsMiddleware(),
       createSecurityHeadersMiddleware(),
@@ -445,7 +424,7 @@ class HttpKernel {
     ];
   }
   group(name) {
-    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN);
+    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN2);
     switch (name) {
       case "authenticated":
         return [createRequireAuthMiddleware(auth)];
@@ -500,18 +479,18 @@ class HttpKernel {
     return this.wrapWebAuthenticated(handler);
   }
   wrapWebAuthenticated(handler) {
-    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN);
+    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN2);
     return withMiddleware(createRequireWebAuthMiddleware(auth))(handler);
   }
   wrapWebAbility(ability, handler) {
-    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN);
+    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN2);
     const abilityChecker = this.dependencies.container.resolve(CORE_TOKEN_SERVICE_TOKEN);
     const requireAbility = createRequireAbilityMiddleware(abilityChecker);
     const middleware = [createRequireWebAuthMiddleware(auth), requireAbility(ability)];
     return withMiddleware(...middleware)(handler);
   }
   wrapWebGlobalAdmin(handler) {
-    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN);
+    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN2);
     const middleware = [createRequireWebAuthMiddleware(auth), createRequireGlobalAdminMiddleware()];
     return withMiddleware(...middleware)(handler);
   }
@@ -535,8 +514,8 @@ class HttpKernel {
     return withMiddleware(...middleware)(handler);
   }
   wrapPolicy(resource, action, handler) {
-    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN);
-    const gate = this.dependencies.container.resolve(CORE_POLICY_GATE_TOKEN);
+    const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN2);
+    const gate = this.dependencies.container.resolve(CORE_POLICY_GATE_TOKEN2);
     return withMiddleware(createAuthorizeMiddleware(gate, auth, resource, action))(handler);
   }
   wrapLogin(handler) {