From 2223ef41d9cffeeb340487b3e5cd1b8eaabfbe04 Mon Sep 17 00:00:00 2001
From: Michael Bumann <hello@michaelbumann.com>
Date: Sat, 8 Jan 2022 18:03:06 +0100
Subject: [PATCH] User model updates

also use sql.NullString to set access/refresh token
---
 database/models/user.go | 12 ++++++------
 lib/tokens/jwt.go       |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/database/models/user.go b/database/models/user.go
index d536d88..8db46a5 100644
--- a/database/models/user.go
+++ b/database/models/user.go
@@ -7,12 +7,12 @@ import (
 
 // User : User Model
 type User struct {
-	ID           uint `gorm:"primary_key"`
-	Email        sql.NullString
-	Login        string         `gorm:"index"`
-	Password     string         `gorm:"index"`
-	RefreshToken sql.NullString `gorm:"index"`
-	AccessToken  sql.NullString `gorm:"index"`
+	ID           uint           `gorm:"primary_key"`
+	Email        sql.NullString `gorm:uniqueIndex`
+	Login        string         `gorm:"uniqueIndex;not null"`
+	Password     string         `gorm:"index;not null"`
+	RefreshToken sql.NullString `gorm:"uniqueIndex"`
+	AccessToken  sql.NullString `gorm:"uniqueIndex"`
 	UpdatedAt    time.Time      `gorm:"autoUpdateTime`
 	CreatedAt    time.Time      `gorm:"autoCreateTime"`
 }
diff --git a/lib/tokens/jwt.go b/lib/tokens/jwt.go
index 0876822..949cba2 100644
--- a/lib/tokens/jwt.go
+++ b/lib/tokens/jwt.go
@@ -1,6 +1,8 @@
 package tokens
 
 import (
+	"database/sql"
+
 	"github.com/bumi/lndhub.go/database/models"
 	"github.com/dgrijalva/jwt-go"
 	"github.com/labstack/echo/v4"
@@ -26,7 +28,7 @@ func GenerateAccessToken(c echo.Context, u *models.User) error {
 	if err != nil {
 		return err
 	}
-	u.AccessToken = t
+	u.AccessToken = sql.NullString{String: t}
 
 	return err
 }
@@ -41,7 +43,7 @@ func GenerateRefreshToken(c echo.Context, u *models.User) error {
 		return err
 	}
 
-	u.RefreshToken = rt
+	u.RefreshToken = sql.NullString{String: rt}
 
 	return err
 }