fix/remove utc

handler/loginHandler.go

@@ -23,14 +23,14 @@ func LoginHandler(context *gin.Context) {
 	// validate the loginObj for valid credential adn if these are valid then
 
 	var claims = &models.JwtClaims{}
-	claims.ComapnyId = "ComapnyId"
+	claims.CompanyId = "CompanyId"
 	claims.Username = loginObj.UserName
-	claims.Roles = []int{1,2,3}
+	claims.Roles = []int{1, 2, 3}
 	claims.Audience = context.Request.Header.Get("Referer") // get it from Referer header
 
 	var tokenCreationTime = time.Now().UTC()
 	var expirationTime = tokenCreationTime.Add(time.Duration(2) * time.Hour)
-	tokeString, err := token.GenrateToken(claims, expirationTime)
+	tokenString, err := token.GenrateToken(claims, expirationTime)
 
 	if err != nil {
 		badRequest(context, http.StatusBadRequest, "error in gerating token", []models.ErrorDetail{
@@ -41,5 +41,5 @@ func LoginHandler(context *gin.Context) {
 		})
 	}
 
-	ok(context, http.StatusOK, "token created", tokeString)
+	ok(context, http.StatusOK, "token created", tokenString)
 }

middleware/authorization.go

@@ -22,7 +22,6 @@ func ReturnUnauthorized(context *gin.Context) {
 	})
 }
 
-
 func ValidateToken() gin.HandlerFunc {
 	return func(context *gin.Context) {
 		tokenString := context.Request.Header.Get("apikey")
@@ -34,7 +33,7 @@ func ValidateToken() gin.HandlerFunc {
 		if len(context.Keys) == 0 {
 			context.Keys = make(map[string]interface{})
 		}
-		context.Keys["ComapnyId"] = claims.ComapnyId
+		context.Keys["CompanyId"] = claims.CompanyId
 		context.Keys["Username"] = claims.Username
 		context.Keys["Roles"] = claims.Roles
 
@@ -66,4 +65,4 @@ func Authorization(validRoles []int) gin.HandlerFunc {
 			}
 		}
 	}
-}
+}

models/ClaimsModel.go

@@ -9,7 +9,7 @@ import (
 )
 
 type JwtClaims struct {
-	ComapnyId string `json:"comapnyId,omitempty"`
+	CompanyId string `json:"comapnyId,omitempty"`
 	Username  string `json:"username,omitempty"`
 	Roles     []int  `json:"roles,omitempty"`
 	jwt.StandardClaims
@@ -18,13 +18,13 @@ type JwtClaims struct {
 const ip = "192.168.0.107"
 
 func (claims JwtClaims) Valid() error {
-	var now = time.Now().UTC().Unix()
+	var now = time.Now().Unix()
 	if claims.VerifyExpiresAt(now, true) && claims.VerifyIssuer(ip, true) {
-		return nil	
+		return nil
 	}
 	return fmt.Errorf("Token is invalid")
 }
 
 func (claims JwtClaims) VerifyAudience(origin string) bool {
 	return strings.Compare(claims.Audience, origin) == 0
-}
+}

token/token.go

@@ -16,7 +16,7 @@ const (
 func GenrateToken(claims *models.JwtClaims, expirationTime time.Time) (string, error) {
 
 	claims.ExpiresAt = expirationTime.Unix()
-	claims.IssuedAt = time.Now().UTC().Unix()
+	claims.IssuedAt = time.Now().Unix()
 	claims.Issuer = ip
 
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
@@ -29,7 +29,6 @@ func GenrateToken(claims *models.JwtClaims, expirationTime time.Time) (string, e
 	return tokenString, nil
 }
 
-
 func VerifyToken(tokenString, origin string) (bool, *models.JwtClaims) {
 	claims := &models.JwtClaims{}
 	token, _ := getTokenFromString(tokenString, claims)
@@ -60,4 +59,4 @@ func getTokenFromString(tokenString string, claims *models.JwtClaims) (*jwt.Toke
 		// hmacSampleSecret is a []byte containing your secret, e.g. []byte("my_secret_key")
 		return []byte(jWTPrivateToken), nil
 	})
-}
+}