Merge branch 'dev' into #156-move-rooms-to-the-past-room-list-and-change-settlestatus-automatically-when-the-participant-is-one

Author: 14KGun

.dockerignore

@@ -0,0 +1,11 @@
+/node_modules
+.env.test
+.env.production
+.env.development
+.DS_store
+*.code-workspace
+*.swp
+/logs/*.log
+
+# AdminJS 관련 디렉토리
+.adminjs

.env.example

@@ -8,3 +8,5 @@ FRONT_URL=[front url(e.g. http://localhost:3000)]
 AWS_ACCESS_KEY_ID=[AWS Access key ID]
 AWS_SECRET_ACCESS_KEY=[AWS Secret access key]
 AWS_S3_BUCKET_NAME=[AWS S3 Buck name]
+JWT_SECRET_KEY=[JWT SERCRET KEY]
+APP_URI_SCHEME=[APP_URI_SCHEME]

.github/workflows/push_image_ecr.yml

@@ -1,4 +1,4 @@
-name: Push Image to Amazon ECR
+name: Push Prod Image to Amazon ECR
 
 # when tagging action success
 on:

.github/workflows/push_image_ecr_dev.yml

@@ -0,0 +1,43 @@
+name: Push Dev Image to Amazon ECR
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - dev
+
+env:
+  AWS_REGION: ap-northeast-2
+
+jobs:
+  if_merged:
+    if: github.event.pull_request.merged == true
+    name: Create Release and Tag
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ env.AWS_REGION }}
+    
+    - name: Login to AWS ECR
+      id: login-ecr
+      uses: aws-actions/amazon-ecr-login@v1
+    
+    - name: Build and Push to AWS ECR
+      id: build_image
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        ECR_REPOSITORY: taxi-back
+      run: |
+        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:dev .
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:dev
+        echo "Push iamge : $ECR_REGISTRY/$ECR_REPOSITORY:dev"

Dockerfile

@@ -4,6 +4,9 @@ FROM node:16-alpine
 WORKDIR /usr/src/app
 COPY . .
 
+# Install curl (for taxi-docker)
+RUN apk update && apk add curl
+
 # Install requirements
 RUN npm ci
 

README.md

@@ -44,5 +44,6 @@ See [contributors](https://github.com/sparcs-kaist/taxi-front/graphs/contributor
  - frontend : https://github.com/sparcs-kaist/taxi-front
  - backend : https://github.com/sparcs-kaist/taxi-back
  - app : https://github.com/sparcs-kaist/taxi-app
+ - docker : https://github.com/sparcs-kaist/taxi-docker
  - figma : https://www.figma.com/file/li34hP1oStJAzLNjcG5KjN/SPARCS-Taxi?node-id=0%3A1
  - taxiSampleGenerator : https://github.com/sparcs-kaist/taxiSampleGenerator

package-lock.json

@@ -22,6 +22,7 @@
     "express-session": "^1.17.1",
     "express-socket.io-session": "^1.3.5",
     "express-validator": "^6.14.0",
+    "jsonwebtoken": "^8.5.1",
     "mongoose": "^6.5.2",
     "querystring": "^0.2.1",
     "redis": "^4.2.0",

package.json

@@ -16,4 +16,6 @@ module.exports = {
     secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
     s3BucketName: process.env.AWS_S3_BUCKET_NAME,
   },
+  jwtSecretKey: process.env.JWT_SECRET_KEY,
+  appUriScheme: process.env.APP_URI_SCHEME,
 };

security.js

@@ -0,0 +1,7 @@
+const TOKEN_EXPIRED = -3;
+const TOKEN_INVALID = -2;
+
+module.exports = {
+  TOKEN_INVALID,
+  TOKEN_EXPIRED,
+};

src/config/constants.js

@@ -0,0 +1,9 @@
+const { jwtSecretKey, frontUrl } = require("../../security");
+
+module.exports = {
+  jwtSecretKey: jwtSecretKey,
+  option: {
+    algorithm: "HS256",
+    issuer: frontUrl,
+  },
+};