From 5652b23a9fb907971cc70cf7d3f62aa4681cca66 Mon Sep 17 00:00:00 2001
From: offler9 <sipitpit09@gmail.com>
Date: Thu, 7 Nov 2019 10:00:44 +0700
Subject: [PATCH] fix logic at func Auth

---
 endpoint/users.go | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/endpoint/users.go b/endpoint/users.go
index fd44b62..c7eaa27 100644
--- a/endpoint/users.go
+++ b/endpoint/users.go
@@ -357,18 +357,14 @@ func Auth(c *gin.Context) {
 	if logging.Token == "" {
 		util.CallServerError(c, "you have to sign in first", nil)
 		c.Abort()
-	} else if token != nil && err != nil {
+	} else if token != nil && time.Unix(claim.ExpiresAt, 0).Sub(time.Now()) < 30*time.Second {
 		util.CallUserError(c, "token expired", err)
+		err = config.DB.Model(&logging).Where("token = ?", tokenString).Delete(&logging).Error
+		if err != nil {
+			fmt.Println(err)
+			util.CallServerError(c, "fail when try to delete the logging", err)
+		}
 		c.Abort()
-	}
-	if time.Unix(claim.ExpiresAt, 0).Sub(time.Now()) > 30*time.Second {
-		return
-	}
-
-	err = config.DB.Model(&logging).Where("token = ?", tokenString).Delete(&logging).Error
-	if err != nil {
-		fmt.Println(err)
-		util.CallServerError(c, "fail when try to delete the logging", err)
 		return
 	}
 }