Changeset e007fcd for pages

Timestamp:

07/16/22 21:31:18 (2 years ago)

Author:

anastasovv <simon@…>

Branches:

main

Children:

e903234

Parents:

55701f0

Message:

Now you need to activate your account via email & also added mail sending after server crash

Location:

pages

Files:

• activate/[id].js (added)
• admin/index.js (added)
• api/blackjack/gameStates.js (modified) (1 diff)
• api/blackjack/index.js (modified) (5 diffs)
• api/poker/gameStates.js (modified) (2 diffs)
• api/poker/index.js (modified) (4 diffs)
• api/postgre/activate/[id].js (added)
• api/postgre/index.js (modified) (12 diffs)
• api/roulette/gameStates.js (modified) (3 diffs)
• api/roulette/index.js (modified) (5 diffs)

pages/api/blackjack/gameStates.js

@@ -14 +14 @@
 export let game = {
   credits: -1,
+  username: '',
+  displayName: '',
   deck: [...deck],
   status: '_1_room_created',      // statuses: _1_room_created, _2_made_initial_bet, _3_made_side_bet, _4_cards_on_the_table, _5_game_over

pages/api/blackjack/index.js

@@ -11 +11 @@
  * Set up a room
  */
-function createARoom(session_id) {
+function createARoom(session_id, displayName, username) {
   let room = {
-    ...game, playerCards: [...game.playerCards], dealerCards: [...game.dealerCards],
+    ...game, displayName: displayName, username: username, playerCards: [...game.playerCards], dealerCards: [...game.dealerCards],
   }
 
@@ -241 +241 @@
         rooms[session_id] = room;
 
+        update_rooms_to_database();
+
         if (room.sideBetName !== '' && room.sideBetName !== 'none') {
           room.sideBetEarnings = calculateSideBetEarnings(room);
@@ -257 +259 @@
           
           rooms[session_id] = room;
-
-          update_rooms_to_database();
 
           axios.get(`${process.env.HOME_URL}/api/postgre/?action=add_credits&session_id=${session_id}&credits=${room.sideBetEarnings}`).then(postgreRes => {
@@ -348 +348 @@
     /**
      * /---------------------- GET ----------------------/
-     * Remove a room from the rooms array.
-     * @action remove_room
-     * @param session_id
-     */
-    if (req.query.action === 'remove_room' && req.query?.session_id) {
-      const session_id = req.query.session_id;
-
-      if (rooms[session_id] !== undefined) {
-        delete rooms[session_id];
-      }
-      
-      res.json({
-        success: true,
-      })
-            
-      update_rooms_to_database();
-    }
-
-    /**
-     * /---------------------- GET ----------------------/
      * Updates the state periodically
      * @action update_state
@@ -399 +379 @@
           }
           else {
-            createARoom(session_id);
+            createARoom(session_id, postgreRes.data?.displayName, postgreRes.data?.username);
           }
     

pages/api/poker/gameStates.js

@@ -54 +54 @@
  */
 
-export function createTable(playerId, playerName, tableName) {
+export function createTable(playerId, playerName, tableName, username) {
     const tableId = uuidv4();
 
@@ -75 +75 @@
             id: playerId,
             table: tableId,
+            username: username,
             credits: 0,
             status: '_1_just_entered',

pages/api/poker/index.js

@@ -198 +198 @@
          * @param tableId
          * @param displayName
-         */
-         if (req.query.action === 'join_a_table' && req.query?.session_id && req.query?.tableId && req.query?.displayName) {
+         * @param username
+         */
+         if (req.query.action === 'join_a_table' && req.query?.session_id && req.query?.tableId && req.query?.displayName && req.query?.username) {
             if (req.query.tableId.length > 0) {
                 const { success } = getTableAndPlayer(req.query.session_id);
@@ -210 +211 @@
                             id: req.query.session_id,
                             table: req.query.tableId,
+                            username: req.query.username,
                             credits: 0,
                             status: '_1_just_entered',
@@ -241 +243 @@
          * @param displayName
          * @param tableName
-         */
-        if (req.query.action === 'create_a_table' && req.query?.session_id && req.query?.displayName && req.query?.tableName) {
+         * @param username
+         */
+        if (req.query.action === 'create_a_table' && req.query?.session_id && req.query?.displayName && req.query?.tableName && req.query?.username) {
             const { success } = getTableAndPlayer(req.query.session_id);
 
             if (!success) {
-                createTable(req.query.session_id, req.query.displayName, req.query.tableName);
+                createTable(req.query.session_id, req.query.displayName, req.query.tableName, req.query.username);
             }
 
@@ -305 +308 @@
                         success: true,
                         displayName: postgreRes.data?.displayName,
+                        username: postgreRes.data?.username,
                         session_id: postgreRes.data?.session_id,
                         credits: postgreRes.data?.credits,

pages/api/postgre/index.js

@@ -6 +6 @@
 
 const crypto = require('crypto');
+
+const nodemailer = require('nodemailer');
 
 import { progressRoundTillTheEnd } from '../poker/tableSpecific';
@@ -214 +216 @@
     /**
      * /---------------------- GET ----------------------/
+     * Activates an user account if not activated.
+     * @action activate_account
+     * @param emailActivationId
+     */
+    if (req.query?.action === 'activate_account' && req.query?.emailActivationId) {
+      pool.query('SELECT * FROM users WHERE email_activation_id = $1', [req.query.emailActivationId], (error, results) => {
+        if (error) throw error;
+
+        if (results.rows.length > 0) {
+          pool.query('UPDATE users SET activated = $1 WHERE email_activation_id = $2', [true, req.query.emailActivationId], (error, results) => {
+            if (error) throw error;
+
+            res.json({
+              success: true,
+            })
+          });
+        }
+        else {
+          res.json({
+            success: false,
+          })
+        }
+      });
+    }
+
+    /**
+     * /---------------------- GET ----------------------/
      * Checks if the player is logged in, and returns his session if so.
      * @action check_if_logged_in
@@ -226 +255 @@
           success: true,
           displayName: session.displayName,
+          username: session.username,
           session_id: session.id,
           credits: session.credits,
@@ -254 +284 @@
 
         sessions.splice(sessions.indexOf(session), 1);
-
-        axios.get(`${process.env.HOME_URL}/api/blackjack/?action=remove_room&session_id=${session_id}`);
-
         update_sessions_to_database();
+
+        // remove player from games:
+        if (rooms[session_id] !== undefined) {
+          delete rooms[session_id];
+          update_rooms_to_database();
+        }
+
+        if (game.players?.map(e=>e.session_id).indexOf(session_id) !== -1) {
+          game.players?.splice(game.players?.map(e=>e.session_id).indexOf(session_id), 1);
+          update_game_to_database();
+        }
+
+        tables.forEach(table => {
+          table.players?.forEach(player => {
+            if (player.id === session_id) {
+              player.isGhost = true;
+            }
+          })
+        })
+        update_tables_to_database();
       }
 
@@ -480 +527 @@
     if (body?.action === 'register') {
       // checks
+      if (body?.email == "undefined" || body?.email == "null" || body?.email == "") {
+        res.json({
+          success: false,
+          message: 'Email is required',
+        });
+        return ;
+      }
+      if (!body?.email?.includes('@') || body?.email?.indexOf('@', body?.email?.indexOf('@')+1) !== -1) {
+        res.json({
+          success: false,
+          message: 'Not a valid email',
+        });
+        return ;
+      }
       if (body?.username == "undefined" || body?.username == "null" || body?.username == "") {
         res.json({
@@ -535 +596 @@
         }
 
+        const emailActivationId = uuidv4();
+
         // store user in database
-        pool.query('INSERT INTO users (username, password, salt) VALUES ($1, $2, $3)', [body.username, hashedPassword, salt], (error, usersResults) => {
+        pool.query('INSERT INTO users (username, password, salt, email, email_activation_id, activated) VALUES ($1, $2, $3, $4, $5, $6)', [body.username, hashedPassword, salt, body.email, emailActivationId, false], (error, usersResults) => {
           if (error) throw error;
 
@@ -544 +607 @@
             pool.query('INSERT INTO stats (username, blackjack_games, roulette_games, poker_games, blackjack_won_games, roulette_won_games, poker_won_games, money_bet, money_earned) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)', [body.username, 0, 0, 0, 0, 0, 0, 0, 0], (error, statsResults) => {
               if (error) throw error;
+
+              sendMailForActivation(body.displayName, body.email, emailActivationId);
 
               res.json({
@@ -604 +669 @@
           if (usersResults.rows.length > 0) {
             const user = usersResults.rows[0];
+
             const salt = user.salt;
             const hashedPassword = crypto.pbkdf2Sync(body.password, salt, 1000, 64, 'sha512').toString('hex');
 
             if (hashedPassword === user.password) {
+              if (user.activated === "false") {
+                res.json({
+                  success: false,
+                  message: 'Account not activated. Check your email.',
+                })
+
+                return ;
+              }
+
               pool.query('SELECT * FROM players WHERE username = $1', [body.username], (error, playersResults) => {
                 if (playersResults.rows.length > 0) {
@@ -658 +733 @@
 }
 
+// Mailing
+const transporter = nodemailer.createTransport({
+  service: 'gmail',
+  auth: {
+      user: process.env.GOOGLE_EMAIL,
+      pass: process.env.GOOGLE_APP_PASSWORD,
+  }
+})
+
+function sendMailForActivation(displayName, userEmail, emailActivationId) {
+  const message = {
+      from: process.env.GOOGLE_EMAIL,
+      to: userEmail,
+      subject: "Caessino - Activate your account",
+      html: `
+          <h4>Hello, ${displayName}</h4>
+          <p>Thank you for creating an account at Caessino. Just one more step and you can start enjoying the games!</p>
+          <p>To activate your account please follow this link: <a target="_blank" href="${process.env.HOME_URL}/activate/${emailActivationId}">Activate account</a>
+          <br/>
+          <p>Cheers and happy playing,</p>
+          <p>The Team ESS</p>
+      `
+  }
+
+  transporter.sendMail(message, (err, data) => {
+      if (err) {
+          console.log(err);
+      }
+  })
+}
+
+let mailSentTo = {
+  poker: [],
+  roulette: [],
+  blackjack: [],
+}
+function sendMailForGameCompletition(game, username, displayName) {
+  return ;
+
+  const msgPoker = 'Your game was played to the end by the computer with the following rules:<br/>1. No more bets were made by any player;<br/>2. Cards were dealt normally like they would be under normal circumstances;<br/>3. Credits were given to the winners and taken from the losers.';
+  const msgRoulette = 'If you reconnect immediately, you can catch this ongoing game. But don\'t worry if you can\'t! If you win, credits will be awarded to you.';
+  const msgBlackjack = 'You can now continue playing your game.';
+  
+  pool.query('SELECT * FROM users WHERE username = $1', [username], (error, results) => {
+    if (error) throw error;
+
+    if (results.rows.length > 0) {
+      const userEmail = results.rows[0].email;
+
+      if ((game === 'poker' && mailSentTo.poker.indexOf(userEmail) === -1) ||
+          (game === 'roulette' && mailSentTo.roulette.indexOf(userEmail) === -1) ||
+          (game === 'blackjack' && mailSentTo.blackjack.indexOf(userEmail) === -1))
+      {
+        const message = {
+          from: process.env.GOOGLE_EMAIL,
+          to: userEmail,
+          subject: "Caessino - Server is back online",
+          html: `
+            <h4>Hello, ${displayName}</h4>
+            <p>We are writing to inform you that the server is back online.</p>
+            <p>We know that you were in the middle of playing ${game}, and we apologize for the interrupt.</p>
+            <p>${game === 'poker' ? msgPoker : game === 'roulette' ? msgRoulette : msgBlackjack}</p>
+            <br/>
+            <p>All the best,</p>
+            <p>The Team ESS</p>
+            `
+        }
+
+        transporter.sendMail(message, (err, data) => {
+          if (err) {
+              console.log(err);
+          }
+        })
+
+        mailSentTo[game].push(userEmail)
+      }
+    }
+  });
+}
 
 /**
@@ -708 +862 @@
     })
 
+    tables.forEach(table => {
+      if (table.ended) {
+        table.players?.forEach(player => {
+          if (!player.isGhost) {
+            sendMailForGameCompletition('poker', player.username, player.displayName);
+          }
+        })
+      }
+    })
+
     cleanTables();
 
@@ -731 +895 @@
 
     game = JSON.parse(results?.rows[0]?.data || []);
+
+    game.players?.forEach(player => {
+      sendMailForGameCompletition('roulette', player.username, player.name);
+    })
 
     game.loaded = true;
@@ -767 +935 @@
         rooms[room.id] = {...room, id: ''}
       })
+
+      tmpRooms.forEach(room => {
+        sendMailForGameCompletition('blackjack', room.username, room.displayName);
+      })
       
       rooms["loaded"] = true;

pages/api/roulette/gameStates.js

@@ -26 +26 @@
     game.status = '_1_ongoing_timer';
 
+    let inactivePlayers = []
+
     game.players.forEach(player => {
         player.whichBets = [];
@@ -37 +39 @@
         player.status = '_1_no_placed_bet';
         player.gotResults = false;
+
+        const d = Date.now();
+
+        if (d - player.lastActivity > 200000) {
+            inactivePlayers.push(player);
+        }
     })
+
+    for (let i = 0; i < inactivePlayers.length; i++) {
+        if (game.players.indexOf(inactivePlayers[i]) !== -1) {
+            game.players.splice(game.players.indexOf(inactivePlayers[i]), 1);
+        }
+    }
 }
 
@@ -68 +82 @@
 }
 
-export function addPlayer(session_id, name) {
+export function addPlayer(session_id, name, username) {
     if (game.players.map(e=>e.session_id).indexOf(session_id) === -1) {
         game.players.push({
+            lastActivity: Date.now(),
             session_id: session_id,
+            username: username,
             name: name,
             whichBets: [],

pages/api/roulette/index.js

@@ -78 +78 @@
                         },
                         player.credits = postgreRes.data?.credits;
+                        player.lastActivity = Date.now();
                     }
                 });
@@ -97 +98 @@
 
             let extraAction = "";
+            let extraAction2 = "";
             let magicNumber = -1;
             let winningBets = [];
@@ -107 +109 @@
 
                     player.gotResults = true;
+                }
+                if (game.timeToStart > game.COUNTDOWN_FROM + game.WAIT_BEFORE - 15) {
+                    extraAction2 = "keep_alert";
                 }
             }
@@ -121 +126 @@
                 },
                 extraAction: extraAction,
+                extraAction2: extraAction2,
                 magicNumber: magicNumber,
                 winningBets: winningBets,
@@ -138 +144 @@
             axios.get(`${process.env.HOME_URL}/api/postgre?action=check_if_logged_in&session_id=${session_id}`).then(postgreRes => {
                 if (postgreRes.data?.success) {
-                    addPlayer(session_id, postgreRes.data?.displayName);
+                    addPlayer(session_id, postgreRes.data?.displayName, postgreRes.data?.username);
                 
                     res.json({