Release v1.1.0

.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+npm-debug.log
+Gravity Documentation - v1.pdf
+public/bundle.js

.env_sample

@@ -15,3 +15,13 @@ EMAIL='[REPLACE_EMAIL]'
 REFRESH_TOKEN='[REPLACE_REFRESH_TOKEN]'
 CLIENT_SECRET='[REPLACE_CLIENT_SECRET]'
 CLIENT_ID='[REPLACE_CLIENT_ID]'
+REDIS_HOST=redis
+REDIS_PORT=6379
+MONGO_URL=mongodb://mongo:27017/metisPN
+URL_DB=mongodb://mongo:27017/metisPN
+NODE_OPTIONS=--max_old_space_size=4096
+S3_STREAM_ENDPOINT='sfo3.digitaloceanspaces.com'
+S3_STREAM_KEY='ZS6SNTVEW45MWFOZZHB5'
+S3_STREAM_SECRET_KEY='pFancYkzwzT57TJBdu2pAFdbY/KB+WdoX7kYxAuu7Gg'
+S3_STREAM_BUCKET_DEV='metis-logs-dev'
+S3_STREAM_BUCKET_PROD='metis-logs-prod'

.github/workflows/dev.workflow.yml

@@ -0,0 +1,42 @@
+name: Build and publish Metis Dev
+
+on:
+  push:
+    branches: [ dev ]
+  workflow_dispatch:
+
+jobs:
+  build_and_push:
+    environment: dev
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v2
+      - name: Build image
+        run: docker build -t metis .
+      - name: Install doctl
+        uses: digitalocean/action-doctl@v2
+        with:
+          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+      - name: Log in to DO Container Registry
+        run: doctl registry login --expiry-seconds 600
+      - name: Tag image
+        run: docker tag metis ${{ secrets.DIGITALOCEAN_REGISTRY }}:${{ secrets.DIGITALOCEAN_APP_TAG }}
+      - name: Push image to DO Container Registry
+        run: docker push ${{ secrets.DIGITALOCEAN_REGISTRY }}:${{ secrets.DIGITALOCEAN_APP_TAG }}
+      - name: Launch image
+        run: doctl apps create-deployment ${{ secrets.DIGITALOCEAN_APP_ID }} --wait
+      - name: Channel specific notification Slack
+        uses: adamkdean/simple-slack-notify@master
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        with:
+          channel: '#general'
+          text: 'A new version of Metis Dev has been deployed'
+#      - name: send custom message to Telegram
+#        uses: appleboy/telegram-action@master
+#        with:
+#          to: ${{ secrets.TELEGRAM_TO }}
+#          token: ${{ secrets.TELEGRAM_TOKEN }}
+#          message: |
+#            The ${{ github.event_name }} event triggered final step. This is only a test.

.github/workflows/prod.workflow.yml

@@ -0,0 +1,42 @@
+name: Build and publish Metis Prod
+
+on:
+  push:
+    branches: [ release/** ]
+  workflow_dispatch:
+
+jobs:
+  build_and_push:
+    environment: production
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v2
+      - name: Build image
+        run: docker build -t metis .
+      - name: Install doctl
+        uses: digitalocean/action-doctl@v2
+        with:
+          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+      - name: Log in to DO Container Registry
+        run: doctl registry login --expiry-seconds 600
+      - name: Tag image
+        run: docker tag metis ${{ secrets.DIGITALOCEAN_REGISTRY }}:${{ secrets.DIGITALOCEAN_APP_TAG }}
+      - name: Push image to DO Container Registry
+        run: docker push ${{ secrets.DIGITALOCEAN_REGISTRY }}:${{ secrets.DIGITALOCEAN_APP_TAG }}
+      - name: Launch image
+        run: doctl apps create-deployment ${{ secrets.DIGITALOCEAN_APP_ID }} --wait
+      - name: Channel specific notification Slack
+        uses: adamkdean/simple-slack-notify@master
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        with:
+          channel: '#general'
+          text: 'A new version of Metis Prod has been deployed'
+#      - name: send custom message to Telegram
+#        uses: appleboy/telegram-action@master
+#        with:
+#          to: ${{ secrets.TELEGRAM_TO }}
+#          token: ${{ secrets.TELEGRAM_TOKEN }}
+#          message: |
+#            The ${{ github.event_name }} event triggered final step. This is only a test.

.gitignore

@@ -28,3 +28,6 @@ dev
 
 .idea
 /logs/log-api.log
+/data
+/mongodb_data
+/.scannerwork

README.md

@@ -27,3 +27,17 @@ To build your own local Metis instance to truly protect your communications!
 7. Open your browser and type in 127.0.0.1:4000
 
 This is a 100% local instance of Metis that talks to Jupiter's blockchain. Anyone can complete these steps and create their own private, encrypted, and shielded communications. Even though this is a local only instance, you can log into ANY Metis instance with your credentials and it will still work and have all your past conversations waiting for you! This is due to all your conversations being encrypted and stored on Jupiter's decentralized blockchain.
+
+If you want to start the system using docker, it is necessary to execute the following steps.
+
+1. Install **docker**
+2. Install **docker-compose**
+3. Clone the repository code https://github.com/jupiter-project/metis.git
+	`git clone https://github.com/jupiter-project/metis.git`
+4. It is necessary to switch to the dev branch
+	`cd metis`
+	`git checkout dev`
+	`git pull`
+5. Inside the code folder execute the command `docker-compose up --build`
+6. This command will start a mongodb container, a redis container and a metis container.
+7. Open your browser and type in 127.0.0.1:4000

config/apn.js

@@ -1,6 +1,6 @@
 const { join } = require('path');
 
-const IS_PRODUCTION = process.env.NODE_ENV === 'production';
+const IS_PRODUCTION = ['qa', 'staging', 'production'].includes(process.env.NODE_ENV);
 
 const getApnOptions = () => ({
   pfx: join(__dirname, '../certificates', 'apn.p12'),

config/gravity.js

@@ -2520,7 +2520,7 @@ class Gravity {
                     APP_ACCOUNT: passphrase,
                     APP_ACCOUNT_ADDRESS: address,
                     APP_PUBLIC_KEY: publicKey,
-                    ENCRYPT_ALGORITHM: 'aes-128-cbc',
+                    ENCRYPT_ALGORITHM: 'aes-256-cbc',
                     ENCRYPT_PASSWORD: password,
                     APP_ACCOUNT_ID: publicKey,
                   };

config/notifications.js

@@ -8,9 +8,10 @@ const logger = require('../utils/logger')(module);
  * @param badgeCount Integer of updated badge count
  * @param payload Extra data
  * @param category Used to identify push on device
+ * @param delay delay on milliseconds for push notification
  * @returns {Promise}
  */
-async function sendPushNotification(tokens, alert, badgeCount, payload, category) {
+function sendPushNotification(tokens, alert, badgeCount, payload, category, delay = 1) {
   logger.info('[Notifications][sendPushNotification] -> Start');
 
   const apnProvider = new apn.Provider(APN_OPTIONS);
@@ -27,11 +28,12 @@ async function sendPushNotification(tokens, alert, badgeCount, payload, category
 
   notification.category = `metis.category.${category || 'default'}`;
 
-  // Send the actual notification
-  const result = await apnProvider.send(notification, tokens);
-
-  // Show the result of the send operation:
-  logger.info(JSON.stringify(result));
+  setTimeout(async () => {
+    // Send the actual notification
+    const result = await apnProvider.send(notification, tokens);
+    // Show the result of the send operation:
+    logger.info(JSON.stringify(result));
+  }, delay);
 }
 
 module.exports = {

config/passport.js

@@ -102,7 +102,7 @@ const metisSignup = (passport) => {
             }, req.flash('signupMessage', 'Your account has been created and is being saved into the blockchain. Please wait a couple of minutes before logging in.'));
           })
           .catch((err) => {
-            logger.error(err);
+            logger.error('USER CREATION FAILED', JSON.stringify(err));
             let errorMessage;
             if (err.verification_error !== undefined && err.verification_error === true) {
               err.errors.forEach((x) => {
@@ -112,7 +112,7 @@ const metisSignup = (passport) => {
             } else {
               errorMessage = err.errors;
             }
-            return done(null, false, req.flash('signupMessage', errorMessage));
+            return done(null, false, { message: errorMessage });
           });
       });
 

controllers/_application.js

@@ -262,11 +262,21 @@ module.exports = (app, passport, React, ReactDOMServer) => {
 
     passport.authenticate('gravity-login', (err, userInfo) => {
       if (err) return next(err);
+      if (!userInfo) {
+        const errorMessage = 'There was an error in verifying the passphrase with the Blockchain';
+
+        logger.error(new Error(errorMessage));
+
+        return res.status(400).json({
+          success: false,
+          message: errorMessage,
+        });
+      }
 
       const accountData = JSON.parse(gravity.decrypt(userInfo.accountData));
 
       userInfo.publicKey = accountData.publicKey;
-      res.json(userInfo);
+      return res.json(userInfo);
     })(req, res, next);
   });
 

controllers/channels.js

@@ -6,25 +6,42 @@ import { messagesConfig } from '../config/constants';
 import Invite from '../models/invite';
 import Channel from '../models/channel';
 import Message from '../models/message';
+import { findNotificationInfoByAliasOrJupId } from '../services/notificationService';
+import metis from '../config/metis';
 
 const connection = process.env.SOCKET_SERVER;
 const device = require('express-device');
-const Notifications = require('../models/notifications');
 const { sendPushNotification } = require('../config/notifications');
 const logger = require('../utils/logger')(module);
-
-const decryptUserData = (req) => {
-  return JSON.parse(gravity.decrypt(req.session.accessData));
+const { hasJsonStructure } = require('../utils/utils');
+
+const decryptUserData = req => JSON.parse(gravity.decrypt(req.session.accessData));
+
+const getPNTokensAndSendPushNotification = (members, senderAlias, channel, message, title) => {
+  if (members && Array.isArray(members) && !_.isEmpty(members)) {
+    findNotificationInfoByAliasOrJupId(members, channel.id)
+      .then((data) => {
+        if (data && Array.isArray(data) && !_.isEmpty(data)) {
+          const tokens = _.map(data, 'token');
+          const payload = { title, channel };
+          sendPushNotification(tokens, message, 0, payload, 'channels');
+        }
+      })
+      .catch((error) => {
+        logger.error(JSON.stringify(error));
+      });
+  }
 };
 
-const getPNTokensAndSendPushNotification = (members, channelName, senderAlias) => {
-  Notifications.find({ alias: { $in: members }, token: { $ne: '' } })
+const getPNTokenAndSendInviteNotification = (senderAlias, recipientAliasOrJupId, channelName) => {
+  findNotificationInfoByAliasOrJupId([recipientAliasOrJupId])
     .then((data) => {
       if (data && Array.isArray(data) && !_.isEmpty(data)) {
         const tokens = _.map(data, 'token');
-        const alert = `${senderAlias} has sent a message to '${channelName}' channel`;
-        const payload = { title: 'New Message' };
-        sendPushNotification(tokens, alert, 1, payload, 'channels');
+        const alert = `${senderAlias} invited you to the channel "${channelName}"`;
+        const payload = { title: 'Invitation', isInvitation: true };
+        const threeMinutesDelay = 180000;
+        sendPushNotification(tokens, alert, 0, payload, 'channels', threeMinutesDelay);
       }
     })
     .catch((error) => {
@@ -60,8 +77,7 @@ module.exports = (app, passport, React, ReactDOMServer) => {
   });
 
   app.post('/reportUser', controller.isLoggedIn, (req, res) => {
-
-    let transporter = mailer.createTransport({
+    const transporter = mailer.createTransport({
       service: 'gmail',
       auth: {
         type: 'OAuth2',
@@ -163,6 +179,10 @@ module.exports = (app, passport, React, ReactDOMServer) => {
 
     try {
       response = await invite.send();
+      const recipient = _.get(data, 'recipient', '');
+      const sender = _.get(data, 'senderAlias', '');
+      const channelName = _.get(data, 'channel.name', '');
+      getPNTokenAndSendInviteNotification(sender, recipient, channelName);
     } catch (e) {
       logger.error(e);
       response = e;
@@ -258,7 +278,7 @@ module.exports = (app, passport, React, ReactDOMServer) => {
    */
   app.post('/data/messages', controller.isLoggedIn, async (req, res) => {
     const { maxMessageLength } = messagesConfig;
-    const hasMessage = _.get(req, 'body.data.message', null);
+    let hasMessage = _.get(req, 'body.data.message', null);
     let response;
 
     if (hasMessage && hasMessage.length <= maxMessageLength) {
@@ -270,25 +290,45 @@ module.exports = (app, passport, React, ReactDOMServer) => {
       message.record.sender = _.get(req, 'user.record.account', req.body.user.account);
       // accountData
       // const userData = decryptUserData(req);
-      let members = _.get(req, 'body.members', []);
+
+      let { members } = await metis.getMember({
+        channel: tableData.account,
+        account: tableData.publicKey,
+        password: tableData.password,
+      });
+
+      const mentions = _.get(req, 'body.mentions', []);
+      const channel = _.get(req, 'body.channel', []);
       const channelName = _.get(tableData, 'name', 'a channel');
       const accessData = _.get(req, 'session.accessData', req.body.user.accountData);
       const userData = JSON.parse(gravity.decrypt(accessData));
       try {
         const data = await message.sendMessage(userData, tableData, message.record);
         response = data;
-
-        if (Array.isArray(members)) {
-          members = members.filter(member => member !== message.record.name);
+        if (Array.isArray(members) && members.length > 0) {
+          const senderName = message.record.name;
+          members = members.filter(member => member !== senderName && !mentions.includes(member));
+
+          if (hasJsonStructure(hasMessage)) {
+            hasMessage = JSON.parse(hasMessage);
+            hasMessage = hasMessage.fromMsj || '';
+          }
+
+          // push notification for members
+          const pnTitle = `${senderName} @ ${channelName}`;
+          getPNTokensAndSendPushNotification(members, senderName, channel, hasMessage, pnTitle);
+
+          // Push notification for mentioned members
+          const pnmTitle = `${senderName} has tagged @ ${channelName}`;
+          getPNTokensAndSendPushNotification(mentions, senderName, channel, hasMessage, pnmTitle);
         }
-        getPNTokensAndSendPushNotification(members, channelName, message.record.name);
       } catch (e) {
-        logger.error(e);
+        logger.error('[/data/messages]', JSON.stringify(e));
         response = { success: false, fullError: e };
       }
     } else {
-      response = { success: false, messages: [`Message exceeds allowable limit of ${maxMessageLength} characters`] };
-      logger.error(response);
+      response = { success: false, messages: [`Message is not valid or exceeds allowable limit of ${maxMessageLength} characters`] };
+      logger.error(JSON.stringify(response));
     }
     res.send(response);
   });

controllers/pushNotificationController.js

@@ -0,0 +1,7 @@
+const Notification = require('../services/pushNotificationTokenService');
+
+module.exports = (app) => {
+  app.post('/pn_token', Notification.addTokenNotification);
+  app.put('/mute_channels', Notification.editMutedChannels);
+  app.get('/mute_channels/:alias', Notification.findMutedChannels);
+};

docker-compose.yml

@@ -1,12 +1,20 @@
 version: "3"
 services:
+  mongo:
+    image: "mongo:3.6"
+    volumes:
+      - ./data/db:/data/db
+    ports:
+      - 27017:27017
+      - 28017:28017
   redis:
     image: "redis"
     ports:
       - "6380:6379"
   metis:
     build: .
     depends_on:
+      - mongo
       - redis
     ports:
       - "4000:4000"
@@ -16,5 +24,8 @@ services:
       - ./:/apps/metis
       - /apps/metis/node_modules
     environment:
+      - MONGO_URL=mongodb://mongo:27017/metisPN
+      - URL_DB=mongodb://mongo:27017/metisPN
       - REDIS_HOST=redis
       - REDIS_PORT=6379
+      - BUCKET_NAME=metis_s3