From a88ba8c0a2bb70bc7622b53c6ceb75e8be6820ad Mon Sep 17 00:00:00 2001
From: thelenvr <thelenvr@gmail.com>
Date: Mon, 18 Mar 2024 19:39:31 -0400
Subject: [PATCH 1/3] fixed commit

---
 app/controller/auth.go | 53 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/app/controller/auth.go b/app/controller/auth.go
index 3a3c100..7afab80 100644
--- a/app/controller/auth.go
+++ b/app/controller/auth.go
@@ -1,8 +1,12 @@
 package controller
 
 import (
+	"crypto/aes"
+	"crypto/cipher"
 	"crypto/rand"
+	"encoding/base64"
 	"fmt"
+	"io"
 	"math/big"
 	"time"
 
@@ -124,7 +128,15 @@ func Register(c *fiber.Ctx) error {
 			"msg": "user with this username or email already exists",
 		})
 	}
+	// bcrypt encryption for password
 	register.Password, _ = GeneratePasswordHash([]byte(register.Password))
+
+	// AES encryption for payment info
+	key := []byte("abc123def456ghi7") // 16 byte key
+	register.CardNumber, _ = AESEncrypt(key, register.CardNumber)
+	register.CardType, _ = AESEncrypt(key, register.CardNumber)
+	register.CardExpiration, _ = AESEncrypt(key, register.CardNumber)
+
 	newUser := model.User{}
 	if err := convert.Update(&newUser, &register); err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
@@ -272,6 +284,47 @@ func GeneratePasswordHash(password []byte) (string, error) {
 	return string(hashedPassword), nil
 }
 
+func AESEncrypt(key []byte, plaintext string) (string, error) {
+	byteString := []byte(plaintext)
+	block, err := aes.NewCipher(key)
+	// err: cipher cannot be created
+	if err != nil {
+		return "", err
+	}
+	cipherText := make([]byte, aes.BlockSize+len(byteString))
+	iv := cipherText[:aes.BlockSize] // extends to blocksize
+	// err: can't encrypt
+	if _, err = io.ReadFull(rand.Reader, iv); err != nil {
+		return "", err
+	}
+	stream := cipher.NewCFBEncrypter(block, iv)
+	stream.XORKeyStream(cipherText[aes.BlockSize:], byteString)
+	return base64.StdEncoding.EncodeToString(cipherText), nil
+}
+
+func AESDecrypt(key []byte, plaintext string) (string, error) {
+	cipherText, err := base64.StdEncoding.DecodeString(plaintext)
+	// err: cannot base64 decode
+	if err != nil {
+		return "", err
+	}
+	block, err := aes.NewCipher(key)
+	// err: cannot make new cipher
+	if err != nil {
+		return "", err
+	}
+	// err: ciphertext block size is wrong
+	if len(cipherText) < aes.BlockSize {
+		return "", fmt.Errorf("ciphertext wrong block size")
+	}
+	iv := cipherText[:aes.BlockSize]
+	cipherText = cipherText[aes.BlockSize:]
+	stream := cipher.NewCFBDecrypter(block, iv)
+	stream.XORKeyStream(cipherText, cipherText)
+
+	return string(cipherText), nil
+}
+
 func IsValidPassword(hash, password []byte) bool {
 	err := bcrypt.CompareHashAndPassword(hash, password)
 	return err == nil

From 4fc786fa67f98726c319ab41ae996b24d53234c8 Mon Sep 17 00:00:00 2001
From: thelenvr <thelenvr@gmail.com>
Date: Mon, 18 Mar 2024 19:52:51 -0400
Subject: [PATCH 2/3] using JWTSecret as key

---
 app/controller/auth.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controller/auth.go b/app/controller/auth.go
index 7afab80..c0bac3a 100644
--- a/app/controller/auth.go
+++ b/app/controller/auth.go
@@ -132,7 +132,7 @@ func Register(c *fiber.Ctx) error {
 	register.Password, _ = GeneratePasswordHash([]byte(register.Password))
 
 	// AES encryption for payment info
-	key := []byte("abc123def456ghi7") // 16 byte key
+	key := []byte(config.Conf.JWTSecret) // 16 byte key
 	register.CardNumber, _ = AESEncrypt(key, register.CardNumber)
 	register.CardType, _ = AESEncrypt(key, register.CardNumber)
 	register.CardExpiration, _ = AESEncrypt(key, register.CardNumber)

From 2fa4d0fd5fe4791515e3d8231bd47f74039e2551 Mon Sep 17 00:00:00 2001
From: thelenvr <thelenvr@gmail.com>
Date: Tue, 19 Mar 2024 08:33:25 -0400
Subject: [PATCH 3/3] change JWTExpireSeconds based on remember var

---
 app/controller/auth.go | 5 +++++
 app/schema/user.go     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/controller/auth.go b/app/controller/auth.go
index c0bac3a..708c2a7 100644
--- a/app/controller/auth.go
+++ b/app/controller/auth.go
@@ -74,6 +74,11 @@ func Login(c *fiber.Ctx) error {
 			"msg": err.Error(),
 		})
 	}
+	if !login.Remember {
+		config.Conf.JWTExpireSeconds = 1800
+	} else {
+		config.Conf.JWTExpireSeconds = 1209600
+	}
 	c.Cookie(&fiber.Cookie{
 		Name:  "access_token",
 		Value: token,
diff --git a/app/schema/user.go b/app/schema/user.go
index 5775939..33a7fa9 100644
--- a/app/schema/user.go
+++ b/app/schema/user.go
@@ -95,6 +95,7 @@ type UserListResponse = ListResponse[User]
 type Auth struct {
 	Username string `json:"username" default:"demo"`
 	Password string `json:"password" default:"123456"`
+	Remember bool   `json:"remember" default:"false"`
 }
 
 type JWT struct {