Added notification generation on SMS. Added FCM Token saving on login.

client/public/firebase-messaging-sw.js

@@ -43,7 +43,7 @@ self.addEventListener("notificationclick", function (event) {
   console.log("SW notificationclick", event);
 });
 
-self.addEventListener("message", (message) => {
+// self.addEventListener("message", (message) => {
-  console.log("Push from SW", message);
+//   console.log("Push from SW", message);
-//   registration.showNotification("Push from SW" + JSON.stringify(message.data));
+// //   registration.showNotification("Push from SW" + JSON.stringify(message.data));
-});
+// });

client/src/App/App.container.jsx

@@ -9,13 +9,12 @@ import apolloLogger from "apollo-link-logger";
 import { RetryLink } from "apollo-link-retry";
 import { WebSocketLink } from "apollo-link-ws";
 import { getMainDefinition } from "apollo-utilities";
+import LogRocket from "logrocket";
 import React, { Component } from "react";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
-import { auth, messaging } from "../firebase/firebase.utils";
+import { auth } from "../firebase/firebase.utils";
 import errorLink from "../graphql/apollo-error-handling";
 import App from "./App";
-import LogRocket from "logrocket";
-import { notification } from "antd";
 
 if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
 
@@ -117,29 +116,6 @@ export default class AppContainer extends Component {
     this.state = { client };
   }
 
-  async componentDidMount() {
-    messaging
-      .requestPermission()
-      .then(async function () {
-        const token = await messaging.getToken();
-        console.log("messaging -> token", token);
-      })
-      .catch(function (err) {
-        console.log("Unable to get permission to notify.", err);
-      });
-    navigator.serviceWorker.addEventListener("message", (message) => {
-      console.log("Comp Did Mount", message);
-      notification["info"]({ message: JSON.stringify(message.data) });
-      navigator.serviceWorker
-        .getRegistration()
-        .then((registration) =>
-          registration.showNotification(
-            "Comp Did" + JSON.stringify(message.data)
-          )
-        );
-    });
-  }
-
   render() {
     const { client } = this.state;
 

client/src/components/fcm-notification/fcm-notification.component.jsx

@@ -0,0 +1,60 @@
+import { notification } from "antd";
+import React, { Component } from "react";
+import { messaging } from "../../firebase/firebase.utils";
+import { withApollo } from "react-apollo";
+import { UPDATE_FCM_TOKEN } from "../../graphql/user.queries";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+class FcmNotificationComponent extends Component {
+  async componentDidMount() {
+    const { client, currentUser } = this.props;
+    messaging
+      .requestPermission()
+      .then(async function () {
+        const token = await messaging.getToken();
+
+        client.mutate({
+          mutation: UPDATE_FCM_TOKEN,
+          variables: { authEmail: currentUser.email, token: { [token]: true } },
+        });
+      })
+      .catch(function (err) {
+        console.log("Unable to get permission to notify.", err);
+      });
+    navigator.serviceWorker.addEventListener("message", (message) => {
+      const { payload } = message.data.firebaseMessaging;
+      // notification["info"]({ message: JSON.stringify(payload) });
+
+      navigator.serviceWorker.getRegistration().then((registration) =>
+        registration.showNotification(payload.notification.title, {
+          body: payload.notification.body,
+          icon: "logo240.png",
+          badge: "logo240.png",
+          actions: [
+            {
+              action: "respond",
+              title: "Respond",
+            },
+          ],
+        })
+      );
+    });
+  }
+
+  render() {
+    return <div></div>;
+  }
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withApollo(FcmNotificationComponent));

client/src/graphql/user.queries.js

@@ -1,7 +1,7 @@
 import { gql } from "apollo-boost";
 
 export const UPSERT_USER = gql`
-  mutation upsert_user($authEmail: String!, $authToken: String!) {
+  mutation UPSERT_USER($authEmail: String!, $authToken: String!) {
     insert_users(
       objects: [{ email: $authEmail, authid: $authToken }]
       on_conflict: { constraint: users_pkey, update_columns: [authid] }
@@ -12,3 +12,17 @@ export const UPSERT_USER = gql`
     }
   }
 `;
+
+export const UPDATE_FCM_TOKEN = gql`
+  mutation UPDATE_FCM_TOKEN($authEmail: String!, $token: jsonb!) {
+    update_users(
+      where: { email: { _eq: $authEmail } }
+      _append: { fcmtokens: $token }
+    ) {
+      affected_rows
+      returning {
+        fcmtokens
+      }
+    }
+  }
+`;

client/src/pages/manage/manage.page.component.jsx

@@ -11,7 +11,7 @@ import "./manage.page.styles.scss";
 import BreadCrumbs from "../../components/breadcrumbs/breadcrumbs.component";
 import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
 import ChatAffixContainer from "../../components/chat-affix/chat-affix.container";
-
+import FcmNotification from "../../components/fcm-notification/fcm-notification.component";
 const ManageRootPage = lazy(() =>
   import("../manage-root/manage-root.page.container")
 );
@@ -100,6 +100,7 @@ export default function Manage({ match }) {
         <Content
           className='content-container'
           style={{ padding: "0em 4em 4em" }}>
+          <FcmNotification />
           <ErrorBoundary>
             <Suspense
               fallback={

hasura/migrations/1588355454260_alter_table_public_users_add_column_fcmtokens/down.yaml

@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."users" DROP COLUMN "fcmtokens";
+  type: run_sql

hasura/migrations/1588355454260_alter_table_public_users_add_column_fcmtokens/up.yaml

@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."users" ADD COLUMN "fcmtokens" jsonb NULL;
+  type: run_sql

hasura/migrations/1588355462630_update_permission_user_public_table_users/down.yaml

@@ -0,0 +1,21 @@
+- args:
+    role: user
+    table:
+      name: users
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check: {}
+      columns:
+      - authid
+      - email
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: users
+      schema: public
+  type: create_insert_permission

hasura/migrations/1588355462630_update_permission_user_public_table_users/up.yaml

@@ -0,0 +1,22 @@
+- args:
+    role: user
+    table:
+      name: users
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check: {}
+      columns:
+      - authid
+      - email
+      - fcmtokens
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: users
+      schema: public
+  type: create_insert_permission

hasura/migrations/1588355471991_update_permission_user_public_table_users/down.yaml

@@ -0,0 +1,23 @@
+- args:
+    role: user
+    table:
+      name: users
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - email
+      - authid
+      - created_at
+      - updated_at
+      computed_fields: []
+      filter:
+        authid:
+          _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: users
+      schema: public
+  type: create_select_permission

hasura/migrations/1588355471991_update_permission_user_public_table_users/up.yaml

@@ -0,0 +1,22 @@
+- args:
+    role: user
+    table:
+      name: users
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - authid
+      - email
+      - fcmtokens
+      computed_fields: []
+      filter:
+        authid:
+          _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: users
+      schema: public
+  type: create_select_permission

hasura/migrations/1588355478259_update_permission_user_public_table_users/down.yaml

@@ -0,0 +1,22 @@
+- args:
+    role: user
+    table:
+      name: users
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - authid
+      - email
+      - fcmtokens
+      computed_fields: []
+      filter:
+        authid:
+          _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: users
+      schema: public
+  type: create_select_permission

hasura/migrations/1588355478259_update_permission_user_public_table_users/up.yaml

@@ -0,0 +1,24 @@
+- args:
+    role: user
+    table:
+      name: users
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - authid
+      - created_at
+      - email
+      - fcmtokens
+      - updated_at
+      computed_fields: []
+      filter:
+        authid:
+          _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: users
+      schema: public
+  type: create_select_permission

hasura/migrations/1588355488534_update_permission_user_public_table_users/down.yaml

@@ -0,0 +1,25 @@
+- args:
+    role: user
+    table:
+      name: users
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - authid
+      - email
+      - created_at
+      - updated_at
+      filter:
+        authid:
+          _eq: X-Hasura-User-Id
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: users
+      schema: public
+  type: create_update_permission

hasura/migrations/1588355488534_update_permission_user_public_table_users/up.yaml

@@ -0,0 +1,24 @@
+- args:
+    role: user
+    table:
+      name: users
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - authid
+      - email
+      - fcmtokens
+      filter:
+        authid:
+          _eq: X-Hasura-User-Id
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: users
+      schema: public
+  type: create_update_permission

hasura/migrations/1588358447309_alter_table_public_users_alter_column_fcmtokens/down.yaml

@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE ONLY "public"."users" ALTER COLUMN "fcmtokens" DROP DEFAULT;
+  type: run_sql

hasura/migrations/1588358447309_alter_table_public_users_alter_column_fcmtokens/up.yaml

@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE ONLY "public"."users" ALTER COLUMN "fcmtokens" SET DEFAULT '{}'::jsonb;
+  type: run_sql

server/firebase/firebase-handler.js

@@ -8,6 +8,8 @@ admin.initializeApp({
 });
 //var defaultApp = admin.initializeApp(defaultAppConfig);
 
+exports.admin = admin;
+
 exports.sendNotification = (req, res) => {
   console.log("Firebase Send.");
   //   const { ids } = req.body;
@@ -19,11 +21,11 @@ exports.sendNotification = (req, res) => {
 
   //Dev
   var registrationToken =
-    "dwsrcoeaIpwEmSzrVkE-_V:APA91bFurr0yCN-yXcaNrJvn8_f47I4vb4avxeS0NR5SCBPNADFB-gC79Hdmj7wqPccPmZCx0NzA_Dqi1lLYegpN-tFvANaK9I00oOSsFnOxv6KNZDLW0WguwFA0vQN8X50BaGuLTQqM";
+    "fqIWg8ENDFyrRrMWJ1sItR:APA91bHirdZ05Zo66flMlvala97SMXoiQGwP4oCvMwd-vVrSauD_WoNim3kXHGqyP-bzENjkXwA5icyUAReFbeHn6dIaPcbpcsXuY73-eJAXvZiu1gIsrd1BOsnj3dEMT7Q4F6mTPth1";
   var message = {
+    notification: { title: "The Title", body: "The Body" },
     data: {
-      title: "850",
+      jobid: "1234",
-      body: "2:45",
     },
     token: registrationToken,
   };

server/graphql-client/queries.js

@@ -14,12 +14,20 @@ query FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID(
 
 exports.INSERT_MESSAGE = `
 mutation INSERT_MESSAGE($msg: [messages_insert_input!]!) {
-    insert_messages(objects: $msg) {
+  insert_messages(objects: $msg) {
-      returning {
+    returning {
-        id
+      conversation {
+        bodyshop {
+          associations(where: {active: {_eq: true}}) {
+            user {
+              fcmtokens
+            }
+          }
+        }
       }
     }
   }
+}
   `;
 
 exports.UPDATE_MESSAGE_STATUS = `

server/sms/receive.js

@@ -2,9 +2,11 @@ require("dotenv").config();
 const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
 const phone = require("phone");
+const admin = require("../firebase/firebase-handler").admin;
 
 exports.receive = (req, res) => {
   //Perform request validation
+  console.log("Twilio Receive Inbound");
   if (
     !!!req.body ||
     !!!req.body.MessagingServiceSid ||
@@ -16,9 +18,9 @@ exports.receive = (req, res) => {
     client
       .request(queries.FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID, {
         mssid: req.body.MessagingServiceSid,
-        phone: phone(req.body.From)[0]
+        phone: phone(req.body.From)[0],
       })
-      .then(response => {
+      .then((response) => {
         //TODO Add logic for handling MMS.
         let newMessage = { msid: req.body.SmsMessageSid, text: req.body.Body };
         if (response.bodyshops[0]) {
@@ -29,8 +31,8 @@ exports.receive = (req, res) => {
             newMessage.conversation = {
               data: {
                 bodyshopid: response.bodyshops[0].id,
-                phone_num: phone(req.body.From)[0]
+                phone_num: phone(req.body.From)[0],
-              }
+              },
             };
           } else if (response.bodyshops[0].conversations.length === 1) {
             //Just add it to the conversation
@@ -47,16 +49,52 @@ exports.receive = (req, res) => {
 
           client
             .request(queries.INSERT_MESSAGE, { msg: newMessage })
-            .then(r2 => {
+            .then((r2) => {
+              console.log("R2", JSON.stringify(r2));
+
+              const arrayOfAllUserFcmTokens = r2.insert_messages.returning[0].conversation.bodyshop.associations.map(
+                (a) => a.user.fcmtokens
+              );
+              const allTokens = [];
+              arrayOfAllUserFcmTokens.map((i) =>
+                Object.keys(i).map((k) => allTokens.push(k))
+              );
+              const uniqueTokens = [...new Set(allTokens)];
+              console.log("exports.receive -> uniqueTokens", uniqueTokens);
+
+              var message = {
+                notification: {
+                  title: `New SMS From ${phone(req.body.From)[0]}`,
+                  body: req.body.Body,
+                },
+                data: {
+                  jobid: "1234",
+                },
+                tokens: uniqueTokens,
+              };
+
+              // Send a message to the device corresponding to the provided
+              // registration token.
+              admin
+                .messaging()
+                .sendMulticast(message)
+                .then((response) => {
+                  // Response is a message ID string.
+                  console.log("Successfully sent message:", response);
+                })
+                .catch((error) => {
+                  console.log("Error sending message:", error);
+                });
+
               res.status(200).end();
             })
-            .catch(e2 => {
+            .catch((e2) => {
               console.log("e2", e2);
               res.status(500).json(e2);
             });
         }
       })
-      .catch(e1 => {
+      .catch((e1) => {
         console.log("e1", e1);
         res.status(500).json(e1);
       });