From d886d780b4ef3b072302b400259ba247e5e3fec6 Mon Sep 17 00:00:00 2001 From: Lakhan Samani Date: Tue, 24 May 2022 12:50:33 +0530 Subject: [PATCH] fix: replace all logs --- server/resolvers/forgot_password.go | 9 +++++++-- server/sessionstore/redis_store.go | 13 +++++++------ server/sessionstore/session.go | 5 +++-- server/token/auth_token.go | 8 ++++---- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/server/resolvers/forgot_password.go b/server/resolvers/forgot_password.go index 0388e8c..8f2641b 100644 --- a/server/resolvers/forgot_password.go +++ b/server/resolvers/forgot_password.go @@ -59,9 +59,10 @@ func ForgotPasswordResolver(ctx context.Context, params model.ForgotPasswordInpu verificationToken, err := token.CreateVerificationToken(params.Email, constants.VerificationTypeForgotPassword, hostname, nonceHash, redirectURL) if err != nil { - log.Println(`error generating token`, err) + log.Debug("Failed to create verification token", err) + return res, err } - db.Provider.AddVerificationRequest(models.VerificationRequest{ + _, err = db.Provider.AddVerificationRequest(models.VerificationRequest{ Token: verificationToken, Identifier: constants.VerificationTypeForgotPassword, ExpiresAt: time.Now().Add(time.Minute * 30).Unix(), @@ -69,6 +70,10 @@ func ForgotPasswordResolver(ctx context.Context, params model.ForgotPasswordInpu Nonce: nonceHash, RedirectURI: redirectURL, }) + if err != nil { + log.Debug("Failed to add verification request", err) + return res, err + } // exec it as go routin so that we can reduce the api latency go email.SendForgotPasswordMail(params.Email, verificationToken, hostname) diff --git a/server/sessionstore/redis_store.go b/server/sessionstore/redis_store.go index 4fad694..0fe893b 100644 --- a/server/sessionstore/redis_store.go +++ b/server/sessionstore/redis_store.go @@ -2,8 +2,9 @@ package sessionstore import ( "context" - "log" "strings" + + log "github.com/sirupsen/logrus" ) type RedisStore struct { @@ -15,7 +16,7 @@ type RedisStore struct { func (c *RedisStore) ClearStore() { err := c.store.Del(c.ctx, "authorizer_*").Err() if err != nil { - log.Fatalln("Error clearing redis store:", err) + log.Debug("Error clearing redis store:", err) } } @@ -23,7 +24,7 @@ func (c *RedisStore) ClearStore() { func (c *RedisStore) GetUserSessions(userID string) map[string]string { data, err := c.store.HGetAll(c.ctx, "*").Result() if err != nil { - log.Println("error getting token from redis store:", err) + log.Debug("error getting token from redis store:", err) } res := map[string]string{} @@ -44,7 +45,7 @@ func (c *RedisStore) DeleteAllUserSession(userId string) { if k == "token" { err := c.store.Del(c.ctx, v) if err != nil { - log.Println("Error deleting redis token:", err) + log.Debug("Error deleting redis token:", err) } } } @@ -54,7 +55,7 @@ func (c *RedisStore) DeleteAllUserSession(userId string) { func (c *RedisStore) SetState(key, value string) { err := c.store.Set(c.ctx, "authorizer_"+key, value, 0).Err() if err != nil { - log.Fatalln("Error saving redis token:", err) + log.Debug("Error saving redis token:", err) } } @@ -63,7 +64,7 @@ func (c *RedisStore) GetState(key string) string { state := "" state, err := c.store.Get(c.ctx, "authorizer_"+key).Result() if err != nil { - log.Println("error getting token from redis store:", err) + log.Debug("error getting token from redis store:", err) } return state diff --git a/server/sessionstore/session.go b/server/sessionstore/session.go index 659ddaa..a8027c2 100644 --- a/server/sessionstore/session.go +++ b/server/sessionstore/session.go @@ -2,9 +2,10 @@ package sessionstore import ( "context" - "log" "strings" + log "github.com/sirupsen/logrus" + "github.com/authorizerdev/authorizer/server/constants" "github.com/authorizerdev/authorizer/server/envstore" "github.com/go-redis/redis/v8" @@ -89,7 +90,7 @@ func RemoveState(key string) { // InitializeSessionStore initializes the SessionStoreObj based on environment variables func InitSession() error { if envstore.EnvStoreObj.GetStringStoreEnvVariable(constants.EnvKeyRedisURL) != "" { - log.Println("using redis store to save sessions") + log.Info("using redis store to save sessions") redisURL := envstore.EnvStoreObj.GetStringStoreEnvVariable(constants.EnvKeyRedisURL) redisURLHostPortsList := strings.Split(redisURL, ",") diff --git a/server/token/auth_token.go b/server/token/auth_token.go index 56d9e08..3fdda60 100644 --- a/server/token/auth_token.go +++ b/server/token/auth_token.go @@ -3,10 +3,11 @@ package token import ( "encoding/json" "fmt" - "log" "strings" "time" + log "github.com/sirupsen/logrus" + "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt" "github.com/google/uuid" @@ -330,14 +331,13 @@ func CreateIDToken(user models.User, roles []string, hostname, nonce string) (st `, string(userBytes), string(claimBytes), accessTokenScript)) val, err := vm.Get("functionRes") - if err != nil { - log.Println("error getting custom access token script:", err) + log.Debug("error getting custom access token script:", err) } else { extraPayload := make(map[string]interface{}) err = json.Unmarshal([]byte(fmt.Sprintf("%s", val)), &extraPayload) if err != nil { - log.Println("error converting accessTokenScript response to map:", err) + log.Debug("error converting accessTokenScript response to map:", err) } else { for k, v := range extraPayload { customClaims[k] = v