Merge pull request #15 from Nummenpojat/status-messages

Logs

Author: Aromiii

app/.env

@@ -11,7 +11,7 @@ COPY package*.json ./
 RUN npm install
 
 # Copy the rest of the application code to the container
-COPY ../suppis-nettisivut .
+COPY . .
 
 # Build the React app
 RUN npm run build

app/Dockerfile

@@ -36,7 +36,7 @@ export default function MessageWrapper() {
         .catch(reason => handleMessageApiCallResponse(reason))
     }
 
-    alert(error.response.data)
+    alert(`Ongelma ilmeentyi: ${error.response.data}`)
   }
 
   const handleCsvToJson = (): Promise<any> => {
@@ -62,14 +62,24 @@ export default function MessageWrapper() {
 
   const handleSend = async (event: any) => {
     event.preventDefault()
+
+    if (message == "") {
+      alert("Sinun pitää antaa viesti")
+      return
+    }
+
+    if (!confirm(`Haluatko lähettää viestin:\n\n${message}\n\nHuomaathan että viestin lähettämisessä kestää hetki joten älä ihmettele jos näyttä siltä että mitään ei tapahdu`)) {
+      return
+    }
+
     if (!toList) {
       try {
         const result: AxiosResponse = await core.post("/api/whatsapp/send/one", {
           number: phoneNumber,
           message: message
         })
 
-        alert(result.data)
+        alert(`Viestin lähettäminen onnistui.`)
 
       } catch (error: any) {
         handleMessageApiCallResponse(error)
@@ -84,7 +94,7 @@ export default function MessageWrapper() {
           message: message
         })
 
-        alert(result.data)
+        alert("Viestien lähettäminen onnistui")
       } catch (error: any) {
         handleMessageApiCallResponse(error)
       }

app/src/pages/message.tsx

@@ -1,3 +1,4 @@
 PORT= # Port number
 FIREBASE_SECRET_KEY_PATH= # File path to Firebase service key. Example: "/config/firebase-admin-secrets/secret-key.json"
-WHATSAPP_SESSION_PATH= # File path where whatsapp-web.js stores session
+WHATSAPP_SESSION_PATH= # File path where whatsapp-web.js stores session
+LOG_GROUP_ID= # Whatsapp group that works as log storage

core/.env.example

@@ -1,7 +1,5 @@
-# Local configs
-config/whatsapp/*
-../suppis-core/.idea
-config/firebase-admin-secrets/*
+firebase.json
+whatsapp
 
 # Logs
 logs
@@ -74,6 +72,7 @@ typings/
 .yarn-integrity
 
 # dotenv environment variables file
+../.env
 .env
 .env.test
 

core/.gitignore

@@ -14,7 +14,7 @@ RUN \
   apt-get install -y google-chrome-stable && \
   rm -rf /var/lib/apt/lists/*s
 
-COPY ../suppis-core ./
+COPY . .
 
 RUN npm run build
 

core/Dockerfile

@@ -6,7 +6,7 @@ services:
     restart: always
     environment:
       PORT: 3001
-      FIREBASE_SECRET_KEY_PATH: /app/config/firebase-admin-secrets/suppis-firebase-admin-secrets.json
+      FIREBASE_SECRET_KEY_PATH: /app/config/firebase-admin-secrets/firebase.json
       WHATSAPP_SESSION_PATH: /app/config/whatsapp
     volumes:
       - ./config/whatsapp:/app/config/whatsapp

core/docker-compose.yml

@@ -0,0 +1,15 @@
+import {getAuth} from "firebase-admin/auth";
+
+const getCurrentUser = async (idToken: string) => {
+  try {
+    // Verifies ID token to ensure correct access right to API
+    const result = await getAuth().verifyIdToken(idToken)
+
+    // Gets user to check custom claims
+    return await getAuth().getUser(result.uid)
+  } catch (error) {
+    console.log(`Error occurred when getting current user: ${error}`)
+  }
+}
+
+export default getCurrentUser;

core/src/auth/getCurrentUser.ts

@@ -1,11 +1,7 @@
-import {checkNumbers, client} from "../main";
+import {checkNumbers, client, logMessage} from "../main";
+import getCurrentUser from "../../../auth/getCurrentUser";
 
-/**
- *  Send message with Whatsapp to single number
- *  @param phoneNumber Number that message is sent
- *  @param message Text that is sent to phoneNumber provided
- **/
-export const sendMessage = async (phoneNumber: string, message: string) => {
+export const sendMessage = async (phoneNumber: string, message: string, senderIdToken: string) => {
 
   // Checking that phone number is not empty
   if (phoneNumber == "" || phoneNumber == null) {
@@ -17,7 +13,6 @@ export const sendMessage = async (phoneNumber: string, message: string) => {
     throw "You need to provide message to send"
   }
 
-
   // Removing + at the start if it exits so the phone number is in right format
   if (phoneNumber.startsWith('+')) {
     phoneNumber = phoneNumber.substring(1)
@@ -33,6 +28,8 @@ export const sendMessage = async (phoneNumber: string, message: string) => {
     // Sending message to chosen chat
     const returnMessage = await client.sendMessage(chatId, message)
 
+    const user = await getCurrentUser(senderIdToken)
+    logMessage(`${user?.email || "Unknown"} sent message:\n\n${returnMessage.body}`)
     console.log(`Message ${returnMessage.body} sent`);
     return `Message ${returnMessage.body} sent`
 

core/src/modules/whatsapp/commands/sendMessage.ts

@@ -1,11 +1,7 @@
-import {checkNumbers, client} from "../main";
+import {checkNumbers, client, logMessage} from "../main";
+import getCurrentUser from "../../../auth/getCurrentUser";
 
-/**
- * Send same message to list of people
- * @param message Text that is sent to list provided
- * @param persons Array that contains numbers of people to send the message
- * */
-export const sendMessageToList = async (message: string, numbers: string[]) => {
+export const sendMessageToList = async (message: string, numbers: string[], senderIdToken: string) => {
 
   // Checking that message is not empty
   if (message == "" || message == null) {
@@ -42,6 +38,8 @@ export const sendMessageToList = async (message: string, numbers: string[]) => {
       throw error
     }
   }
+  const user = await getCurrentUser(senderIdToken)
+  logMessage(`${user?.email || "Unknown"} sent message to ${numbers.length} people:\n\n${message}`)
   console.log(`Message ${message} sent to list of people`);
   return `Message ${message} sent to list of people`
 }