style: auto format whole project
This commit is contained in:
@@ -4,6 +4,6 @@ const client = new Client({
|
||||
host: 'localhost',
|
||||
user: 'postgres',
|
||||
port: 5432,
|
||||
})
|
||||
});
|
||||
|
||||
export default client;
|
||||
|
@@ -4,7 +4,10 @@ import client from './client';
|
||||
import User from '../../src/models/user';
|
||||
import '../../src/config/orm';
|
||||
|
||||
export async function createUser(email = 'user@automatisch.io', password = 'sample') {
|
||||
export async function createUser(
|
||||
email = 'user@automatisch.io',
|
||||
password = 'sample'
|
||||
) {
|
||||
const UNIQUE_VIOLATION_CODE = '23505';
|
||||
const userParams = {
|
||||
email,
|
||||
@@ -29,14 +32,17 @@ export async function createUser(email = 'user@automatisch.io', password = 'samp
|
||||
}
|
||||
}
|
||||
|
||||
export const createDatabaseAndUser = async (database = appConfig.postgresDatabase, user = appConfig.postgresUsername) => {
|
||||
export const createDatabaseAndUser = async (
|
||||
database = appConfig.postgresDatabase,
|
||||
user = appConfig.postgresUsername
|
||||
) => {
|
||||
await client.connect();
|
||||
await createDatabase(database);
|
||||
await createDatabaseUser(user);
|
||||
await grantPrivileges(database, user);
|
||||
|
||||
await client.end();
|
||||
}
|
||||
};
|
||||
|
||||
export const createDatabase = async (database = appConfig.postgresDatabase) => {
|
||||
const DUPLICATE_DB_CODE = '42P04';
|
||||
@@ -51,7 +57,7 @@ export const createDatabase = async (database = appConfig.postgresDatabase) => {
|
||||
|
||||
logger.info(`Database: ${database} already exists!`);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
export const createDatabaseUser = async (user = appConfig.postgresUsername) => {
|
||||
const DUPLICATE_OBJECT_CODE = '42710';
|
||||
@@ -68,25 +74,25 @@ export const createDatabaseUser = async (user = appConfig.postgresUsername) => {
|
||||
|
||||
logger.info(`Database User: ${user} already exists!`);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
export const grantPrivileges = async (
|
||||
database = appConfig.postgresDatabase, user = appConfig.postgresUsername
|
||||
database = appConfig.postgresDatabase,
|
||||
user = appConfig.postgresUsername
|
||||
) => {
|
||||
await client.query(
|
||||
`GRANT ALL PRIVILEGES ON DATABASE ${database} TO ${user};`
|
||||
);
|
||||
|
||||
logger.info(
|
||||
`${user} has granted all privileges on ${database}!`
|
||||
);
|
||||
}
|
||||
logger.info(`${user} has granted all privileges on ${database}!`);
|
||||
};
|
||||
|
||||
export const dropDatabase = async () => {
|
||||
if (appConfig.appEnv != 'development' && appConfig.appEnv != 'test') {
|
||||
const errorMessage = 'Drop database command can be used only with development or test environments!'
|
||||
const errorMessage =
|
||||
'Drop database command can be used only with development or test environments!';
|
||||
|
||||
logger.error(errorMessage)
|
||||
logger.error(errorMessage);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -94,13 +100,15 @@ export const dropDatabase = async () => {
|
||||
await dropDatabaseAndUser();
|
||||
|
||||
await client.end();
|
||||
}
|
||||
};
|
||||
|
||||
export const dropDatabaseAndUser = async(database = appConfig.postgresDatabase, user = appConfig.postgresUsername) => {
|
||||
export const dropDatabaseAndUser = async (
|
||||
database = appConfig.postgresDatabase,
|
||||
user = appConfig.postgresUsername
|
||||
) => {
|
||||
await client.query(`DROP DATABASE IF EXISTS ${database}`);
|
||||
logger.info(`Database: ${database} removed!`);
|
||||
|
||||
await client.query(`DROP USER IF EXISTS ${user}`);
|
||||
logger.info(`Database User: ${user} removed!`);
|
||||
}
|
||||
|
||||
};
|
||||
|
@@ -10,7 +10,7 @@ const knexConfig = {
|
||||
user: appConfig.postgresUsername,
|
||||
password: appConfig.postgresPassword,
|
||||
database: appConfig.postgresDatabase,
|
||||
ssl: appConfig.postgresEnableSsl
|
||||
ssl: appConfig.postgresEnableSsl,
|
||||
},
|
||||
pool: { min: 0, max: 20 },
|
||||
migrations: {
|
||||
@@ -20,7 +20,7 @@ const knexConfig = {
|
||||
},
|
||||
seeds: {
|
||||
directory: __dirname + '/src/db/seeds',
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
export default knexConfig;
|
||||
|
@@ -1,5 +1,3 @@
|
||||
import sendMessageToChannel from "./send-message-to-channel";
|
||||
import sendMessageToChannel from './send-message-to-channel';
|
||||
|
||||
export default [
|
||||
sendMessageToChannel
|
||||
];
|
||||
export default [sendMessageToChannel];
|
||||
|
@@ -17,12 +17,12 @@ export default async function createAuthData($: IGlobalVariable) {
|
||||
scope: scopes.join(' '),
|
||||
});
|
||||
|
||||
const url = `${$.app.apiBaseUrl}/oauth2/authorize?${searchParams.toString()}`;
|
||||
const url = `${
|
||||
$.app.apiBaseUrl
|
||||
}/oauth2/authorize?${searchParams.toString()}`;
|
||||
|
||||
await $.auth.set({ url });
|
||||
} catch (error) {
|
||||
throw new Error(
|
||||
`Error occured while verifying credentials: ${error}`
|
||||
);
|
||||
throw new Error(`Error occured while verifying credentials: ${error}`);
|
||||
}
|
||||
}
|
||||
|
@@ -12,9 +12,10 @@ export default {
|
||||
readOnly: true,
|
||||
value: '{WEB_APP_URL}/app/discord/connections/add',
|
||||
placeholder: null,
|
||||
description: 'When asked to input an OAuth callback or redirect URL in Discord OAuth, enter the URL above.',
|
||||
description:
|
||||
'When asked to input an OAuth callback or redirect URL in Discord OAuth, enter the URL above.',
|
||||
docUrl: 'https://automatisch.io/docs/discord#oauth-redirect-url',
|
||||
clickToCopy: true
|
||||
clickToCopy: true,
|
||||
},
|
||||
{
|
||||
key: 'consumerKey',
|
||||
@@ -26,7 +27,7 @@ export default {
|
||||
placeholder: null,
|
||||
description: null,
|
||||
docUrl: 'https://automatisch.io/docs/discord#consumer-key',
|
||||
clickToCopy: false
|
||||
clickToCopy: false,
|
||||
},
|
||||
{
|
||||
key: 'consumerSecret',
|
||||
@@ -38,7 +39,7 @@ export default {
|
||||
placeholder: null,
|
||||
description: null,
|
||||
docUrl: 'https://automatisch.io/docs/discord#consumer-secret',
|
||||
clickToCopy: false
|
||||
clickToCopy: false,
|
||||
},
|
||||
{
|
||||
key: 'botToken',
|
||||
@@ -50,8 +51,8 @@ export default {
|
||||
placeholder: null,
|
||||
description: null,
|
||||
docUrl: 'https://automatisch.io/docs/discord#bot-token',
|
||||
clickToCopy: false
|
||||
}
|
||||
clickToCopy: false,
|
||||
},
|
||||
],
|
||||
authenticationSteps: [
|
||||
{
|
||||
@@ -60,7 +61,7 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'key',
|
||||
value: '{key}'
|
||||
value: '{key}',
|
||||
},
|
||||
{
|
||||
name: 'formattedData',
|
||||
@@ -68,19 +69,19 @@ export default {
|
||||
properties: [
|
||||
{
|
||||
name: 'consumerKey',
|
||||
value: '{fields.consumerKey}'
|
||||
value: '{fields.consumerKey}',
|
||||
},
|
||||
{
|
||||
name: 'consumerSecret',
|
||||
value: '{fields.consumerSecret}'
|
||||
value: '{fields.consumerSecret}',
|
||||
},
|
||||
{
|
||||
name: 'botToken',
|
||||
value: '{fields.botToken}'
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
value: '{fields.botToken}',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'mutation' as const,
|
||||
@@ -88,9 +89,9 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'id',
|
||||
value: '{createConnection.id}'
|
||||
}
|
||||
]
|
||||
value: '{createConnection.id}',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'openWithPopup' as const,
|
||||
@@ -98,9 +99,9 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'url',
|
||||
value: '{createAuthData.url}'
|
||||
}
|
||||
]
|
||||
value: '{createAuthData.url}',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'mutation' as const,
|
||||
@@ -108,7 +109,7 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'id',
|
||||
value: '{createConnection.id}'
|
||||
value: '{createConnection.id}',
|
||||
},
|
||||
{
|
||||
name: 'formattedData',
|
||||
@@ -116,11 +117,11 @@ export default {
|
||||
properties: [
|
||||
{
|
||||
name: 'oauthVerifier',
|
||||
value: '{openAuthPopup.code}'
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
value: '{openAuthPopup.code}',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'mutation' as const,
|
||||
@@ -128,10 +129,10 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'id',
|
||||
value: '{createConnection.id}'
|
||||
}
|
||||
]
|
||||
}
|
||||
value: '{createConnection.id}',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
|
||||
createAuthData,
|
||||
|
@@ -28,10 +28,7 @@ const verifyCredentials = async ($: IGlobalVariable) => {
|
||||
expires_in: expiresIn,
|
||||
scope: scope,
|
||||
token_type: tokenType,
|
||||
guild: {
|
||||
id: guildId,
|
||||
name: guildName,
|
||||
}
|
||||
guild: { id: guildId, name: guildName },
|
||||
} = verifiedCredentials;
|
||||
|
||||
await $.auth.set({
|
||||
@@ -40,7 +37,7 @@ const verifyCredentials = async ($: IGlobalVariable) => {
|
||||
expiresIn,
|
||||
scope,
|
||||
tokenType,
|
||||
})
|
||||
});
|
||||
|
||||
const user = await getCurrentUser($);
|
||||
|
||||
|
@@ -1,5 +1,3 @@
|
||||
import listChannels from "./list-channels";
|
||||
import listChannels from './list-channels';
|
||||
|
||||
export default [
|
||||
listChannels,
|
||||
];
|
||||
export default [listChannels];
|
||||
|
@@ -13,7 +13,9 @@ export default {
|
||||
error: null,
|
||||
};
|
||||
|
||||
const response = await $.http.get(`/guilds/${$.auth.data.guildId}/channels`);
|
||||
const response = await $.http.get(
|
||||
`/guilds/${$.auth.data.guildId}/channels`
|
||||
);
|
||||
|
||||
channels.data = response.data
|
||||
.filter((channel: IJSONObject) => {
|
||||
|
@@ -12,9 +12,10 @@ export default {
|
||||
readOnly: true,
|
||||
value: '{WEB_APP_URL}/app/flickr/connections/add',
|
||||
placeholder: null,
|
||||
description: 'When asked to input an OAuth callback or redirect URL in Flickr OAuth, enter the URL above.',
|
||||
description:
|
||||
'When asked to input an OAuth callback or redirect URL in Flickr OAuth, enter the URL above.',
|
||||
docUrl: 'https://automatisch.io/docs/flickr#oauth-redirect-url',
|
||||
clickToCopy: true
|
||||
clickToCopy: true,
|
||||
},
|
||||
{
|
||||
key: 'consumerKey',
|
||||
@@ -26,7 +27,7 @@ export default {
|
||||
placeholder: null,
|
||||
description: null,
|
||||
docUrl: 'https://automatisch.io/docs/flickr#consumer-key',
|
||||
clickToCopy: false
|
||||
clickToCopy: false,
|
||||
},
|
||||
{
|
||||
key: 'consumerSecret',
|
||||
@@ -38,8 +39,8 @@ export default {
|
||||
placeholder: null,
|
||||
description: null,
|
||||
docUrl: 'https://automatisch.io/docs/flickr#consumer-secret',
|
||||
clickToCopy: false
|
||||
}
|
||||
clickToCopy: false,
|
||||
},
|
||||
],
|
||||
authenticationSteps: [
|
||||
{
|
||||
@@ -48,7 +49,7 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'key',
|
||||
value: '{key}'
|
||||
value: '{key}',
|
||||
},
|
||||
{
|
||||
name: 'formattedData',
|
||||
@@ -56,15 +57,15 @@ export default {
|
||||
properties: [
|
||||
{
|
||||
name: 'consumerKey',
|
||||
value: '{fields.consumerKey}'
|
||||
value: '{fields.consumerKey}',
|
||||
},
|
||||
{
|
||||
name: 'consumerSecret',
|
||||
value: '{fields.consumerSecret}'
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
value: '{fields.consumerSecret}',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'mutation' as const,
|
||||
@@ -72,9 +73,9 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'id',
|
||||
value: '{createConnection.id}'
|
||||
}
|
||||
]
|
||||
value: '{createConnection.id}',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'openWithPopup' as const,
|
||||
@@ -82,9 +83,9 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'url',
|
||||
value: '{createAuthData.url}'
|
||||
}
|
||||
]
|
||||
value: '{createAuthData.url}',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'mutation' as const,
|
||||
@@ -92,7 +93,7 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'id',
|
||||
value: '{createConnection.id}'
|
||||
value: '{createConnection.id}',
|
||||
},
|
||||
{
|
||||
name: 'formattedData',
|
||||
@@ -100,11 +101,11 @@ export default {
|
||||
properties: [
|
||||
{
|
||||
name: 'oauthVerifier',
|
||||
value: '{openAuthPopup.oauth_verifier}'
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
value: '{openAuthPopup.oauth_verifier}',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'mutation' as const,
|
||||
@@ -112,10 +113,10 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'id',
|
||||
value: '{createConnection.id}'
|
||||
}
|
||||
]
|
||||
}
|
||||
value: '{createConnection.id}',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
|
||||
createAuthData,
|
||||
|
@@ -6,7 +6,7 @@ const isStillVerified = async ($: IGlobalVariable) => {
|
||||
method: 'flickr.test.login',
|
||||
format: 'json',
|
||||
nojsoncallback: 1,
|
||||
}
|
||||
};
|
||||
const response = await $.http.get('/rest', { params });
|
||||
return !!response.data.user.id;
|
||||
} catch (error) {
|
||||
|
@@ -10,7 +10,7 @@ type TPhotoset = {
|
||||
title: {
|
||||
_content: string;
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
export default {
|
||||
name: 'List albums',
|
||||
@@ -25,7 +25,7 @@ export default {
|
||||
format: 'json',
|
||||
nojsoncallback: 1,
|
||||
};
|
||||
let response = await $.http.get('/rest', { params, });
|
||||
let response = await $.http.get('/rest', { params });
|
||||
|
||||
const aggregatedResponse: TResponse = {
|
||||
data: [...response.data.photosets.photoset],
|
||||
@@ -35,19 +35,21 @@ export default {
|
||||
response = await $.http.get('/rest', {
|
||||
params: {
|
||||
...params,
|
||||
page: response.data.photosets.page
|
||||
}
|
||||
page: response.data.photosets.page,
|
||||
},
|
||||
});
|
||||
|
||||
aggregatedResponse.data.push(...response.data.photosets.photoset);
|
||||
}
|
||||
|
||||
aggregatedResponse.data = aggregatedResponse.data.map((photoset: TPhotoset) => {
|
||||
return {
|
||||
value: photoset.id,
|
||||
name: photoset.title._content,
|
||||
} as IJSONObject;
|
||||
});
|
||||
aggregatedResponse.data = aggregatedResponse.data.map(
|
||||
(photoset: TPhotoset) => {
|
||||
return {
|
||||
value: photoset.id,
|
||||
name: photoset.title._content,
|
||||
} as IJSONObject;
|
||||
}
|
||||
);
|
||||
|
||||
return aggregatedResponse;
|
||||
},
|
||||
|
@@ -3,9 +3,4 @@ import newFavoritePhotos from './new-favorite-photos';
|
||||
import newPhotos from './new-photos';
|
||||
import newPhotosInAlbums from './new-photos-in-album';
|
||||
|
||||
export default [
|
||||
newAlbums,
|
||||
newFavoritePhotos,
|
||||
newPhotos,
|
||||
newPhotosInAlbums,
|
||||
];
|
||||
export default [newAlbums, newFavoritePhotos, newPhotos, newPhotosInAlbums];
|
||||
|
@@ -13,7 +13,9 @@ export default async function createAuthData($: IGlobalVariable) {
|
||||
scope: scopes.join(','),
|
||||
});
|
||||
|
||||
const url = `${$.app.baseUrl}/login/oauth/authorize?${searchParams.toString()}`;
|
||||
const url = `${
|
||||
$.app.baseUrl
|
||||
}/login/oauth/authorize?${searchParams.toString()}`;
|
||||
|
||||
await $.auth.set({
|
||||
url,
|
||||
|
@@ -12,9 +12,10 @@ export default {
|
||||
readOnly: true,
|
||||
value: '{WEB_APP_URL}/app/github/connections/add',
|
||||
placeholder: null,
|
||||
description: 'When asked to input an OAuth callback or redirect URL in Github OAuth, enter the URL above.',
|
||||
description:
|
||||
'When asked to input an OAuth callback or redirect URL in Github OAuth, enter the URL above.',
|
||||
docUrl: 'https://automatisch.io/docs/github#oauth-redirect-url',
|
||||
clickToCopy: true
|
||||
clickToCopy: true,
|
||||
},
|
||||
{
|
||||
key: 'consumerKey',
|
||||
@@ -26,7 +27,7 @@ export default {
|
||||
placeholder: null,
|
||||
description: null,
|
||||
docUrl: 'https://automatisch.io/docs/github#client-id',
|
||||
clickToCopy: false
|
||||
clickToCopy: false,
|
||||
},
|
||||
{
|
||||
key: 'consumerSecret',
|
||||
@@ -38,8 +39,8 @@ export default {
|
||||
placeholder: null,
|
||||
description: null,
|
||||
docUrl: 'https://automatisch.io/docs/github#client-secret',
|
||||
clickToCopy: false
|
||||
}
|
||||
clickToCopy: false,
|
||||
},
|
||||
],
|
||||
authenticationSteps: [
|
||||
{
|
||||
@@ -48,7 +49,7 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'key',
|
||||
value: '{key}'
|
||||
value: '{key}',
|
||||
},
|
||||
{
|
||||
name: 'formattedData',
|
||||
@@ -56,15 +57,15 @@ export default {
|
||||
properties: [
|
||||
{
|
||||
name: 'consumerKey',
|
||||
value: '{fields.consumerKey}'
|
||||
value: '{fields.consumerKey}',
|
||||
},
|
||||
{
|
||||
name: 'consumerSecret',
|
||||
value: '{fields.consumerSecret}'
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
value: '{fields.consumerSecret}',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'mutation' as const,
|
||||
@@ -72,9 +73,9 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'id',
|
||||
value: '{createConnection.id}'
|
||||
}
|
||||
]
|
||||
value: '{createConnection.id}',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'openWithPopup' as const,
|
||||
@@ -82,9 +83,9 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'url',
|
||||
value: '{createAuthData.url}'
|
||||
}
|
||||
]
|
||||
value: '{createAuthData.url}',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'mutation' as const,
|
||||
@@ -92,7 +93,7 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'id',
|
||||
value: '{createConnection.id}'
|
||||
value: '{createConnection.id}',
|
||||
},
|
||||
{
|
||||
name: 'formattedData',
|
||||
@@ -100,11 +101,11 @@ export default {
|
||||
properties: [
|
||||
{
|
||||
name: 'oauthVerifier',
|
||||
value: '{openAuthPopup.code}'
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
value: '{openAuthPopup.code}',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'mutation' as const,
|
||||
@@ -112,10 +113,10 @@ export default {
|
||||
arguments: [
|
||||
{
|
||||
name: 'id',
|
||||
value: '{createConnection.id}'
|
||||
}
|
||||
]
|
||||
}
|
||||
value: '{createConnection.id}',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
|
||||
createAuthData,
|
||||
|
@@ -12,9 +12,10 @@ const verifyCredentials = async ($: IGlobalVariable) => {
|
||||
},
|
||||
{
|
||||
headers: {
|
||||
Accept: 'application/json'
|
||||
}
|
||||
});
|
||||
Accept: 'application/json',
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
const data = response.data;
|
||||
|
||||
|
@@ -1,11 +1,11 @@
|
||||
import { TBeforeRequest } from "@automatisch/types";
|
||||
import { TBeforeRequest } from '@automatisch/types';
|
||||
|
||||
const addAuthHeader: TBeforeRequest = ($, requestConfig) => {
|
||||
if (requestConfig.headers && $.auth.data?.accessToken) {
|
||||
requestConfig.headers.Authorization = `Bearer ${$.auth.data.accessToken}`
|
||||
requestConfig.headers.Authorization = `Bearer ${$.auth.data.accessToken}`;
|
||||
}
|
||||
|
||||
return requestConfig;
|
||||
}
|
||||
};
|
||||
|
||||
export default addAuthHeader;
|
||||
|
@@ -1,15 +1,17 @@
|
||||
type TRepoOwnerAndRepo = {
|
||||
repoOwner?: string;
|
||||
repo?: string;
|
||||
}
|
||||
};
|
||||
|
||||
export default function getRepoOwnerAndRepo(repoFullName: string): TRepoOwnerAndRepo {
|
||||
export default function getRepoOwnerAndRepo(
|
||||
repoFullName: string
|
||||
): TRepoOwnerAndRepo {
|
||||
if (!repoFullName) return {};
|
||||
|
||||
const [repoOwner, repo] = repoFullName.split('/');
|
||||
|
||||
return {
|
||||
repoOwner,
|
||||
repo
|
||||
repo,
|
||||
};
|
||||
}
|
||||
|
@@ -1,7 +1,4 @@
|
||||
import listLabels from './list-labels';
|
||||
import listRepos from './list-repos';
|
||||
|
||||
export default [
|
||||
listLabels,
|
||||
listRepos,
|
||||
];
|
||||
export default [listLabels, listRepos];
|
||||
|
@@ -7,10 +7,9 @@ export default {
|
||||
key: 'listLabels',
|
||||
|
||||
async run($: IGlobalVariable) {
|
||||
const {
|
||||
repoOwner,
|
||||
repo,
|
||||
} = getRepoOwnerAndRepo($.step.parameters.repo as string);
|
||||
const { repoOwner, repo } = getRepoOwnerAndRepo(
|
||||
$.step.parameters.repo as string
|
||||
);
|
||||
|
||||
if (!repo) return { data: [] };
|
||||
|
||||
|
@@ -3,9 +3,4 @@ import newPullRequests from './new-pull-requests';
|
||||
import newStargazers from './new-stargazers';
|
||||
import newWatchers from './new-watchers';
|
||||
|
||||
export default [
|
||||
newIssues,
|
||||
newPullRequests,
|
||||
newStargazers,
|
||||
newWatchers,
|
||||
];
|
||||
export default [newIssues, newPullRequests, newStargazers, newWatchers];
|
||||
|
@@ -10,15 +10,13 @@ export default async function createAuthData($: IGlobalVariable) {
|
||||
const searchParams = qs.stringify({
|
||||
client_id: $.auth.data.consumerKey as string,
|
||||
redirect_uri: redirectUri,
|
||||
response_type: 'code'
|
||||
})
|
||||
response_type: 'code',
|
||||
});
|
||||
|
||||
await $.auth.set({
|
||||
url: `${$.auth.data.oauth2Url}/authorize?${searchParams}`,
|
||||
});
|
||||
} catch (error) {
|
||||
throw new Error(
|
||||
`Error occured while verifying credentials: ${error}`
|
||||
);
|
||||
throw new Error(`Error occured while verifying credentials: ${error}`);
|
||||
}
|
||||
}
|
||||
|
@@ -34,8 +34,8 @@ export default {
|
||||
{
|
||||
label: 'sandbox',
|
||||
value: 'https://test.salesforce.com/services/oauth2',
|
||||
}
|
||||
]
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
key: 'consumerKey',
|
||||
@@ -76,7 +76,7 @@ export default {
|
||||
properties: [
|
||||
{
|
||||
name: 'oauth2Url',
|
||||
value: '{fields.oauth2Url}'
|
||||
value: '{fields.oauth2Url}',
|
||||
},
|
||||
{
|
||||
name: 'consumerKey',
|
||||
|
@@ -13,10 +13,10 @@ const verifyCredentials = async ($: IGlobalVariable) => {
|
||||
grant_type: 'authorization_code',
|
||||
client_id: $.auth.data.consumerKey as string,
|
||||
client_secret: $.auth.data.consumerSecret as string,
|
||||
redirect_uri: redirectUri
|
||||
redirect_uri: redirectUri,
|
||||
});
|
||||
const { data } = await $.http.post(
|
||||
`${$.auth.data.oauth2Url}/token?${searchParams}`,
|
||||
`${$.auth.data.oauth2Url}/token?${searchParams}`
|
||||
);
|
||||
|
||||
await $.auth.set({
|
||||
|
@@ -1,7 +1,4 @@
|
||||
import listObjects from './list-objects';
|
||||
import listFields from './list-fields';
|
||||
|
||||
export default [
|
||||
listObjects,
|
||||
listFields,
|
||||
];
|
||||
export default [listObjects, listFields];
|
||||
|
@@ -2,19 +2,21 @@ import { IGlobalVariable } from '@automatisch/types';
|
||||
|
||||
type TResponse = {
|
||||
sobjects: TObject[];
|
||||
}
|
||||
};
|
||||
|
||||
type TObject = {
|
||||
name: string;
|
||||
label: string;
|
||||
}
|
||||
};
|
||||
|
||||
export default {
|
||||
name: 'List objects',
|
||||
key: 'listObjects',
|
||||
|
||||
async run($: IGlobalVariable) {
|
||||
const response = await $.http.get<TResponse>('/services/data/v56.0/sobjects');
|
||||
const response = await $.http.get<TResponse>(
|
||||
'/services/data/v56.0/sobjects'
|
||||
);
|
||||
|
||||
const objects = response.data.sobjects.map((object) => {
|
||||
return {
|
||||
|
@@ -1,5 +1,3 @@
|
||||
import updatedFieldInRecords from "./updated-field-in-records";
|
||||
import updatedFieldInRecords from './updated-field-in-records';
|
||||
|
||||
export default [
|
||||
updatedFieldInRecords
|
||||
];
|
||||
export default [updatedFieldInRecords];
|
||||
|
@@ -23,7 +23,7 @@ const updatedFieldInRecord = async ($: IGlobalVariable): Promise<void> => {
|
||||
const options = {
|
||||
params: {
|
||||
q: getQuery(object, limit, offset),
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
response = await $.http.get('/services/data/v56.0/query', options);
|
||||
@@ -34,7 +34,7 @@ const updatedFieldInRecord = async ($: IGlobalVariable): Promise<void> => {
|
||||
raw: record,
|
||||
meta: {
|
||||
internalId: `${record.Id}-${record[field]}`,
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -3,7 +3,8 @@ const cronTimes = {
|
||||
everyHourExcludingWeekends: '0 * * * 1-5',
|
||||
everyDayAt: (hour: number) => `0 ${hour} * * *`,
|
||||
everyDayExcludingWeekendsAt: (hour: number) => `0 ${hour} * * 1-5`,
|
||||
everyWeekOnAndAt: (weekday: number, hour: number) => `0 ${hour} * * ${weekday}`,
|
||||
everyWeekOnAndAt: (weekday: number, hour: number) =>
|
||||
`0 ${hour} * * ${weekday}`,
|
||||
everyMonthOnAndAt: (day: number, hour: number) => `0 ${hour} ${day} * *`,
|
||||
};
|
||||
|
||||
|
@@ -4,7 +4,9 @@ import cronParser from 'cron-parser';
|
||||
export default function getNextCronDateTime(cronString: string) {
|
||||
const cronDate = cronParser.parseExpression(cronString);
|
||||
const matchingNextCronDateTime = cronDate.next();
|
||||
const matchingNextDateTime = DateTime.fromJSDate(matchingNextCronDateTime.toDate());
|
||||
const matchingNextDateTime = DateTime.fromJSDate(
|
||||
matchingNextCronDateTime.toDate()
|
||||
);
|
||||
|
||||
return matchingNextDateTime;
|
||||
};
|
||||
}
|
||||
|
@@ -3,9 +3,4 @@ import everyDay from './every-day';
|
||||
import everyWeek from './every-week';
|
||||
import everyMonth from './every-month';
|
||||
|
||||
export default [
|
||||
everyHour,
|
||||
everyDay,
|
||||
everyWeek,
|
||||
everyMonth,
|
||||
];
|
||||
export default [everyHour, everyDay, everyWeek, everyMonth];
|
||||
|
@@ -1,7 +1,4 @@
|
||||
import findMessage from './find-message';
|
||||
import sendMessageToChannel from './send-a-message-to-channel';
|
||||
|
||||
export default [
|
||||
findMessage,
|
||||
sendMessageToChannel,
|
||||
];
|
||||
export default [findMessage, sendMessageToChannel];
|
||||
|
@@ -38,7 +38,8 @@ export default defineAction({
|
||||
type: 'dropdown' as const,
|
||||
required: false,
|
||||
value: false,
|
||||
description: 'If you choose no, this message will appear to come from you. Direct messages are always sent by bots.',
|
||||
description:
|
||||
'If you choose no, this message will appear to come from you. Direct messages are always sent by bots.',
|
||||
variables: false,
|
||||
options: [
|
||||
{
|
||||
@@ -48,8 +49,8 @@ export default defineAction({
|
||||
{
|
||||
label: 'No',
|
||||
value: false,
|
||||
}
|
||||
]
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: 'Bot name',
|
||||
@@ -57,7 +58,8 @@ export default defineAction({
|
||||
type: 'string' as const,
|
||||
required: true,
|
||||
value: 'Automatisch',
|
||||
description: 'Specify the bot name which appears as a bold username above the message inside Slack. Defaults to Automatisch.',
|
||||
description:
|
||||
'Specify the bot name which appears as a bold username above the message inside Slack. Defaults to Automatisch.',
|
||||
variables: true,
|
||||
},
|
||||
{
|
||||
@@ -65,7 +67,8 @@ export default defineAction({
|
||||
key: 'botIcon',
|
||||
type: 'string' as const,
|
||||
required: false,
|
||||
description: 'Either an image url or an emoji available to your team (surrounded by :). For example, https://example.com/icon_256.png or :robot_face:',
|
||||
description:
|
||||
'Either an image url or an emoji available to your team (surrounded by :). For example, https://example.com/icon_256.png or :robot_face:',
|
||||
variables: true,
|
||||
},
|
||||
],
|
||||
|
@@ -7,7 +7,7 @@ type TData = {
|
||||
username?: string;
|
||||
icon_url?: string;
|
||||
icon_emoji?: string;
|
||||
}
|
||||
};
|
||||
|
||||
const postMessage = async ($: IGlobalVariable) => {
|
||||
const { parameters } = $.step;
|
||||
@@ -37,11 +37,9 @@ const postMessage = async ($: IGlobalVariable) => {
|
||||
sendAsBot,
|
||||
};
|
||||
|
||||
const response = await $.http.post(
|
||||
'/chat.postMessage',
|
||||
data,
|
||||
{ additionalProperties: customConfig },
|
||||
);
|
||||
const response = await $.http.post('/chat.postMessage', data, {
|
||||
additionalProperties: customConfig,
|
||||
});
|
||||
|
||||
if (response.data.ok === false) {
|
||||
throw new Error(JSON.stringify(response.data));
|
||||
|
@@ -59,4 +59,4 @@ export default async function createAuthData($: IGlobalVariable) {
|
||||
await $.auth.set({
|
||||
url,
|
||||
});
|
||||
};
|
||||
}
|
||||
|
@@ -22,14 +22,9 @@ const verifyCredentials = async ($: IGlobalVariable) => {
|
||||
|
||||
const {
|
||||
bot_user_id: botId,
|
||||
authed_user: {
|
||||
id: userId,
|
||||
access_token: userAccessToken,
|
||||
},
|
||||
authed_user: { id: userId, access_token: userAccessToken },
|
||||
access_token: botAccessToken,
|
||||
team: {
|
||||
name: teamName,
|
||||
}
|
||||
team: { name: teamName },
|
||||
} = response.data;
|
||||
|
||||
await $.auth.set({
|
||||
@@ -44,7 +39,7 @@ const verifyCredentials = async ($: IGlobalVariable) => {
|
||||
const currentUser = await getCurrentUser($);
|
||||
|
||||
await $.auth.set({
|
||||
screenName: `${currentUser.real_name} @ ${teamName}`
|
||||
screenName: `${currentUser.real_name} @ ${teamName}`,
|
||||
});
|
||||
};
|
||||
|
||||
|
@@ -3,9 +3,9 @@ import { TBeforeRequest } from '@automatisch/types';
|
||||
const addAuthHeader: TBeforeRequest = ($, requestConfig) => {
|
||||
const authData = $.auth.data;
|
||||
if (
|
||||
requestConfig.headers
|
||||
&& authData?.userAccessToken
|
||||
&& authData?.botAccessToken
|
||||
requestConfig.headers &&
|
||||
authData?.userAccessToken &&
|
||||
authData?.botAccessToken
|
||||
) {
|
||||
if (requestConfig.additionalProperties?.sendAsBot) {
|
||||
requestConfig.headers.Authorization = `Bearer ${authData.botAccessToken}`;
|
||||
@@ -14,7 +14,8 @@ const addAuthHeader: TBeforeRequest = ($, requestConfig) => {
|
||||
}
|
||||
}
|
||||
|
||||
requestConfig.headers['Content-Type'] = requestConfig.headers['Content-Type'] || 'application/json; charset=utf-8';
|
||||
requestConfig.headers['Content-Type'] =
|
||||
requestConfig.headers['Content-Type'] || 'application/json; charset=utf-8';
|
||||
|
||||
return requestConfig;
|
||||
};
|
||||
|
@@ -3,7 +3,7 @@ import { IGlobalVariable, IJSONObject } from '@automatisch/types';
|
||||
const getCurrentUser = async ($: IGlobalVariable): Promise<IJSONObject> => {
|
||||
const params = {
|
||||
user: $.auth.data.userId as string,
|
||||
}
|
||||
};
|
||||
const response = await $.http.get('/users.info', { params });
|
||||
const currentUser = response.data.user;
|
||||
|
||||
|
@@ -3,9 +3,4 @@ import newFollowerOfMe from './new-follower-of-me';
|
||||
import searchTweets from './search-tweets';
|
||||
import userTweets from './user-tweets';
|
||||
|
||||
export default [
|
||||
myTweets,
|
||||
newFollowerOfMe,
|
||||
searchTweets,
|
||||
userTweets,
|
||||
];
|
||||
export default [myTweets, newFollowerOfMe, searchTweets, userTweets];
|
||||
|
@@ -1,10 +1,10 @@
|
||||
import appConfig from './app'
|
||||
import appConfig from './app';
|
||||
|
||||
const corsOptions = {
|
||||
origin: appConfig.webAppUrl,
|
||||
methods: 'POST',
|
||||
credentials: true,
|
||||
optionsSuccessStatus: 200,
|
||||
}
|
||||
};
|
||||
|
||||
export default corsOptions;
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { Knex } from "knex";
|
||||
import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.createTable('users', (table) => {
|
||||
@@ -8,10 +8,8 @@ export async function up(knex: Knex): Promise<void> {
|
||||
|
||||
table.timestamps(true, true);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
export async function down(knex: Knex): Promise<void> {
|
||||
return knex.schema.dropTable('users');
|
||||
}
|
||||
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import { Knex } from "knex";
|
||||
import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.createTable('credentials', (table) => {
|
||||
table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'))
|
||||
table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'));
|
||||
table.string('key').notNullable();
|
||||
table.string('display_name').notNullable();
|
||||
table.text('data').notNullable();
|
||||
@@ -11,7 +11,7 @@ export async function up(knex: Knex): Promise<void> {
|
||||
|
||||
table.timestamps(true, true);
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
export async function down(knex: Knex): Promise<void> {
|
||||
return knex.schema.dropTable('credentials');
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { Knex } from "knex";
|
||||
import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.table('credentials', (table) => {
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { Knex } from "knex";
|
||||
import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.renameTable('credentials', 'connections');
|
||||
|
@@ -2,7 +2,7 @@ import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.createTable('steps', (table) => {
|
||||
table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'))
|
||||
table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'));
|
||||
table.string('key').notNullable();
|
||||
table.string('app_key').notNullable();
|
||||
table.string('type').notNullable();
|
||||
|
@@ -1,14 +1,14 @@
|
||||
import { Knex } from "knex";
|
||||
import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.createTable('flows', (table) => {
|
||||
table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'))
|
||||
table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'));
|
||||
table.string('name');
|
||||
table.uuid('user_id').references('id').inTable('users');
|
||||
|
||||
table.timestamps(true, true);
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
export async function down(knex: Knex): Promise<void> {
|
||||
return knex.schema.dropTable('flows');
|
||||
|
@@ -1,15 +1,11 @@
|
||||
import { Knex } from "knex";
|
||||
import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.table('steps', (table) => {
|
||||
table
|
||||
.uuid('flow_id')
|
||||
.references('id')
|
||||
.inTable('flows');
|
||||
table.uuid('flow_id').references('id').inTable('flows');
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
export async function down(knex: Knex): Promise<void> {
|
||||
return knex.schema.table('steps', (table) => {
|
||||
table.dropColumn('flow_id');
|
||||
|
@@ -1,16 +1,15 @@
|
||||
import { Knex } from "knex";
|
||||
import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.alterTable('steps', table => {
|
||||
return knex.schema.alterTable('steps', (table) => {
|
||||
table.string('key').nullable().alter();
|
||||
table.string('app_key').nullable().alter();
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
export async function down(knex: Knex): Promise<void> {
|
||||
return knex.schema.alterTable('steps', table => {
|
||||
return knex.schema.alterTable('steps', (table) => {
|
||||
table.string('key').notNullable().alter();
|
||||
table.string('app_key').notNullable().alter();
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import { Knex } from "knex";
|
||||
import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.table('flows', (table) => {
|
||||
table.boolean('active').defaultTo(false)
|
||||
table.boolean('active').defaultTo(false);
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -2,7 +2,7 @@ import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.createTable('executions', (table) => {
|
||||
table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'))
|
||||
table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'));
|
||||
table.uuid('flow_id').references('id').inTable('flows');
|
||||
table.boolean('test_run').notNullable().defaultTo(false);
|
||||
|
||||
|
@@ -2,7 +2,7 @@ import { Knex } from 'knex';
|
||||
|
||||
export async function up(knex: Knex): Promise<void> {
|
||||
return knex.schema.createTable('execution_steps', (table) => {
|
||||
table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'))
|
||||
table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'));
|
||||
table.uuid('execution_id').references('id').inTable('executions');
|
||||
table.uuid('step_id').references('id').inTable('steps');
|
||||
table.string('status');
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { Knex } from "knex";
|
||||
import { Knex } from 'knex';
|
||||
|
||||
async function addDeletedColumn(knex: Knex, tableName: string) {
|
||||
return await knex.schema.table(tableName, (table) => {
|
||||
|
@@ -32,13 +32,13 @@ const createFlow = async (
|
||||
type: 'trigger',
|
||||
position: 1,
|
||||
appKey,
|
||||
connectionId
|
||||
connectionId,
|
||||
});
|
||||
|
||||
await Step.query().insert({
|
||||
flowId: flow.id,
|
||||
type: 'action',
|
||||
position: 2
|
||||
position: 2,
|
||||
});
|
||||
|
||||
return flow;
|
||||
|
@@ -18,7 +18,9 @@ const resetConnection = async (
|
||||
})
|
||||
.throwIfNotFound();
|
||||
|
||||
if (!connection.formattedData) { return null; }
|
||||
if (!connection.formattedData) {
|
||||
return null;
|
||||
}
|
||||
|
||||
connection = await connection.$query().patchAndFetch({
|
||||
formattedData: { screenName: connection.formattedData.screenName },
|
||||
|
@@ -1,6 +1,10 @@
|
||||
import Context from '../../types/express/context';
|
||||
|
||||
const getCurrentUser = async (_parent: unknown, _params: unknown, context: Context) => {
|
||||
const getCurrentUser = async (
|
||||
_parent: unknown,
|
||||
_params: unknown,
|
||||
context: Context
|
||||
) => {
|
||||
return context.currentUser;
|
||||
};
|
||||
|
||||
|
@@ -13,8 +13,8 @@ const getExecution = async (
|
||||
.$relatedQuery('executions')
|
||||
.withGraphFetched({
|
||||
flow: {
|
||||
steps: true
|
||||
}
|
||||
steps: true,
|
||||
},
|
||||
})
|
||||
.findById(params.executionId)
|
||||
.throwIfNotFound();
|
||||
|
@@ -13,12 +13,12 @@ const getFlows = async (_parent: unknown, params: Params, context: Context) => {
|
||||
const flowsQuery = context.currentUser
|
||||
.$relatedQuery('flows')
|
||||
.joinRelated({
|
||||
steps: true
|
||||
steps: true,
|
||||
})
|
||||
.withGraphFetched({
|
||||
steps: {
|
||||
connection: true
|
||||
}
|
||||
connection: true,
|
||||
},
|
||||
})
|
||||
.where((builder) => {
|
||||
if (params.connectionId) {
|
||||
|
@@ -3,7 +3,7 @@ import appConfig from '../../config/app';
|
||||
const healthcheck = () => {
|
||||
return {
|
||||
version: appConfig.version,
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
export default healthcheck;
|
||||
|
@@ -1,4 +1,8 @@
|
||||
import { IApp, IAuthenticationStep, IAuthenticationStepField } from '@automatisch/types';
|
||||
import {
|
||||
IApp,
|
||||
IAuthenticationStep,
|
||||
IAuthenticationStepField,
|
||||
} from '@automatisch/types';
|
||||
import cloneDeep from 'lodash/cloneDeep';
|
||||
|
||||
const connectionIdArgument = {
|
||||
@@ -9,16 +13,11 @@ const connectionIdArgument = {
|
||||
const resetConnectionStep = {
|
||||
type: 'mutation' as const,
|
||||
name: 'resetConnection',
|
||||
arguments: [
|
||||
connectionIdArgument,
|
||||
],
|
||||
arguments: [connectionIdArgument],
|
||||
};
|
||||
|
||||
function replaceCreateConnection(string: string) {
|
||||
return string.replace(
|
||||
'{createConnection.id}',
|
||||
'{connection.id}'
|
||||
);
|
||||
return string.replace('{createConnection.id}', '{connection.id}');
|
||||
}
|
||||
|
||||
function removeAppKeyArgument(args: IAuthenticationStepField[]) {
|
||||
@@ -36,7 +35,7 @@ function addConnectionId(step: IAuthenticationStep) {
|
||||
return {
|
||||
name: property.name,
|
||||
value: replaceCreateConnection(property.value),
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
@@ -60,7 +59,7 @@ function replaceCreateConnectionsWithUpdate(steps: IAuthenticationStep[]) {
|
||||
}
|
||||
|
||||
return step;
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
function addReconnectionSteps(app: IApp): IApp {
|
||||
@@ -68,12 +67,11 @@ function addReconnectionSteps(app: IApp): IApp {
|
||||
|
||||
if (hasReconnectionSteps) return app;
|
||||
|
||||
const updatedSteps = replaceCreateConnectionsWithUpdate(app.auth.authenticationSteps);
|
||||
const updatedSteps = replaceCreateConnectionsWithUpdate(
|
||||
app.auth.authenticationSteps
|
||||
);
|
||||
|
||||
app.auth.reconnectionSteps = [
|
||||
resetConnectionStep,
|
||||
...updatedSteps,
|
||||
]
|
||||
app.auth.reconnectionSteps = [resetConnectionStep, ...updatedSteps];
|
||||
|
||||
return app;
|
||||
}
|
||||
|
@@ -16,7 +16,7 @@ const appInfoConverter = (rawAppData: IApp) => {
|
||||
};
|
||||
}
|
||||
|
||||
return field
|
||||
return field;
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -3,15 +3,15 @@ import logger from './logger';
|
||||
|
||||
type Error = {
|
||||
message: string;
|
||||
}
|
||||
};
|
||||
|
||||
const errorHandler = (err: Error, req: Request, res: Response): void => {
|
||||
if(err.message === 'Not Found') {
|
||||
res.status(404).end()
|
||||
if (err.message === 'Not Found') {
|
||||
res.status(404).end();
|
||||
} else {
|
||||
logger.error(err.message)
|
||||
res.status(500).end()
|
||||
logger.error(err.message);
|
||||
res.status(500).end();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
export default errorHandler;
|
||||
|
@@ -75,7 +75,10 @@ const globalVariable = async (
|
||||
},
|
||||
},
|
||||
pushTriggerItem: (triggerItem: ITriggerItem) => {
|
||||
if (isAlreadyProcessed(triggerItem.meta.internalId) && !$.execution.testRun) {
|
||||
if (
|
||||
isAlreadyProcessed(triggerItem.meta.internalId) &&
|
||||
!$.execution.testRun
|
||||
) {
|
||||
// early exit as we do not want to process duplicate items in actual executions
|
||||
throw new EarlyExitError();
|
||||
}
|
||||
|
@@ -10,7 +10,7 @@ const levels = {
|
||||
};
|
||||
|
||||
const level = () => {
|
||||
return appConfig.appEnv === 'development' ? 'debug' : 'info'
|
||||
return appConfig.appEnv === 'development' ? 'debug' : 'info';
|
||||
};
|
||||
|
||||
const colors = {
|
||||
@@ -27,8 +27,8 @@ const format = winston.format.combine(
|
||||
winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss:ms' }),
|
||||
winston.format.colorize({ all: true }),
|
||||
winston.format.printf(
|
||||
(info) => `${info.timestamp} [${info.level}]: ${info.message}`,
|
||||
),
|
||||
(info) => `${info.timestamp} [${info.level}]: ${info.message}`
|
||||
)
|
||||
);
|
||||
|
||||
const transports = [
|
||||
|
@@ -3,13 +3,14 @@ import { Request } from 'express';
|
||||
import logger from './logger';
|
||||
|
||||
const stream: StreamOptions = {
|
||||
write: (message) => logger.http(message.substring(0, message.lastIndexOf("\n")))
|
||||
write: (message) =>
|
||||
logger.http(message.substring(0, message.lastIndexOf('\n'))),
|
||||
};
|
||||
|
||||
const registerGraphQLToken = () => {
|
||||
morgan.token("graphql-query", (req: Request) => {
|
||||
if(req.body.query) {
|
||||
return `GraphQL ${req.body.query}`
|
||||
morgan.token('graphql-query', (req: Request) => {
|
||||
if (req.body.query) {
|
||||
return `GraphQL ${req.body.query}`;
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -17,7 +18,7 @@ const registerGraphQLToken = () => {
|
||||
registerGraphQLToken();
|
||||
|
||||
const morganMiddleware = morgan(
|
||||
":method :url :status :res[content-length] - :response-time ms\n:graphql-query",
|
||||
':method :url :status :res[content-length] - :response-time ms\n:graphql-query',
|
||||
{ stream }
|
||||
);
|
||||
|
||||
|
@@ -25,7 +25,10 @@ export default function parseLinkHeader(link: string): TParsedLinkHeader {
|
||||
const items = link.split(',');
|
||||
|
||||
for (const item of items) {
|
||||
const [rawUriReference, ...rawLinkParameters] = item.split(';') as [string, ...string[]];
|
||||
const [rawUriReference, ...rawLinkParameters] = item.split(';') as [
|
||||
string,
|
||||
...string[]
|
||||
];
|
||||
const trimmedUriReference = rawUriReference.trim();
|
||||
|
||||
const reference = trimmedUriReference.slice(1, -1);
|
||||
@@ -45,4 +48,4 @@ export default function parseLinkHeader(link: string): TParsedLinkHeader {
|
||||
}
|
||||
|
||||
return parsed;
|
||||
}
|
||||
}
|
||||
|
@@ -36,7 +36,10 @@ class Base extends Model {
|
||||
this.updatedAt = new Date().toISOString();
|
||||
}
|
||||
|
||||
async $beforeUpdate(opts: ModelOptions, queryContext: QueryContext): Promise<void> {
|
||||
async $beforeUpdate(
|
||||
opts: ModelOptions,
|
||||
queryContext: QueryContext
|
||||
): Promise<void> {
|
||||
this.updatedAt = new Date().toISOString();
|
||||
|
||||
await super.$beforeUpdate(opts, queryContext);
|
||||
|
@@ -1,20 +1,34 @@
|
||||
import { Model, Page, PartialModelObject, ForClassMethod, AnyQueryBuilder } from "objection";
|
||||
import {
|
||||
Model,
|
||||
Page,
|
||||
PartialModelObject,
|
||||
ForClassMethod,
|
||||
AnyQueryBuilder,
|
||||
} from 'objection';
|
||||
|
||||
const DELETED_COLUMN_NAME = 'deleted_at';
|
||||
|
||||
const buildQueryBuidlerForClass = (): ForClassMethod => {
|
||||
return (modelClass) => {
|
||||
const qb: AnyQueryBuilder = Model.QueryBuilder.forClass.call(ExtendedQueryBuilder, modelClass);
|
||||
const qb: AnyQueryBuilder = Model.QueryBuilder.forClass.call(
|
||||
ExtendedQueryBuilder,
|
||||
modelClass
|
||||
);
|
||||
qb.onBuild((builder) => {
|
||||
if (!builder.context().withSoftDeleted) {
|
||||
builder.whereNull(`${qb.modelClass().tableName}.${DELETED_COLUMN_NAME}`);
|
||||
builder.whereNull(
|
||||
`${qb.modelClass().tableName}.${DELETED_COLUMN_NAME}`
|
||||
);
|
||||
}
|
||||
});
|
||||
return qb;
|
||||
};
|
||||
};
|
||||
|
||||
class ExtendedQueryBuilder<M extends Model, R = M[]> extends Model.QueryBuilder<M, R> {
|
||||
class ExtendedQueryBuilder<M extends Model, R = M[]> extends Model.QueryBuilder<
|
||||
M,
|
||||
R
|
||||
> {
|
||||
ArrayQueryBuilderType!: ExtendedQueryBuilder<M, M[]>;
|
||||
SingleQueryBuilderType!: ExtendedQueryBuilder<M, M>;
|
||||
MaybeSingleQueryBuilderType!: ExtendedQueryBuilder<M, M | undefined>;
|
||||
@@ -25,7 +39,7 @@ class ExtendedQueryBuilder<M extends Model, R = M[]> extends Model.QueryBuilder<
|
||||
|
||||
delete() {
|
||||
return this.patch({
|
||||
[DELETED_COLUMN_NAME]: (new Date()).toISOString(),
|
||||
[DELETED_COLUMN_NAME]: new Date().toISOString(),
|
||||
} as unknown as PartialModelObject<M>);
|
||||
}
|
||||
|
||||
|
@@ -2,13 +2,13 @@ import FieldType from './field';
|
||||
import AuthenticationStepType from './authentication-step';
|
||||
|
||||
type AppInfo = {
|
||||
name: string,
|
||||
key: string,
|
||||
iconUrl: string,
|
||||
docUrl: string,
|
||||
primaryColor: string,
|
||||
fields: FieldType[],
|
||||
authenticationSteps?: AuthenticationStepType[]
|
||||
}
|
||||
name: string;
|
||||
key: string;
|
||||
iconUrl: string;
|
||||
docUrl: string;
|
||||
primaryColor: string;
|
||||
fields: FieldType[];
|
||||
authenticationSteps?: AuthenticationStepType[];
|
||||
};
|
||||
|
||||
export default AppInfo;
|
||||
|
@@ -1,10 +1,10 @@
|
||||
type AuthenticationStepField = {
|
||||
name: string,
|
||||
value: string | null,
|
||||
name: string;
|
||||
value: string | null;
|
||||
fields?: {
|
||||
name: string,
|
||||
value: string | null
|
||||
}[]
|
||||
}
|
||||
name: string;
|
||||
value: string | null;
|
||||
}[];
|
||||
};
|
||||
|
||||
export default AuthenticationStepField;
|
||||
|
@@ -1,10 +1,10 @@
|
||||
import type { IAuthenticationStepField } from '@automatisch/types';
|
||||
|
||||
type AuthenticationStep = {
|
||||
step: number,
|
||||
type: string,
|
||||
name: string,
|
||||
step: number;
|
||||
type: string;
|
||||
name: string;
|
||||
fields: IAuthenticationStepField[];
|
||||
}
|
||||
};
|
||||
|
||||
export default AuthenticationStep;
|
||||
|
22
packages/backend/src/types/field.d.ts
vendored
22
packages/backend/src/types/field.d.ts
vendored
@@ -1,14 +1,14 @@
|
||||
type Field = {
|
||||
key: string,
|
||||
label: string,
|
||||
type: string,
|
||||
required: boolean,
|
||||
readOnly: boolean,
|
||||
value: string,
|
||||
placeholder: string | null,
|
||||
description: string,
|
||||
docUrl: string,
|
||||
clickToCopy: boolean
|
||||
}
|
||||
key: string;
|
||||
label: string;
|
||||
type: string;
|
||||
required: boolean;
|
||||
readOnly: boolean;
|
||||
value: string;
|
||||
placeholder: string | null;
|
||||
description: string;
|
||||
docUrl: string;
|
||||
clickToCopy: boolean;
|
||||
};
|
||||
|
||||
export default Field;
|
||||
|
@@ -2,6 +2,6 @@ import test from 'ava';
|
||||
|
||||
const fn = () => 'foo';
|
||||
|
||||
test('fn() returns foo', t => {
|
||||
t.is(fn(), 'foo');
|
||||
test('fn() returns foo', (t) => {
|
||||
t.is(fn(), 'foo');
|
||||
});
|
||||
|
Reference in New Issue
Block a user