feat: finish tutorial

.vscode/extensions.json

@@ -8,7 +8,8 @@
     "pflannery.vscode-versionlens",
     "editorconfig.editorconfig",
     "prisma.prisma",
-    "graphql.vscode-graphql"
+    "graphql.vscode-graphql",
+    "johnpapa.vscode-cloak"
   ],
   "unwantedRecommendations": []
 }

README.md

@@ -99,3 +99,5 @@ WRONG
 api/node_modules/.prisma
 
 ---
+
+TODO see about test not picking up transitive dependencies, e.g. ArticleCell -> Article -> CommentForm

api/db/migrations/20220402112722_create_comment/migration.sql

@@ -0,0 +1,13 @@
+-- CreateTable
+CREATE TABLE "Comment" (
+    "id" SERIAL NOT NULL,
+    "name" TEXT NOT NULL,
+    "body" TEXT NOT NULL,
+    "postId" INTEGER NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "Comment_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "Comment" ADD CONSTRAINT "Comment_postId_fkey" FOREIGN KEY ("postId") REFERENCES "Post"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

api/db/migrations/20220402115226_add_roles_to_user/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "roles" TEXT NOT NULL DEFAULT E'moderator';

api/db/schema.prisma

@@ -9,10 +9,11 @@ generator client {
 }
 
 model Post {
-  id        Int      @id @default(autoincrement())
+  id        Int       @id @default(autoincrement())
   title     String
   body      String
-  createdAt DateTime @default(now())
+  comments  Comment[]
+  createdAt DateTime  @default(now())
 }
 
 model Contact {
@@ -31,4 +32,14 @@ model User {
   salt                String
   resetToken          String?
   resetTokenExpiresAt DateTime?
+  roles               String    @default("moderator")
+}
+
+model Comment {
+  id        Int      @id @default(autoincrement())
+  name      String
+  body      String
+  post      Post     @relation(fields: [postId], references: [id])
+  postId    Int
+  createdAt DateTime @default(now())
 }

api/src/graphql/comments.sdl.js

@@ -0,0 +1,31 @@
+export const schema = gql`
+  type Comment {
+    id: Int!
+    name: String!
+    body: String!
+    post: Post!
+    postId: Int!
+    createdAt: DateTime!
+  }
+
+  type Query {
+    comments(postId: Int!): [Comment!]! @skipAuth
+  }
+
+  input CreateCommentInput {
+    name: String!
+    body: String!
+    postId: Int!
+  }
+
+  input UpdateCommentInput {
+    name: String
+    body: String
+    postId: Int
+  }
+  type Mutation {
+    createComment(input: CreateCommentInput!): Comment! @skipAuth
+    deleteComment(id: Int!): Comment!
+      @requireAuth(roles: ["moderator", "admin"])
+  }
+`

api/src/lib/auth.js

@@ -21,7 +21,7 @@ import { db } from './db'
 export const getCurrentUser = async (session) => {
   return await db.user.findUnique({
     where: { id: session.id },
-    select: { id: true, email: true },
+    select: { id: true, email: true, roles: true },
   })
 }
 
@@ -57,7 +57,7 @@ export const hasRole = ({ roles }) => {
       if (Array.isArray(context.currentUser.roles)) {
         return context.currentUser.roles?.some((r) => roles.includes(r))
       } else {
-        roles.some((r) => context.currentUser.roles?.includes(r))
+        return roles.some((r) => context.currentUser.roles?.includes(r))
       }
     }
 

api/src/services/comments/comments.js

@@ -0,0 +1,30 @@
+import { db } from 'src/lib/db'
+import { requireAuth } from 'src/lib/auth'
+
+export const comments = ({ postId }) => {
+  return db.comment.findMany({ where: { postId } })
+}
+
+export const comment = ({ id }) => {
+  return db.comment.findUnique({
+    where: { id },
+  })
+}
+
+export const Comment = {
+  post: (_obj, { root }) =>
+    db.comment.findUnique({ where: { id: root.id } }).post(),
+}
+
+export const createComment = ({ input }) => {
+  return db.comment.create({
+    data: input,
+  })
+}
+
+export const deleteComment = ({ id }) => {
+  requireAuth({ roles: ['moderator', 'admin'] })
+  return db.comment.delete({
+    where: { id },
+  })
+}

api/src/services/comments/comments.scenarios.js

@@ -0,0 +1,39 @@
+export const standard = defineScenario({
+  comment: {
+    jane: {
+      data: {
+        name: 'Jane Doe',
+        body: 'I like trees',
+        post: {
+          create: {
+            title: 'Redwood Leaves',
+            body: 'The quick brown fox jumped over the lazy dog.',
+          },
+        },
+      },
+    },
+    john: {
+      data: {
+        name: 'John Doe',
+        body: 'Hug a tree today',
+        post: {
+          create: {
+            title: 'Root Systems',
+            body: 'The five boxing wizards jump quickly.',
+          },
+        },
+      },
+    },
+  },
+})
+
+export const postOnly = defineScenario({
+  post: {
+    bark: {
+      data: {
+        title: 'Bark',
+        body: "A tree's bark is worse than its bite",
+      },
+    },
+  },
+})

api/src/services/comments/comments.test.js

@@ -0,0 +1,78 @@
+import { comments, createComment, deleteComment } from './comments'
+import { db } from 'src/lib/db'
+import { AuthenticationError, ForbiddenError } from '@redwoodjs/graphql-server'
+
+// Generated boilerplate tests do not account for all circumstances
+// and can fail without adjustments, e.g. Float and DateTime types.
+//           Please refer to the RedwoodJS Testing Docs:
+//       https://redwoodjs.com/docs/testing#testing-services
+// https://redwoodjs.com/docs/testing#jest-expect-type-considerations
+
+describe('comments', () => {
+  scenario(
+    'returns all comments for a single post from the database',
+    async (scenario) => {
+      const result = await comments({ postId: scenario.comment.jane.postId })
+      const post = await db.post.findUnique({
+        where: { id: scenario.comment.jane.postId },
+        include: { comments: true },
+      })
+      expect(result.length).toEqual(post.comments.length)
+    }
+  )
+
+  scenario('postOnly', 'creates a new comment', async (scenario) => {
+    const comment = await createComment({
+      input: {
+        name: 'Billy Bob',
+        body: 'What is your favorite tree bark?',
+        postId: scenario.post.bark.id,
+      },
+    })
+
+    expect(comment.name).toEqual('Billy Bob')
+    expect(comment.body).toEqual('What is your favorite tree bark?')
+    expect(comment.postId).toEqual(scenario.post.bark.id)
+    expect(comment.createdAt).not.toEqual(null)
+  })
+  scenario(
+    'allows admins and moderators to delete a comment',
+    async (scenario) => {
+      mockCurrentUser({ roles: ['admin', 'moderator'] })
+
+      const comment = await deleteComment({
+        id: scenario.comment.jane.id,
+      })
+      expect(comment.id).toEqual(scenario.comment.jane.id)
+
+      const result = await comments({ postId: scenario.comment.jane.id })
+      expect(result.length).toEqual(0)
+    }
+  )
+
+  scenario(
+    'does not allow a non-moderator to delete a comment',
+    async (scenario) => {
+      mockCurrentUser({ roles: 'user' })
+
+      expect(() =>
+        deleteComment({
+          id: scenario.comment.jane.id,
+        })
+      ).toThrow(ForbiddenError)
+    }
+  )
+
+  scenario(
+    'does not allow a logged out user to delete a comment',
+    async (scenario) => {
+      mockCurrentUser(null)
+
+      expect(() =>
+        deleteComment({
+          id: scenario.comment.jane.id,
+        })
+      ).toThrow(AuthenticationError)
+    }
+  )
+})

api/src/services/contacts/contacts.test.js

@@ -6,8 +6,6 @@ import {
   deleteContact,
 } from './contacts'
 
-import { UserInputError } from '@redwoodjs/graphql-server'
-
 // Generated boilerplate tests do not account for all circumstances
 // and can fail without adjustments, e.g. Float and DateTime types.
 //           Please refer to the RedwoodJS Testing Docs:

package.json

@@ -21,5 +21,11 @@
   "prisma": {
     "seed": "yarn rw exec seed"
   },
+  "resolutions": {
+    "@storybook/addon-a11y": "6.4.20",
+    "@storybook/builder-webpack5": "6.4.20",
+    "@storybook/manager-webpack5": "6.4.20",
+    "@storybook/react": "6.4.20"
+  },
   "packageManager": "yarn@3.2.0"
 }

scripts/create-user.js

@@ -0,0 +1,15 @@
+#!/usr/bin/node
+
+import CryptoJS from 'crypto-js'
+import { db } from 'api/src/lib/db'
+
+const user = 'moderator@moderator.com'
+const password = 'password'
+const salt = CryptoJS.lib.WordArray.random(128 / 8).toString()
+const hashedPassword = CryptoJS.PBKDF2(password, salt, {
+  keySize: 256 / 32,
+}).toString()
+// TODO add flag for admin
+db.user.create({
+  data: { email: user, hashedPassword, salt },
+})

scripts/seed.js

@@ -29,28 +29,33 @@ export default async () => {
 
       console.log(`  Seeded "${post.title}"`)
     }
-
+    // TODO: provide way for user to add their hashed password/salt
     // create an admin user
-    // await db.user.upsert({
-    //   where: { id: 1 },
-    //   create: {
-    //     id: 1,
-    //     email: 'admin@admin.com',
-    //     hashedPassword:
-    //       'ad9563042fe9f154419361eeeb775d8a12f3975a3722953fd8e326dd108d5645',
-    //     salt: '1c99de412b219e9abf4665293211adce',
-    //   },
-    //   update: {},
-    // })
-
-    // console.info('')
-    // console.info('  Seeded admin user:')
-    // console.info('')
-    // console.info('    Email: admin@admin.com')
-    // console.info('    Password: admin')
-    // console.info('')
-    // console.info(`  (Please don't use this login in a production environment)`)
-    // console.info('')
+    await db.user.upsert({
+      where: { id: 1 },
+      create: {
+        id: 1,
+        email: 'admin@admin.com',
+        hashedPassword:
+          '8bfb40af37a60874fd038eb3ffb16882ce93f5d84c42534d5dc4d24b1c9bcd39',
+        salt: '18def4c24d52742cb16f2d18312883c6',
+        roles: 'admin',
+      },
+      update: {},
+    })
+    // create a moderator user
+    await db.user.upsert({
+      where: { id: 2 },
+      create: {
+        id: 2,
+        email: 'moderator@moderator.com',
+        hashedPassword:
+          '2fbc110bd445dbb4f588c67c7a88f324444fd84716af3ad35ced0b0ebeef4e47',
+        salt: 'f0a8a4a7ccbe92563bffa4ca5fc40c3f',
+        roles: 'moderator',
+      },
+      update: {},
+    })
   } catch (error) {
     console.warn('Please define your seed data.')
     console.error(error)

web/config/storybook.config.js

@@ -2,8 +2,5 @@ module.exports = {
   features: {
     interactionsDebugger: true,
   },
-  addons: [
-    '@storybook/addon-actions/register',
-    '@storybook/addon-interactions',
-  ],
+  addons: ['@storybook/addon-essentials', '@storybook/addon-interactions'],
 }

web/package.json

@@ -22,7 +22,7 @@
     "react-dom": "17.0.2"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "6.4.20",
+    "@storybook/addon-essentials": "6.4.20",
     "@storybook/addon-interactions": "6.4.20",
     "@storybook/jest": "0.0.10",
     "@storybook/test-runner": "0.0.4",