chore: Introduce app info converter and use JSON for info files

packages/backend/src/apps/flickr/info.json

@@ -1,10 +1,7 @@
-import appInfoType from '../../types/app-info';
+{
-import appConfig from '../../config/app';
-
-const appInfo: appInfoType = {
   "name": "Flickr",
   "key": "flickr",
-  "iconUrl": `${appConfig.baseUrl}/apps/flickr/assets/favicon.svg`,
+  "iconUrl": "{BASE_URL}/apps/flickr/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/flickr",
   "primaryColor": "000000",
   "fields": [
@@ -116,5 +113,3 @@ const appInfo: appInfoType = {
     }
   ]
 }
-
-export default appInfo;

packages/backend/src/apps/twitch/info.json

@@ -1,10 +1,7 @@
-import appInfoType from '../../types/app-info';
+{
-import appConfig from '../../config/app';
-
-const appInfo: appInfoType = {
   "name": "Twitch",
   "key": "twitch",
-  "iconUrl": `${appConfig.baseUrl}/apps/twitch/assets/favicon.svg`,
+  "iconUrl": "{BASE_URL}/apps/twitch/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/twitch",
   "primaryColor": "6441a5",
   "fields": [
@@ -46,5 +43,3 @@ const appInfo: appInfoType = {
     }
   ]
 }
-
-export default appInfo;

packages/backend/src/apps/twitter/info.json

@@ -1,10 +1,7 @@
-import appInfoType from '../../types/app-info';
+{
-import appConfig from '../../config/app';
-
-const appInfo: appInfoType = {
   "name": "Twitter",
   "key": "twitter",
-  "iconUrl": `${appConfig.baseUrl}/apps/twitter/assets/favicon.svg`,
+  "iconUrl": "{BASE_URL}/apps/twitter/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/twitter",
   "primaryColor": "2DAAE1",
   "fields": [
@@ -116,5 +113,3 @@ const appInfo: appInfoType = {
     }
   ]
 }
-
-export default appInfo;

packages/backend/src/graphql/mutations/create-connection.ts

@@ -10,7 +10,7 @@ type Params = {
   data: object
 }
 const createConnectionResolver = async (params: Params, req: RequestWithCurrentUser) => {
-  const app = await App.findOneByKey(params.key);
+  const app = App.findOneByKey(params.key);
   const connection = await Connection.query().insert({
     key: params.key,
     data: params.data,

packages/backend/src/graphql/queries/get-app-connections.ts

@@ -9,7 +9,7 @@ type Params = {
 }
 
 const getAppConnectionsResolver = async (params: Params, req: RequestWithCurrentUser) => {
-  const app = await App.findOneByKey(params.key);
+  const app = App.findOneByKey(params.key);
   const connections = await Connection.query()
     .where({ user_id: req.currentUser.id, key: params.key })
 

packages/backend/src/graphql/queries/get-app.ts

@@ -14,7 +14,7 @@ const getAppResolver = async (params: Params, req: RequestWithCurrentUser) => {
     throw new Error('No key provided.')
   }
 
-  const app = await App.findOneByKey(params.key);
+  const app = App.findOneByKey(params.key);
 
   if (req.currentUser?.id) {
     const connections = await Connection.query()

packages/backend/src/graphql/queries/get-connected-apps.ts

@@ -9,7 +9,7 @@ type Params = {
 }
 
 const getConnectedAppsResolver = async (params: Params, req: RequestWithCurrentUser) => {
-  let apps = await App.findAll(params.name)
+  let apps = App.findAll(params.name)
 
   const connections = await Connection.query()
     .select('connections.key')

packages/backend/src/helpers/app-info-converter.ts

@@ -0,0 +1,11 @@
+import AppInfoType from '../types/app-info';
+import appConfig from '../config/app';
+
+const appInfoConverter = (rawAppData: string) => {
+  const computedRawData = rawAppData.replace('{BASE_URL}', appConfig.baseUrl);
+  const computedJSONData: AppInfoType = JSON.parse(computedRawData)
+
+  return computedJSONData;
+}
+
+export default appInfoConverter;

packages/backend/src/models/app.ts

@@ -1,31 +1,26 @@
 import fs from 'fs';
+import appInfoConverter from '../helpers/app-info-converter';
 
 class App {
   static folderPath = __dirname + '/../apps';
   static list = fs.readdirSync(this.folderPath);
 
-  static async findAll(name?: string): Promise<object[]> {
+  static findAll(name?: string): object[] {
-    let appList;
+    if(!name) return this.list.map((name) => this.findOneByName(name));
 
-    if(!name) {
+    return this.list
-      appList = this.list.map(async (name) => await this.findOneByName(name));
+      .filter((app) => app.includes(name.toLowerCase()))
-    } else {
+      .map((name) => this.findOneByName(name));
-      appList = this.list
-        .filter((app) => app.includes(name.toLowerCase()))
-        .map(async (name) => await this.findOneByName(name));
-    }
-
-    return Promise.all(appList)
   }
 
-  static async findOneByName(name: string): Promise<object> {
+  static findOneByName(name: string): object {
-    const rawAppData = (await import(`../apps/${name}/info`)).default;
+    const rawAppData = fs.readFileSync(this.folderPath + `/${name}/info.json`, 'utf-8');
-    return rawAppData;
+    return appInfoConverter(rawAppData);
   }
 
-  static async findOneByKey(key: string): Promise<object> {
+  static findOneByKey(key: string): object {
-    const rawAppData = (await import(`../apps/${key}/info`)).default;
+    const rawAppData = fs.readFileSync(this.folderPath + `/${key}/info.json`, 'utf-8');
-    return rawAppData;
+    return appInfoConverter(rawAppData);
   }
 }