fix: Type problems regarding global variable

This commit is contained in:
Faruk AYDIN
2022-10-06 00:49:24 +03:00
parent 8308265a62
commit 63ffd1f720
7 changed files with 21 additions and 24 deletions

View File

@@ -1,4 +1,4 @@
import { IGlobalVariableForConnection } from '@automatisch/types';
import { IGlobalVariable } from '@automatisch/types';
import getCurrentUser from '../../common/get-current-user';
import getUserByUsername from '../../common/get-user-by-username';
import getUserTweets from '../../common/get-user-tweets';
@@ -19,15 +19,15 @@ export default {
},
],
async run($: IGlobalVariableForConnection) {
async run($: IGlobalVariable) {
return this.getTweets($, await $.db.flow.lastInternalId());
},
async testRun($: IGlobalVariableForConnection) {
async testRun($: IGlobalVariable) {
return this.getTweets($);
},
async getTweets($: IGlobalVariableForConnection, lastInternalId?: string) {
async getTweets($: IGlobalVariable, lastInternalId?: string) {
const { username } = await getCurrentUser($);
const user = await getUserByUsername($, username);

View File

@@ -1,6 +1,6 @@
import Context from '../../types/express/context';
import axios from 'axios';
import prepareGlobalVariableForConnection from '../../helpers/global-variable/connection';
import globalVariable from '../../helpers/global-variable';
import App from '../../models/app';
type Params = {
@@ -29,7 +29,7 @@ const createAuthData = async (
.default;
const app = App.findOneByKey(connection.key);
const $ = prepareGlobalVariableForConnection(connection, app);
const $ = globalVariable(connection, app);
await authInstance.createAuthData($);
try {

View File

@@ -1,3 +1,4 @@
import { IJSONObject } from '@automatisch/types';
import Step from '../../models/step';
import Context from '../../types/express/context';
@@ -6,7 +7,7 @@ type Params = {
id: string;
key: string;
appKey: string;
parameters: Record<string, unknown>;
parameters: IJSONObject;
flow: {
id: string;
};

View File

@@ -1,6 +1,6 @@
import Context from '../../types/express/context';
import App from '../../models/app';
import prepareGlobalVariableForConnection from '../../helpers/global-variable/connection';
import globalVariable from '../../helpers/global-variable';
type Params = {
input: {
@@ -24,7 +24,7 @@ const verifyConnection = async (
const authInstance = (await import(`../../apps/${connection.key}2/auth`))
.default;
const $ = prepareGlobalVariableForConnection(connection, app);
const $ = globalVariable(connection, app);
await authInstance.verifyCredentials($);
connection = await connection.$query().patchAndFetch({

View File

@@ -1,17 +1,13 @@
import createHttpClient from '../http-client';
import Connection from '../../models/connection';
import Flow from '../../models/flow';
import {
IJSONObject,
IApp,
IGlobalVariableForConnection,
} from '@automatisch/types';
import createHttpClient from './http-client';
import Connection from '../models/connection';
import Flow from '../models/flow';
import { IJSONObject, IApp, IGlobalVariable } from '@automatisch/types';
const prepareGlobalVariableForConnection = (
const globalVariable = (
connection: Connection,
appData: IApp,
flow?: Flow
): IGlobalVariableForConnection => {
): IGlobalVariable => {
return {
auth: {
set: async (args: IJSONObject) => {
@@ -32,4 +28,4 @@ const prepareGlobalVariableForConnection = (
};
};
export default prepareGlobalVariableForConnection;
export default globalVariable;

View File

@@ -4,7 +4,7 @@ import App from './app';
import Flow from './flow';
import Connection from './connection';
import ExecutionStep from './execution-step';
import type { IStep } from '@automatisch/types';
import type { IJSONObject, IStep } from '@automatisch/types';
import Telemetry from '../helpers/telemetry';
import appConfig from '../config/app';
@@ -17,7 +17,7 @@ class Step extends Base {
connectionId?: string;
status = 'incomplete';
position!: number;
parameters: Record<string, unknown>;
parameters: IJSONObject;
connection?: Connection;
flow: Flow;
executionSteps: ExecutionStep[];

View File

@@ -56,7 +56,7 @@ export interface IStep {
connectionId?: string;
status: string;
position: number;
parameters: Record<string, unknown>;
parameters: IJSONObject;
connection?: Partial<IConnection>;
flow: IFlow;
executionSteps: IExecutionStep[];
@@ -195,7 +195,7 @@ export type IHttpClientParams = {
baseURL?: string;
};
export type IGlobalVariableForConnection = {
export type IGlobalVariable = {
auth: {
set: (args: IJSONObject) => Promise<IConnection>;
data: IJSONObject;