@crowdin/app-project-module 0.108.0 → 1.0.0

package/out/storage/index.js

@@ -41,6 +41,7 @@ const logger_1 = require("../util/logger");
 const mysql_1 = require("./mysql");
 const postgre_1 = require("./postgre");
 const sqlite_1 = require("./sqlite");
+const d1_1 = require("./d1");
 const path_1 = __importStar(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const child_process_1 = require("child_process");
@@ -62,7 +63,13 @@ exports.TABLES = {
 let storage;
 function initialize(config) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (config.postgreConfig) {
+        if (config.d1Config) {
+            (0, logger_1.log)('Using Cloudflare D1 database');
+            storage = new d1_1.D1Storage(config.d1Config);
+            // Skip migration for D1 - it will be done lazily on first request
+            return;
+        }
+        else if (config.postgreConfig) {
             (0, logger_1.log)('Using PostgreSQL database');
             let dumpDirectory = null;
             if (config.migrateToPostgreFromSQLite) {

package/out/storage/mysql.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySQLStorage = void 0;
-const uuid_1 = require("uuid");
+const crypto_1 = require("crypto");
 const types_1 = require("../modules/integration/util/types");
 const util_1 = require("../util");
 class MySQLStorage {
@@ -124,23 +124,23 @@ class MySQLStorage {
             config          text
         )`,
             job: `(
-            id              varchar(255) not null primary key,
-            integration_id  varchar(255) not null,
-            crowdin_id      varchar(255) not null,
-            type            varchar(255) not null,
-            payload         text,
-            title           text,
-            progress        int 0,
-            status          varchar(255)     '${types_1.JobStatus.CREATED}',
-            payload         text,
-            info            text,
-            data            text,
-            attempt         int 0,
-            errors          text,
-            processed_entities text,
-            created_at      varchar(255) not null,
-            updated_at      varchar(255),
-            finished_at     varchar(255)
+            id                  varchar(255) not null primary key,
+            integration_id      varchar(255) not null,
+            crowdin_id          varchar(255) not null,
+            type                varchar(255) not null,
+            payload             text,
+            title               text,
+            progress            int 0,
+            status              varchar(255)     '${types_1.JobStatus.CREATED}',
+            payload             text,
+            info                text,
+            data                text,
+            attempt             int 0,
+            errors              text,
+            processed_entities  text,
+            created_at          varchar(255) not null,
+            updated_at          varchar(255),
+            finished_at         varchar(255)
         )`,
             translation_file_cache: `(
             id              int auto_increment primary key,
@@ -338,7 +338,10 @@ class MySQLStorage {
                 yield connection.execute('DELETE FROM sync_settings where integration_id = ?', [id]);
                 yield connection.execute('DELETE FROM files_snapshot where integration_id = ?', [id]);
                 yield connection.execute('DELETE FROM webhooks where integration_id = ?', [id]);
+                yield connection.execute('DELETE FROM user_errors where integration_id = ?', [id]);
+                yield connection.execute('DELETE FROM integration_settings where integration_id = ?', [id]);
                 yield connection.execute('DELETE FROM job where integration_id = ?', [id]);
+                yield connection.execute('DELETE FROM translation_file_cache where integration_id = ?', [id]);
                 yield connection.execute('DELETE FROM unsynced_files where integration_id = ?', [id]);
                 yield connection.execute('DELETE FROM synced_data where integration_id = ?', [id]);
             }));
@@ -598,7 +601,7 @@ class MySQLStorage {
     }
     createJob({ integrationId, crowdinId, type, title, payload }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const id = (0, uuid_1.v4)();
+            const id = (0, crypto_1.randomUUID)();
             yield this.dbPromise;
             yield this.executeQuery((connection) => connection.execute(`
                 INSERT INTO job(id, integration_id, crowdin_id, type, payload, title, created_at)

package/out/storage/postgre.d.ts

@@ -48,7 +48,6 @@ export declare class PostgreStorage implements Storage {
     executeQuery<T>(command: (client: Client) => Promise<T>): Promise<T>;
     private hasDumpFiles;
     migrate(): Promise<void>;
-    alterTables(client: Client): Promise<void>;
     addColumns(client: Client, newColumns: string[], tableName: string): Promise<void>;
     addColumn(client: Client, columnName: string, tableName: string, columnType: string): Promise<void>;
     addTables(client: Client): Promise<void>;

package/out/storage/postgre.js

@@ -15,7 +15,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgreStorage = void 0;
 const pg_1 = require("pg");
-const uuid_1 = require("uuid");
 const crypto_1 = require("crypto");
 const types_1 = require("../types");
 const types_2 = require("../modules/integration/util/types");
@@ -91,22 +90,22 @@ class PostgreStorage {
             config          varchar
         )`,
             job: `(
-            id              varchar not null primary key,
-            integration_id  varchar not null,
-            crowdin_id      varchar not null,
-            type            varchar not null,
-            title           varchar     null,
-            progress        int default 0,
-            status          varchar default '${types_2.JobStatus.CREATED}',
-            payload         varchar     null,
-            info            varchar     null,
-            data            varchar     null,
-            attempt         int default 0,
-            errors          varchar     null,
-            processed_entities varchar     null,
-            created_at      varchar not null,
-            updated_at      varchar     null,
-            finished_at     varchar     null
+            id                  varchar not null primary key,
+            integration_id      varchar not null,
+            crowdin_id          varchar not null,
+            type                varchar not null,
+            title               varchar     null,
+            progress            int default 0,
+            status              varchar default '${types_2.JobStatus.CREATED}',
+            payload             varchar     null,
+            info                varchar     null,
+            data                varchar     null,
+            attempt             int default 0,
+            errors              varchar     null,
+            processed_entities  varchar     null,
+            created_at          varchar not null,
+            updated_at          varchar     null,
+            finished_at         varchar     null
         )`,
             translation_file_cache: `(
             id              serial primary key,
@@ -222,8 +221,6 @@ class PostgreStorage {
                     yield client.query('SELECT pg_advisory_lock($1)', [this.migrationLockId]);
                     try {
                         yield this.addTables(client);
-                        // TODO: temporary code
-                        yield this.alterTables(client);
                     }
                     finally {
                         yield client.query('SELECT pg_advisory_unlock($1)', [this.migrationLockId]);
@@ -237,16 +234,6 @@ class PostgreStorage {
             }
         });
     }
-    alterTables(client) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.addColumns(client, ['crowdin_id'], 'app_metadata');
-            yield this.addColumns(client, ['agent_id'], 'crowdin_credentials');
-            yield this.addColumn(client, 'attempt', 'job', 'int default 0');
-            yield this.addColumn(client, 'errors', 'job', 'varchar NULL');
-            yield this.addColumn(client, 'processed_entities', 'job', 'varchar NULL');
-            yield this.addColumn(client, 'managers', 'integration_credentials', 'varchar NULL');
-        });
-    }
     addColumns(client, newColumns, tableName) {
         return __awaiter(this, void 0, void 0, function* () {
             const tableInfo = yield client.query('SELECT column_name FROM information_schema.columns WHERE table_name = $1', [tableName]);
@@ -402,7 +389,10 @@ class PostgreStorage {
                 yield client.query('DELETE FROM sync_settings where integration_id = $1', [id]);
                 yield client.query('DELETE FROM files_snapshot where integration_id = $1', [id]);
                 yield client.query('DELETE FROM webhooks where integration_id = $1', [id]);
+                yield client.query('DELETE FROM user_errors where integration_id = $1', [id]);
+                yield client.query('DELETE FROM integration_settings where integration_id = $1', [id]);
                 yield client.query('DELETE FROM job where integration_id = $1', [id]);
+                yield client.query('DELETE FROM translation_file_cache where integration_id = $1', [id]);
                 yield client.query('DELETE FROM unsynced_files where integration_id = $1', [id]);
                 yield client.query('DELETE FROM synced_data where integration_id = $1', [id]);
             }));
@@ -655,7 +645,7 @@ class PostgreStorage {
     }
     createJob({ integrationId, crowdinId, type, payload, title }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const id = (0, uuid_1.v4)();
+            const id = (0, crypto_1.randomUUID)();
             yield this.dbPromise;
             yield this.executeQuery((client) => client.query(`
                     INSERT

package/out/storage/sqlite.d.ts

@@ -1,7 +1,7 @@
 import { Storage } from '.';
-import { CrowdinCredentials } from '../types';
 import { IntegrationConfig, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncSettings, IntegrationWebhooks } from '../modules/integration/types';
-import { CreateJobParams, GetActiveJobsParams, GetJobParams, GetFileTranslationCacheByLanguageParams, Job, TranslationCache, UpdateJobParams, UpdateTranslationCacheParams, GetFileTranslationCache, UnsyncedFiles, GetUnsyncedFiles, IntegrationSyncedData, GetAllJobsParams } from '../modules/integration/util/types';
+import { CreateJobParams, GetActiveJobsParams, GetAllJobsParams, GetFileTranslationCache, GetFileTranslationCacheByLanguageParams, GetJobParams, GetUnsyncedFiles, IntegrationSyncedData, Job, TranslationCache, UnsyncedFiles, UpdateJobParams, UpdateTranslationCacheParams } from '../modules/integration/util/types';
+import { CrowdinCredentials } from '../types';
 import { UserErrors } from './types';
 export interface SQLiteStorageConfig {
     dbFolder: string;
@@ -34,9 +34,6 @@ export declare class SQLiteStorage implements Storage {
     private removeColumns;
     private addColumns;
     private addColumn;
-    private updateTables;
-    private moveIntegrationSettings;
-    private migrateManagers;
     migrate(): Promise<void>;
     saveCrowdinCredentials(credentials: CrowdinCredentials): Promise<void>;
     updateCrowdinCredentials(credentials: CrowdinCredentials): Promise<void>;

package/out/storage/sqlite.js

@@ -12,9 +12,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLiteStorage = void 0;
 const path_1 = require("path");
-const uuid_1 = require("uuid");
-const types_1 = require("../types");
-const types_2 = require("../modules/integration/util/types");
+const crypto_1 = require("crypto");
+const types_1 = require("../modules/integration/util/types");
+const types_2 = require("../types");
 class SQLiteStorage {
     constructor(config) {
         this.dbPromise = new Promise((res, rej) => {
@@ -84,22 +84,22 @@ class SQLiteStorage {
             config         varchar     null
         )`,
             job: `(
-            id             varchar not null primary key,
-            integration_id varchar not null,
-            crowdin_id     varchar not null,
-            type           varchar not null,
-            title          varchar     null,
-            progress       integer DEFAULT 0,
-            status         varchar DEFAULT '${types_2.JobStatus.CREATED}',
-            payload        varchar     null,
-            info           varchar     null,
-            data           varchar     null,
-            attempt        varchar DEFAULT 0,
-            errors         varchar     null,
-            processed_entities varchar     null,
-            created_at     varchar not null,
-            updated_at     varchar     null,
-            finished_at    varchar     null
+            id                  varchar not null primary key,
+            integration_id      varchar not null,
+            crowdin_id          varchar not null,
+            type                varchar not null,
+            title               varchar     null,
+            progress            integer DEFAULT 0,
+            status              varchar DEFAULT '${types_1.JobStatus.CREATED}',
+            payload             varchar     null,
+            info                varchar     null,
+            data                varchar     null,
+            attempt             varchar DEFAULT 0,
+            errors              varchar     null,
+            processed_entities  varchar     null,
+            created_at          varchar not null,
+            updated_at          varchar     null,
+            finished_at         varchar     null
         )`,
             translation_file_cache: `(
             id             integer not null primary key autoincrement,
@@ -228,47 +228,6 @@ class SQLiteStorage {
             }
         });
     }
-    updateTables() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.addColumns(['app_secret', 'domain', 'user_id', 'agent_id', 'organization_id', 'base_url'], 'crowdin_credentials');
-            yield this.addColumns(['crowdin_id'], 'app_metadata');
-            yield this.addColumn('job', 'attempt', 'DEFAULT 0');
-            yield this.addColumn('job', 'errors', 'null');
-            yield this.addColumn('job', 'processed_entities', 'null');
-            yield this.addColumn('integration_credentials', 'managers', 'null');
-        });
-    }
-    moveIntegrationSettings() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const integrationCredentials = yield this.each('SELECT * FROM integration_credentials', []);
-            for (const credentials of integrationCredentials) {
-                if (credentials.config) {
-                    yield this.saveIntegrationConfig(credentials.id, credentials.crowdin_id, credentials.config);
-                }
-            }
-            yield this.removeColumns('config', 'integration_credentials');
-        });
-    }
-    migrateManagers() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tableInfo = yield this.each('PRAGMA table_info(integration_credentials);', []);
-            const exists = tableInfo.some((columnInfo) => columnInfo.name === 'managers');
-            if (exists) {
-                return;
-            }
-            yield this.addColumn('integration_credentials', 'managers', 'null');
-            const integrationSettings = yield this.each('SELECT integration_id, config FROM integration_settings', []);
-            for (const settings of integrationSettings) {
-                const config = JSON.parse(settings.config);
-                if (config.managers) {
-                    yield this.run('UPDATE integration_credentials SET managers = ? WHERE id = ?', [
-                        JSON.stringify(config.managers),
-                        settings.integration_id,
-                    ]);
-                }
-            }
-        });
-    }
     migrate() {
         return __awaiter(this, void 0, void 0, function* () {
             let _connection_res;
@@ -279,7 +238,7 @@ class SQLiteStorage {
             });
             const sqlite = require('sqlite3');
             //@ts-ignore
-            this.db = new sqlite.Database((0, path_1.join)(this.config.dbFolder, types_1.storageFiles.SQLITE), (error) => {
+            this.db = new sqlite.Database((0, path_1.join)(this.config.dbFolder, types_2.storageFiles.SQLITE), (error) => {
                 if (error) {
                     _connection_rej(error);
                 }
@@ -292,11 +251,9 @@ class SQLiteStorage {
                 for (const [tableName, tableSchema] of Object.entries(this.tables)) {
                     yield this._run(`create table if not exists ${tableName} ${tableSchema};`, []);
                 }
-                this._res && this._res();
-                // TODO: temporary code
-                yield this.updateTables();
-                yield this.moveIntegrationSettings();
-                yield this.migrateManagers();
+                if (this._res) {
+                    this._res();
+                }
             }
             catch (e) {
                 this._rej && this._rej(e);
@@ -389,7 +346,10 @@ class SQLiteStorage {
             yield this.run('DELETE FROM sync_settings where integration_id = ?', [id]);
             yield this.run('DELETE FROM files_snapshot where integration_id = ?', [id]);
             yield this.run('DELETE FROM webhooks where integration_id = ?', [id]);
+            yield this.run('DELETE FROM user_errors where integration_id = ?', [id]);
+            yield this.run('DELETE FROM integration_settings where integration_id = ?', [id]);
             yield this.run('DELETE FROM job where integration_id = ?', [id]);
+            yield this.run('DELETE FROM translation_file_cache where integration_id = ?', [id]);
             yield this.run('DELETE FROM unsynced_files where integration_id = ?', [id]);
             yield this.run('DELETE FROM synced_data where integration_id = ?', [id]);
         });
@@ -570,7 +530,7 @@ class SQLiteStorage {
     }
     createJob({ integrationId, crowdinId, type, title, payload }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const id = (0, uuid_1.v4)();
+            const id = (0, crypto_1.randomUUID)();
             yield this.run(`
                 INSERT
                 INTO job(id, integration_id, crowdin_id, type, payload, title, created_at)
@@ -593,7 +553,7 @@ class SQLiteStorage {
         if (status) {
             updateFields.push('status = ?');
             updateParams.push(status);
-            if (!updateFields.includes('finished_at = ?') && [types_2.JobStatus.FAILED, types_2.JobStatus.CANCELED].includes(status)) {
+            if (!updateFields.includes('finished_at = ?') && [types_1.JobStatus.FAILED, types_1.JobStatus.CANCELED].includes(status)) {
                 updateFields.push('finished_at = ?');
                 updateParams.push(Date.now().toString());
             }
@@ -659,7 +619,7 @@ class SQLiteStorage {
                 SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status, title, info, data, attempt, errors, processed_entities as processedEntities, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
                 WHERE status IN (?,?) AND finished_at is NULL
-            `, [types_2.JobStatus.IN_PROGRESS, types_2.JobStatus.CREATED]);
+            `, [types_1.JobStatus.IN_PROGRESS, types_1.JobStatus.CREATED]);
         });
     }
     getAllJobs({ integrationId, crowdinId, limit, offset }) {

package/out/types.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import Crowdin from '@crowdin/crowdin-api-client';
 import { JwtPayload, VerifyOptions } from '@crowdin/crowdin-apps-functions';
 import { Request } from 'express';
@@ -10,6 +12,8 @@ import { IntegrationLogic } from './modules/integration/types';
 import { Storage } from './storage';
 import { MySQLStorageConfig } from './storage/mysql';
 import { PostgreStorageConfig } from './storage/postgre';
+import { D1StorageConfig } from './storage/d1';
+import type { Fetcher } from '@cloudflare/workers-types';
 import { ApiModule } from './modules/api/types';
 import { LogErrorFunction, LogFunction } from './util/logger';
 import { AiProviderModule } from './modules/ai-provider/types';
@@ -21,6 +25,8 @@ import { WorkflowStepTypeModule } from './modules/workflow-step-type/types';
 import { AiRequestProcessorModule, AiStreamProcessorModule } from './modules/ai-request-processors/types';
 import { AutomationActionModule } from './modules/automation-action/types';
 import { AuthGuardModule } from './modules/auth-guard/types';
+import { Cron } from './util/cron';
+export { Cron };
 export interface ClientConfig extends ImagePath {
     /**
      * Authentication Crowdin App type: "authorization_code", "crowdin_app", "crowdin_agent". Default: "crowdin_app"
@@ -102,6 +108,20 @@ export interface ClientConfig extends ImagePath {
      * config to configure MySQL as a storage
      */
     mysqlConfig?: MySQLStorageConfig;
+    /**
+     * config to configure Cloudflare D1 as a storage
+     */
+    d1Config?: D1StorageConfig;
+    /**
+     * Custom cron for scheduling background jobs.
+     * If not provided, the default node-cron will be used.
+     * Useful for external cron systems like Cloudflare Workers Scheduled Events.
+     */
+    cron?: Cron;
+    /**
+     * Cloudflare Workers Assets configuration
+     */
+    assetsConfig?: AssetsConfig;
     /**
      * integration module logic
      */
@@ -165,7 +185,7 @@ export interface ClientConfig extends ImagePath {
     /**
      * Install hook
      */
-    onInstall?: ({ organization, userId, client, }: {
+    onInstall?: (options: {
         organization: string;
         userId: number;
         client: Crowdin;
@@ -173,14 +193,20 @@ export interface ClientConfig extends ImagePath {
     /**
      * Uninstall hook for cleanup logic
      */
-    onUninstall?: (organization: string, allCredentials: {
-        settings?: any;
-        credentials: any;
-    }[]) => Promise<void>;
+    onUninstall?: (options: {
+        organization: string;
+        allCredentials: {
+            settings?: any;
+            credentials: any;
+        }[];
+    }) => Promise<void>;
     /**
      * Error interceptor (can be used to log error in centralized place)
      */
-    onError?: (error: any, context?: CrowdinContextInfo) => void;
+    onError?: (options: {
+        error: any;
+        context?: CrowdinContextInfo;
+    }) => void;
     /**
      * Disable global error handling of unhandledRejection and uncaughtException events
      */
@@ -277,13 +303,27 @@ export interface ClientConfig extends ImagePath {
      * Auth guard module for custom authentication/authorization checks
      */
     authGuard?: AuthGuardModule | AuthGuardModule[];
+    /**
+     * custom file storage
+     */
+    fileStore?: FileStore;
+    /**
+     * path to assets files directory (default: 'static')
+     */
+    assetsPath?: string;
+}
+export interface AssetsConfig {
+    /**
+     * Cloudflare Workers Assets Fetcher
+     */
+    fetcher: Fetcher;
 }
 export interface Environments {
     environments?: Environment | Environment[];
 }
 type Environment = 'crowdin' | 'crowdin-enterprise';
 export type Config = ClientConfig & {
-    baseUrl: string;
+    baseUrl?: string;
     clientId: string;
     clientSecret: string;
     port: number;
@@ -397,22 +437,39 @@ interface ModuleContent {
     url?: string;
 }
 export interface CrowdinAppUtilities extends CrowdinMetadataStore {
-    establishCrowdinConnection: (authRequest: string | CrowdinClientRequest, moduleKey: string[] | string | undefined) => Promise<{
+    establishCrowdinConnection: (options: {
+        authRequest?: CrowdinClientRequest;
+        jwtToken?: string;
+        moduleKey: string[] | string | undefined;
+    }) => Promise<{
         context: CrowdinContextInfo;
         client?: Crowdin;
     }>;
-    encryptCrowdinConnection: (data: {
+    encryptCrowdinConnection: (options: {
         crowdinId: string;
         extra: Record<string, any>;
     }) => string;
-    dencryptCrowdinConnection: (hash: string, autoRenew?: boolean) => Promise<{
+    decryptCrowdinConnection: (options: {
+        hash: string;
+        autoRenew?: boolean;
+    }) => Promise<{
         client: Crowdin;
         extra: Record<string, any>;
     }>;
+    jwtMiddleware: (options: {
+        moduleKey: string[] | string;
+        optional?: boolean;
+        checkSubscriptionExpiration?: boolean;
+    }) => (req: any, res: any, next: any) => void;
     storage: Storage;
+    cron: Cron;
 }
 export interface CrowdinMetadataStore {
-    saveMetadata: (id: string, metadata: any, crowdinId: string) => Promise<void>;
+    saveMetadata: (options: {
+        id: string;
+        metadata: any;
+        crowdinId: string;
+    }) => Promise<void>;
     getMetadata: (id: string) => Promise<any | undefined>;
     deleteMetadata: (id: string) => Promise<void>;
     /**
@@ -444,7 +501,7 @@ export interface UiModule extends ModuleKey {
     /**
      * Additional attributes for react-jsonschema-doc
      */
-    formUiSchema?: object;
+    formUiSchema?: any;
     /**
      * path to ui folder (e.g. {@example join(__dirname, 'public')})
      */
@@ -457,10 +514,6 @@ export interface UiModule extends ModuleKey {
      * Module name
      */
     name?: string;
-    /**
-     * Temporary property. Indicates if passwords should be masked. Will be dropped when all existing apps will migrate.
-     */
-    maskPasswords?: boolean;
 }
 export interface ModuleKey {
     /**
@@ -476,7 +529,10 @@ export interface ImagePath {
 }
 export interface Logger {
     enabled: boolean;
-    log?: (message: string, context?: CrowdinContextInfo) => void;
+    log?: (options: {
+        message: string;
+        context?: CrowdinContextInfo;
+    }) => void;
 }
 export interface Pricing {
     planType: 'free' | 'recurring';
@@ -524,4 +580,8 @@ export interface ModalModule extends ModuleContent, UiModule, Environments {
 }
 export interface ContextModule extends ContextContent, UiModule, Environments {
 }
-export {};
+export interface FileStore {
+    getFile: (fileRef: string) => Promise<Buffer>;
+    storeFile: (content: Buffer) => Promise<string>;
+    deleteFile: (fileRef: string) => Promise<void>;
+}

package/out/util/connection.js

@@ -273,7 +273,7 @@ function prepareIntegrationCredentials(config, integration, integrationCredentia
                     let newCredentials;
                     if (performRefreshTokenRequest) {
                         const loginForm = yield (0, storage_1.getStorage)().getMetadata((0, defaults_1.getOAuthLoginFormId)(integrationCredentials.id));
-                        newCredentials = yield performRefreshTokenRequest(credentials, loginForm);
+                        newCredentials = yield performRefreshTokenRequest({ credentials, loginForm });
                     }
                     else if (oauthLogin) {
                         const url = oauthLogin.refreshTokenUrl || oauthLogin.accessTokenUrl;

package/out/util/credentials-masker.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="qs" />
-import { CrowdinClientRequest, UiModule } from '../types';
 import { Request, Response } from 'express';
+import { CrowdinClientRequest, UiModule } from '../types';
 declare function maskKey(key: string): string;
 declare function getRequestCredentialsMasker({ moduleConfig, dataPath, }: {
     moduleConfig?: UiModule;
     dataPath?: string;
 }): (req: Request | CrowdinClientRequest, res: Response, next: Function) => any;
-declare function postRequestCredentialsMasker(moduleConfig?: UiModule, credentialsExtractor?: Function): (req: CrowdinClientRequest | Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
-export { getRequestCredentialsMasker, postRequestCredentialsMasker, maskKey };
+declare function postRequestCredentialsMasker(moduleConfig?: UiModule, credentialsExtractor?: Function): (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;
+export { getRequestCredentialsMasker, maskKey, postRequestCredentialsMasker };