Merge pull request #163 from bvquoc/main

fix version & refactor

.github/workflows/ci.yml

@@ -8,11 +8,11 @@ jobs:
 
     strategy:
       matrix:
-        go-version: ["1.20", "1.21"]
-        node-version: ["18.18.0"]
+        go-version: ["1.22"]
+        node-version: ["20.10.0"]
         os: [ubuntu-latest, macos-latest, windows-latest]
         include:
-          - node-version: "18.18.0"
+          - node-version: "20.10.0"
             next-env: "production"
 
     steps:

backend/main.go

@@ -28,7 +28,6 @@ import (
 	"book-store-management-backend/module/user/usertransport/ginuser"
 	"fmt"
 	"log"
-	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/joho/godotenv"
@@ -101,7 +100,7 @@ func main() {
 		cfg.SMTPort)
 
 	r := gin.Default()
-	r.Use(CORSMiddleware())
+	r.Use(middleware.CORSMiddleware())
 	r.Use(middleware.Recover(appCtx))
 
 	docs.SwaggerInfo.BasePath = "/v1"
@@ -191,20 +190,3 @@ func connectDatabaseWithRetryIn60s(cfg *appConfig) (*gorm.DB, error) {
 
 	return nil, fmt.Errorf("failed to connect to database after retrying for 10 seconds: %w", err)
 }
-
-func CORSMiddleware() gin.HandlerFunc {
-	return func(c *gin.Context) {
-
-		c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
-		c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
-		c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
-		c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT, DELETE, PATCH")
-
-		if c.Request.Method == "OPTIONS" {
-			c.AbortWithStatus(http.StatusNoContent)
-			return
-		}
-
-		c.Next()
-	}
-}

backend/middleware/cors.go

@@ -0,0 +1,24 @@
+package middleware
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+func CORSMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+
+		c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
+		c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
+		c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
+		c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT, DELETE, PATCH")
+
+		if c.Request.Method == "OPTIONS" {
+			c.AbortWithStatus(http.StatusNoContent)
+			return
+		}
+
+		c.Next()
+	}
+}

frontend/.env

@@ -1,2 +1,3 @@
 AUTH_SECRET=secret
 NEXTAUTH_URL=http://localhost:80
+AUTH_TRUST_HOST=true

frontend/lib/auth/auth.config.js

@@ -1,40 +1,42 @@
+import { NextResponse } from "next/server";
+
 export const authConfig = {
-    pages: {
-      signIn: "/login",
-      forgotPassword: "/forgot-password",
+  pages: {
+    signIn: "/login",
+    forgotPassword: "/forgot-password",
+  },
+  providers: [],
+  callbacks: {
+    jwt({ token, user }) {
+      // console.log(user)
+      if (user) {
+        token.id = user;
+      }
+      return token;
     },
-    providers: [],
-    callbacks: {
-      jwt({ token, user }) {
-        // console.log(user)
-        if (user) {
-          token.id = user;
-        }
-        return token;
-      },
-      session({ session, token }) {
-        if (token) {
-          session.user = token.id;
-        }
-        return session;
-      },
-      async authorized({ auth, request }) {
-        const user = auth?.user;
-        // console.log(user)
-        const isOnLoginPage = request.nextUrl?.pathname.startsWith("/login");
-        const isOnForgotPasswordPage =
-          request.nextUrl?.pathname.startsWith("/forgot-password");
-
-        if (user && isOnLoginPage) {
-          return Response.redirect(new URL("/", request.nextUrl));
-        }
-        if (user && isOnForgotPasswordPage) {
-          return Response.redirect(new URL("/", request.nextUrl));
-        }
-        if (!user && !isOnLoginPage && !isOnForgotPasswordPage) {
-          return false;
-        }
-        return true;
-      },
+    session({ session, token }) {
+      if (token) {
+        session.user = token.id;
+      }
+      return session;
     },
-  };
+    async authorized({ auth, request }) {
+      const user = auth?.user;
+      // console.log(user)
+      const isOnLoginPage = request.nextUrl?.pathname.startsWith("/login");
+      const isOnForgotPasswordPage =
+        request.nextUrl?.pathname.startsWith("/forgot-password");
+
+      if (user && isOnLoginPage) {
+        return NextResponse.redirect(new URL("/", request.nextUrl));
+      }
+      if (user && isOnForgotPasswordPage) {
+        return NextResponse.redirect(new URL("/", request.nextUrl));
+      }
+      if (!user && !isOnLoginPage && !isOnForgotPasswordPage) {
+        return false;
+      }
+      return true;
+    },
+  },
+};