From fe862a50e5973559a23039294855cb0d470d3e6f Mon Sep 17 00:00:00 2001 From: manoj Date: Sun, 18 Dec 2022 11:46:48 +0530 Subject: [PATCH] remove unused empty line changes --- couchbase.env | 14 -------------- server/constants/db_types.go | 2 +- server/resolvers/admin_signup.go | 4 ---- server/resolvers/verify_otp.go | 1 + server/test/update_all_users_tests.go | 1 - server/test/webhook_logs_test.go | 1 - 6 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 couchbase.env diff --git a/couchbase.env b/couchbase.env deleted file mode 100644 index d28bc0b..0000000 --- a/couchbase.env +++ /dev/null @@ -1,14 +0,0 @@ - -ENV=test -DATABASE_TYPE=couchbase -COUCHBASE_SCOPE=_default -DATABASE_USERNAME=admin -DATABASE_PASSWORD=123456 -COUCHBASE_BUCKET=auth -DATABASE_URL=couchbase://127.0.0.1 -CUSTOM_ACCESS_TOKEN_SCRIPT="function(user,tokenPayload){var data = tokenPayload;data.extra = {'x-extra-id': user.id};return data;}" -SMTP_HOST=smtp.mailtrap.io -SMTP_PORT=2525 -SMTP_USERNAME=test -SMTP_PASSWORD=test -SENDER_EMAIL="info@authorizer.dev" \ No newline at end of file diff --git a/server/constants/db_types.go b/server/constants/db_types.go index 041827f..94f2faa 100644 --- a/server/constants/db_types.go +++ b/server/constants/db_types.go @@ -27,6 +27,6 @@ const ( DbTypePlanetScaleDB = "planetscale" // DbTypeDynamoDB is the Dynamo database type DbTypeDynamoDB = "dynamodb" - // DbTypeDynamoDB is the Dynamo database type + // DbTypeCouchbaseDB is the Couchbase database type DbTypeCouchbaseDB = "couchbase" ) diff --git a/server/resolvers/admin_signup.go b/server/resolvers/admin_signup.go index 8b4fd64..c1dd5c1 100644 --- a/server/resolvers/admin_signup.go +++ b/server/resolvers/admin_signup.go @@ -53,21 +53,18 @@ func AdminSignupResolver(ctx context.Context, params model.AdminSignupInput) (*m memorystore.Provider.UpdateEnvVariable(constants.EnvKeyAdminSecret, params.AdminSecret) // consvert EnvData to JSON storeData, err := memorystore.Provider.GetEnvStore() - if err != nil { log.Debug("Error getting env store: ", err) return res, err } env, err := db.Provider.GetEnv(ctx) - if err != nil { log.Debug("Failed to get env: ", err) return res, err } envData, err := crypto.EncryptEnvData(storeData) - if err != nil { log.Debug("Failed to encrypt envstore: ", err) return res, err @@ -80,7 +77,6 @@ func AdminSignupResolver(ctx context.Context, params model.AdminSignupInput) (*m } hashedKey, err := crypto.EncryptPassword(params.AdminSecret) - if err != nil { log.Debug("Failed to encrypt admin session key: ", err) return res, err diff --git a/server/resolvers/verify_otp.go b/server/resolvers/verify_otp.go index 04503ba..b792adb 100644 --- a/server/resolvers/verify_otp.go +++ b/server/resolvers/verify_otp.go @@ -31,6 +31,7 @@ func VerifyOtpResolver(ctx context.Context, params model.VerifyOTPRequest) (*mod log.Debug("Failed to get otp request by email: ", err) return res, fmt.Errorf(`invalid email: %s`, err.Error()) } + if params.Otp != otp.Otp { log.Debug("Failed to verify otp request: Incorrect value") return res, fmt.Errorf(`invalid otp`) diff --git a/server/test/update_all_users_tests.go b/server/test/update_all_users_tests.go index 984d3b5..6473908 100644 --- a/server/test/update_all_users_tests.go +++ b/server/test/update_all_users_tests.go @@ -41,7 +41,6 @@ func updateAllUsersTest(t *testing.T, s TestSetup) { Offset: 0, }) assert.NoError(t, err) - for _, u := range listUsers.Users { assert.True(t, refs.BoolValue(u.IsMultiFactorAuthEnabled)) } diff --git a/server/test/webhook_logs_test.go b/server/test/webhook_logs_test.go index 653db8c..98b9036 100644 --- a/server/test/webhook_logs_test.go +++ b/server/test/webhook_logs_test.go @@ -24,7 +24,6 @@ func webhookLogsTest(t *testing.T, s TestSetup) { req.Header.Set("Cookie", fmt.Sprintf("%s=%s", constants.AdminCookieName, h)) webhookLogs, err := resolvers.WebhookLogsResolver(ctx, nil) - assert.NoError(t, err) assert.Greater(t, len(webhookLogs.WebhookLogs), 1)