Refactor Generate Token

Author: raul-brainattica

core/authentication/jwt_backend.go

@@ -34,13 +34,17 @@ func InitJWTAuthenticationBackend() *JWTAuthenticationBackend {
 	return authBackendInstance
 }
 
-func (backend *JWTAuthenticationBackend) GenerateToken(user *models.User) string {
+func (backend *JWTAuthenticationBackend) GenerateToken(userUUID string) (string, error) {
 	token := jwt.New(jwt.GetSigningMethod("RS256"))
-	token.Claims["exp"] = time.Now().Add(time.Hour * time.Duration(tokenDuration)).Unix()
+	token.Claims["exp"] = time.Now().Add(time.Hour * time.Duration(settings.Get().JWTExpirationDelta)).Unix()
 	token.Claims["iat"] = time.Now().Unix()
-	token.Claims["sub"] = user.UUID
-	tokenString, _ := token.SignedString(backend.privateKey)
-	return tokenString
+	token.Claims["sub"] = userUUID
+	tokenString, err := token.SignedString(backend.privateKey)
+	if err != nil {
+		panic(err)
+		return "", err
+	}
+	return tokenString, nil
 }
 
 func (backend *JWTAuthenticationBackend) Authenticate(user *models.User) bool {

services/auth_service.go

@@ -13,18 +13,25 @@ func Login(requestUser *models.User) (int, []byte) {
 	authBackend := authentication.InitJWTAuthenticationBackend()
 
 	if authBackend.Authenticate(requestUser) {
-		token := parameters.TokenAuthentication{authBackend.GenerateToken(requestUser)}
-		response, _ := json.Marshal(token)
-		return http.StatusOK, response
+		token, err := authBackend.GenerateToken(requestUser.UUID)
+		if err != nil {
+			return http.StatusInternalServerError, []byte("")
+		} else {
+			response, _ := json.Marshal(parameters.TokenAuthentication{token})
+			return http.StatusOK, response
+		}
 	}
 
 	return http.StatusUnauthorized, []byte("")
 }
 
 func RefreshToken(requestUser *models.User) []byte {
 	authBackend := authentication.InitJWTAuthenticationBackend()
-	token := parameters.TokenAuthentication{authBackend.GenerateToken(requestUser)}
-	response, err := json.Marshal(token)
+	token, err := authBackend.GenerateToken(requestUser.UUID)
+	if err != nil {
+		panic(err)
+	}
+	response, err := json.Marshal(parameters.TokenAuthentication{token})
 	if err != nil {
 		panic(err)
 	}

settings/pre.json

@@ -1,4 +1,5 @@
 {
   "PrivateKeyPath": "/home/vagrant/go/src/api.jwt.auth/settings/keys/private_key",
-  "PublicKeyPath": "/home/vagrant/go/src/api.jwt.auth/settings/keys/public_key.pub"
+  "PublicKeyPath": "/home/vagrant/go/src/api.jwt.auth/settings/keys/public_key.pub",
+  "JWTExpirationDelta": 72
 }

settings/prod.json

@@ -1,4 +1,5 @@
 {
   "PrivateKeyPath": "/home/vagrant/go/src/api.jwt.auth/settings/keys/private_key",
-  "PublicKeyPath": "/home/vagrant/go/src/api.jwt.auth/settings/keys/public_key.pub"
+  "PublicKeyPath": "/home/vagrant/go/src/api.jwt.auth/settings/keys/public_key.pub",
+  "JWTExpirationDelta": 72
 }

settings/settings.go

@@ -14,8 +14,9 @@ var environments = map[string]string{
 }
 
 type Settings struct {
-	PrivateKeyPath string
-	PublicKeyPath  string
+	PrivateKeyPath     string
+	PublicKeyPath      string
+	JWTExpirationDelta int
 }
 
 var settings Settings = Settings{}

settings/tests.json

@@ -1,4 +1,5 @@
 {
   "PrivateKeyPath": "/home/vagrant/go/src/api.jwt.auth/settings/keys/private_key",
-  "PublicKeyPath": "/home/vagrant/go/src/api.jwt.auth/settings/keys/public_key.pub"
+  "PublicKeyPath": "/home/vagrant/go/src/api.jwt.auth/settings/keys/public_key.pub",
+  "JWTExpirationDelta": 72
 }