@logto/cli 1.10.0 → 1.10.1

package/lib/commands/database/config.js

@@ -1,10 +1,10 @@
-import { defaultTenantId, LogtoOidcConfigKey, logtoConfigGuards, logtoConfigKeys, } from '@logto/schemas';
+import { defaultTenantId, LogtoOidcConfigKey, logtoConfigGuards, logtoConfigKeys, SupportedSigningKeyAlgorithm, } from '@logto/schemas';
 import { deduplicate, noop } from '@silverhand/essentials';
 import chalk from 'chalk';
 import { createPoolFromConfig } from '../../database.js';
 import { getRowsByKeys, updateValueByKey } from '../../queries/logto-config.js';
 import { consoleLog } from '../../utils.js';
-import { PrivateKeyType, generateOidcCookieKey, generateOidcPrivateKey } from './utils.js';
+import { generateOidcCookieKey, generateOidcPrivateKey } from './utils.js';
 const validKeysDisplay = chalk.green(logtoConfigKeys.join(', '));
 const validateKeys = (keys) => {
     const invalidKey = (Array.isArray(keys) ? keys : [keys]).find(
@@ -19,7 +19,10 @@ const validRotateKeys = Object.freeze([
     LogtoOidcConfigKey.PrivateKeys,
     LogtoOidcConfigKey.CookieKeys,
 ]);
-const validPrivateKeyTypes = Object.freeze([PrivateKeyType.RSA, PrivateKeyType.EC]);
+const validPrivateKeyTypes = Object.freeze([
+    SupportedSigningKeyAlgorithm.RSA,
+    SupportedSigningKeyAlgorithm.EC,
+]);
 const validateRotateKey = (key) => {
     // Using `.includes()` will result a type error
     // eslint-disable-next-line unicorn/prefer-includes
@@ -118,8 +121,9 @@ const rotateConfig = {
         default: 'ec',
     }),
     handler: async ({ key, tenantId, type }) => {
+        const keyType = type.toUpperCase();
         validateRotateKey(key);
-        validatePrivateKeyType(type);
+        validatePrivateKeyType(keyType);
         const pool = await createPoolFromConfig();
         const { rows } = await getRowsByKeys(pool, tenantId, [key]);
         if (!rows[0]) {
@@ -131,7 +135,7 @@ const rotateConfig = {
             // No need for default. It's already exhaustive
             switch (key) {
                 case LogtoOidcConfigKey.PrivateKeys: {
-                    return [await generateOidcPrivateKey(type), ...original];
+                    return [await generateOidcPrivateKey(keyType), ...original];
                 }
                 case LogtoOidcConfigKey.CookieKeys: {
                     return [generateOidcCookieKey(), ...original];

package/lib/commands/database/seed/oidc-config.js

@@ -1,11 +1,12 @@
 import { readFile } from 'node:fs/promises';
 import { LogtoOidcConfigKey, logtoConfigGuards } from '@logto/schemas';
+import { generateStandardId } from '@logto/shared';
 import { getEnvAsStringArray } from '@silverhand/essentials';
 import chalk from 'chalk';
 import { z } from 'zod';
 import { getRowsByKeys, updateValueByKey } from '../../../queries/logto-config.js';
 import { consoleLog } from '../../../utils.js';
-import { generateOidcCookieKey, generateOidcPrivateKey } from '../utils.js';
+import { buildOidcKeyFromRawString, generateOidcCookieKey, generateOidcPrivateKey, } from '../utils.js';
 const isBase64FormatPrivateKey = (key) => !key.includes('-');
 export const seedOidcConfigs = async (pool, tenantId) => {
     const tenantPrefix = `[${tenantId}]`;
@@ -67,20 +68,16 @@ export const oidcConfigReaders = {
         const privateKeys = getEnvAsStringArray('OIDC_PRIVATE_KEYS');
         if (privateKeys.length > 0) {
             return {
-                value: privateKeys.map((key) => {
-                    if (isBase64FormatPrivateKey(key)) {
-                        return Buffer.from(key, 'base64').toString('utf8');
-                    }
-                    return key;
-                }),
+                value: privateKeys.map((key) => buildOidcKeyFromRawString(isBase64FormatPrivateKey(key) ? Buffer.from(key, 'base64').toString('utf8') : key)),
                 fromEnv: true,
             };
         }
         // Read keys from files
         const privateKeyPaths = getEnvAsStringArray('OIDC_PRIVATE_KEY_PATHS');
         if (privateKeyPaths.length > 0) {
+            const privateKeys = await Promise.all(privateKeyPaths.map(async (path) => readFile(path, 'utf8')));
             return {
-                value: await Promise.all(privateKeyPaths.map(async (path) => readFile(path, 'utf8'))),
+                value: privateKeys.map((key) => buildOidcKeyFromRawString(key)),
                 fromEnv: true,
             };
         }
@@ -91,7 +88,11 @@ export const oidcConfigReaders = {
     },
     [LogtoOidcConfigKey.CookieKeys]: async () => {
         const envKey = 'OIDC_COOKIE_KEYS';
-        const keys = getEnvAsStringArray(envKey);
+        const keys = getEnvAsStringArray(envKey).map((key) => ({
+            id: generateStandardId(),
+            value: key,
+            createdAt: Math.floor(Date.now() / 1000),
+        }));
         return { value: keys.length > 0 ? keys : [generateOidcCookieKey()], fromEnv: keys.length > 0 };
     },
 };

package/lib/commands/database/utils.d.ts

@@ -1,6 +1,12 @@
-export declare enum PrivateKeyType {
-    RSA = "rsa",
-    EC = "ec"
-}
-export declare const generateOidcPrivateKey: (type?: PrivateKeyType) => Promise<string>;
-export declare const generateOidcCookieKey: () => string;
+import { type OidcConfigKey, SupportedSigningKeyAlgorithm } from '@logto/schemas';
+export declare const generateOidcPrivateKey: (type?: SupportedSigningKeyAlgorithm) => Promise<OidcConfigKey>;
+export declare const generateOidcCookieKey: () => {
+    id: string;
+    value: string;
+    createdAt: number;
+};
+export declare const buildOidcKeyFromRawString: (raw: string) => {
+    id: string;
+    value: string;
+    createdAt: number;
+};

package/lib/commands/database/utils.js

@@ -1,13 +1,9 @@
 import { generateKeyPair } from 'node:crypto';
 import { promisify } from 'node:util';
-import { generateStandardSecret } from '@logto/shared';
-export var PrivateKeyType;
-(function (PrivateKeyType) {
-    PrivateKeyType["RSA"] = "rsa";
-    PrivateKeyType["EC"] = "ec";
-})(PrivateKeyType || (PrivateKeyType = {}));
-export const generateOidcPrivateKey = async (type = PrivateKeyType.EC) => {
-    if (type === PrivateKeyType.RSA) {
+import { SupportedSigningKeyAlgorithm } from '@logto/schemas';
+import { generateStandardId, generateStandardSecret } from '@logto/shared';
+export const generateOidcPrivateKey = async (type = SupportedSigningKeyAlgorithm.EC) => {
+    if (type === SupportedSigningKeyAlgorithm.RSA) {
         const { privateKey } = await promisify(generateKeyPair)('rsa', {
             modulusLength: 4096,
             publicKeyEncoding: {
@@ -19,10 +15,10 @@ export const generateOidcPrivateKey = async (type = PrivateKeyType.EC) => {
                 format: 'pem',
             },
         });
-        return privateKey;
+        return buildOidcKeyFromRawString(privateKey);
     }
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (type === PrivateKeyType.EC) {
+    if (type === SupportedSigningKeyAlgorithm.EC) {
         const { privateKey } = await promisify(generateKeyPair)('ec', {
             // https://security.stackexchange.com/questions/78621/which-elliptic-curve-should-i-use
             namedCurve: 'secp384r1',
@@ -35,8 +31,13 @@ export const generateOidcPrivateKey = async (type = PrivateKeyType.EC) => {
                 format: 'pem',
             },
         });
-        return privateKey;
+        return buildOidcKeyFromRawString(privateKey);
     }
     throw new Error(`Unsupported private key ${String(type)}`);
 };
-export const generateOidcCookieKey = () => generateStandardSecret();
+export const generateOidcCookieKey = () => buildOidcKeyFromRawString(generateStandardSecret());
+export const buildOidcKeyFromRawString = (raw) => ({
+    id: generateStandardId(),
+    value: raw,
+    createdAt: Math.floor(Date.now() / 1000),
+});

package/lib/connector/factories.d.ts

@@ -1,2 +1,3 @@
+import type { BaseRoutes, Router } from '@withtyped/server';
 import type { ConnectorFactory, ConnectorPackage } from './types.js';
-export declare const loadConnectorFactories: (connectorPackages: ConnectorPackage[], ignoreVersionMismatch: boolean) => Promise<ConnectorFactory[]>;
+export declare const loadConnectorFactories: (connectorPackages: ConnectorPackage[], ignoreVersionMismatch: boolean) => Promise<ConnectorFactory<Router<any, BaseRoutes, string>>[]>;

package/lib/connector/factories.js

@@ -3,7 +3,7 @@ import { consoleLog } from '../utils.js';
 import { notImplemented } from './consts.js';
 import { loadConnector } from './loader.js';
 import { parseMetadata, validateConnectorModule } from './utils.js';
-// eslint-disable-next-line @silverhand/fp/no-let
+// eslint-disable-next-line @silverhand/fp/no-let, @typescript-eslint/no-explicit-any
 let cachedConnectorFactories;
 export const loadConnectorFactories = async (connectorPackages, ignoreVersionMismatch) => {
     if (cachedConnectorFactories) {
@@ -17,6 +17,7 @@ export const loadConnectorFactories = async (connectorPackages, ignoreVersionMis
             return {
                 metadata: await parseMetadata(rawConnector.metadata, packagePath),
                 type: rawConnector.type,
+                configGuard: rawConnector.configGuard,
                 createConnector,
                 path: packagePath,
             };
@@ -30,6 +31,8 @@ export const loadConnectorFactories = async (connectorPackages, ignoreVersionMis
         }
     }));
     // eslint-disable-next-line @silverhand/fp/no-mutation
-    cachedConnectorFactories = connectorFactories.filter((connectorFactory) => connectorFactory !== undefined);
+    cachedConnectorFactories = connectorFactories.filter(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (connectorFactory) => connectorFactory !== undefined);
     return cachedConnectorFactories;
 };

package/lib/connector/types.d.ts

@@ -1,9 +1,10 @@
 import type { AllConnector, CreateConnector } from '@logto/connector-kit';
+import type { BaseRoutes, Router } from '@withtyped/server';
 /**
  * Dynamic loaded connector type.
  */
-export type ConnectorFactory<T extends AllConnector = AllConnector> = Pick<T, 'type' | 'metadata'> & {
-    createConnector: CreateConnector<T>;
+export type ConnectorFactory<T extends Router<any, BaseRoutes, string>, U extends AllConnector = AllConnector> = Pick<U, 'type' | 'metadata' | 'configGuard'> & {
+    createConnector: CreateConnector<U, T>;
     path: string;
 };
 export type ConnectorPackage = {

package/lib/connector/utils.d.ts

@@ -1,11 +1,12 @@
 import type { AllConnector, BaseConnector, ConnectorMetadata, GetConnectorConfig, GetCloudServiceClient } from '@logto/connector-kit';
 import { ConnectorType } from '@logto/connector-kit';
+import type { BaseRoutes, Router } from '@withtyped/server';
 import type { ConnectorFactory } from './types.js';
 export declare function validateConnectorModule(connector: Partial<BaseConnector<ConnectorType>>): asserts connector is BaseConnector<ConnectorType>;
 export declare const readUrl: (url: string, baseUrl: string, type: 'text' | 'image') => Promise<string>;
 export declare const parseMetadata: (metadata: AllConnector['metadata'], packagePath: string) => Promise<AllConnector['metadata']>;
-export declare const buildRawConnector: <T extends AllConnector = AllConnector>(connectorFactory: ConnectorFactory<T>, getConnectorConfig?: GetConnectorConfig, getCloudServiceClient?: GetCloudServiceClient) => Promise<{
-    rawConnector: T;
+export declare const buildRawConnector: <T extends Router<any, BaseRoutes, string>, U extends AllConnector = AllConnector>(connectorFactory: ConnectorFactory<T, U>, getConnectorConfig?: GetConnectorConfig, getCloudServiceClient?: GetCloudServiceClient<T> | undefined) => Promise<{
+    rawConnector: U;
     rawMetadata: ConnectorMetadata;
 }>;
 export declare const isKeyInObject: <Key extends string>(object: unknown, key: Key) => object is Record<string, unknown> & Record<Key, unknown>;

package/lib/database.d.ts

@@ -9,4 +9,4 @@ export declare const createPoolFromConfig: () => Promise<import("slonik").Databa
  * @returns A new database pool with the database URL in config.
  */
 export declare const createPoolAndDatabaseIfNeeded: () => Promise<import("slonik").DatabasePool>;
-export declare const insertInto: <T extends SchemaLike>(object: T, table: string) => import("slonik").TaggedTemplateLiteralInvocation<import("slonik").QueryResultRow>;
+export declare const insertInto: <T extends SchemaLike<string>>(object: T, table: string) => import("slonik").TaggedTemplateLiteralInvocation<import("slonik").QueryResultRow>;

package/lib/package-json.d.ts

@@ -73,6 +73,7 @@ export declare const packageJson: {
     devDependencies: {
         "@silverhand/eslint-config": string;
         "@silverhand/ts-config": string;
+        "@withtyped/server": string;
         "@types/inquirer": string;
         "@types/jest": string;
         "@types/node": string;

package/lib/package-json.js

@@ -1,6 +1,6 @@
 export const packageJson = {
     "name": "@logto/cli",
-    "version": "1.10.0",
+    "version": "1.10.1",
     "description": "Logto CLI.",
     "author": "Silverhand Inc. <contact@silverhand.io>",
     "homepage": "https://github.com/logto-io/logto#readme",
@@ -43,12 +43,12 @@ export const packageJson = {
         "url": "https://github.com/logto-io/logto/issues"
     },
     "dependencies": {
-        "@logto/connector-kit": "workspace:^1.1.1",
+        "@logto/connector-kit": "workspace:^2.0.0",
         "@logto/core-kit": "workspace:^2.2.0",
         "@logto/language-kit": "workspace:^1.0.0",
-        "@logto/phrases": "workspace:^1.5.0",
+        "@logto/phrases": "workspace:^1.6.0",
         "@logto/phrases-experience": "workspace:^1.3.1",
-        "@logto/schemas": "workspace:1.10.0",
+        "@logto/schemas": "workspace:1.10.1",
         "@logto/shared": "workspace:^3.0.0",
         "@silverhand/essentials": "^2.8.4",
         "chalk": "^5.0.0",
@@ -57,7 +57,7 @@ export const packageJson = {
         "got": "^13.0.0",
         "hpagent": "^1.2.0",
         "inquirer": "^9.0.0",
-        "nanoid": "^4.0.0",
+        "nanoid": "^5.0.1",
         "ora": "^6.1.2",
         "p-limit": "^4.0.0",
         "p-queue": "^7.3.4",
@@ -71,11 +71,12 @@ export const packageJson = {
         "tar": "^6.1.11",
         "typescript": "^5.0.0",
         "yargs": "^17.6.0",
-        "zod": "^3.20.2"
+        "zod": "^3.22.3"
     },
     "devDependencies": {
         "@silverhand/eslint-config": "4.0.1",
         "@silverhand/ts-config": "4.0.0",
+        "@withtyped/server": "^0.12.9",
         "@types/inquirer": "^9.0.0",
         "@types/jest": "^29.4.0",
         "@types/node": "^18.11.18",
@@ -85,9 +86,9 @@ export const packageJson = {
         "@types/yargs": "^17.0.13",
         "eslint": "^8.44.0",
         "jest": "^29.5.0",
-        "lint-staged": "^14.0.0",
+        "lint-staged": "^15.0.0",
         "prettier": "^3.0.0",
-        "sinon": "^16.0.0"
+        "sinon": "^17.0.0"
     },
     "eslintConfig": {
         "extends": "@silverhand",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/cli",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "Logto CLI.",
   "author": "Silverhand Inc. <contact@silverhand.io>",
   "homepage": "https://github.com/logto-io/logto#readme",
@@ -28,12 +28,12 @@
     "url": "https://github.com/logto-io/logto/issues"
   },
   "dependencies": {
-    "@logto/connector-kit": "^1.1.1",
+    "@logto/connector-kit": "^2.0.0",
     "@logto/core-kit": "^2.2.0",
     "@logto/language-kit": "^1.0.0",
-    "@logto/phrases": "^1.5.0",
+    "@logto/phrases": "^1.6.0",
     "@logto/phrases-experience": "^1.3.1",
-    "@logto/schemas": "1.10.0",
+    "@logto/schemas": "1.10.1",
     "@logto/shared": "^3.0.0",
     "@silverhand/essentials": "^2.8.4",
     "chalk": "^5.0.0",
@@ -42,7 +42,7 @@
     "got": "^13.0.0",
     "hpagent": "^1.2.0",
     "inquirer": "^9.0.0",
-    "nanoid": "^4.0.0",
+    "nanoid": "^5.0.1",
     "ora": "^6.1.2",
     "p-limit": "^4.0.0",
     "p-queue": "^7.3.4",
@@ -56,11 +56,12 @@
     "tar": "^6.1.11",
     "typescript": "^5.0.0",
     "yargs": "^17.6.0",
-    "zod": "^3.20.2"
+    "zod": "^3.22.3"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "4.0.1",
     "@silverhand/ts-config": "4.0.0",
+    "@withtyped/server": "^0.12.9",
     "@types/inquirer": "^9.0.0",
     "@types/jest": "^29.4.0",
     "@types/node": "^18.11.18",
@@ -70,9 +71,9 @@
     "@types/yargs": "^17.0.13",
     "eslint": "^8.44.0",
     "jest": "^29.5.0",
-    "lint-staged": "^14.0.0",
+    "lint-staged": "^15.0.0",
     "prettier": "^3.0.0",
-    "sinon": "^16.0.0"
+    "sinon": "^17.0.0"
   },
   "eslintConfig": {
     "extends": "@silverhand",