2023 update (#207)

2023 update

Author: batamar

Diff for: book/1-end/app/package.json

@@ -8,22 +8,22 @@
     "lint": "eslint . --ext .ts,.tsx"
   },
   "dependencies": {
-    "dotenv": "^8.2.0",
-    "next": "^9.1.2",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "typescript": "^4.7.3"
+    "dotenv": "^16.3.1",
+    "next": "^14.0.3",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "typescript": "^5.3.2"
   },
   "devDependencies": {
-    "@types/node": "^12.12.2",
-    "@types/react": "^18.0.14",
-    "@types/react-dom": "^18.0.5",
-    "@typescript-eslint/eslint-plugin": "^4.2.0",
-    "@typescript-eslint/parser": "^4.2.0",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^7.1.0",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-react": "^7.21.5",
-    "prettier": "^2.2.1"
+    "@types/node": "^20.10.1",
+    "@types/react": "^18.2.39",
+    "@types/react-dom": "^18.2.17",
+    "@typescript-eslint/eslint-plugin": "^6.13.1",
+    "@typescript-eslint/parser": "^6.13.1",
+    "eslint": "^8.54.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-react": "^7.33.2",
+    "prettier": "^3.1.0"
   }
 }

Diff for: book/1-end/app/yarn.lock

@@ -8,7 +8,7 @@ environment-defaults:
 global:
   application_name: api-saas-boilerplate-app
   default_ec2_keyname: null
-  default_platform: Node.js 14 running on 64bit Amazon Linux 2
+  default_platform: Node.js 18 running on 64bit Amazon Linux 2
   default_region: us-east-1
   include_git_submodules: true
   instance_profile: null

Diff for: book/10-begin/api/.elasticbeanstalk/config.yml

@@ -15,51 +15,48 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "aws-sdk": "^2.796.0",
-    "bcrypt": "^5.0.0",
-    "compression": "^1.7.4",
-    "connect-mongo": "^3.2.0",
+    "aws-sdk": "^2.1512.0",
+    "bcrypt": "^5.1.1",
+    "connect-mongo": "^5.1.0",
     "cors": "^2.8.5",
-    "dotenv": "^8.2.0",
-    "express": "^4.17.1",
+    "dotenv": "^16.3.1",
+    "express": "^4.18.2",
     "express-session": "^1.17.1",
     "he": "^1.2.0",
-    "helmet": "4.1.0-rc.2",
-    "highlight.js": "^10.5.0",
+    "highlight.js": "^11.9.0",
     "lodash": "^4.17.20",
-    "marked": "^4.0.16",
-    "mongoose": "^6.3.5",
-    "node-fetch": "^2.6.1",
-    "passport": "^0.6.0",
+    "marked": "^11.0.0",
+    "mongoose": "^8.0.2",
+    "node-fetch": "2.6.1",
+    "passport": "^0.7.0",
     "passport-google-oauth": "^2.0.0",
     "passwordless": "^1.1.3",
     "passwordless-tokenstore": "^0.0.10",
-    "socket.io": "^3.0.3",
-    "stripe": "^8.129.0",
-    "typescript": "^4.7.3",
-    "winston": "^3.3.3"
+    "socket.io": "^4.7.2",
+    "stripe": "^14.7.0",
+    "typescript": "^5.3.2"
   },
   "devDependencies": {
     "@types/connect-mongo": "^3.1.3",
     "@types/dotenv": "^8.2.0",
-    "@types/express": "^4.11.1",
-    "@types/express-session": "^1.15.8",
-    "@types/jest": "^22.2.3",
-    "@types/lodash": "^4.14.108",
+    "@types/express": "^4.17.21",
+    "@types/express-session": "^1.17.10",
+    "@types/jest": "^29.5.11",
+    "@types/lodash": "^4.14.202",
     "@types/mongoose": "^5.5.43",
-    "@types/node": "^12.12.2",
-    "@types/node-fetch": "^1.6.9",
-    "@types/passport": "^1.0.8",
+    "@types/node": "^20.10.3",
+    "@types/node-fetch": "^2.6.9",
+    "@types/passport": "^1.0.16",
     "@types/socket.io": "^3.0.2",
-    "@typescript-eslint/eslint-plugin": "^4.2.0",
-    "@typescript-eslint/parser": "^4.2.0",
-    "eslint": "^7.25.0",
-    "eslint-config-prettier": "^7.1.0",
-    "eslint-plugin-prettier": "^3.3.1",
-    "jest": "^26.4.2",
-    "nodemon": "^2.0.7",
-    "prettier": "^2.2.1",
-    "ts-jest": "^26.4.4",
-    "ts-node": "^10.8.1"
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
+    "@typescript-eslint/parser": "^6.13.2",
+    "eslint": "^8.55.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "jest": "^29.7.0",
+    "nodemon": "^3.0.2",
+    "prettier": "^3.1.0",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.1"
   }
 }

Diff for: book/10-begin/api/package.json

@@ -64,9 +64,13 @@ function setupGoogle({ server }) {
   });
 
   passport.deserializeUser((id, done) => {
-    User.findById(id, User.publicFields()).exec((err, user) => {
-      done(err, user);
-    });
+    User.findById(id, User.publicFields())
+      .then((user) => {
+        done(null, user);
+      })
+      .catch((error) => {
+        done(error, null);
+      });
   });
 
   server.use(passport.initialize());

Diff for: book/10-begin/api/server/google-auth.ts

@@ -1,7 +1,7 @@
 import * as mongoose from 'mongoose';
 
 import * as he from 'he';
-import * as hljs from 'highlight.js';
+import hljs from 'highlight.js';
 import { marked } from 'marked';
 
 import Discussion from './Discussion';
@@ -52,16 +52,19 @@ function markdownToHtml(content) {
     `;
   };
 
+  renderer.code = (code, infostring: string) => {
+    const [lang] = infostring.split(' | ');
+
+    const language = hljs.getLanguage(lang) ? lang : 'plaintext';
+
+    return `<pre><code class="hljs language-${lang}">${
+      hljs.highlight(code, { language }).value
+    }</code></pre>`;
+  };
+
   marked.setOptions({
     renderer,
     breaks: true,
-    highlight(code, lang) {
-      if (!lang) {
-        return hljs.highlightAuto(code).value;
-      }
-
-      return hljs.highlight(lang, code).value;
-    },
   });
 
   return marked(he.decode(content));

Diff for: book/10-begin/api/server/models/Post.ts

@@ -36,11 +36,15 @@ function setupPasswordless({ server }) {
 
   server.use((req, __, next) => {
     if (req.user && typeof req.user === 'string') {
-      User.findById(req.user, User.publicFields()).exec((err, user) => {
-        req.user = user;
-        console.log('passwordless middleware');
-        next(err);
-      });
+      User.findById(req.user, User.publicFields())
+        .then((user) => {
+          req.user = user;
+          console.log('passwordless middleware');
+          next();
+        })
+        .catch((err) => {
+          next(err);
+        });
     } else {
       next();
     }
@@ -77,14 +81,14 @@ function setupPasswordless({ server }) {
     '/auth/logged_in',
     passwordless.acceptToken(),
     (req, __, next) => {
-      if (req.user && typeof req.user === 'string') {
-        User.findById(req.user, User.publicFields()).exec((err, user) => {
+      User.findById(req.user, User.publicFields())
+        .then((user) => {
           req.user = user;
+          next();
+        })
+        .catch((err) => {
           next(err);
         });
-      } else {
-        next();
-      }
     },
     async (req, res) => {
       let teamSlugOfInvitedTeam;

Diff for: book/10-begin/api/server/passwordless-auth.ts

@@ -1,4 +1,6 @@
-import * as mongoSessionStore from 'connect-mongo';
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const MongoStore = require('connect-mongo');
+
 import * as cors from 'cors';
 import * as express from 'express';
 import * as session from 'express-session';
@@ -30,15 +32,13 @@ stripeWebhookAndCheckoutCallback({ server });
 
 server.use(express.json());
 
-const MongoStore = mongoSessionStore(session);
-
 const sessionOptions = {
   name: process.env.SESSION_NAME,
   secret: process.env.SESSION_SECRET,
   resave: false,
   saveUninitialized: false,
-  store: new MongoStore({
-    mongooseConnection: mongoose.connection,
+  store: MongoStore.create({
+    mongoUrl: process.env.MONGO_URL_TEST,
     ttl: 14 * 24 * 60 * 60, // save session 14 days
     autoRemove: 'interval',
     autoRemoveInterval: 1440, // clears every day

Diff for: book/10-begin/api/server/server.ts

@@ -16,6 +16,7 @@ function setupSockets({ httpServer, origin, sessionMiddleware }) {
         credentials: true,
       },
       cookie: {
+        name: 'io',
         httpOnly: true,
         maxAge: 14 * 24 * 60 * 60 * 1000, // expires in 14 days
         domain: 'localhost',
@@ -29,7 +30,7 @@ function setupSockets({ httpServer, origin, sessionMiddleware }) {
 
     io.use(wrap(sessionMiddleware));
 
-    io.on('connection', (socket) => {
+    io.on('connection', (socket: any) => {
       if (
         !socket.request.session ||
         ((!socket.request.session.passport || !socket.request.session.passport.user) &&

Diff for: book/10-begin/api/server/sockets.ts

@@ -8,7 +8,7 @@ const dev = process.env.NODE_ENV !== 'production';
 
 const stripeInstance = new Stripe(
   dev ? process.env.STRIPE_TEST_SECRETKEY : process.env.STRIPE_LIVE_SECRETKEY,
-  { apiVersion: '2020-08-27' },
+  { apiVersion: '2023-10-16' },
 );
 
 function createSession({ userId, teamId, teamSlug, customerId, subscriptionId, userEmail, mode }) {
@@ -66,7 +66,7 @@ function updateSubscription(subscriptionId: string, params: Stripe.SubscriptionU
 
 function cancelSubscription({ subscriptionId }) {
   console.log('cancel subscription', subscriptionId);
-  return stripeInstance.subscriptions.del(subscriptionId);
+  return stripeInstance.subscriptions.cancel(subscriptionId);
 }
 
 function getListOfInvoices({ customerId }) {
@@ -93,7 +93,6 @@ function stripeWebhookAndCheckoutCallback({ server }) {
         // Occurs whenever an invoice payment attempt fails, due either to a declined payment or to the lack of a stored payment method.
 
         if (event.type === 'invoice.payment_failed') {
-          // @ts-expect-error subscription does not exist on type Object
           const { subscription } = event.data.object;
           console.log(JSON.stringify(subscription));
 

Diff for: book/10-begin/api/server/stripe.ts

@@ -6,7 +6,7 @@ import { generateSlug } from '../../../server/utils/slugify';
 require('dotenv').config();
 
 describe('slugify', () => {
-  beforeAll(async (done) => {
+  beforeAll(async () => {
     await mongoose.connect(process.env.MONGO_URL_TEST);
 
     const mockUsers = [
@@ -34,8 +34,6 @@ describe('slugify', () => {
     ];
 
     await User.insertMany(mockUsers);
-
-    done();
   });
 
   test('not duplicated', async () => {
@@ -56,10 +54,8 @@ describe('slugify', () => {
     await expect(generateSlug(User, 'John & Johnson@#$')).resolves.toEqual('john-johnson-2');
   });
 
-  afterAll(async (done) => {
+  afterAll(async () => {
     await User.deleteMany({ slug: { $in: ['john', 'john-johnson', 'john-johnson-1'] } });
     await mongoose.disconnect();
-
-    done();
   });
 });