n8n 0.231.2 → 0.233.0

package/dist/environments/versionControl/versionControl.controller.ee.js

@@ -8,55 +8,413 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersionControlController = void 0;
 const decorators_1 = require("../../decorators");
-const versionControlEnabledMiddleware_1 = require("./middleware/versionControlEnabledMiddleware");
+const versionControlEnabledMiddleware_ee_1 = require("./middleware/versionControlEnabledMiddleware.ee");
 const versionControl_service_ee_1 = require("./versionControl.service.ee");
-let VersionControlController = class VersionControlController {
-    constructor(versionControlService) {
+const ResponseHelper_1 = require("../../ResponseHelper");
+const express_1 = __importDefault(require("express"));
+const versionControlPreferences_service_ee_1 = require("./versionControlPreferences.service.ee");
+const constants_1 = require("./constants");
+let VersionControlController = exports.VersionControlController = class VersionControlController {
+    constructor(versionControlService, versionControlPreferencesService) {
         this.versionControlService = versionControlService;
+        this.versionControlPreferencesService = versionControlPreferencesService;
     }
     async getPreferences() {
-        return this.versionControlService.versionControlPreferences;
+        return this.versionControlPreferencesService.getPreferences();
     }
     async setPreferences(req) {
-        const sanitizedPreferences = {
-            ...req.body,
-            privateKey: undefined,
-            publicKey: undefined,
-        };
-        await this.versionControlService.validateVersionControlPreferences(sanitizedPreferences);
-        return this.versionControlService.setPreferences(sanitizedPreferences);
+        var _a;
+        if (req.body.branchReadOnly === undefined &&
+            this.versionControlPreferencesService.isVersionControlConnected()) {
+            throw new ResponseHelper_1.BadRequestError('Cannot change preferences while connected to a version control provider. Please disconnect first.');
+        }
+        try {
+            const sanitizedPreferences = {
+                ...req.body,
+                initRepo: (_a = req.body.initRepo) !== null && _a !== void 0 ? _a : true,
+                connected: undefined,
+                publicKey: undefined,
+            };
+            await this.versionControlPreferencesService.validateVersionControlPreferences(sanitizedPreferences);
+            const updatedPreferences = await this.versionControlPreferencesService.setPreferences(sanitizedPreferences);
+            if (sanitizedPreferences.initRepo === true) {
+                try {
+                    await this.versionControlService.initializeRepository({
+                        ...updatedPreferences,
+                        branchName: updatedPreferences.branchName === ''
+                            ? constants_1.VERSION_CONTROL_DEFAULT_BRANCH
+                            : updatedPreferences.branchName,
+                        initRepo: true,
+                    });
+                    if (this.versionControlPreferencesService.getPreferences().branchName !== '') {
+                        await this.versionControlPreferencesService.setPreferences({
+                            connected: true,
+                        });
+                    }
+                }
+                catch (error) {
+                    await this.versionControlService.disconnect({ keepKeyPair: true });
+                    throw error;
+                }
+            }
+            await this.versionControlService.init();
+            return this.versionControlPreferencesService.getPreferences();
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async updatePreferences(req) {
+        try {
+            const sanitizedPreferences = {
+                ...req.body,
+                initRepo: false,
+                connected: undefined,
+                publicKey: undefined,
+                repositoryUrl: undefined,
+                authorName: undefined,
+                authorEmail: undefined,
+            };
+            const currentPreferences = this.versionControlPreferencesService.getPreferences();
+            await this.versionControlPreferencesService.validateVersionControlPreferences(sanitizedPreferences);
+            if (sanitizedPreferences.branchName &&
+                sanitizedPreferences.branchName !== currentPreferences.branchName) {
+                await this.versionControlService.setBranch(sanitizedPreferences.branchName);
+            }
+            if (sanitizedPreferences.branchColor || sanitizedPreferences.branchReadOnly !== undefined) {
+                await this.versionControlPreferencesService.setPreferences({
+                    branchColor: sanitizedPreferences.branchColor,
+                    branchReadOnly: sanitizedPreferences.branchReadOnly,
+                }, true);
+            }
+            await this.versionControlService.init();
+            return this.versionControlPreferencesService.getPreferences();
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async disconnect(req) {
+        try {
+            return await this.versionControlService.disconnect(req.body);
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async getBranches() {
+        try {
+            return await this.versionControlService.getBranches();
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async pushWorkfolder(req, res) {
+        if (this.versionControlPreferencesService.isBranchReadOnly()) {
+            throw new ResponseHelper_1.BadRequestError('Cannot push onto read-only branch.');
+        }
+        try {
+            const result = await this.versionControlService.pushWorkfolder(req.body);
+            if (result.pushed) {
+                res.statusCode = 200;
+            }
+            else {
+                res.statusCode = 409;
+            }
+            return result;
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async pullWorkfolder(req, res) {
+        var _a;
+        try {
+            const result = await this.versionControlService.pullWorkfolder({
+                force: req.body.force,
+                variables: req.body.variables,
+                userId: req.user.id,
+                importAfterPull: (_a = req.body.importAfterPull) !== null && _a !== void 0 ? _a : true,
+            });
+            if (result === null || result === void 0 ? void 0 : result.workflows) {
+                res.statusCode = 200;
+            }
+            else {
+                res.statusCode = 409;
+            }
+            return result;
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async resetWorkfolder(req) {
+        var _a;
+        try {
+            return await this.versionControlService.resetWorkfolder({
+                force: req.body.force,
+                variables: req.body.variables,
+                userId: req.user.id,
+                importAfterPull: (_a = req.body.importAfterPull) !== null && _a !== void 0 ? _a : true,
+            });
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async getStatus() {
+        try {
+            return await this.versionControlService.getStatus();
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async status() {
+        try {
+            return await this.versionControlService.status();
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
     }
     async generateKeyPair() {
-        return this.versionControlService.generateAndSaveKeyPair();
+        try {
+            const result = await this.versionControlPreferencesService.generateAndSaveKeyPair();
+            return result;
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async export() {
+        try {
+            return await this.versionControlService.export();
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async import(req) {
+        try {
+            return await this.versionControlService.import({
+                userId: req.user.id,
+            });
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async fetch() {
+        try {
+            return await this.versionControlService.fetch();
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async diff() {
+        try {
+            return await this.versionControlService.diff();
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async push(req) {
+        if (this.versionControlPreferencesService.isBranchReadOnly()) {
+            throw new ResponseHelper_1.BadRequestError('Cannot push onto read-only branch.');
+        }
+        try {
+            return await this.versionControlService.push(req.body.force);
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async commit(req) {
+        try {
+            return await this.versionControlService.commit(req.body.message);
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async stage(req) {
+        try {
+            return await this.versionControlService.stage(req.body);
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async unstage() {
+        try {
+            return await this.versionControlService.unstage();
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
+    }
+    async pull() {
+        try {
+            return await this.versionControlService.pull();
+        }
+        catch (error) {
+            throw new ResponseHelper_1.BadRequestError(error.message);
+        }
     }
 };
 __decorate([
     (0, decorators_1.Authorized)('any'),
-    (0, decorators_1.Get)('/preferences', { middlewares: [versionControlEnabledMiddleware_1.versionControlLicensedMiddleware] }),
+    (0, decorators_1.Get)('/preferences', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedMiddleware] }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], VersionControlController.prototype, "getPreferences", null);
 __decorate([
     (0, decorators_1.Authorized)(['global', 'owner']),
-    (0, decorators_1.Post)('/preferences', { middlewares: [versionControlEnabledMiddleware_1.versionControlLicensedMiddleware] }),
+    (0, decorators_1.Post)('/preferences', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedMiddleware] }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], VersionControlController.prototype, "setPreferences", null);
 __decorate([
     (0, decorators_1.Authorized)(['global', 'owner']),
-    (0, decorators_1.Get)('/generateKeyPair', { middlewares: [versionControlEnabledMiddleware_1.versionControlLicensedMiddleware] }),
+    (0, decorators_1.Patch)('/preferences', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedMiddleware] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "updatePreferences", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Post)('/disconnect', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedMiddleware] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "disconnect", null);
+__decorate([
+    (0, decorators_1.Authorized)('any'),
+    (0, decorators_1.Get)('/get-branches', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedMiddleware] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "getBranches", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Post)('/push-workfolder', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedAndEnabledMiddleware] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "pushWorkfolder", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Post)('/pull-workfolder', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedAndEnabledMiddleware] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "pullWorkfolder", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Get)('/reset-workfolder', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedAndEnabledMiddleware] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "resetWorkfolder", null);
+__decorate([
+    (0, decorators_1.Authorized)('any'),
+    (0, decorators_1.Get)('/get-status', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedAndEnabledMiddleware] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "getStatus", null);
+__decorate([
+    (0, decorators_1.Authorized)('any'),
+    (0, decorators_1.Get)('/status', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedMiddleware] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "status", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Post)('/generate-key-pair', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedMiddleware] }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], VersionControlController.prototype, "generateKeyPair", null);
-VersionControlController = __decorate([
-    (0, decorators_1.RestController)('/versionControl'),
-    __metadata("design:paramtypes", [versionControl_service_ee_1.VersionControlService])
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Get)('/export', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedMiddleware] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "export", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Get)('/import', { middlewares: [versionControlEnabledMiddleware_ee_1.versionControlLicensedMiddleware] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "import", null);
+__decorate([
+    (0, decorators_1.Authorized)('any'),
+    (0, decorators_1.Get)('/fetch'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "fetch", null);
+__decorate([
+    (0, decorators_1.Authorized)('any'),
+    (0, decorators_1.Get)('/diff'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "diff", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Post)('/push'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "push", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Post)('/commit'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "commit", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Post)('/stage'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "stage", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Post)('/unstage'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "unstage", null);
+__decorate([
+    (0, decorators_1.Authorized)(['global', 'owner']),
+    (0, decorators_1.Get)('/pull'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], VersionControlController.prototype, "pull", null);
+exports.VersionControlController = VersionControlController = __decorate([
+    (0, decorators_1.RestController)(`/${constants_1.VERSION_CONTROL_API_ROOT}`),
+    __metadata("design:paramtypes", [versionControl_service_ee_1.VersionControlService,
+        versionControlPreferences_service_ee_1.VersionControlPreferencesService])
 ], VersionControlController);
-exports.VersionControlController = VersionControlController;
 //# sourceMappingURL=versionControl.controller.ee.js.map

package/dist/environments/versionControl/versionControl.controller.ee.js.map

@@ -1 +1 @@
-{"version":3,"file":"versionControl.controller.ee.js","sourceRoot":"","sources":["../../../src/environments/versionControl/versionControl.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAqE;AACrE,kGAAgG;AAChG,2EAAoE;AAIpE,IACa,wBAAwB,GADrC,MACa,wBAAwB;IACpC,YAAoB,qBAA4C;QAA5C,0BAAqB,GAArB,qBAAqB,CAAuB;IAAG,CAAC;IAI9D,AAAN,KAAK,CAAC,cAAc;QAEnB,OAAO,IAAI,CAAC,qBAAqB,CAAC,yBAAyB,CAAC;IAC7D,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CAAC,GAA4C;QAChE,MAAM,oBAAoB,GAAuC;YAChE,GAAG,GAAG,CAAC,IAAI;YACX,UAAU,EAAE,SAAS;YACrB,SAAS,EAAE,SAAS;SACpB,CAAC;QACF,MAAM,IAAI,CAAC,qBAAqB,CAAC,iCAAiC,CAAC,oBAAoB,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;IACxE,CAAC;IAMK,AAAN,KAAK,CAAC,eAAe;QACpB,OAAO,IAAI,CAAC,qBAAqB,CAAC,sBAAsB,EAAE,CAAC;IAC5D,CAAC;CACD,CAAA;AAxBM;IAFL,IAAA,uBAAU,EAAC,KAAK,CAAC;IACjB,IAAA,gBAAG,EAAC,cAAc,EAAE,EAAE,WAAW,EAAE,CAAC,kEAAgC,CAAC,EAAE,CAAC;;;;8DAIxE;AAIK;IAFL,IAAA,uBAAU,EAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/B,IAAA,iBAAI,EAAC,cAAc,EAAE,EAAE,WAAW,EAAE,CAAC,kEAAgC,CAAC,EAAE,CAAC;;;;8DASzE;AAMK;IAFL,IAAA,uBAAU,EAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/B,IAAA,gBAAG,EAAC,kBAAkB,EAAE,EAAE,WAAW,EAAE,CAAC,kEAAgC,CAAC,EAAE,CAAC;;;;+DAG5E;AA5BW,wBAAwB;IADpC,IAAA,2BAAc,EAAC,iBAAiB,CAAC;qCAEU,iDAAqB;GADpD,wBAAwB,CA6BpC;AA7BY,4DAAwB"}
+{"version":3,"file":"versionControl.controller.ee.js","sourceRoot":"","sources":["../../../src/environments/versionControl/versionControl.controller.ee.ts"],"names":[],"mappings":"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"}

package/dist/environments/versionControl/versionControl.service.ee.d.ts

@@ -1,15 +1,57 @@
-import { VersionControlPreferences } from './types/versionControlPreferences';
-import type { ValidationError } from 'class-validator';
+import type { VersionControlPreferences } from './types/versionControlPreferences';
+import { VersionControlGitService } from './versionControlGit.service.ee';
+import type { CommitResult, DiffResult, FetchResult, PullResult, PushResult, StatusResult } from 'simple-git';
+import type { ExportResult } from './types/exportResult';
+import { VersionControlExportService } from './versionControlExport.service.ee';
+import type { ImportResult } from './types/importResult';
+import type { VersionControlPushWorkFolder } from './types/versionControlPushWorkFolder';
+import type { VersionControllPullOptions } from './types/versionControlPullWorkFolder';
+import type { VersionControlledFile } from './types/versionControlledFile';
+import { VersionControlPreferencesService } from './versionControlPreferences.service.ee';
 export declare class VersionControlService {
-    private _versionControlPreferences;
+    private gitService;
+    private versionControlPreferencesService;
+    private versionControlExportService;
+    private sshKeyName;
+    private sshFolder;
+    private gitFolder;
+    constructor(gitService: VersionControlGitService, versionControlPreferencesService: VersionControlPreferencesService, versionControlExportService: VersionControlExportService);
     init(): Promise<void>;
-    get versionControlPreferences(): VersionControlPreferences;
-    set versionControlPreferences(preferences: Partial<VersionControlPreferences>);
-    generateAndSaveKeyPair(): Promise<{
-        privateKey: string;
-        publicKey: string;
-    }>;
-    validateVersionControlPreferences(preferences: Partial<VersionControlPreferences>): Promise<ValidationError[]>;
-    setPreferences(preferences: Partial<VersionControlPreferences>, saveToDb?: boolean): Promise<VersionControlPreferences>;
-    loadFromDbAndApplyVersionControlPreferences(): Promise<VersionControlPreferences | undefined>;
+    disconnect(options?: {
+        keepKeyPair?: boolean;
+    }): Promise<VersionControlPreferences>;
+    initializeRepository(preferences: VersionControlPreferences): Promise<{
+        branches: string[];
+        currentBranch: string;
+    }>;
+    export(): Promise<{
+        tags: ExportResult | undefined;
+        credentials: ExportResult | undefined;
+        variables: ExportResult | undefined;
+        workflows: ExportResult | undefined;
+    }>;
+    import(options: VersionControllPullOptions): Promise<ImportResult | undefined>;
+    getBranches(): Promise<{
+        branches: string[];
+        currentBranch: string;
+    }>;
+    setBranch(branch: string): Promise<{
+        branches: string[];
+        currentBranch: string;
+    }>;
+    resetWorkfolder(options: VersionControllPullOptions): Promise<ImportResult | undefined>;
+    pushWorkfolder(options: VersionControlPushWorkFolder): Promise<PushResult | VersionControlledFile[]>;
+    pullWorkfolder(options: VersionControllPullOptions): Promise<ImportResult | StatusResult | undefined>;
+    stage(options: Pick<VersionControlPushWorkFolder, 'fileNames' | 'credentialIds' | 'workflowIds'>): Promise<{
+        staged: string[];
+    } | string>;
+    unstage(): Promise<StatusResult | string>;
+    status(): Promise<StatusResult>;
+    private fileNameToVersionControlledFile;
+    getStatus(): Promise<VersionControlledFile[]>;
+    commit(message?: string): Promise<CommitResult>;
+    fetch(): Promise<FetchResult>;
+    diff(): Promise<DiffResult>;
+    pull(): Promise<PullResult>;
+    push(force?: boolean): Promise<PushResult>;
 }