@nlabs/reaktor 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nlabs/reaktor",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Reaktor",
   "main": "./index.js",
   "types": "./lib/index.d.js",
@@ -34,27 +34,27 @@
   },
   "dependencies": {
     "@nlabs/arkhamjs": "^3.11.11",
-    "@nlabs/rip-hunter": "^2.0.0",
-    "@nlabs/utils": "^1.2.0",
+    "@nlabs/rip-hunter": "^2.0.1",
+    "@nlabs/utils": "^1.2.2",
     "apn": "^2.2.0",
     "arangojs": "^6.0.0",
-    "aws-sdk": "^2.411.0",
+    "aws-sdk": "^2.421.0",
     "gm": "^1.23.1",
     "google-libphonenumber": "^3.0.10",
-    "googleapis": "^37.2.0",
+    "googleapis": "^38.0.0",
     "graphql": "^14.0.2",
     "graphql-errors": "^2.1.0",
-    "graphql-fields": "^2.0.1",
+    "graphql-fields": "^2.0.3",
     "hiredis": "^0.5.0",
     "lodash": "^4.17.4",
-    "luxon": "^1.3.3",
+    "luxon": "^1.11.4",
     "node-yelp": "0.0.3",
     "numeral": "^2.0.6",
     "redis": "^2.8.0",
     "request-promise": "^4.2.2",
-    "stripe": "^6.12.1",
+    "stripe": "^6.26.0",
     "to": "^0.2.9",
-    "twilio": "^3.11.0",
+    "twilio": "^3.29.1",
     "typed-promisify": "^0.4.0",
     "universal-analytics": "^0.4.16",
     "update": "^0.7.4"
@@ -62,12 +62,12 @@
   "devDependencies": {
     "@types/graphql": "^14.0.1",
     "@types/history": "^4.6.2",
-    "@types/jest": "^24.0.9",
+    "@types/jest": "^24.0.11",
     "@types/luxon": "^1.11.0",
-    "@types/node": "^11.9.4",
+    "@types/node": "^11.11.3",
     "@types/twilio": "^0.0.10",
-    "eslint": "^5.13.0",
-    "eslint-config-styleguidejs": "^1.0.3",
+    "eslint": "^5.15.1",
+    "eslint-config-styleguidejs": "^1.0.8",
     "graphql-tools": "^4.0.0",
     "source-map-loader": "^0.2.4",
     "typescript": "^3.0.3"

package/src/config.ts

@@ -26,7 +26,13 @@ export interface EnvConfig {
 
 const appPackage: any = require('../package.json');
 
-const {arangodbDatabase, arangodbPassword, arangodbPort = '8529', arangodbUrl, arangodbUsername} = process.env;
+const {
+  arangodbDatabase = 'reaktor',
+  arangodbPassword,
+  arangodbPort = '8529',
+  arangodbUrl = 'db.reaktor.io',
+  arangodbUsername = 'reaktor'
+} = process.env;
 
 export class Config {
   static values: EnvConfig = {
@@ -37,7 +43,7 @@ export class Config {
         version: appPackage.version
       },
       arangodb: {
-        apiUrl: `http://${arangodbUsername}:${arangodbPassword}@${arangodbUrl}:${arangodbPort}`,
+        apiUrl: `http://${arangodbUrl}:${arangodbPort}`,
         database: arangodbDatabase,
         dump: '/Applications/ArangoDB-CLI.app/Contents/MacOS/arangodump',
         password: arangodbPassword,

package/src/data/conversations.ts

@@ -47,7 +47,7 @@ export const getConversationList = (context: ApiContext, from: number, to: numbe
 
 export const getDirectConversation = (context: ApiContext, userId: string): Promise<ConversationType> => {
   const action: string = 'getDirect';
-  const {appId: sessionApp, database, userId: sessionId} = context;
+  const {database, userId: sessionId} = context;
   const formatUserId: string = parseId(userId);
 
   const aqlQry: AqlQuery = aql`FOR c IN conversations
@@ -72,7 +72,6 @@ export const getDirectConversation = (context: ApiContext, userId: string): Prom
         conversation.users = users.map((user: UserType) => {
           const {_key: userKey, imgId} = user;
           const thumbUrlData: ImageUrlData = {
-            appId: sessionApp,
             directory: 'images',
             imgId,
             isThumb: true,
@@ -98,7 +97,7 @@ export const getDirectConversation = (context: ApiContext, userId: string): Prom
 
 export const getConversation = (context: ApiContext, convoId: string): Promise<ConversationType> => {
   const action: string = 'getItem';
-  const {appId: sessionApp, database, userId: sessionId} = context;
+  const {database, userId: sessionId} = context;
   const formatConvoId: string = parseId(convoId);
 
   const aqlQry: AqlQuery = aql`FOR c IN conversations
@@ -120,7 +119,6 @@ export const getConversation = (context: ApiContext, convoId: string): Promise<C
         conversation.users = conversation.users.map((user: UserType) => {
           const {_key: userKey, imgId} = user;
           const thumbUrlData: ImageUrlData = {
-            appId: sessionApp,
             directory: 'images',
             imgId,
             isThumb: true,

package/src/data/email.ts

@@ -21,8 +21,7 @@ export const appTemplate = (app: AppType, message: string = '', vars = {}): stri
   if(!isEmpty(app)) {
     updatedMessage = message.replace(/\[appName\]/g, app.name)
       .replace(/\[appUrl\]/g, app.url)
-      .replace(/\[appEmail\]/g, app.email)
-      .replace(/\[appId\]/g, app.id);
+      .replace(/\[appEmail\]/g, app.email);
   }
 
   Object.keys(vars).forEach((key: string) => {
@@ -53,7 +52,7 @@ export const sendEmail = (params: EmailType): Promise<boolean> => {
   const formatTitle: string = appTemplate(app, title);
   const formatText: string = appTemplate(app, text);
   const formatHtml: string = appTemplate(app, html);
-  const {_key: appId, hasCustomEmail, urlFacebook, urlTwitter} = app;
+  const {_key: hasCustomEmail, urlFacebook, urlTwitter} = app;
 
   const parseTemplate = (body: string) => {
     const templateBody: string = appTemplate(app, body || '');
@@ -89,7 +88,7 @@ export const sendEmail = (params: EmailType): Promise<boolean> => {
   };
 
   if(hasCustomEmail) {
-    const s3Params: GetObjectRequest = {Bucket: null, Key: `apps/${appId}/templates/email.html`};
+    const s3Params: GetObjectRequest = {Bucket: null, Key: `apps/templates/email.html`};
     promise = s3Get(s3Params).then((results) => parseTemplate(results.Body.toString()));
   } else {
     promise = new Promise((resolve, reject) => {

package/src/data/files.ts

@@ -25,7 +25,7 @@ request.defaults({encoding: null});
 
 // Upload file
 export const addFile = (context: ApiContext, item: FileType = {}): Promise<FileType> => {
-  const {appId: sessionApp, database, userId: sessionId, userType} = context;
+  const {database, userId: sessionId, userType} = context;
   const {
     description = '',
     fileType = '',
@@ -35,7 +35,7 @@ export const addFile = (context: ApiContext, item: FileType = {}): Promise<FileT
   } = item;
 
   // Id
-  const fileId: string = id ? parseId(id) : createHash(`file-${sessionId}-${sessionApp}`);
+  const fileId: string = id ? parseId(id) : createHash(`file-${sessionId}`);
 
   // Name
   const isUrl: boolean = url !== '';

package/src/data/images.ts

@@ -407,7 +407,7 @@ export const getPathUserImages = (userID: string, photoId: string, type: string,
 };
 
 export const getUrlImages = (data: ImageUrlData): string => {
-  const {appId, imgId, directory = 'images', imgType = 'profile', isThumb, type, typeId} = data;
+  const {imgId, directory = 'images', imgType = 'profile', isThumb, type, typeId} = data;
   const host: string = Config.get('environment') === 'production'
     ? `https://box.${Config.get('app.url')}`
     : `https://s3.amazonaws.com/dev.${Config.get('app.url')}`;
@@ -417,17 +417,17 @@ export const getUrlImages = (data: ImageUrlData): string => {
     switch(type) {
       case 'app':
         // https://box.reaktor.io/myApp/app/images/123.jpg
-        return `${host}/${appId}/${type}/${directory}/${imgId}${suffix}.jpg`;
+        return `${host}/${type}/${directory}/${imgId}${suffix}.jpg`;
       case 'users':
         // https://box.reaktor.io/myApp/users/demoUser/images/123.jpg
-        return `${host}/${appId}/${type}/${typeId}/${directory}/${imgId}${suffix}.jpg`;
+        return `${host}/${type}/${typeId}/${directory}/${imgId}${suffix}.jpg`;
     }
 
     if(imgType === 'profile') {
-      return `${host}/${appId}/defaults/${type}_bk${suffix}.jpg`;
+      return `${host}/defaults/${type}_bk${suffix}.jpg`;
     }
 
-    return `${host}/${appId}/defaults/${type}_wh${suffix}.jpg`;
+    return `${host}/defaults/${type}_wh${suffix}.jpg`;
   }
 
   return '';