ユーザ関連機能の作成

.eslintrc.js

@@ -25,6 +25,7 @@ module.exports = {
       jsx: true
     }
   },
+  ignorePatterns: ['/db/**/*'],
   rules: {
     'react/react-in-jsx-scope': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off'

.github/workflows/firebase-hosting-merge.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: 'yarn build:client'
+      - run: 'yarn install && yarn build:client'
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'

.github/workflows/firebase-hosting-pull-request.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: 'yarn lint'
+      - run: 'yarn install && yarn lint'
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'

.prettierignore

@@ -7,3 +7,4 @@ server/migration
 server/index.js
 server/lambda.js
 server/lambda_migration.js
+db/**/*

package.json

@@ -3,12 +3,12 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "npm run migrate:dev && run-p dev:*",
+    "dev": "npm run migrate:dev && run-p 'dev:*'",
     "dev:client": "next dev -p 8000",
     "dev:server": "npm run dev --prefix server",
     "dev:aspida": "aspida --watch",
     "dev:pathpida": "pathpida --enableStatic --watch",
-    "build": "run-p build:client build:server",
+    "build": "run-p 'build:client' 'build:server'",
     "prebuild:client": "npm run generate",
     "build:client": "pathpida --enableStatic && aspida && next build && next export",
     "build:server": "npm run build --prefix server",
@@ -23,7 +23,7 @@
     "migrate:dev:createonly": "npm run migrate:dev:createonly --prefix server",
     "migrate:reset": "npm run migrate:reset --prefix server",
     "seed": "npm run seed --prefix server",
-    "start": "run-p start:*",
+    "start": "run-p 'start:*'",
     "start:client": "next start",
     "start:server": "npm start --prefix server",
     "pretest": "npm run generate",
@@ -38,48 +38,52 @@
   "dependencies": {
     "@aspida/axios": "^1.11.0",
     "@aspida/react-query": "^1.11.0",
-    "@emotion/react": "^11.10.4",
-    "@emotion/styled": "^11.10.4",
-    "@mui/icons-material": "^5.10.3",
-    "@mui/material": "^5.10.5",
-    "@prisma/client": "^3.9.1",
+    "@emotion/react": "^11.10.5",
+    "@emotion/styled": "^11.10.5",
+    "@fontsource/roboto": "^4.5.8",
+    "@mui/icons-material": "^5.11.9",
+    "@mui/material": "^5.11.9",
+    "@prisma/client": "^3.15.2",
     "axios": "^0.27.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
-    "firebase": "^9.9.4",
-    "frourio": "^0.29.0",
-    "next": "^12.2.5",
-    "pathpida": "^0.18.1",
-    "prisma": "^3.9.1",
+    "firebase": "^9.17.1",
+    "firebaseui": "^6.0.2",
+    "frourio": "^0.31.1",
+    "next": "^13.1.6",
+    "pathpida": "^0.20.1",
+    "prisma": "^3.15.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-query": "^3.34.14",
-    "reflect-metadata": "^0.1.13"
+    "react-hook-form": "^7.43.1",
+    "react-query": "^3.39.3",
+    "reflect-metadata": "^0.1.13",
+    "sass": "^1.58.1"
   },
   "devDependencies": {
-    "@fastify/cors": "^7.0.0",
-    "@testing-library/react": "^13.3.0",
-    "@types/jest": "^27.4.0",
-    "@types/node": "^17.0.15",
-    "@types/react": "^18.0.15",
-    "@types/react-dom": "^18.0.6",
-    "@typescript-eslint/eslint-plugin": "^5.10.2",
-    "@typescript-eslint/parser": "^5.10.2",
-    "babel-jest": "^27.5.0",
+    "@fastify/cors": "^8.2.0",
+    "@testing-library/react": "^13.4.0",
+    "@types/jest": "^29.4.0",
+    "@types/node": "^18.13.0",
+    "@types/react": "^18.0.28",
+    "@types/react-dom": "^18.0.10",
+    "@typescript-eslint/eslint-plugin": "^5.52.0",
+    "@typescript-eslint/parser": "^5.52.0",
+    "babel-jest": "^27.5.1",
     "cross-env": "^7.0.3",
-    "dotenv": "^16.0.0",
-    "eslint": "^8.22.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-react": "^7.28.0",
-    "fastify": "^3.27.1",
+    "dotenv": "^16.0.3",
+    "eslint": "^8.34.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-plugin-react": "^7.32.2",
+    "fastify": "^4.13.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^27.5.0",
+    "jest": "^27.5.1",
     "npm-run-all": "^4.1.5",
-    "pathpida": "^0.18.1",
-    "prettier": "^2.5.1",
-    "ts-jest": "^27.1.3",
-    "ts-loader": "^8.4.0",
+    "pathpida": "^0.20.1",
+    "prettier": "^2.8.4",
+    "ts-jest": "^29.0.5",
+    "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   }
 }

server/api/users/controller.ts

@@ -0,0 +1,55 @@
+import { defineController } from './$relay'
+import {
+  createUserFromEmailAndPassword,
+  getUserByUid,
+  updateUser
+} from '$/service/user'
+import admin from 'firebase-admin'
+
+export default defineController(() => ({
+  // ログイン/連携登録
+  post: async ({ headers, body }) => {
+    const { idtoken: idToken } = headers
+    const auth = admin.auth()
+
+    let uid
+    try {
+      const res = await auth.verifyIdToken(idToken)
+      uid = res.uid
+    } catch (e) {
+      return {
+        status: 400
+        // body: 'Incorrect ID Token.'
+      }
+    }
+
+    try {
+      let user = await getUserByUid(uid)
+
+      if (user) {
+        if (user.role !== 'TEMPORARY') {
+          return {
+            status: 409,
+            body: 'Specific user is already registered.'
+          }
+        }
+        if (user.email !== body.email || user.userName !== body.userName) {
+          user = await updateUser(user.uid, {
+            email: body.email,
+            userName: body.userName
+          })
+        }
+      } else if (!user) {
+        user = await createUserFromEmailAndPassword(body.uid, body.email)
+      }
+
+      return { status: 200, body: user }
+    } catch (e) {
+      console.log(e)
+      return {
+        status: 409,
+        body: 'Update Failed.'
+      }
+    }
+  }
+}))

server/api/user/index.ts → server/api/users/index.ts

@@ -1,14 +1,15 @@
 import type { AuthHeader, User } from '$/types'
-import type { ReadStream } from 'fs'
 
-export type Methods = {
-  get: {
-    reqHeaders: AuthHeader
-    resBody: User
-  }
+type PostType = {
+  uid: string
+  userName: string
+  email: string
+}
 
+export type Methods = {
   post: {
     reqHeaders: AuthHeader
+    reqBody: PostType
     resBody: User
   }
 }

server/package.json

@@ -3,13 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "npm run generate && npm run migrate:dev && run-p dev:*",
+    "dev": "npm run generate && npm run migrate:dev && run-p 'dev:*'",
     "dev:server": "node-dev --respawn index.js",
     "dev:build": "node ./scripts/build.dev.js",
     "dev:frourio": "frourio --watch",
     "dev:prisma": "prisma generate --watch",
     "build": "npm run generate && node ./scripts/build.prod.js",
-    "generate": "run-p generate:*",
+    "generate": "run-p 'generate:*'",
     "generate:frourio": "frourio",
     "generate:prisma": "prisma generate",
     "migrate:dev": "prisma migrate dev",
@@ -20,31 +20,32 @@
     "start": "cross-env NODE_ENV=production node index.js"
   },
   "dependencies": {
-    "@fastify/cors": "^7.0.0",
-    "@fastify/helmet": "^8.0.0",
-    "@fastify/jwt": "^5.0.1",
-    "@fastify/multipart": "^6.0.0",
-    "@fastify/static": "^5.0.2",
-    "@prisma/client": "^3.9.1",
+    "@fastify/cookie": "^8.3.0",
+    "@fastify/cors": "^8.2.0",
+    "@fastify/helmet": "^10.1.0",
+    "@fastify/jwt": "^6.5.0",
+    "@fastify/multipart": "^6.0.1",
+    "@fastify/static": "^6.9.0",
+    "@prisma/client": "^3.15.2",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.13.2",
-    "dotenv": "^16.0.0",
-    "fastify": "^3.27.1",
-    "firebase-admin": "^11.0.1",
+    "class-validator": "^0.14.0",
+    "dotenv": "^16.0.3",
+    "fastify": "^4.13.0",
+    "firebase-admin": "^11.5.0",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@types/busboy": "^1.3.0",
-    "@types/jest": "^27.4.0",
+    "@types/busboy": "^1.5.0",
+    "@types/jest": "^29.4.0",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.14.19",
-    "esbuild-node-externals": "^1.4.1",
-    "frourio": "^0.29.0",
-    "node-dev": "^7.1.0",
+    "esbuild": "^0.14.54",
+    "esbuild-node-externals": "^1.6.0",
+    "frourio": "^0.31.1",
+    "node-dev": "^7.4.3",
     "npm-run-all": "^4.1.5",
-    "prisma": "^3.9.1",
+    "prisma": "^3.15.2",
     "ts-loader": "^8.4.0",
     "ts-node": "^10.9.1",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   }
 }

server/service/app.ts

@@ -4,17 +4,25 @@ import helmet from '@fastify/helmet'
 import cors from '@fastify/cors'
 import fastifyStatic from '@fastify/static'
 import fastifyJwt from '@fastify/jwt'
+import cookie from '@fastify/cookie'
 import {
-  API_JWT_SECRET,
   API_BASE_PATH,
+  API_JWT_SECRET,
   API_UPLOAD_DIR
 } from '$/service/envValues'
 import server from '$/$server'
 
 export const init = (serverFactory?: FastifyServerFactory) => {
   const app = Fastify({ serverFactory })
   app.register(helmet)
-  app.register(cors)
+  app.register(cookie)
+  // TODO: FIXME
+  app.register(cors, {
+    credentials: true,
+    origin: (origin, callback) => {
+      callback(null, true)
+    }
+  })
   app.register(fastifyStatic, {
     root: path.join(__dirname, 'static'),
     prefix: '/static/'