chapter-9 edits

book/8-end/package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "nodemon server/server.js --watch server",
-    "build": "NODE_ENV=production next build",
+    "build": "next build",
     "start": "node server/app.js",
     "lint": "eslint components pages lib server",
     "test": "jest --coverage"

book/8-end/server/server.js

@@ -19,7 +19,7 @@ const { stripeCheckoutCallback } = require('./stripe');
 require('dotenv').config();
 
 const dev = process.env.NODE_ENV !== 'production';
-const MONGO_URL = dev ? process.env.MONGO_URL_TEST : process.env.MONGO_URL;
+const MONGO_URL = process.env.MONGO_URL_TEST;
 
 const options = {
   useNewUrlParser: true,

book/9-begin/package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "nodemon server/server.js --watch server",
-    "build": "NODE_ENV=production next build",
+    "build": "next build",
     "start": "node server/server.js",
     "lint": "eslint components pages lib server",
     "test": "jest --coverage"

book/9-begin/server/api/admin.js

@@ -2,7 +2,7 @@ const express = require('express');
 const Book = require('../models/Book');
 const User = require('../models/User');
 const { getRepos } = require('../github');
-const logger = require('../logger');
+// const logger = require('../logger');
 
 const router = express.Router();
 
@@ -29,7 +29,7 @@ router.post('/books/add', async (req, res) => {
     const book = await Book.add({ userId: req.user.id, ...req.body });
     res.json(book);
   } catch (err) {
-    logger.error(err);
+    console.error(err);
     res.json({ error: err.message || err.toString() });
   }
 });
@@ -68,7 +68,7 @@ router.post('/books/sync-content', async (req, res) => {
     await Book.syncContent({ id: bookId, user, request: req });
     res.json({ done: 1 });
   } catch (err) {
-    logger.error(err);
+    console.error(err);
     res.json({ error: err.message || err.toString() });
   }
 });
@@ -85,7 +85,7 @@ router.get('/github/repos', async (req, res) => {
     const response = await getRepos({ user, request: req });
     res.json({ repos: response.data });
   } catch (err) {
-    logger.error(err);
+    console.error(err);
     res.json({ error: err.message || err.toString() });
   }
 });

book/9-begin/server/api/customer.js

@@ -2,7 +2,7 @@ const express = require('express');
 const Book = require('../models/Book');
 const Purchase = require('../models/Purchase');
 const { createSession } = require('../stripe');
-const logger = require('../logger');
+// const logger = require('../logger');
 
 const router = express.Router();
 
@@ -53,7 +53,7 @@ router.post('/stripe/fetch-checkout-session', async (req, res) => {
 
     res.json({ sessionId: session.id });
   } catch (err) {
-    logger.error(err);
+    console.error(err);
     res.json({ error: err.message || err.toString() });
   }
 });

book/9-begin/server/github.js

@@ -3,7 +3,7 @@ const fetch = require('node-fetch');
 const { oauthLoginUrl } = require('@octokit/oauth-login-url');
 const _ = require('lodash');
 
-const logger = require('./logger');
+// const logger = require('./logger');
 const User = require('./models/User');
 
 require('dotenv').config();
@@ -19,7 +19,7 @@ function getAPI({ user, previews = [], request }) {
     request: { timeout: 10000 },
     log: {
       info(msg, info) {
-        logger.info(`Github API log: ${msg}`, {
+        console.log(`Github API log: ${msg}`, {
           ..._.omit(info, 'headers', 'request', 'body'),
           user: _.pick(user, '_id', 'githubUsername', 'githubId'),
           ..._.pick(request, 'ip', 'hostname'),
@@ -89,7 +89,7 @@ function setupGithub({ server, ROOT_URL }) {
       clientId: CLIENT_ID,
       redirectUrl: `${ROOT_URL}/auth/github/callback`,
       scopes: ['repo', 'user:email'],
-      log: { warn: (message) => logger.warn(message) },
+      log: { warn: (message) => console.log(message) },
     });
 
     req.session.githubAuthState = state;
@@ -148,7 +148,7 @@ function setupGithub({ server, ROOT_URL }) {
         profile: profile.data,
       });
     } catch (error) {
-      logger.error(error.toString());
+      console.error(error.toString());
 
       res.redirect(`${redirectUrl}/admin?error=${error.toString()}`);
     }

book/9-begin/server/models/Book.js

@@ -11,7 +11,7 @@ const User = require('./User');
 const { addToMailchimp } = require('../mailchimp');
 const { getCommits, getRepoDetail } = require('../github');
 
-const logger = require('../logger');
+// const logger = require('../logger');
 
 const { Schema } = mongoose;
 
@@ -151,9 +151,9 @@ class BookClass {
 
         try {
           await Chapter.syncContent({ book, data });
-          logger.info('Content is synced', { path: f.path });
+          console.log('Content is synced', { path: f.path });
         } catch (error) {
-          logger.error('Content sync has error', { path: f.path, error });
+          console.error('Content sync has error', { path: f.path, error });
         }
       }),
     );
@@ -181,7 +181,7 @@ class BookClass {
     try {
       await addToMailchimp({ email: user.email, listName: 'purchased' });
     } catch (error) {
-      logger.error('buy error:', error);
+      console.error('buy error:', error);
     }
 
     return Purchase.create({

book/9-begin/server/models/EmailTemplate.js

@@ -1,6 +1,6 @@
 const mongoose = require('mongoose');
 const _ = require('lodash');
-const logger = require('../logger');
+// const logger = require('../logger');
 
 const { Schema } = mongoose;
 
@@ -66,7 +66,7 @@ function insertTemplates() {
     }
 
     EmailTemplate.create(template).catch((error) => {
-      logger.error('EmailTemplate insertion error:', error);
+      console.error('EmailTemplate insertion error:', error);
     });
   });
 }

book/9-begin/server/models/User.js

@@ -5,7 +5,7 @@ const { addToMailchimp } = require('../mailchimp');
 const generateSlug = require('../utils/slugify');
 const sendEmail = require('../aws-ses');
 const { getEmailTemplate } = require('./EmailTemplate');
-const logger = require('../logger');
+// const logger = require('../logger');
 
 const { Schema } = mongoose;
 
@@ -116,13 +116,13 @@ class UserClass {
         body: template.message,
       });
     } catch (err) {
-      logger.error('Email sending error:', err);
+      console.error('Email sending error:', err);
     }
 
     try {
       await addToMailchimp({ email, listName: 'signedup' });
     } catch (error) {
-      logger.error('Mailchimp error:', error);
+      console.error('Mailchimp error:', error);
     }
 
     return _.pick(newUser, UserClass.publicFields());

book/9-begin/server/server.js

@@ -17,7 +17,7 @@ const { stripeCheckoutCallback } = require('./stripe');
 require('dotenv').config();
 
 const dev = process.env.NODE_ENV !== 'production';
-const MONGO_URL = dev ? process.env.MONGO_URL_TEST : process.env.MONGO_URL;
+const MONGO_URL = process.env.MONGO_URL_TEST;
 
 const port = process.env.PORT || 8000;
 const ROOT_URL = `http://localhost:${port}`;

book/9-begin/server/stripe.js

@@ -3,7 +3,7 @@ const lodash = require('lodash');
 
 const Book = require('./models/Book');
 const User = require('./models/User');
-const logger = require('./logger');
+// const logger = require('./logger');
 
 const dev = process.env.NODE_ENV !== 'production';
 const API_KEY = dev ? process.env.Stripe_Test_SecretKey : process.env.Stripe_Live_SecretKey;
@@ -97,7 +97,7 @@ function stripeCheckoutCallback({ server }) {
 
       res.redirect(`${ROOT_URL}${session.metadata.redirectUrl}`);
     } catch (err) {
-      logger.error(err);
+      console.error(err);
       res.redirect(
         `${ROOT_URL}${session.metadata.redirectUrl}?error=${err.message || err.toString()}`,
       );