Merge pull request #14 from jrione/development

v0.0.2
jrione · Mar 14, 2024 · 4062633 · 4062633
2 parents 9163afe + d382e2f
commit 4062633
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/.github/workflows/go-actions.yml b/.github/workflows/go-actions.yml
@@ -28,12 +28,6 @@ jobs:
         --arg port "${{ secrets.PORT }}" \
         --arg name "${{ secrets.NAME }}" \
         '(. | .server.listen = $serverListen | .database.username = $username | .database.password = $password | .database.hostname = $hostname | .database.port = $port | .database.name = $name )' | tee config.json
-    - name: Save Artifact
-      uses: actions/upload-artifact@v4
-      with: 
-        name: env_artifact
-        path: ./config.json
-        retention-days: 1
     - name: Test
       run: |
         ./gin-crud &

diff --git a/controller/login_controller.go b/controller/login_controller.go
@@ -40,7 +40,8 @@ func (l LoginController) Login(gctx *gin.Context) {
 		})
 		return
 	}
-	if req.Username != data.Username && !checkHashPass(data.Password, req.Password) {
+
+	if req.Username != data.Username || !checkHashPass(data.Password, req.Password) {
 		gctx.JSON(http.StatusUnauthorized, gin.H{
 			"code": http.StatusUnauthorized,
 			"err":  "Incorrect Username Or Password",

diff --git a/middleware/middleware.go b/middleware/middleware.go
@@ -2,7 +2,6 @@ package auth
 
 import (
 	"fmt"
-	"log"
 	"net/http"
 	"strings"
 
@@ -32,7 +31,6 @@ func CORSMiddleware() gin.HandlerFunc {
 		gctx.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT")
 
 		if gctx.Request.Method == "OPTIONS" {
-			log.Print("Handling Options")
 			gctx.AbortWithStatus(204)
 			return
 		}

diff --git a/migrations/user.sql b/migrations/user.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS "User" (
   username CHAR(20) NOT NULL PRIMARY KEY,
   full_name VARCHAR(50) NOT NULL,
   email VARCHAR(50) NOT NULL,
-  password VARCHAR(16) NOT NULL,
+  password VARCHAR(60) NOT NULL,
   created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
   updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
 );