@foir/sdk 0.20.0 → 0.22.0

package/dist/next.js

@@ -20,6 +20,26 @@ function createFoirCookieAdapter(store, opts = {}) {
 // src/graphql/foir-request.ts
 import { print as print2 } from "graphql";
 
+// src/transport/key-kind.ts
+var KEY_PREFIXES = [
+  ["foir_pub_", "publishable"],
+  ["foir_srv_", "server"],
+  ["foir_adm_", "admin"],
+  ["pk_", "publishable"],
+  ["sk_", "older"],
+  ["tc_", "older"]
+];
+function foirKeyKind(apiKey) {
+  if (typeof apiKey !== "string") return void 0;
+  for (const [prefix, kind] of KEY_PREFIXES) {
+    if (apiKey.startsWith(prefix)) return kind;
+  }
+  return void 0;
+}
+function isPublishableFoirKey(apiKey) {
+  return foirKeyKind(apiKey) === "publishable";
+}
+
 // src/graphql/cdn-route.ts
 import { print } from "graphql";
 
@@ -123,6 +143,28 @@ function refuseCredentialHeaders(extra) {
   }
 }
 var FOIR_VISITOR_IP_HEADER = "X-Foir-Visitor-IP";
+function sentCoordinate(value) {
+  return Math.round(value * 100) / 100;
+}
+async function resolveFoirVisitor(source) {
+  const value = typeof source === "function" ? await source() : source;
+  if (value === null || value === void 0) return { place: {} };
+  if (typeof value === "string") {
+    const address2 = value.trim();
+    return { address: address2 || void 0, place: {} };
+  }
+  const address = value.address?.trim();
+  const country = value.country?.trim();
+  const place = {};
+  if (country) place.country = country;
+  if (Number.isFinite(value.latitude) && Number.isFinite(value.longitude)) {
+    place.location = {
+      latitude: sentCoordinate(value.latitude),
+      longitude: sentCoordinate(value.longitude)
+    };
+  }
+  return { address: address || void 0, place };
+}
 function buildFoirHeaders(input) {
   const headers = {
     "Content-Type": "application/json"
@@ -169,8 +211,8 @@ var FoirAuthDowngradedError = class extends FoirRequestError {
   downgrade;
   constructor(downgrade) {
     super(
-      `[foir] your customer token was ${downgrade.customerToken} (${downgrade.reason}), so the request was served as ${downgrade.servedAs}`,
-      { graphQLErrors: [{ message: "customer token rejected", extensions: { code: "AUTH_DOWNGRADED" } }] }
+      `[foir] your user token was ${downgrade.userToken} (${downgrade.reason}), so the request was served as ${downgrade.servedAs}`,
+      { graphQLErrors: [{ message: "user token rejected", extensions: { code: "AUTH_DOWNGRADED" } }] }
     );
     this.name = "FoirAuthDowngradedError";
     this.downgrade = downgrade;
@@ -178,7 +220,7 @@ var FoirAuthDowngradedError = class extends FoirRequestError {
 };
 var FoirSessionExpiredError = class extends FoirRequestError {
   constructor(options) {
-    super("[foir] the customer session has expired and could not be refreshed: sign in again", {
+    super("[foir] the user session has expired and could not be refreshed: sign in again", {
       cause: options?.cause,
       graphQLErrors: [{ message: "session expired", extensions: { code: "SESSION_EXPIRED" } }]
     });
@@ -195,7 +237,7 @@ function reportAuthDowngrade(envelope) {
   if (warnedDowngrade === downgrade.reason) return;
   warnedDowngrade = downgrade.reason;
   console.warn(
-    `[foir] your customer token was ${downgrade.customerToken} (${downgrade.reason}) \u2014 this request was served as ${downgrade.servedAs}, so auth-targeted content resolved to its anonymous variant. ` + (downgrade.reason === "expired" ? "Re-exchange the token and retry." : "Check which credential you are sending.")
+    `[foir] your user token was ${downgrade.userToken} (${downgrade.reason}) \u2014 this request was served as ${downgrade.servedAs}, so auth-targeted content resolved to its anonymous variant. ` + (downgrade.reason === "expired" ? "Re-exchange the token and retry." : "Check which credential you are sending.")
   );
 }
 function refusePrunedDocument(json, options) {
@@ -739,10 +781,7 @@ function foirDataEndpoint(apiUrl, path) {
   return foirApiEndpoint(apiUrl, path);
 }
 async function resolveVisitorAddress(config) {
-  const source = config.visitor;
-  const value = typeof source === "function" ? await source() : source;
-  const address = value?.trim();
-  return address ? address : void 0;
+  return (await resolveFoirVisitor(config.visitor)).address;
 }
 async function resolveBearerToken(config) {
   const source = config.bearerToken;
@@ -783,7 +822,7 @@ async function resolveFoirAuth(config) {
   };
 }
 function foirRoute(input) {
-  if (!input.apiKey.startsWith("pk_")) return { lane: "origin", reason: "key" };
+  if (!isPublishableFoirKey(input.apiKey)) return { lane: "origin", reason: "key" };
   if (input.bearerToken) return { lane: "origin", reason: "bearer" };
   if (input.orgId || input.orgUrl) return { lane: "origin", reason: "org" };
   if (input.mutation) return { lane: "origin", reason: "operation" };
@@ -917,42 +956,63 @@ var AUTH_OPS = {
   authConfig: "authConfig",
   authProviders: "authProviders",
   defaultAuthProvider: "defaultAuthProvider",
-  customerSignupContext: "customerSignupContext",
+  signupContext: "signupContext",
   // Post-credential self reads.
   currentUser: "currentUser",
   myProviderToken: "myProviderToken",
-  // What the calling credential may do, and for a signed-in customer the roles
+  // What the calling credential may do, and for a signed-in user the roles
   // they hold. `./access` reads it.
   whoami: "whoami",
   // Methods.
-  customerLogin: "customerLogin",
-  customerRegister: "customerRegister",
-  customerRequestOTP: "customerRequestOTP",
-  customerLoginOTP: "customerLoginOTP",
+  login: "login",
+  register: "register",
+  requestOTP: "requestOTP",
+  loginWithOTP: "loginWithOTP",
   // Session lifecycle.
-  customerRefreshToken: "customerRefreshToken",
-  customerLogout: "customerLogout",
-  customerJoinWaitlist: "customerJoinWaitlist",
-  // Password management and account lifecycle — the block that had no path.
-  customerRequestPasswordReset: "customerRequestPasswordReset",
-  customerResetPassword: "customerResetPassword",
-  customerUpdatePassword: "customerUpdatePassword",
-  customerVerifyEmail: "customerVerifyEmail",
+  refreshToken: "refreshToken",
+  logout: "logout",
+  joinWaitlist: "joinWaitlist",
+  // Password management and account lifecycle.
+  requestPasswordReset: "requestPasswordReset",
+  resetPassword: "resetPassword",
+  updatePassword: "updatePassword",
+  verifyEmail: "verifyEmail",
   deleteMyAccount: "deleteMyAccount",
-  // The operator's organization context. TWO ops and no third: one to read
-  // which organizations the caller may stand in, one to say which. There is
-  // deliberately no per-call org argument anywhere in this SDK — the claim the
-  // row layer reads is resolved from the caller's own membership row on every
-  // request, so an application that never names an org cannot name the wrong
-  // one.
+  // The user's own profile, and the apps they have agreed may act for them.
+  updateMyProfile: "updateMyProfile",
+  myAuthorizedApps: "myAuthorizedApps",
+  revokeAuthorizedApp: "revokeAuthorizedApp",
+  // Where they are signed in, their personal access tokens, and the
+  // providers they sign in with.
+  mySessions: "mySessions",
+  endMySession: "endMySession",
+  signOutEverywhere: "signOutEverywhere",
+  createPersonalAccessToken: "createPersonalAccessToken",
+  mySignInMethods: "mySignInMethods",
+  connectSignInMethod: "connectSignInMethod",
+  disconnectSignInMethod: "disconnectSignInMethod",
+  // Their second factors. A change needs one proven first, by a step-up.
+  myFactors: "myFactors",
+  beginStepUp: "beginStepUp",
+  completeStepUp: "completeStepUp",
+  beginFactorEnrollment: "beginFactorEnrollment",
+  completeFactorEnrollment: "completeFactorEnrollment",
+  removeFactor: "removeFactor",
+  makeRecoveryCodes: "makeRecoveryCodes",
+  // The organizations the caller may stand in. Nothing selects one: a request
+  // names the organization it acts in (`orgId` or `orgUrl` below), and the
+  // platform checks the caller stands there every time.
   myOrganizations: "myOrganizations",
-  selectMyOrganization: "selectMyOrganization",
   // Founding one. Present in a manifest only when the project opted in.
-  registerOperatorOrganization: "registerOperatorOrganization",
+  registerOrganization: "registerOrganization",
   // External identity providers.
-  customerLoginWithProvider: "customerLoginWithProvider",
-  customerProviderCallback: "customerProviderCallback",
-  customerProviderVerifyOTP: "customerProviderVerifyOTP"
+  loginWithProvider: "loginWithProvider",
+  providerCallback: "providerCallback",
+  providerVerifyOTP: "providerVerifyOTP",
+  // A provider sign-in that names an address somebody already holds, waiting
+  // for the code sent to it.
+  confirmProviderLink: "confirmProviderLink",
+  resendProviderLinkCode: "resendProviderLinkCode"
 };
 function authClientConfig(env, options) {
   const apiKey = resolveFoirApiKey(env);
@@ -1015,58 +1075,58 @@ function stripUndefined(args) {
 // src/auth/auth.ts
 var TOKEN_KEY = "foir:token";
 var REFRESH_KEY = "foir:refreshToken";
-var CUSTOMER_ID_KEY = "foir:customerId";
+var USER_ID_KEY = "foir:userId";
 var EMAIL_KEY = "foir:email";
-async function customerLogin(env, vars) {
-  return authOp(env, AUTH_OPS.customerLogin, vars);
+async function login(env, vars) {
+  return authOp(env, AUTH_OPS.login, vars);
 }
-async function customerRegister(env, vars) {
-  return authOp(env, AUTH_OPS.customerRegister, vars);
+async function register(env, vars) {
+  return authOp(env, AUTH_OPS.register, vars);
 }
-async function customerLoginOTP(env, vars) {
-  return authOp(env, AUTH_OPS.customerLoginOTP, vars);
+async function loginWithOTP(env, vars) {
+  return authOp(env, AUTH_OPS.loginWithOTP, vars);
 }
-async function customerProviderCallback(env, input) {
-  return authOp(env, AUTH_OPS.customerProviderCallback, { input });
+async function providerCallback(env, input) {
+  return authOp(env, AUTH_OPS.providerCallback, { input });
 }
 async function saveSession(adapter, result) {
   await adapter.set(TOKEN_KEY, result.token);
   await adapter.set(REFRESH_KEY, result.refreshToken);
-  if (!result.customerId) {
-    return await getSessionCustomer(adapter) ?? { id: "", email: "" };
+  if (!result.userId) {
+    return await getSessionUser(adapter) ?? { id: "", email: "" };
   }
-  await adapter.set(CUSTOMER_ID_KEY, result.customerId);
+  await adapter.set(USER_ID_KEY, result.userId);
   await adapter.set(EMAIL_KEY, result.email);
-  return { id: result.customerId, email: result.email };
+  return { id: result.userId, email: result.email };
 }
 async function clearSession(adapter) {
   await adapter.unset(TOKEN_KEY);
   await adapter.unset(REFRESH_KEY);
-  await adapter.unset(CUSTOMER_ID_KEY);
+  await adapter.unset(USER_ID_KEY);
   await adapter.unset(EMAIL_KEY);
 }
 async function getSessionToken(adapter) {
   return await adapter.get(TOKEN_KEY) ?? null;
 }
-async function getSessionCustomer(adapter) {
-  const id = await adapter.get(CUSTOMER_ID_KEY) ?? null;
+async function getSessionUser(adapter) {
+  const id = await adapter.get(USER_ID_KEY) ?? null;
   const email = await adapter.get(EMAIL_KEY) ?? null;
   if (!id) return null;
   return { id, email: email ?? "" };
 }
-async function loginWithPassword(adapter, env, vars) {
-  return saveSession(adapter, await customerLogin(env, vars));
+async function signInWithPassword(adapter, env, vars) {
+  return saveSession(adapter, await login(env, vars));
 }
-async function registerWithPassword(adapter, env, vars) {
-  return saveSession(adapter, await customerRegister(env, vars));
+async function signUpWithPassword(adapter, env, vars) {
+  return saveSession(adapter, await register(env, vars));
 }
-async function loginWithOTP(adapter, env, vars) {
-  return saveSession(adapter, await customerLoginOTP(env, vars));
+async function signInWithOTP(adapter, env, vars) {
+  return saveSession(adapter, await loginWithOTP(env, vars));
 }
 
 // src/next/session.ts
 async function getFoirSession(store) {
-  return getSessionCustomer(createFoirCookieAdapter(store));
+  return getSessionUser(createFoirCookieAdapter(store));
 }
 async function getFoirToken(store) {
   return getSessionToken(createFoirCookieAdapter(store));
@@ -1081,7 +1141,7 @@ function foirSignInWithPassword({
   password,
   cookieOptions
 }) {
-  return loginWithPassword(createFoirCookieAdapter(store, { cookieOptions }), env, {
+  return signInWithPassword(createFoirCookieAdapter(store, { cookieOptions }), env, {
     email,
     password
   });
@@ -1093,7 +1153,7 @@ function foirRegisterWithPassword({
   password,
   cookieOptions
 }) {
-  return registerWithPassword(createFoirCookieAdapter(store, { cookieOptions }), env, {
+  return signUpWithPassword(createFoirCookieAdapter(store, { cookieOptions }), env, {
     email,
     password
   });
@@ -1105,13 +1165,13 @@ function foirSignInWithOtp({
   otp,
   cookieOptions
 }) {
-  return loginWithOTP(createFoirCookieAdapter(store, { cookieOptions }), env, {
+  return signInWithOTP(createFoirCookieAdapter(store, { cookieOptions }), env, {
     email,
     otp
   });
 }
 async function completeFoirProviderLogin(opts) {
-  const result = await customerProviderCallback(opts.env, {
+  const result = await providerCallback(opts.env, {
     providerKey: opts.providerKey,
     code: opts.code,
     state: opts.state

package/dist/placement/index.d.ts

@@ -1,11 +1,11 @@
 /**
- * `@foir/sdk/placement`: your app's own admin console, shown inside Foir's.
+ * `@foir/sdk/placement`: your app's own console, shown inside Foir's.
  *
  * A full-page placement is loaded in a frame on the Foir console. No cookie
  * reaches a cross-site frame, so the console hands the page a short-lived token
  * instead, by message, to your placement's origin only. The token is the
- * operator looking at the page, acting through your app at the level your app
- * is installed at, carrying what your placement declares and this operator
+ * person looking at the page, acting through your app at the level your app
+ * is installed at, carrying what your placement declares and this person
  * holds, as grants in the permission catalogue's names. Your page runs no
  * login of its own.
  *
@@ -21,7 +21,7 @@
  * ```
  *
  * The console also tells the page how it looks, so the page can match it: pass
- * `onAppearance` and apply the theme it names. The operator's console theme is
+ * `onAppearance` and apply the theme it names. Their console theme is
  * their own setting and need not be their system's.
  *
  * The browser shows the page blank, however well it is authenticated, unless
@@ -40,7 +40,7 @@ export declare const PLACEMENT_MESSAGE: {
     readonly refresh: "foir:placement:refresh";
     /** Console to page: no token, and why. */
     readonly refused: "foir:placement:refused";
-    /** Console to page: the operator signed out. */
+    /** Console to page: the person signed out. */
     readonly signedOut: "foir:placement:signed-out";
     /** Console to page: how the console looks, now and whenever it changes. */
     readonly appearance: "foir:placement:appearance";
@@ -55,7 +55,7 @@ export interface PlacementGrant {
     orgId: string;
     /**
      * What the token carries: the grants your placement declares that this
-     * operator holds, in the permission catalogue's names. A grant the operator
+     * person holds, in the permission catalogue's names. A grant the person
      * holds part of is carried as that part, so ask with `can` and not by
      * looking for a spelling here.
      */
@@ -65,30 +65,13 @@ export interface PlacementGrant {
         grant: string;
         reason: string;
     }[];
-    /**
-     * @deprecated Read `grants`. The same list under the name it had before a
-     * placement declared grants.
-     */
-    grantedScopes: string[];
-    /**
-     * @deprecated Read `withheldGrants`. The same list under the name it had
-     * before a placement declared grants.
-     */
-    withheld: {
-        scope: string;
-        reason: string;
-    }[];
 }
-/**
- * What a console sends with a token. A console of the release before sends
- * only `grantedScopes` and `withheld`, and the session reads `grants` from
- * those.
- */
-type PlacementGrantMessage = Pick<PlacementGrant, 'accessToken' | 'expiresAt' | 'orgId'> & Partial<Pick<PlacementGrant, 'grants' | 'withheldGrants' | 'grantedScopes' | 'withheld'>>;
+/** What a console sends with a token. A list it does not send is an empty one. */
+type PlacementGrantMessage = Pick<PlacementGrant, 'accessToken' | 'expiresAt' | 'orgId'> & Partial<Pick<PlacementGrant, 'grants' | 'withheldGrants'>>;
 /** How the console looks, for an embedded page to match. */
 export interface PlacementAppearance {
     /**
-     * The console's theme as the operator sees it: their own choice, or their
+     * The console's theme as the person sees it: their own choice, or their
      * system's when they left it to the system.
      */
     theme: 'light' | 'dark';
@@ -114,7 +97,7 @@ export type PlacementPageMessage = {
 };
 /**
  * The Foir consoles, per environment. A project that serves the console on its
- * own verified admin domain adds that origin too: the install preview lists it.
+ * own verified console domain adds that origin too: the install preview lists it.
  */
 export declare const FOIR_CONSOLE_ORIGINS: {
     readonly production: readonly ["https://app.foir.io"];
@@ -144,7 +127,7 @@ export interface ConnectPlacementOptions {
     refreshBeforeMs?: number;
     /**
      * Called with how the console looks: once as soon as the console says, which
-     * is before the token arrives, and again whenever the operator changes it.
+     * is before the token arrives, and again whenever the person changes it.
      * Apply it instead of the system's preference, so the page matches the
      * console it is shown in.
      */
@@ -160,22 +143,22 @@ export interface PlacementSession {
     readonly grant: PlacementGrant;
     /**
      * How the console looks now, or null when the console has not said (a console
-     * older than this). Kept current as the operator changes it.
+     * older than this). Kept current as the person changes it.
      */
     readonly appearance: PlacementAppearance | null;
     /**
-     * Whether the token covers this grant, to hide or grey out what the operator
+     * Whether the token covers this grant, to hide or grey out what the person
      * cannot do. It answers as Foir's API would: a grant for every model covers
      * the same grant for one, and one for every owner's rows covers a person's
      * own. `can('records:read.all:order')` is true for a token that carries
      * `records:read.all`.
      */
     can(grant: string): boolean;
-    /** A GraphQL request to Foir's API as the operator, through your app. */
+    /** A GraphQL request to Foir's API as the person, through your app. */
     request<TResult = unknown>(document: string | {
         toString(): string;
     }, variables?: Record<string, unknown>): Promise<TResult>;
-    /** Called when the operator signs out; the session holds no token from then on. */
+    /** Called when the person signs out; the session holds no token from then on. */
     onSignedOut(listener: () => void): () => void;
     /** Stop listening and refreshing. */
     close(): void;

package/dist/placement.js

@@ -1,9 +1,9 @@
 // src/auth/grant-table.generated.ts
 var GRANT_TABLE = [
-  ["records:read", true, ["own", "named", "all"], []],
+  ["records:read", true, ["own", "all"], []],
   ["records:create", true, [], []],
-  ["records:write", true, ["own", "named", "all"], []],
-  ["records:delete", true, ["own", "named", "all"], []],
+  ["records:write", true, ["own", "all"], []],
+  ["records:delete", true, ["own", "all"], []],
   ["records:publish", true, ["own", "all"], []],
   ["records:attribute", true, [], []],
   ["search:read", true, [], []],
@@ -19,8 +19,8 @@ var GRANT_TABLE = [
   ["notifications:consent", false, [], []],
   ["pushcredentials:read", false, [], []],
   ["pushcredentials:write", false, [], []],
-  ["notes:read", false, [], []],
-  ["notes:write", false, [], []],
+  ["notes:read", false, ["own", "all"], []],
+  ["notes:write", false, ["own", "all"], []],
   ["notes:create", false, [], []],
   ["approvals:read", false, [], []],
   ["approvals:write", false, [], []],
@@ -77,7 +77,8 @@ var GRANT_TABLE = [
   ["roles:write", false, [], []],
   ["projects:read", false, [], []],
   ["projects:write", false, [], []],
-  ["project:manage", false, [], ["records:read.all", "records:create", "records:write.all", "records:delete.all", "records:publish.all", "records:attribute", "search:read", "embeddings:read", "embeddings:write", "schemas:read", "drafts:read", "files:read.all", "files:write.all", "files:delete.all", "users:read.all", "identities:read", "users:create", "identities:delete", "users:write.all", "users:delete.all", "notifications:read.all", "notifications:write.all", "notifications:consent", "pushcredentials:read", "pushcredentials:write", "notes:read", "notes:write", "notes:create", "approvals:read", "approvals:write", "rooms:read", "rooms:write", "presence:read", "operations:read", "operations:execute", "operations:write", "appconfig:read", "schedules:read", "schedules:write", "hooks:read", "hooks:write", "auth:login_with_foir", "relyingparties:read", "relyingparties:write", "domains:read", "domains:write", "secrets:read", "secrets:list", "secrets:put", "secrets:delete", "appsecrets:read", "appsecrets:list", "appsecrets:put", "appsecrets:delete", "usersecrets:read", "usersecrets:list", "usersecrets:put", "usersecrets:delete", "opsecrets:read", "opsecrets:write", "settings:read", "settings:write", "designtokens:read", "designtokens:write", "models:read", "models:write", "configs:read", "configs:write", "signinproviders:read", "signinproviders:write", "apps:read", "apps:write", "events:read", "targeting:debug", "visitors:forward", "apikeys:read", "apikeys:write", "organizations:read", "organizations:create", "organizations:delete", "organizations:write", "organizations:reach", "members:read", "members:write", "roles:read", "roles:write", "projects:read", "projects:write"]],
+  ["project:stand", false, [], []],
+  ["project:manage", false, [], ["project:stand", "records:read.all", "records:create", "records:write.all", "records:delete.all", "records:publish.all", "records:attribute", "search:read", "embeddings:read", "embeddings:write", "schemas:read", "drafts:read", "files:read.all", "files:write.all", "files:delete.all", "users:read.all", "identities:read", "users:create", "identities:delete", "users:write.all", "users:setup", "users:delete.all", "notifications:read.all", "notifications:write.all", "notifications:consent", "pushcredentials:read", "pushcredentials:write", "notes:read.all", "notes:write.all", "notes:create", "approvals:read", "approvals:write", "rooms:read", "rooms:write", "presence:read", "operations:read", "operations:execute", "operations:write", "appconfig:read", "schedules:read", "schedules:write", "hooks:read", "hooks:write", "auth:login_with_foir", "relyingparties:read", "relyingparties:write", "domains:read", "domains:write", "secrets:read", "secrets:list", "secrets:put", "secrets:delete", "appsecrets:read", "appsecrets:list", "appsecrets:put", "appsecrets:delete", "usersecrets:read", "usersecrets:list", "usersecrets:put", "usersecrets:delete", "opsecrets:read", "opsecrets:write", "settings:read", "settings:write", "designtokens:read", "designtokens:write", "models:read", "models:write", "configs:read", "configs:write", "signinproviders:read", "signinproviders:write", "apps:read", "apps:write", "events:read", "targeting:debug", "visitors:forward", "apikeys:read", "apikeys:write", "organizations:read", "organizations:create", "organizations:delete", "organizations:write", "organizations:reach", "members:read", "members:write", "roles:read", "roles:write", "projects:read", "projects:write", "audit:read"]],
   ["projects:create", false, [], []],
   ["projects:delete", false, [], []],
   ["tenants:read", false, [], []],
@@ -90,12 +91,14 @@ var GRANT_TABLE = [
   ["usage:read", false, [], []],
   ["controlkeys:read", false, [], []],
   ["controlkeys:write", false, [], []],
+  ["tenantsigninproviders:read", false, [], []],
+  ["tenantsigninproviders:write", false, [], []],
   ["tenanthooks:read", false, [], []],
   ["tenanthooks:write", false, [], []],
   ["apps:install", false, [], []],
-  ["tenant:manage", false, [], ["project:manage", "projects:create", "projects:delete", "tenants:read", "tenants:write", "tenants:delete", "audit:read", "export:run", "billing:read", "billing:manage", "usage:read", "controlkeys:read", "controlkeys:write", "tenanthooks:read", "tenanthooks:write", "apps:install"]],
+  ["tenant:manage", false, [], ["project:manage", "projects:create", "projects:delete", "tenants:read", "tenants:write", "tenants:delete", "export:run", "billing:read", "billing:manage", "usage:read", "controlkeys:read", "controlkeys:write", "tenanthooks:read", "tenanthooks:write", "tenantsigninproviders:read", "tenantsigninproviders:write", "apps:install"]],
   ["platform:read", false, [], []],
-  ["platform:manage", false, [], ["tenant:manage", "platform:read", "platform:create_workspace", "users:setup"]],
+  ["platform:manage", false, [], ["tenant:manage", "platform:read", "platform:create_workspace"]],
   ["platform:create_workspace", false, [], []],
   ["users:read", false, ["own", "named", "all"], []],
   ["users:write", false, ["own", "all"], []],
@@ -202,7 +205,7 @@ var PLACEMENT_MESSAGE = {
   refresh: "foir:placement:refresh",
   /** Console to page: no token, and why. */
   refused: "foir:placement:refused",
-  /** Console to page: the operator signed out. */
+  /** Console to page: the person signed out. */
   signedOut: "foir:placement:signed-out",
   /** Console to page: how the console looks, now and whenever it changes. */
   appearance: "foir:placement:appearance"
@@ -210,27 +213,22 @@ var PLACEMENT_MESSAGE = {
 function strings(value) {
   return Array.isArray(value) ? value.filter((v) => typeof v === "string") : null;
 }
-function reasons(value, key) {
+function reasons(value) {
   if (!Array.isArray(value)) return null;
   const out = [];
   for (const entry of value) {
     const e = entry;
-    if (typeof e?.[key] === "string") out.push({ name: e[key], reason: typeof e.reason === "string" ? e.reason : "" });
+    if (typeof e?.grant === "string") out.push({ grant: e.grant, reason: typeof e.reason === "string" ? e.reason : "" });
   }
   return out;
 }
 function grantFrom(sent) {
-  const grants = strings(sent.grants) ?? strings(sent.grantedScopes) ?? [];
-  const withheld = reasons(sent.withheldGrants, "grant") ?? reasons(sent.withheld, "scope") ?? [];
-  const before = reasons(sent.withheld, "scope") ?? withheld;
   return {
     accessToken: sent.accessToken,
     expiresAt: sent.expiresAt,
     orgId: sent.orgId,
-    grants,
-    withheldGrants: withheld.map((w) => ({ grant: w.name, reason: w.reason })),
-    grantedScopes: strings(sent.grantedScopes) ?? grants,
-    withheld: before.map((w) => ({ scope: w.name, reason: w.reason }))
+    grants: strings(sent.grants) ?? [],
+    withheldGrants: reasons(sent.withheldGrants) ?? []
   };
 }
 var FOIR_CONSOLE_ORIGINS = {
@@ -301,7 +299,7 @@ function connectPlacement(options) {
     };
     const session = {
       get grant() {
-        if (!grant) throw new PlacementRefused("the operator has signed out");
+        if (!grant) throw new PlacementRefused("the person using the console has signed out");
         return grant;
       },
       get appearance() {
@@ -311,7 +309,7 @@ function connectPlacement(options) {
       // names a placement declared then; and by what the list covers.
       can: (asked) => grant ? grant.grants.includes(asked) || holds(grant.grants, asked) : false,
       async request(document, variables) {
-        if (!grant) throw new PlacementRefused("the operator has signed out");
+        if (!grant) throw new PlacementRefused("the person using the console has signed out");
         const res = await doFetch(`${apiUrl}/graphql`, {
           method: "POST",
           headers: { "content-type": "application/json", authorization: `Bearer ${grant.accessToken}` },