generate token differently

uug-ai · Jun 28, 2024 · 20b50ef · 20b50ef
1 parent 526920c
commit 20b50ef
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 92 deletions.
diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json
@@ -4,8 +4,6 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
-
-
     {
       "name": "Launch Package",
       "type": "go",

diff --git a/api/controllers/users.go b/api/controllers/users.go
@@ -1,8 +1,7 @@
 package controllers
 
 import (
-	"bytes"
-	"encoding/gob"
+	"encoding/json"
 	"os"
 	"strconv"
 	"time"
@@ -169,6 +168,7 @@ func DeleteUser(c *gin.Context) error {
 	})
 	return nil
 }
+
 // InviteUser godoc
 // @Router /api/users/invite [post]
 // @Security Bearer
@@ -181,104 +181,103 @@ func DeleteUser(c *gin.Context) error {
 // @Description Invite user
 // @Success 200
 func InviteUser(c *gin.Context) {
-    var user models.User
-    if err := c.ShouldBindJSON(&user); err != nil {
-        c.JSON(400, gin.H{
-            "error": "Invalid user data",
-        })
-        return
-    }
+	var user models.User
+	if err := c.ShouldBindJSON(&user); err != nil {
+		c.JSON(400, gin.H{
+			"error": "Invalid user data",
+		})
+		return
+	}
 
-    // Create fingerprint
-    now := time.Now()
-    fingerprint := models.UserFingerprint{
-        Email:      user.Email,
-        FirstName:  user.FirstName,
-        LastName:   user.LastName,
-        Id:         user.Id,
-        Expiration: now.Add(time.Hour * 24 * 7).Unix(), // 1 week (7 days)
-        Creation:   now.Unix(),
-    }
+	// Create fingerprint
+	now := time.Now()
+	fingerprint := models.UserFingerprint{
+		Email:      user.Email,
+		FirstName:  user.FirstName,
+		LastName:   user.LastName,
+		Id:         user.Id,
+		Expiration: now.Add(time.Hour * 24 * 7).Unix(), // 1 week (7 days)
+		Creation:   now.Unix(),
+	}
 
-    // Serialize fingerprint
-    var buffer bytes.Buffer
-    enc := gob.NewEncoder(&buffer)
-    if err := enc.Encode(fingerprint); err != nil {
-        c.JSON(500, gin.H{
-            "error": "Error while encoding fingerprint",
-        })
-        return
-    }
+	// Serialize fingerprint
+	bufferBytes, err := json.Marshal(fingerprint)
+	if err != nil {
+		c.JSON(500, gin.H{
+			"error": "Error while encoding fingerprint",
+		})
+		return
+	}
 
-    // Encrypt the fingerprint using the ENV variable PRIVATE_KEY
-    encryptionKey := os.Getenv("PRIVATE_KEY")
-    if encryptionKey == "" {
-        c.JSON(500, gin.H{
-            "error": "No encryption key found",
-        })
-        return
-    }
+	// Encrypt the fingerprint using the ENV variable PRIVATE_KEY
+	encryptionKey := os.Getenv("PRIVATE_KEY")
+	if encryptionKey == "" {
+		c.JSON(500, gin.H{
+			"error": "No encryption key found",
+		})
+		return
+	}
 
-    encryptedFingerprint, err := encryption.AesEncrypt(buffer.Bytes(), encryptionKey)
-    if err != nil {
-        c.JSON(500, gin.H{
-            "error": "Error while encrypting fingerprint",
-        })
-        return
-    }
+	encryptedFingerprint, err := encryption.AesEncrypt(bufferBytes, encryptionKey)
+	if err != nil {
+		c.JSON(500, gin.H{
+			"error": "Error while encrypting fingerprint",
+		})
+		return
+	}
 
-    base64Fingerprint := utils.Base64Encode(string(encryptedFingerprint))
-    fprint := utils.EncodeURL(base64Fingerprint)
+	base64Fingerprint := utils.Base64Encode(string(encryptedFingerprint))
+	fprint := utils.EncodeURL(base64Fingerprint)
 
-    mail := notifications.SMTP{
-        Server:     os.Getenv("SMTP_SERVER"),
-        Port:       os.Getenv("SMTP_PORT"),
-        Username:   os.Getenv("SMTP_USERNAME"),
-        Password:   os.Getenv("SMTP_PASSWORD"),
-        EmailFrom:  os.Getenv("EMAIL_FROM"),
-        EmailTo:    user.Email,
-        TemplateId: "invite",
-    }
+	mail := notifications.SMTP{
+		Server:     os.Getenv("SMTP_SERVER"),
+		Port:       os.Getenv("SMTP_PORT"),
+		Username:   os.Getenv("SMTP_USERNAME"),
+		Password:   os.Getenv("SMTP_PASSWORD"),
+		EmailFrom:  os.Getenv("EMAIL_FROM"),
+		EmailTo:    user.Email,
+		TemplateId: "invite",
+	}
 
-    // Get base url
-    baseUrl := os.Getenv("BASE_URL")
-    if baseUrl != "" {
-        baseUrl = utils.RemoveTrailingSlash(baseUrl)
-    }
+	// Get base url
+	baseUrl := os.Getenv("BASE_URL")
+	if baseUrl != "" {
+		baseUrl = utils.RemoveTrailingSlash(baseUrl)
+	}
 
-    message := notifications.Message{
-        Title: "Invitation",
-        Body:  "You have been invited to join the Facial Access Control",
-        User:  user.Email,
-        Data: map[string]string{
-            "link":      baseUrl + "/onboarding?token=" + fprint,
-            "firstname": user.FirstName,
-        },
-    }
+	message := notifications.Message{
+		Title: "Invitation",
+		Body:  "You have been invited to join the Facial Access Control",
+		User:  user.Email,
+		Data: map[string]string{
+			"link":      baseUrl + "/onboarding?token=" + fprint,
+			"firstname": user.FirstName,
+		},
+	}
 
-    if err := mail.Send(message); err != nil {
-        c.JSON(500, gin.H{
-            "error": "Failed to send invite to user",
-        })
-        return
-    }
+	if err := mail.Send(message); err != nil {
+		c.JSON(500, gin.H{
+			"error": "Failed to send invite to user",
+		})
+		return
+	}
 
 	// Add user to the database
-    if errUser := database.AddUser(user); errUser != nil {
-        switch errUser {
-        case database.ErrUserAlreadyExists:
-            c.JSON(409, gin.H{
-                "error": "User already exists",
-            })
-        default:
-            c.JSON(500, gin.H{
-                "error": "Failed to add user",
-            })
-        }
-        return
-    }
+	if errUser := database.AddUser(user); errUser != nil {
+		switch errUser {
+		case database.ErrUserAlreadyExists:
+			c.JSON(409, gin.H{
+				"error": "User already exists",
+			})
+		default:
+			c.JSON(500, gin.H{
+				"error": "Failed to add user",
+			})
+		}
+		return
+	}
 
-    c.JSON(201, gin.H{
-        "message": "User successfully invited",
-    })
+	c.JSON(201, gin.H{
+		"message": "User successfully invited",
+	})
 }