@apito-io/js-admin-sdk 2.1.1 → 2.5.0

package/src/client.ts

@@ -11,6 +11,11 @@ import {
   ApitoError,
   ValidationError,
   InjectedDBOperationInterface,
+  TenantLoginResponse,
+  TenantUser,
+  TenantUsersResponse,
+  TenantByDomainResponse,
+  TenantCatalogSearchRow,
 } from './types';
 
 /**
@@ -32,7 +37,9 @@ export class ApitoClient implements InjectedDBOperationInterface {
       timeout: config.timeout || 30000,
       headers: {
         'Content-Type': 'application/json',
-        'X-Apito-Key': this.apiKey,
+        ...(this.apiKey.startsWith('cli-') || this.apiKey.startsWith('sdk-')
+          ? { 'X-Apito-Sync-Key': this.apiKey }
+          : { 'X-Apito-Key': this.apiKey }),
       },
       ...config.httpClient,
     });
@@ -60,7 +67,9 @@ export class ApitoClient implements InjectedDBOperationInterface {
 
       const headers: Record<string, string> = {
         'Content-Type': 'application/json',
-        'X-Apito-Key': this.apiKey,
+        ...(this.apiKey.startsWith('cli-') || this.apiKey.startsWith('sdk-')
+          ? { 'X-Apito-Sync-Key': this.apiKey }
+          : { 'X-Apito-Key': this.apiKey }),
       };
 
       if (options?.tenantId || this.tenantId) {
@@ -96,18 +105,35 @@ export class ApitoClient implements InjectedDBOperationInterface {
   }
 
   /**
-   * Generate a new tenant token for the specified tenant ID
+   * Generate a tenant-scoped API key. Matches engine `generateTenantToken`: `tenant_id`, `duration`, optional `role`.
+   * Auth uses `X-Apito-Key` (client `apiKey`).
+   *
+   * @param tenantId Catalog tenant id (`tenant_id` in the mutation).
+   * @param duration Expiry calendar day `YYYY-MM-DD`. If omitted/empty, defaults to one year ahead in UTC.
+   * @param role Optional token role; if omitted/empty, the engine defaults to `admin`.
    */
-  async generateTenantToken(token: string, tenantId: string): Promise<string> {
+  async generateTenantToken(tenantId: string, duration?: string, role?: string): Promise<string> {
+    let dur = (duration ?? '').trim();
+    if (!dur) {
+      const d = new Date();
+      dur = `${d.getUTCFullYear() + 1}-${String(d.getUTCMonth() + 1).padStart(2, '0')}-${String(
+        d.getUTCDate()
+      ).padStart(2, '0')}`;
+    }
+
     const query = `
-      mutation GenerateTenantToken($token: String!, $tenantId: String!) {
-        generateTenantToken(token: $token, tenant_id: $tenantId) {
+      mutation GenerateTenantToken($tenantId: String!, $duration: String!, $role: String) {
+        generateTenantToken(tenant_id: $tenantId, duration: $duration, role: $role) {
           token
         }
       }
     `;
 
-    const variables = { token, tenantId };
+    const variables: Record<string, any> = {
+      tenantId,
+      duration: dur,
+      role: role !== undefined && role.trim() !== '' ? role.trim() : null,
+    };
     const response = await this.executeGraphQL(query, variables, { tenantId });
 
     const data = response.data?.generateTenantToken;
@@ -118,6 +144,184 @@ export class ApitoClient implements InjectedDBOperationInterface {
     return data.token;
   }
 
+  /**
+   * Tenant catalog login (system GraphQL). Returns a tenant-scoped `ak_` API token on success.
+   */
+  async loginTenantUser(
+    username: string,
+    password: string,
+    projectId: string
+  ): Promise<TenantLoginResponse> {
+    const query = `
+      query LoginTenantUser($project_id: String!, $username: String!, $password: String!) {
+        loginTenantUser(project_id: $project_id, username: $username, password: $password) {
+          token
+          user {
+            id
+            username
+            email
+            role
+            provider
+            tenant_id
+            status
+            created_at
+            updated_at
+          }
+        }
+      }
+    `;
+    const variables: Record<string, any> = { project_id: projectId, username, password };
+    const response = await this.executeGraphQL(query, variables);
+    const raw = response.data?.loginTenantUser;
+    if (!raw?.token) {
+      throw new ValidationError('Invalid response format for loginTenantUser');
+    }
+    return {
+      token: raw.token as string,
+      user: raw.user as TenantUser | undefined,
+    };
+  }
+
+  /**
+   * Google ID token login for tenant users (project must have google_client_id set).
+   */
+  async loginTenantUserGoogle(projectId: string, idToken: string): Promise<TenantLoginResponse> {
+    const query = `
+      mutation LoginTenantUserGoogle($project_id: String!, $id_token: String!) {
+        loginTenantUserGoogle(project_id: $project_id, id_token: $id_token) {
+          token
+          user {
+            id
+            username
+            email
+            role
+            provider
+            tenant_id
+            status
+            created_at
+            updated_at
+          }
+        }
+      }
+    `;
+    const variables = { project_id: projectId, id_token: idToken };
+    const response = await this.executeGraphQL(query, variables);
+    const raw = response.data?.loginTenantUserGoogle;
+    if (!raw?.token) {
+      throw new ValidationError('Invalid response format for loginTenantUserGoogle');
+    }
+    return {
+      token: raw.token as string,
+      user: raw.user as TenantUser | undefined,
+    };
+  }
+
+  /**
+   * Search tenant users for a project.
+   */
+  async searchTenantUsers(
+    projectId: string,
+    limit?: number,
+    offset?: number
+  ): Promise<TenantUsersResponse> {
+    const query = `
+      query SearchTenantUsers($project_id: String!, $limit: Int, $offset: Int) {
+        searchTenantUsers(project_id: $project_id, limit: $limit, offset: $offset) {
+          count
+          users {
+            id
+            username
+            email
+            role
+            provider
+            tenant_id
+            status
+            created_at
+            updated_at
+          }
+        }
+      }
+    `;
+    const variables: Record<string, any> = { project_id: projectId };
+    if (limit !== undefined) variables.limit = limit;
+    if (offset !== undefined) variables.offset = offset;
+    const response = await this.executeGraphQL(query, variables);
+    const raw = response.data?.searchTenantUsers;
+    if (!raw) {
+      throw new ValidationError('Invalid response format for searchTenantUsers');
+    }
+    let count = 0;
+    if (typeof raw.count === 'number') {
+      count = raw.count;
+    }
+    const users = (raw.users ?? []) as TenantUser[];
+    return { users, count };
+  }
+
+  /**
+   * Resolve the single SaaS catalog tenant for an exact domain match in the project (`tenant` null if none).
+   */
+  async searchTenantsByDomain(projectId: string, domain: string): Promise<TenantByDomainResponse> {
+    const query = `
+      query SearchTenantsByDomain($project_id: String!, $domain: String!) {
+        searchTenantsByDomain(project_id: $project_id, domain: $domain) {
+          tenant {
+            id
+            name
+            status
+            domain
+            data
+          }
+        }
+      }
+    `;
+    const variables: Record<string, any> = {
+      project_id: projectId,
+      domain,
+    };
+    const response = await this.executeGraphQL(query, variables);
+    const raw = response.data?.searchTenantsByDomain;
+    if (!raw) {
+      throw new ValidationError('Invalid response format for searchTenantsByDomain');
+    }
+    const tenant = (raw.tenant ?? null) as TenantCatalogSearchRow | null;
+    return { tenant };
+  }
+
+  /**
+   * Create a tenant catalog user (local password).
+   */
+  async createTenantUser(
+    projectId: string,
+    username: string,
+    email: string,
+    password: string,
+    role: string
+  ): Promise<TenantUser> {
+    const query = `
+      mutation CreateTenantUser($project_id: String!, $username: String!, $password: String!, $role: String, $email: String) {
+        createTenantUser(project_id: $project_id, username: $username, password: $password, role: $role, email: $email) {
+          id
+          username
+          email
+          role
+          provider
+          tenant_id
+          status
+          created_at
+          updated_at
+        }
+      }
+    `;
+    const variables = { project_id: projectId, username, password, email, role };
+    const response = await this.executeGraphQL(query, variables);
+    const u = response.data?.createTenantUser;
+    if (!u?.id) {
+      throw new ValidationError('Invalid response format for createTenantUser');
+    }
+    return u as TenantUser;
+  }
+
   /**
    * Get a single resource by model and ID
    */

package/src/types.ts

@@ -86,6 +86,42 @@ export interface CreateAndUpdateRequest {
   forceUpdate?: boolean;
 }
 
+/** Tenant catalog user from engine system DB (pro_tenant_users). */
+export interface TenantUser {
+  id: string;
+  username: string;
+  email?: string;
+  role: string;
+  tenant_id: string;
+  provider?: string;
+  status?: string;
+  created_at?: string;
+  updated_at?: string;
+}
+
+export interface TenantLoginResponse {
+  token: string;
+  user?: TenantUser;
+}
+
+export interface TenantUsersResponse {
+  users: TenantUser[];
+  count: number;
+}
+
+/** One SaaS catalog tenant row from searchTenantsByDomain. */
+export interface TenantCatalogSearchRow {
+  id: string;
+  name: string;
+  status?: string;
+  domain?: string;
+  data?: string;
+}
+
+export interface TenantByDomainResponse {
+  tenant: TenantCatalogSearchRow | null;
+}
+
 export interface ClientConfig {
   baseURL: string;
   apiKey: string;
@@ -120,7 +156,19 @@ export interface InjectedDBOperationInterface {
     variables?: Record<string, any>,
     options?: { tenantId?: string }
   ): Promise<GraphQLResponse>;
-  generateTenantToken(token: string, tenantId: string): Promise<string>;
+  /** @param token Legacy; ignored. Auth uses client API key. */
+  generateTenantToken(tenantId: string, duration?: string, role?: string): Promise<string>;
+  loginTenantUser(username: string, password: string, projectId: string): Promise<TenantLoginResponse>;
+  loginTenantUserGoogle(projectId: string, idToken: string): Promise<TenantLoginResponse>;
+  searchTenantUsers(projectId: string, limit?: number, offset?: number): Promise<TenantUsersResponse>;
+  searchTenantsByDomain(projectId: string, domain: string): Promise<TenantByDomainResponse>;
+  createTenantUser(
+    projectId: string,
+    username: string,
+    email: string,
+    password: string,
+    role: string
+  ): Promise<TenantUser>;
   getSingleResource(model: string, id: string, singlePageData?: boolean): Promise<DefaultDocumentStructure>;
   searchResources(model: string, filter?: Record<string, any>, aggregate?: boolean): Promise<SearchResult>;
   getRelationDocuments(id: string, connection: Record<string, any>): Promise<SearchResult>;

package/src/version.ts

@@ -1,7 +1,7 @@
 /**
  * Apito JavaScript internal SDK version (kept in sync with package.json for releases)
  */
-export const Version = '2.1.1';
+export const Version = '2.5.0';
 
 /**
  * GetVersion returns the current version of the SDK