feat: implement resolvers

server/db/providers/arangodb/env.go

@@ -1,6 +1,7 @@
 package arangodb
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -11,15 +12,15 @@ import (
 )
 
 // AddEnv to save environment information in database
-func (p *provider) AddEnv(env models.Env) (models.Env, error) {
+func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	if env.ID == "" {
 		env.ID = uuid.New().String()
 	}
 
 	env.CreatedAt = time.Now().Unix()
 	env.UpdatedAt = time.Now().Unix()
-	configCollection, _ := p.db.Collection(nil, models.Collections.Env)
-	meta, err := configCollection.CreateDocument(arangoDriver.WithOverwrite(nil), env)
+	configCollection, _ := p.db.Collection(ctx, models.Collections.Env)
+	meta, err := configCollection.CreateDocument(arangoDriver.WithOverwrite(ctx), env)
 	if err != nil {
 		return env, err
 	}
@@ -29,10 +30,10 @@ func (p *provider) AddEnv(env models.Env) (models.Env, error) {
 }
 
 // UpdateEnv to update environment information in database
-func (p *provider) UpdateEnv(env models.Env) (models.Env, error) {
+func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	env.UpdatedAt = time.Now().Unix()
-	collection, _ := p.db.Collection(nil, models.Collections.Env)
-	meta, err := collection.UpdateDocument(nil, env.Key, env)
+	collection, _ := p.db.Collection(ctx, models.Collections.Env)
+	meta, err := collection.UpdateDocument(ctx, env.Key, env)
 	if err != nil {
 		return env, err
 	}
@@ -43,11 +44,11 @@ func (p *provider) UpdateEnv(env models.Env) (models.Env, error) {
 }
 
 // GetEnv to get environment information from database
-func (p *provider) GetEnv() (models.Env, error) {
+func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
 	var env models.Env
 	query := fmt.Sprintf("FOR d in %s RETURN d", models.Collections.Env)
 
-	cursor, err := p.db.Query(nil, query, nil)
+	cursor, err := p.db.Query(ctx, query, nil)
 	if err != nil {
 		return env, err
 	}
@@ -60,7 +61,7 @@ func (p *provider) GetEnv() (models.Env, error) {
 			}
 			break
 		}
-		_, err := cursor.ReadDocument(nil, &env)
+		_, err := cursor.ReadDocument(ctx, &env)
 		if err != nil {
 			return env, err
 		}

server/db/providers/arangodb/session.go

@@ -1,6 +1,7 @@
 package arangodb
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -9,15 +10,15 @@ import (
 )
 
 // AddSession to save session information in database
-func (p *provider) AddSession(session models.Session) error {
+func (p *provider) AddSession(ctx context.Context, session models.Session) error {
 	if session.ID == "" {
 		session.ID = uuid.New().String()
 	}
 
 	session.CreatedAt = time.Now().Unix()
 	session.UpdatedAt = time.Now().Unix()
-	sessionCollection, _ := p.db.Collection(nil, models.Collections.Session)
-	_, err := sessionCollection.CreateDocument(nil, session)
+	sessionCollection, _ := p.db.Collection(ctx, models.Collections.Session)
+	_, err := sessionCollection.CreateDocument(ctx, session)
 	if err != nil {
 		return err
 	}
@@ -25,12 +26,12 @@ func (p *provider) AddSession(session models.Session) error {
 }
 
 // DeleteSession to delete session information from database
-func (p *provider) DeleteSession(userId string) error {
+func (p *provider) DeleteSession(ctx context.Context, userId string) error {
 	query := fmt.Sprintf(`FOR d IN %s FILTER d.user_id == @userId REMOVE { _key: d._key } IN %s`, models.Collections.Session, models.Collections.Session)
 	bindVars := map[string]interface{}{
 		"userId": userId,
 	}
-	cursor, err := p.db.Query(nil, query, bindVars)
+	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return err
 	}

server/db/providers/arangodb/user.go

@@ -15,7 +15,7 @@ import (
 )
 
 // AddUser to save user information in database
-func (p *provider) AddUser(user models.User) (models.User, error) {
+func (p *provider) AddUser(ctx context.Context, user models.User) (models.User, error) {
 	if user.ID == "" {
 		user.ID = uuid.New().String()
 	}
@@ -30,8 +30,8 @@ func (p *provider) AddUser(user models.User) (models.User, error) {
 
 	user.CreatedAt = time.Now().Unix()
 	user.UpdatedAt = time.Now().Unix()
-	userCollection, _ := p.db.Collection(nil, models.Collections.User)
-	meta, err := userCollection.CreateDocument(arangoDriver.WithOverwrite(nil), user)
+	userCollection, _ := p.db.Collection(ctx, models.Collections.User)
+	meta, err := userCollection.CreateDocument(arangoDriver.WithOverwrite(ctx), user)
 	if err != nil {
 		return user, err
 	}
@@ -42,10 +42,10 @@ func (p *provider) AddUser(user models.User) (models.User, error) {
 }
 
 // UpdateUser to update user information in database
-func (p *provider) UpdateUser(user models.User) (models.User, error) {
+func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.User, error) {
 	user.UpdatedAt = time.Now().Unix()
-	collection, _ := p.db.Collection(nil, models.Collections.User)
-	meta, err := collection.UpdateDocument(nil, user.Key, user)
+	collection, _ := p.db.Collection(ctx, models.Collections.User)
+	meta, err := collection.UpdateDocument(ctx, user.Key, user)
 	if err != nil {
 		return user, err
 	}
@@ -56,9 +56,9 @@ func (p *provider) UpdateUser(user models.User) (models.User, error) {
 }
 
 // DeleteUser to delete user information from database
-func (p *provider) DeleteUser(user models.User) error {
-	collection, _ := p.db.Collection(nil, models.Collections.User)
-	_, err := collection.RemoveDocument(nil, user.Key)
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
+	collection, _ := p.db.Collection(ctx, models.Collections.User)
+	_, err := collection.RemoveDocument(ctx, user.Key)
 	if err != nil {
 		return err
 	}
@@ -67,13 +67,13 @@ func (p *provider) DeleteUser(user models.User) error {
 }
 
 // ListUsers to get list of users from database
-func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error) {
+func (p *provider) ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error) {
 	var users []*model.User
-	ctx := driver.WithQueryFullCount(context.Background())
+	sctx := driver.WithQueryFullCount(ctx)
 
 	query := fmt.Sprintf("FOR d in %s SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.User, pagination.Offset, pagination.Limit)
 
-	cursor, err := p.db.Query(ctx, query, nil)
+	cursor, err := p.db.Query(sctx, query, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -84,7 +84,7 @@ func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error)
 
 	for {
 		var user models.User
-		meta, err := cursor.ReadDocument(nil, &user)
+		meta, err := cursor.ReadDocument(ctx, &user)
 
 		if arangoDriver.IsNoMoreDocuments(err) {
 			break
@@ -104,7 +104,7 @@ func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error)
 }
 
 // GetUserByEmail to get user information from database using email address
-func (p *provider) GetUserByEmail(email string) (models.User, error) {
+func (p *provider) GetUserByEmail(ctx context.Context, email string) (models.User, error) {
 	var user models.User
 
 	query := fmt.Sprintf("FOR d in %s FILTER d.email == @email RETURN d", models.Collections.User)
@@ -112,7 +112,7 @@ func (p *provider) GetUserByEmail(email string) (models.User, error) {
 		"email": email,
 	}
 
-	cursor, err := p.db.Query(nil, query, bindVars)
+	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return user, err
 	}
@@ -125,7 +125,7 @@ func (p *provider) GetUserByEmail(email string) (models.User, error) {
 			}
 			break
 		}
-		_, err := cursor.ReadDocument(nil, &user)
+		_, err := cursor.ReadDocument(ctx, &user)
 		if err != nil {
 			return user, err
 		}
@@ -135,7 +135,7 @@ func (p *provider) GetUserByEmail(email string) (models.User, error) {
 }
 
 // GetUserByID to get user information from database using user ID
-func (p *provider) GetUserByID(id string) (models.User, error) {
+func (p *provider) GetUserByID(ctx context.Context, id string) (models.User, error) {
 	var user models.User
 
 	query := fmt.Sprintf("FOR d in %s FILTER d._id == @id LIMIT 1 RETURN d", models.Collections.User)
@@ -143,7 +143,7 @@ func (p *provider) GetUserByID(id string) (models.User, error) {
 		"id": id,
 	}
 
-	cursor, err := p.db.Query(nil, query, bindVars)
+	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return user, err
 	}
@@ -156,7 +156,7 @@ func (p *provider) GetUserByID(id string) (models.User, error) {
 			}
 			break
 		}
-		_, err := cursor.ReadDocument(nil, &user)
+		_, err := cursor.ReadDocument(ctx, &user)
 		if err != nil {
 			return user, err
 		}

server/db/providers/arangodb/verification_requests.go

@@ -12,15 +12,15 @@ import (
 )
 
 // AddVerification to save verification request in database
-func (p *provider) AddVerificationRequest(verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
+func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
 	if verificationRequest.ID == "" {
 		verificationRequest.ID = uuid.New().String()
 	}
 
 	verificationRequest.CreatedAt = time.Now().Unix()
 	verificationRequest.UpdatedAt = time.Now().Unix()
-	verificationRequestRequestCollection, _ := p.db.Collection(nil, models.Collections.VerificationRequest)
-	meta, err := verificationRequestRequestCollection.CreateDocument(nil, verificationRequest)
+	verificationRequestRequestCollection, _ := p.db.Collection(ctx, models.Collections.VerificationRequest)
+	meta, err := verificationRequestRequestCollection.CreateDocument(ctx, verificationRequest)
 	if err != nil {
 		return verificationRequest, err
 	}
@@ -31,14 +31,14 @@ func (p *provider) AddVerificationRequest(verificationRequest models.Verificatio
 }
 
 // GetVerificationRequestByToken to get verification request from database using token
-func (p *provider) GetVerificationRequestByToken(token string) (models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 	query := fmt.Sprintf("FOR d in %s FILTER d.token == @token LIMIT 1 RETURN d", models.Collections.VerificationRequest)
 	bindVars := map[string]interface{}{
 		"token": token,
 	}
 
-	cursor, err := p.db.Query(nil, query, bindVars)
+	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return verificationRequest, err
 	}
@@ -51,7 +51,7 @@ func (p *provider) GetVerificationRequestByToken(token string) (models.Verificat
 			}
 			break
 		}
-		_, err := cursor.ReadDocument(nil, &verificationRequest)
+		_, err := cursor.ReadDocument(ctx, &verificationRequest)
 		if err != nil {
 			return verificationRequest, err
 		}
@@ -61,7 +61,7 @@ func (p *provider) GetVerificationRequestByToken(token string) (models.Verificat
 }
 
 // GetVerificationRequestByEmail to get verification request by email from database
-func (p *provider) GetVerificationRequestByEmail(email string, identifier string) (models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 
 	query := fmt.Sprintf("FOR d in %s FILTER d.email == @email FILTER d.identifier == @identifier LIMIT 1 RETURN d", models.Collections.VerificationRequest)
@@ -70,7 +70,7 @@ func (p *provider) GetVerificationRequestByEmail(email string, identifier string
 		"identifier": identifier,
 	}
 
-	cursor, err := p.db.Query(nil, query, bindVars)
+	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return verificationRequest, err
 	}
@@ -83,7 +83,7 @@ func (p *provider) GetVerificationRequestByEmail(email string, identifier string
 			}
 			break
 		}
-		_, err := cursor.ReadDocument(nil, &verificationRequest)
+		_, err := cursor.ReadDocument(ctx, &verificationRequest)
 		if err != nil {
 			return verificationRequest, err
 		}
@@ -93,12 +93,12 @@ func (p *provider) GetVerificationRequestByEmail(email string, identifier string
 }
 
 // ListVerificationRequests to get list of verification requests from database
-func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model.VerificationRequests, error) {
+func (p *provider) ListVerificationRequests(ctx context.Context, pagination model.Pagination) (*model.VerificationRequests, error) {
 	var verificationRequests []*model.VerificationRequest
-	ctx := driver.WithQueryFullCount(context.Background())
+	sctx := driver.WithQueryFullCount(ctx)
 	query := fmt.Sprintf("FOR d in %s SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.VerificationRequest, pagination.Offset, pagination.Limit)
 
-	cursor, err := p.db.Query(ctx, query, nil)
+	cursor, err := p.db.Query(sctx, query, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -109,7 +109,7 @@ func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model
 
 	for {
 		var verificationRequest models.VerificationRequest
-		meta, err := cursor.ReadDocument(nil, &verificationRequest)
+		meta, err := cursor.ReadDocument(ctx, &verificationRequest)
 
 		if driver.IsNoMoreDocuments(err) {
 			break
@@ -130,7 +130,7 @@ func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model
 }
 
 // DeleteVerificationRequest to delete verification request from database
-func (p *provider) DeleteVerificationRequest(verificationRequest models.VerificationRequest) error {
+func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error {
 	collection, _ := p.db.Collection(nil, models.Collections.VerificationRequest)
 	_, err := collection.RemoveDocument(nil, verificationRequest.Key)
 	if err != nil {

server/db/providers/arangodb/webhook.go

@@ -13,7 +13,7 @@ import (
 )
 
 // AddWebhook to add webhook
-func (p *provider) AddWebhook(webhook models.Webhook) (models.Webhook, error) {
+func (p *provider) AddWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	if webhook.ID == "" {
 		webhook.ID = uuid.New().String()
 	}
@@ -21,36 +21,36 @@ func (p *provider) AddWebhook(webhook models.Webhook) (models.Webhook, error) {
 	webhook.Key = webhook.ID
 	webhook.CreatedAt = time.Now().Unix()
 	webhook.UpdatedAt = time.Now().Unix()
-	webhookCollection, _ := p.db.Collection(nil, models.Collections.Webhook)
-	_, err := webhookCollection.CreateDocument(nil, webhook)
+	webhookCollection, _ := p.db.Collection(ctx, models.Collections.Webhook)
+	_, err := webhookCollection.CreateDocument(ctx, webhook)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // UpdateWebhook to update webhook
-func (p *provider) UpdateWebhook(webhook models.Webhook) (models.Webhook, error) {
+func (p *provider) UpdateWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	webhook.UpdatedAt = time.Now().Unix()
-	webhookCollection, _ := p.db.Collection(nil, models.Collections.Webhook)
-	meta, err := webhookCollection.UpdateDocument(nil, webhook.Key, webhook)
+	webhookCollection, _ := p.db.Collection(ctx, models.Collections.Webhook)
+	meta, err := webhookCollection.UpdateDocument(ctx, webhook.Key, webhook)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
 
 	webhook.Key = meta.Key
 	webhook.ID = meta.ID.String()
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // ListWebhooks to list webhook
-func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, error) {
+func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error) {
 	webhooks := []*model.Webhook{}
 
 	query := fmt.Sprintf("FOR d in %s SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.Webhook, pagination.Offset, pagination.Limit)
 
-	ctx := driver.WithQueryFullCount(context.Background())
-	cursor, err := p.db.Query(ctx, query, nil)
+	sctx := driver.WithQueryFullCount(ctx)
+	cursor, err := p.db.Query(sctx, query, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -61,7 +61,7 @@ func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, er
 
 	for {
 		var webhook models.Webhook
-		meta, err := cursor.ReadDocument(nil, &webhook)
+		meta, err := cursor.ReadDocument(ctx, &webhook)
 
 		if arangoDriver.IsNoMoreDocuments(err) {
 			break
@@ -81,67 +81,67 @@ func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, er
 }
 
 // GetWebhookByID to get webhook by id
-func (p *provider) GetWebhookByID(webhookID string) (models.Webhook, error) {
+func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
 	var webhook models.Webhook
 	query := fmt.Sprintf("FOR d in %s FILTER d._id == @webhook_id RETURN d", models.Collections.Webhook)
 	bindVars := map[string]interface{}{
 		"webhook_id": webhookID,
 	}
 
-	cursor, err := p.db.Query(nil, query, bindVars)
+	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
 	defer cursor.Close()
 
 	for {
 		if !cursor.HasMore() {
 			if webhook.Key == "" {
-				return webhook, fmt.Errorf("webhook not found")
+				return nil, fmt.Errorf("webhook not found")
 			}
 			break
 		}
-		_, err := cursor.ReadDocument(nil, &webhook)
+		_, err := cursor.ReadDocument(ctx, &webhook)
 		if err != nil {
-			return webhook, err
+			return nil, err
 		}
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // GetWebhookByEventName to get webhook by event_name
-func (p *provider) GetWebhookByEventName(eventName string) (models.Webhook, error) {
+func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error) {
 	var webhook models.Webhook
 	query := fmt.Sprintf("FOR d in %s FILTER d.event_name == @event_name RETURN d", models.Collections.Webhook)
 	bindVars := map[string]interface{}{
 		"event_name": eventName,
 	}
 
-	cursor, err := p.db.Query(nil, query, bindVars)
+	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
 	defer cursor.Close()
 
 	for {
 		if !cursor.HasMore() {
 			if webhook.Key == "" {
-				return webhook, fmt.Errorf("webhook not found")
+				return nil, fmt.Errorf("webhook not found")
 			}
 			break
 		}
-		_, err := cursor.ReadDocument(nil, &webhook)
+		_, err := cursor.ReadDocument(ctx, &webhook)
 		if err != nil {
-			return webhook, err
+			return nil, err
 		}
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // DeleteWebhook to delete webhook
-func (p *provider) DeleteWebhook(webhook models.Webhook) error {
-	webhookCollection, _ := p.db.Collection(nil, models.Collections.Webhook)
-	_, err := webhookCollection.RemoveDocument(nil, webhook.Key)
+func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
+	webhookCollection, _ := p.db.Collection(ctx, models.Collections.Webhook)
+	_, err := webhookCollection.RemoveDocument(ctx, webhook.ID)
 	if err != nil {
 		return err
 	}

server/db/providers/arangodb/webhook_log.go

@@ -13,7 +13,7 @@ import (
 )
 
 // AddWebhookLog to add webhook log
-func (p *provider) AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLog, error) {
+func (p *provider) AddWebhookLog(ctx context.Context, webhookLog models.WebhookLog) (*model.WebhookLog, error) {
 	if webhookLog.ID == "" {
 		webhookLog.ID = uuid.New().String()
 	}
@@ -21,16 +21,16 @@ func (p *provider) AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLo
 	webhookLog.Key = webhookLog.ID
 	webhookLog.CreatedAt = time.Now().Unix()
 	webhookLog.UpdatedAt = time.Now().Unix()
-	webhookLogCollection, _ := p.db.Collection(nil, models.Collections.WebhookLog)
-	_, err := webhookLogCollection.CreateDocument(nil, webhookLog)
+	webhookLogCollection, _ := p.db.Collection(ctx, models.Collections.WebhookLog)
+	_, err := webhookLogCollection.CreateDocument(ctx, webhookLog)
 	if err != nil {
-		return webhookLog, err
+		return nil, err
 	}
-	return webhookLog, nil
+	return webhookLog.AsAPIWebhookLog(), nil
 }
 
 // ListWebhookLogs to list webhook logs
-func (p *provider) ListWebhookLogs(pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
+func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
 	webhookLogs := []*model.WebhookLog{}
 	bindVariables := map[string]interface{}{}
 
@@ -42,8 +42,8 @@ func (p *provider) ListWebhookLogs(pagination model.Pagination, webhookID string
 			"webhook_id": webhookID,
 		}
 	}
-	ctx := driver.WithQueryFullCount(context.Background())
-	cursor, err := p.db.Query(ctx, query, bindVariables)
+	sctx := driver.WithQueryFullCount(ctx)
+	cursor, err := p.db.Query(sctx, query, bindVariables)
 	if err != nil {
 		return nil, err
 	}
@@ -54,7 +54,7 @@ func (p *provider) ListWebhookLogs(pagination model.Pagination, webhookID string
 
 	for {
 		var webhookLog models.WebhookLog
-		meta, err := cursor.ReadDocument(nil, &webhookLog)
+		meta, err := cursor.ReadDocument(ctx, &webhookLog)
 
 		if arangoDriver.IsNoMoreDocuments(err) {
 			break

server/db/providers/cassandradb/env.go

@@ -1,6 +1,7 @@
 package cassandradb
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -10,7 +11,7 @@ import (
 )
 
 // AddEnv to save environment information in database
-func (p *provider) AddEnv(env models.Env) (models.Env, error) {
+func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	if env.ID == "" {
 		env.ID = uuid.New().String()
 	}
@@ -27,7 +28,7 @@ func (p *provider) AddEnv(env models.Env) (models.Env, error) {
 }
 
 // UpdateEnv to update environment information in database
-func (p *provider) UpdateEnv(env models.Env) (models.Env, error) {
+func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	env.UpdatedAt = time.Now().Unix()
 
 	updateEnvQuery := fmt.Sprintf("UPDATE %s SET env = '%s', updated_at = %d WHERE id = '%s'", KeySpace+"."+models.Collections.Env, env.EnvData, env.UpdatedAt, env.ID)
@@ -39,7 +40,7 @@ func (p *provider) UpdateEnv(env models.Env) (models.Env, error) {
 }
 
 // GetEnv to get environment information from database
-func (p *provider) GetEnv() (models.Env, error) {
+func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
 	var env models.Env
 
 	query := fmt.Sprintf("SELECT id, env, hash, created_at, updated_at FROM %s LIMIT 1", KeySpace+"."+models.Collections.Env)

server/db/providers/cassandradb/session.go

@@ -1,6 +1,7 @@
 package cassandradb
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -9,7 +10,7 @@ import (
 )
 
 // AddSession to save session information in database
-func (p *provider) AddSession(session models.Session) error {
+func (p *provider) AddSession(ctx context.Context, session models.Session) error {
 	if session.ID == "" {
 		session.ID = uuid.New().String()
 	}
@@ -26,7 +27,7 @@ func (p *provider) AddSession(session models.Session) error {
 }
 
 // DeleteSession to delete session information from database
-func (p *provider) DeleteSession(userId string) error {
+func (p *provider) DeleteSession(ctx context.Context, userId string) error {
 	deleteSessionQuery := fmt.Sprintf("DELETE FROM %s WHERE user_id = '%s'", KeySpace+"."+models.Collections.Session, userId)
 	err := p.db.Query(deleteSessionQuery).Exec()
 	if err != nil {

server/db/providers/cassandradb/user.go

@@ -1,6 +1,7 @@
 package cassandradb
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"reflect"
@@ -16,7 +17,7 @@ import (
 )
 
 // AddUser to save user information in database
-func (p *provider) AddUser(user models.User) (models.User, error) {
+func (p *provider) AddUser(ctx context.Context, user models.User) (models.User, error) {
 	if user.ID == "" {
 		user.ID = uuid.New().String()
 	}
@@ -79,7 +80,7 @@ func (p *provider) AddUser(user models.User) (models.User, error) {
 }
 
 // UpdateUser to update user information in database
-func (p *provider) UpdateUser(user models.User) (models.User, error) {
+func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.User, error) {
 	user.UpdatedAt = time.Now().Unix()
 
 	bytes, err := json.Marshal(user)
@@ -127,14 +128,14 @@ func (p *provider) UpdateUser(user models.User) (models.User, error) {
 }
 
 // DeleteUser to delete user information from database
-func (p *provider) DeleteUser(user models.User) error {
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
 	query := fmt.Sprintf("DELETE FROM %s WHERE id = '%s'", KeySpace+"."+models.Collections.User, user.ID)
 	err := p.db.Query(query).Exec()
 	return err
 }
 
 // ListUsers to get list of users from database
-func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error) {
+func (p *provider) ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error) {
 	responseUsers := []*model.User{}
 	paginationClone := pagination
 	totalCountQuery := fmt.Sprintf(`SELECT COUNT(*) FROM %s`, KeySpace+"."+models.Collections.User)
@@ -168,7 +169,7 @@ func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error)
 }
 
 // GetUserByEmail to get user information from database using email address
-func (p *provider) GetUserByEmail(email string) (models.User, error) {
+func (p *provider) GetUserByEmail(ctx context.Context, email string) (models.User, error) {
 	var user models.User
 	query := fmt.Sprintf("SELECT id, email, email_verified_at, password, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, created_at, updated_at FROM %s WHERE email = '%s' LIMIT 1", KeySpace+"."+models.Collections.User, email)
 	err := p.db.Query(query).Consistency(gocql.One).Scan(&user.ID, &user.Email, &user.EmailVerifiedAt, &user.Password, &user.SignupMethods, &user.GivenName, &user.FamilyName, &user.MiddleName, &user.Nickname, &user.Birthdate, &user.PhoneNumber, &user.PhoneNumberVerifiedAt, &user.Picture, &user.Roles, &user.RevokedTimestamp, &user.CreatedAt, &user.UpdatedAt)
@@ -179,7 +180,7 @@ func (p *provider) GetUserByEmail(email string) (models.User, error) {
 }
 
 // GetUserByID to get user information from database using user ID
-func (p *provider) GetUserByID(id string) (models.User, error) {
+func (p *provider) GetUserByID(ctx context.Context, id string) (models.User, error) {
 	var user models.User
 	query := fmt.Sprintf("SELECT id, email, email_verified_at, password, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, created_at, updated_at FROM %s WHERE id = '%s' LIMIT 1", KeySpace+"."+models.Collections.User, id)
 	err := p.db.Query(query).Consistency(gocql.One).Scan(&user.ID, &user.Email, &user.EmailVerifiedAt, &user.Password, &user.SignupMethods, &user.GivenName, &user.FamilyName, &user.MiddleName, &user.Nickname, &user.Birthdate, &user.PhoneNumber, &user.PhoneNumberVerifiedAt, &user.Picture, &user.Roles, &user.RevokedTimestamp, &user.CreatedAt, &user.UpdatedAt)

server/db/providers/cassandradb/verification_requests.go

@@ -1,6 +1,7 @@
 package cassandradb
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -11,7 +12,7 @@ import (
 )
 
 // AddVerification to save verification request in database
-func (p *provider) AddVerificationRequest(verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
+func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
 	if verificationRequest.ID == "" {
 		verificationRequest.ID = uuid.New().String()
 	}
@@ -28,7 +29,7 @@ func (p *provider) AddVerificationRequest(verificationRequest models.Verificatio
 }
 
 // GetVerificationRequestByToken to get verification request from database using token
-func (p *provider) GetVerificationRequestByToken(token string) (models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 	query := fmt.Sprintf(`SELECT id, jwt_token, identifier, expires_at, email, nonce, redirect_uri, created_at, updated_at FROM %s WHERE jwt_token = '%s' LIMIT 1`, KeySpace+"."+models.Collections.VerificationRequest, token)
 
@@ -40,7 +41,7 @@ func (p *provider) GetVerificationRequestByToken(token string) (models.Verificat
 }
 
 // GetVerificationRequestByEmail to get verification request by email from database
-func (p *provider) GetVerificationRequestByEmail(email string, identifier string) (models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 	query := fmt.Sprintf(`SELECT id, jwt_token, identifier, expires_at, email, nonce, redirect_uri, created_at, updated_at FROM %s WHERE email = '%s' AND identifier = '%s' LIMIT 1 ALLOW FILTERING`, KeySpace+"."+models.Collections.VerificationRequest, email, identifier)
 
@@ -53,7 +54,7 @@ func (p *provider) GetVerificationRequestByEmail(email string, identifier string
 }
 
 // ListVerificationRequests to get list of verification requests from database
-func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model.VerificationRequests, error) {
+func (p *provider) ListVerificationRequests(ctx context.Context, pagination model.Pagination) (*model.VerificationRequests, error) {
 	var verificationRequests []*model.VerificationRequest
 
 	paginationClone := pagination
@@ -89,7 +90,7 @@ func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model
 }
 
 // DeleteVerificationRequest to delete verification request from database
-func (p *provider) DeleteVerificationRequest(verificationRequest models.VerificationRequest) error {
+func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error {
 	query := fmt.Sprintf("DELETE FROM %s WHERE id = '%s'", KeySpace+"."+models.Collections.VerificationRequest, verificationRequest.ID)
 	err := p.db.Query(query).Exec()
 	if err != nil {

server/db/providers/cassandradb/webhook.go

@@ -1,6 +1,7 @@
 package cassandradb
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"reflect"
@@ -14,7 +15,7 @@ import (
 )
 
 // AddWebhook to add webhook
-func (p *provider) AddWebhook(webhook models.Webhook) (models.Webhook, error) {
+func (p *provider) AddWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	if webhook.ID == "" {
 		webhook.ID = uuid.New().String()
 	}
@@ -23,22 +24,22 @@ func (p *provider) AddWebhook(webhook models.Webhook) (models.Webhook, error) {
 	webhook.CreatedAt = time.Now().Unix()
 	webhook.UpdatedAt = time.Now().Unix()
 
-	insertQuery := fmt.Sprintf("INSERT INTO %s (id, event_name, endpoint, enabled,  created_at, updated_at) VALUES ('%s', '%s', '%s', %t, %d, %d)", KeySpace+"."+models.Collections.Webhook, webhook.ID, webhook.EventName, webhook.EndPoint, webhook.Enabled, webhook.CreatedAt, webhook.UpdatedAt)
+	insertQuery := fmt.Sprintf("INSERT INTO %s (id, event_name, endpoint, headers, enabled,  created_at, updated_at) VALUES ('%s', '%s', '%s', '%s', %t, %d, %d)", KeySpace+"."+models.Collections.Webhook, webhook.ID, webhook.EventName, webhook.EndPoint, webhook.Headers, webhook.Enabled, webhook.CreatedAt, webhook.UpdatedAt)
 	err := p.db.Query(insertQuery).Exec()
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
 
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // UpdateWebhook to update webhook
-func (p *provider) UpdateWebhook(webhook models.Webhook) (models.Webhook, error) {
+func (p *provider) UpdateWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	webhook.UpdatedAt = time.Now().Unix()
 
 	bytes, err := json.Marshal(webhook)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
 	// use decoder instead of json.Unmarshall, because it converts int64 -> float64 after unmarshalling
 	decoder := json.NewDecoder(strings.NewReader(string(bytes)))
@@ -46,7 +47,7 @@ func (p *provider) UpdateWebhook(webhook models.Webhook) (models.Webhook, error)
 	webhookMap := map[string]interface{}{}
 	err = decoder.Decode(&webhookMap)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
 
 	updateFields := ""
@@ -74,13 +75,13 @@ func (p *provider) UpdateWebhook(webhook models.Webhook) (models.Webhook, error)
 
 	err = p.db.Query(query).Exec()
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // ListWebhooks to list webhook
-func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, error) {
+func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error) {
 	webhooks := []*model.Webhook{}
 	paginationClone := pagination
 
@@ -93,14 +94,14 @@ func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, er
 	// there is no offset in cassandra
 	// so we fetch till limit + offset
 	// and return the results from offset to limit
-	query := fmt.Sprintf("SELECT id, event_name, endpoint, enabled, created_at, updated_at FROM %s LIMIT %d", KeySpace+"."+models.Collections.Webhook, pagination.Limit+pagination.Offset)
+	query := fmt.Sprintf("SELECT id, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s LIMIT %d", KeySpace+"."+models.Collections.Webhook, pagination.Limit+pagination.Offset)
 
 	scanner := p.db.Query(query).Iter().Scanner()
 	counter := int64(0)
 	for scanner.Next() {
 		if counter >= pagination.Offset {
 			var webhook models.Webhook
-			err := scanner.Scan(&webhook.ID, &webhook.EventName, &webhook.EndPoint, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
+			err := scanner.Scan(&webhook.ID, &webhook.EventName, &webhook.EndPoint, &webhook.Headers, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
 			if err != nil {
 				return nil, err
 			}
@@ -116,29 +117,29 @@ func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, er
 }
 
 // GetWebhookByID to get webhook by id
-func (p *provider) GetWebhookByID(webhookID string) (models.Webhook, error) {
+func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
 	var webhook models.Webhook
-	query := fmt.Sprintf(`SELECT id, event_name, endpoint, enabled, created_at, updated_at FROM %s WHERE id = '%s' LIMIT 1`, KeySpace+"."+models.Collections.Webhook, webhookID)
-	err := p.db.Query(query).Consistency(gocql.One).Scan(&webhook.ID, &webhook.EventName, &webhook.EndPoint, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
+	query := fmt.Sprintf(`SELECT id, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s WHERE id = '%s' LIMIT 1`, KeySpace+"."+models.Collections.Webhook, webhookID)
+	err := p.db.Query(query).Consistency(gocql.One).Scan(&webhook.ID, &webhook.EventName, &webhook.EndPoint, &webhook.Headers, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // GetWebhookByEventName to get webhook by event_name
-func (p *provider) GetWebhookByEventName(eventName string) (models.Webhook, error) {
+func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error) {
 	var webhook models.Webhook
-	query := fmt.Sprintf(`SELECT id, event_name, endpoint, enabled, created_at, updated_at FROM %s WHERE event_name = '%s' LIMIT 1`, KeySpace+"."+models.Collections.Webhook, eventName)
-	err := p.db.Query(query).Consistency(gocql.One).Scan(&webhook.ID, &webhook.EventName, &webhook.EndPoint, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
+	query := fmt.Sprintf(`SELECT id, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s WHERE event_name = '%s' LIMIT 1`, KeySpace+"."+models.Collections.Webhook, eventName)
+	err := p.db.Query(query).Consistency(gocql.One).Scan(&webhook.ID, &webhook.EventName, &webhook.EndPoint, &webhook.Headers, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // DeleteWebhook to delete webhook
-func (p *provider) DeleteWebhook(webhook models.Webhook) error {
+func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
 	query := fmt.Sprintf("DELETE FROM %s WHERE id = '%s'", KeySpace+"."+models.Collections.Webhook, webhook.ID)
 	err := p.db.Query(query).Exec()
 	return err

server/db/providers/cassandradb/webhook_log.go

@@ -1,6 +1,7 @@
 package cassandradb
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -11,7 +12,7 @@ import (
 )
 
 // AddWebhookLog to add webhook log
-func (p *provider) AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLog, error) {
+func (p *provider) AddWebhookLog(ctx context.Context, webhookLog models.WebhookLog) (*model.WebhookLog, error) {
 	if webhookLog.ID == "" {
 		webhookLog.ID = uuid.New().String()
 	}
@@ -23,13 +24,13 @@ func (p *provider) AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLo
 	insertQuery := fmt.Sprintf("INSERT INTO %s (id, http_status, response, request, webhook_id, created_at, updated_at) VALUES ('%s', %d,'%s', '%s', '%s', %d, %d)", KeySpace+"."+models.Collections.WebhookLog, webhookLog.ID, webhookLog.HttpStatus, webhookLog.Response, webhookLog.Request, webhookLog.WebhookID, webhookLog.CreatedAt, webhookLog.UpdatedAt)
 	err := p.db.Query(insertQuery).Exec()
 	if err != nil {
-		return webhookLog, err
+		return nil, err
 	}
-	return webhookLog, nil
+	return webhookLog.AsAPIWebhookLog(), nil
 }
 
 // ListWebhookLogs to list webhook logs
-func (p *provider) ListWebhookLogs(pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
+func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
 	webhookLogs := []*model.WebhookLog{}
 	paginationClone := pagination
 	totalCountQuery := fmt.Sprintf(`SELECT COUNT(*) FROM %s`, KeySpace+"."+models.Collections.WebhookLog)

server/db/providers/mongodb/env.go

@@ -1,6 +1,7 @@
 package mongodb
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -11,7 +12,7 @@ import (
 )
 
 // AddEnv to save environment information in database
-func (p *provider) AddEnv(env models.Env) (models.Env, error) {
+func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	if env.ID == "" {
 		env.ID = uuid.New().String()
 	}
@@ -20,7 +21,7 @@ func (p *provider) AddEnv(env models.Env) (models.Env, error) {
 	env.UpdatedAt = time.Now().Unix()
 	env.Key = env.ID
 	configCollection := p.db.Collection(models.Collections.Env, options.Collection())
-	_, err := configCollection.InsertOne(nil, env)
+	_, err := configCollection.InsertOne(ctx, env)
 	if err != nil {
 		return env, err
 	}
@@ -28,10 +29,10 @@ func (p *provider) AddEnv(env models.Env) (models.Env, error) {
 }
 
 // UpdateEnv to update environment information in database
-func (p *provider) UpdateEnv(env models.Env) (models.Env, error) {
+func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	env.UpdatedAt = time.Now().Unix()
 	configCollection := p.db.Collection(models.Collections.Env, options.Collection())
-	_, err := configCollection.UpdateOne(nil, bson.M{"_id": bson.M{"$eq": env.ID}}, bson.M{"$set": env}, options.MergeUpdateOptions())
+	_, err := configCollection.UpdateOne(ctx, bson.M{"_id": bson.M{"$eq": env.ID}}, bson.M{"$set": env}, options.MergeUpdateOptions())
 	if err != nil {
 		return env, err
 	}
@@ -39,14 +40,14 @@ func (p *provider) UpdateEnv(env models.Env) (models.Env, error) {
 }
 
 // GetEnv to get environment information from database
-func (p *provider) GetEnv() (models.Env, error) {
+func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
 	var env models.Env
 	configCollection := p.db.Collection(models.Collections.Env, options.Collection())
-	cursor, err := configCollection.Find(nil, bson.M{}, options.Find())
+	cursor, err := configCollection.Find(ctx, bson.M{}, options.Find())
 	if err != nil {
 		return env, err
 	}
-	defer cursor.Close(nil)
+	defer cursor.Close(ctx)
 
 	for cursor.Next(nil) {
 		err := cursor.Decode(&env)

server/db/providers/mongodb/session.go

@@ -1,6 +1,7 @@
 package mongodb
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -10,7 +11,7 @@ import (
 )
 
 // AddSession to save session information in database
-func (p *provider) AddSession(session models.Session) error {
+func (p *provider) AddSession(ctx context.Context, session models.Session) error {
 	if session.ID == "" {
 		session.ID = uuid.New().String()
 	}
@@ -19,7 +20,7 @@ func (p *provider) AddSession(session models.Session) error {
 	session.CreatedAt = time.Now().Unix()
 	session.UpdatedAt = time.Now().Unix()
 	sessionCollection := p.db.Collection(models.Collections.Session, options.Collection())
-	_, err := sessionCollection.InsertOne(nil, session)
+	_, err := sessionCollection.InsertOne(ctx, session)
 	if err != nil {
 		return err
 	}
@@ -27,9 +28,9 @@ func (p *provider) AddSession(session models.Session) error {
 }
 
 // DeleteSession to delete session information from database
-func (p *provider) DeleteSession(userId string) error {
+func (p *provider) DeleteSession(ctx context.Context, userId string) error {
 	sessionCollection := p.db.Collection(models.Collections.Session, options.Collection())
-	_, err := sessionCollection.DeleteMany(nil, bson.M{"user_id": userId}, options.Delete())
+	_, err := sessionCollection.DeleteMany(ctx, bson.M{"user_id": userId}, options.Delete())
 	if err != nil {
 		return err
 	}

server/db/providers/mongodb/user.go

@@ -1,6 +1,7 @@
 package mongodb
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/constants"
@@ -13,7 +14,7 @@ import (
 )
 
 // AddUser to save user information in database
-func (p *provider) AddUser(user models.User) (models.User, error) {
+func (p *provider) AddUser(ctx context.Context, user models.User) (models.User, error) {
 	if user.ID == "" {
 		user.ID = uuid.New().String()
 	}
@@ -29,7 +30,7 @@ func (p *provider) AddUser(user models.User) (models.User, error) {
 	user.UpdatedAt = time.Now().Unix()
 	user.Key = user.ID
 	userCollection := p.db.Collection(models.Collections.User, options.Collection())
-	_, err := userCollection.InsertOne(nil, user)
+	_, err := userCollection.InsertOne(ctx, user)
 	if err != nil {
 		return user, err
 	}
@@ -38,10 +39,10 @@ func (p *provider) AddUser(user models.User) (models.User, error) {
 }
 
 // UpdateUser to update user information in database
-func (p *provider) UpdateUser(user models.User) (models.User, error) {
+func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.User, error) {
 	user.UpdatedAt = time.Now().Unix()
 	userCollection := p.db.Collection(models.Collections.User, options.Collection())
-	_, err := userCollection.UpdateOne(nil, bson.M{"_id": bson.M{"$eq": user.ID}}, bson.M{"$set": user}, options.MergeUpdateOptions())
+	_, err := userCollection.UpdateOne(ctx, bson.M{"_id": bson.M{"$eq": user.ID}}, bson.M{"$set": user}, options.MergeUpdateOptions())
 	if err != nil {
 		return user, err
 	}
@@ -49,9 +50,9 @@ func (p *provider) UpdateUser(user models.User) (models.User, error) {
 }
 
 // DeleteUser to delete user information from database
-func (p *provider) DeleteUser(user models.User) error {
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
 	userCollection := p.db.Collection(models.Collections.User, options.Collection())
-	_, err := userCollection.DeleteOne(nil, bson.M{"_id": user.ID}, options.Delete())
+	_, err := userCollection.DeleteOne(ctx, bson.M{"_id": user.ID}, options.Delete())
 	if err != nil {
 		return err
 	}
@@ -60,7 +61,7 @@ func (p *provider) DeleteUser(user models.User) error {
 }
 
 // ListUsers to get list of users from database
-func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error) {
+func (p *provider) ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error) {
 	var users []*model.User
 	opts := options.Find()
 	opts.SetLimit(pagination.Limit)
@@ -70,20 +71,20 @@ func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error)
 	paginationClone := pagination
 
 	userCollection := p.db.Collection(models.Collections.User, options.Collection())
-	count, err := userCollection.CountDocuments(nil, bson.M{}, options.Count())
+	count, err := userCollection.CountDocuments(ctx, bson.M{}, options.Count())
 	if err != nil {
 		return nil, err
 	}
 
 	paginationClone.Total = count
 
-	cursor, err := userCollection.Find(nil, bson.M{}, opts)
+	cursor, err := userCollection.Find(ctx, bson.M{}, opts)
 	if err != nil {
 		return nil, err
 	}
-	defer cursor.Close(nil)
+	defer cursor.Close(ctx)
 
-	for cursor.Next(nil) {
+	for cursor.Next(ctx) {
 		var user models.User
 		err := cursor.Decode(&user)
 		if err != nil {
@@ -99,10 +100,10 @@ func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error)
 }
 
 // GetUserByEmail to get user information from database using email address
-func (p *provider) GetUserByEmail(email string) (models.User, error) {
+func (p *provider) GetUserByEmail(ctx context.Context, email string) (models.User, error) {
 	var user models.User
 	userCollection := p.db.Collection(models.Collections.User, options.Collection())
-	err := userCollection.FindOne(nil, bson.M{"email": email}).Decode(&user)
+	err := userCollection.FindOne(ctx, bson.M{"email": email}).Decode(&user)
 	if err != nil {
 		return user, err
 	}
@@ -111,11 +112,11 @@ func (p *provider) GetUserByEmail(email string) (models.User, error) {
 }
 
 // GetUserByID to get user information from database using user ID
-func (p *provider) GetUserByID(id string) (models.User, error) {
+func (p *provider) GetUserByID(ctx context.Context, id string) (models.User, error) {
 	var user models.User
 
 	userCollection := p.db.Collection(models.Collections.User, options.Collection())
-	err := userCollection.FindOne(nil, bson.M{"_id": id}).Decode(&user)
+	err := userCollection.FindOne(ctx, bson.M{"_id": id}).Decode(&user)
 	if err != nil {
 		return user, err
 	}

server/db/providers/mongodb/verification_requests.go

@@ -1,6 +1,7 @@
 package mongodb
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -11,7 +12,7 @@ import (
 )
 
 // AddVerification to save verification request in database
-func (p *provider) AddVerificationRequest(verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
+func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
 	if verificationRequest.ID == "" {
 		verificationRequest.ID = uuid.New().String()
 
@@ -19,7 +20,7 @@ func (p *provider) AddVerificationRequest(verificationRequest models.Verificatio
 		verificationRequest.UpdatedAt = time.Now().Unix()
 		verificationRequest.Key = verificationRequest.ID
 		verificationRequestCollection := p.db.Collection(models.Collections.VerificationRequest, options.Collection())
-		_, err := verificationRequestCollection.InsertOne(nil, verificationRequest)
+		_, err := verificationRequestCollection.InsertOne(ctx, verificationRequest)
 		if err != nil {
 			return verificationRequest, err
 		}
@@ -29,11 +30,11 @@ func (p *provider) AddVerificationRequest(verificationRequest models.Verificatio
 }
 
 // GetVerificationRequestByToken to get verification request from database using token
-func (p *provider) GetVerificationRequestByToken(token string) (models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 
 	verificationRequestCollection := p.db.Collection(models.Collections.VerificationRequest, options.Collection())
-	err := verificationRequestCollection.FindOne(nil, bson.M{"token": token}).Decode(&verificationRequest)
+	err := verificationRequestCollection.FindOne(ctx, bson.M{"token": token}).Decode(&verificationRequest)
 	if err != nil {
 		return verificationRequest, err
 	}
@@ -42,11 +43,11 @@ func (p *provider) GetVerificationRequestByToken(token string) (models.Verificat
 }
 
 // GetVerificationRequestByEmail to get verification request by email from database
-func (p *provider) GetVerificationRequestByEmail(email string, identifier string) (models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 
 	verificationRequestCollection := p.db.Collection(models.Collections.VerificationRequest, options.Collection())
-	err := verificationRequestCollection.FindOne(nil, bson.M{"email": email, "identifier": identifier}).Decode(&verificationRequest)
+	err := verificationRequestCollection.FindOne(ctx, bson.M{"email": email, "identifier": identifier}).Decode(&verificationRequest)
 	if err != nil {
 		return verificationRequest, err
 	}
@@ -55,7 +56,7 @@ func (p *provider) GetVerificationRequestByEmail(email string, identifier string
 }
 
 // ListVerificationRequests to get list of verification requests from database
-func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model.VerificationRequests, error) {
+func (p *provider) ListVerificationRequests(ctx context.Context, pagination model.Pagination) (*model.VerificationRequests, error) {
 	var verificationRequests []*model.VerificationRequest
 
 	opts := options.Find()
@@ -65,17 +66,17 @@ func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model
 
 	verificationRequestCollection := p.db.Collection(models.Collections.VerificationRequest, options.Collection())
 
-	verificationRequestCollectionCount, err := verificationRequestCollection.CountDocuments(nil, bson.M{})
+	verificationRequestCollectionCount, err := verificationRequestCollection.CountDocuments(ctx, bson.M{})
 	paginationClone := pagination
 	paginationClone.Total = verificationRequestCollectionCount
 
-	cursor, err := verificationRequestCollection.Find(nil, bson.M{}, opts)
+	cursor, err := verificationRequestCollection.Find(ctx, bson.M{}, opts)
 	if err != nil {
 		return nil, err
 	}
-	defer cursor.Close(nil)
+	defer cursor.Close(ctx)
 
-	for cursor.Next(nil) {
+	for cursor.Next(ctx) {
 		var verificationRequest models.VerificationRequest
 		err := cursor.Decode(&verificationRequest)
 		if err != nil {
@@ -91,9 +92,9 @@ func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model
 }
 
 // DeleteVerificationRequest to delete verification request from database
-func (p *provider) DeleteVerificationRequest(verificationRequest models.VerificationRequest) error {
+func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error {
 	verificationRequestCollection := p.db.Collection(models.Collections.VerificationRequest, options.Collection())
-	_, err := verificationRequestCollection.DeleteOne(nil, bson.M{"_id": verificationRequest.ID}, options.Delete())
+	_, err := verificationRequestCollection.DeleteOne(ctx, bson.M{"_id": verificationRequest.ID}, options.Delete())
 	if err != nil {
 		return err
 	}

server/db/providers/mongodb/webhook.go

@@ -1,6 +1,7 @@
 package mongodb
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -11,7 +12,7 @@ import (
 )
 
 // AddWebhook to add webhook
-func (p *provider) AddWebhook(webhook models.Webhook) (models.Webhook, error) {
+func (p *provider) AddWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	if webhook.ID == "" {
 		webhook.ID = uuid.New().String()
 	}
@@ -21,27 +22,27 @@ func (p *provider) AddWebhook(webhook models.Webhook) (models.Webhook, error) {
 	webhook.UpdatedAt = time.Now().Unix()
 
 	webhookCollection := p.db.Collection(models.Collections.Webhook, options.Collection())
-	_, err := webhookCollection.InsertOne(nil, webhook)
+	_, err := webhookCollection.InsertOne(ctx, webhook)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // UpdateWebhook to update webhook
-func (p *provider) UpdateWebhook(webhook models.Webhook) (models.Webhook, error) {
+func (p *provider) UpdateWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	webhook.UpdatedAt = time.Now().Unix()
 	webhookCollection := p.db.Collection(models.Collections.Webhook, options.Collection())
-	_, err := webhookCollection.UpdateOne(nil, bson.M{"_id": bson.M{"$eq": webhook.ID}}, bson.M{"$set": webhook}, options.MergeUpdateOptions())
+	_, err := webhookCollection.UpdateOne(ctx, bson.M{"_id": bson.M{"$eq": webhook.ID}}, bson.M{"$set": webhook}, options.MergeUpdateOptions())
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
 
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // ListWebhooks to list webhook
-func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, error) {
+func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error) {
 	var webhooks []*model.Webhook
 	opts := options.Find()
 	opts.SetLimit(pagination.Limit)
@@ -51,20 +52,20 @@ func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, er
 	paginationClone := pagination
 
 	webhookCollection := p.db.Collection(models.Collections.Webhook, options.Collection())
-	count, err := webhookCollection.CountDocuments(nil, bson.M{}, options.Count())
+	count, err := webhookCollection.CountDocuments(ctx, bson.M{}, options.Count())
 	if err != nil {
 		return nil, err
 	}
 
 	paginationClone.Total = count
 
-	cursor, err := webhookCollection.Find(nil, bson.M{}, opts)
+	cursor, err := webhookCollection.Find(ctx, bson.M{}, opts)
 	if err != nil {
 		return nil, err
 	}
-	defer cursor.Close(nil)
+	defer cursor.Close(ctx)
 
-	for cursor.Next(nil) {
+	for cursor.Next(ctx) {
 		var webhook models.Webhook
 		err := cursor.Decode(&webhook)
 		if err != nil {
@@ -80,29 +81,29 @@ func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, er
 }
 
 // GetWebhookByID to get webhook by id
-func (p *provider) GetWebhookByID(webhookID string) (models.Webhook, error) {
+func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
 	var webhook models.Webhook
 	webhookCollection := p.db.Collection(models.Collections.Webhook, options.Collection())
-	err := webhookCollection.FindOne(nil, bson.M{"_id": webhookID}).Decode(&webhook)
+	err := webhookCollection.FindOne(ctx, bson.M{"_id": webhookID}).Decode(&webhook)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // GetWebhookByEventName to get webhook by event_name
-func (p *provider) GetWebhookByEventName(eventName string) (models.Webhook, error) {
+func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error) {
 	var webhook models.Webhook
 	webhookCollection := p.db.Collection(models.Collections.Webhook, options.Collection())
-	err := webhookCollection.FindOne(nil, bson.M{"event_name": eventName}).Decode(&webhook)
+	err := webhookCollection.FindOne(ctx, bson.M{"event_name": eventName}).Decode(&webhook)
 	if err != nil {
-		return webhook, err
+		return nil, err
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // DeleteWebhook to delete webhook
-func (p *provider) DeleteWebhook(webhook models.Webhook) error {
+func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
 	webhookCollection := p.db.Collection(models.Collections.Webhook, options.Collection())
 	_, err := webhookCollection.DeleteOne(nil, bson.M{"_id": webhook.ID}, options.Delete())
 	if err != nil {

server/db/providers/mongodb/webhook_log.go

@@ -1,6 +1,7 @@
 package mongodb
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -11,7 +12,7 @@ import (
 )
 
 // AddWebhookLog to add webhook log
-func (p *provider) AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLog, error) {
+func (p *provider) AddWebhookLog(ctx context.Context, webhookLog models.WebhookLog) (*model.WebhookLog, error) {
 	if webhookLog.ID == "" {
 		webhookLog.ID = uuid.New().String()
 	}
@@ -21,15 +22,15 @@ func (p *provider) AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLo
 	webhookLog.UpdatedAt = time.Now().Unix()
 
 	webhookLogCollection := p.db.Collection(models.Collections.WebhookLog, options.Collection())
-	_, err := webhookLogCollection.InsertOne(nil, webhookLog)
+	_, err := webhookLogCollection.InsertOne(ctx, webhookLog)
 	if err != nil {
-		return webhookLog, err
+		return nil, err
 	}
-	return webhookLog, nil
+	return webhookLog.AsAPIWebhookLog(), nil
 }
 
 // ListWebhookLogs to list webhook logs
-func (p *provider) ListWebhookLogs(pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
+func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
 	webhookLogs := []*model.WebhookLog{}
 	opts := options.Find()
 	opts.SetLimit(pagination.Limit)
@@ -44,19 +45,20 @@ func (p *provider) ListWebhookLogs(pagination model.Pagination, webhookID string
 	}
 
 	webhookLogCollection := p.db.Collection(models.Collections.WebhookLog, options.Collection())
-	count, err := webhookLogCollection.CountDocuments(nil, query, options.Count())
+	count, err := webhookLogCollection.CountDocuments(ctx, query, options.Count())
 	if err != nil {
 		return nil, err
 	}
 
 	paginationClone.Total = count
 
-	cursor, err := webhookLogCollection.Find(nil, query, opts)
+	cursor, err := webhookLogCollection.Find(ctx, query, opts)
 	if err != nil {
 		return nil, err
 	}
+	defer cursor.Close(ctx)
 
-	for cursor.Next(nil) {
+	for cursor.Next(ctx) {
 		var webhookLog models.WebhookLog
 		err := cursor.Decode(&webhookLog)
 		if err != nil {

server/db/providers/provider_template/env.go

@@ -1,6 +1,7 @@
 package provider_template
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -8,7 +9,7 @@ import (
 )
 
 // AddEnv to save environment information in database
-func (p *provider) AddEnv(env models.Env) (models.Env, error) {
+func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	if env.ID == "" {
 		env.ID = uuid.New().String()
 	}
@@ -19,13 +20,13 @@ func (p *provider) AddEnv(env models.Env) (models.Env, error) {
 }
 
 // UpdateEnv to update environment information in database
-func (p *provider) UpdateEnv(env models.Env) (models.Env, error) {
+func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	env.UpdatedAt = time.Now().Unix()
 	return env, nil
 }
 
 // GetEnv to get environment information from database
-func (p *provider) GetEnv() (models.Env, error) {
+func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
 	var env models.Env
 
 	return env, nil

server/db/providers/provider_template/session.go

@@ -1,6 +1,7 @@
 package provider_template
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -8,7 +9,7 @@ import (
 )
 
 // AddSession to save session information in database
-func (p *provider) AddSession(session models.Session) error {
+func (p *provider) AddSession(ctx context.Context, session models.Session) error {
 	if session.ID == "" {
 		session.ID = uuid.New().String()
 	}
@@ -19,6 +20,6 @@ func (p *provider) AddSession(session models.Session) error {
 }
 
 // DeleteSession to delete session information from database
-func (p *provider) DeleteSession(userId string) error {
+func (p *provider) DeleteSession(ctx context.Context, userId string) error {
 	return nil
 }

server/db/providers/provider_template/user.go

@@ -1,6 +1,7 @@
 package provider_template
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/constants"
@@ -11,7 +12,7 @@ import (
 )
 
 // AddUser to save user information in database
-func (p *provider) AddUser(user models.User) (models.User, error) {
+func (p *provider) AddUser(ctx context.Context, user models.User) (models.User, error) {
 	if user.ID == "" {
 		user.ID = uuid.New().String()
 	}
@@ -31,30 +32,30 @@ func (p *provider) AddUser(user models.User) (models.User, error) {
 }
 
 // UpdateUser to update user information in database
-func (p *provider) UpdateUser(user models.User) (models.User, error) {
+func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.User, error) {
 	user.UpdatedAt = time.Now().Unix()
 	return user, nil
 }
 
 // DeleteUser to delete user information from database
-func (p *provider) DeleteUser(user models.User) error {
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
 	return nil
 }
 
 // ListUsers to get list of users from database
-func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error) {
+func (p *provider) ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error) {
 	return nil, nil
 }
 
 // GetUserByEmail to get user information from database using email address
-func (p *provider) GetUserByEmail(email string) (models.User, error) {
+func (p *provider) GetUserByEmail(ctx context.Context, email string) (models.User, error) {
 	var user models.User
 
 	return user, nil
 }
 
 // GetUserByID to get user information from database using user ID
-func (p *provider) GetUserByID(id string) (models.User, error) {
+func (p *provider) GetUserByID(ctx context.Context, id string) (models.User, error) {
 	var user models.User
 
 	return user, nil

server/db/providers/provider_template/verification_requests.go

@@ -1,6 +1,7 @@
 package provider_template
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -9,7 +10,7 @@ import (
 )
 
 // AddVerification to save verification request in database
-func (p *provider) AddVerificationRequest(verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
+func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
 	if verificationRequest.ID == "" {
 		verificationRequest.ID = uuid.New().String()
 	}
@@ -21,25 +22,25 @@ func (p *provider) AddVerificationRequest(verificationRequest models.Verificatio
 }
 
 // GetVerificationRequestByToken to get verification request from database using token
-func (p *provider) GetVerificationRequestByToken(token string) (models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 
 	return verificationRequest, nil
 }
 
 // GetVerificationRequestByEmail to get verification request by email from database
-func (p *provider) GetVerificationRequestByEmail(email string, identifier string) (models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 
 	return verificationRequest, nil
 }
 
 // ListVerificationRequests to get list of verification requests from database
-func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model.VerificationRequests, error) {
+func (p *provider) ListVerificationRequests(ctx context.Context, pagination model.Pagination) (*model.VerificationRequests, error) {
 	return nil, nil
 }
 
 // DeleteVerificationRequest to delete verification request from database
-func (p *provider) DeleteVerificationRequest(verificationRequest models.VerificationRequest) error {
+func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error {
 	return nil
 }

server/db/providers/provider_template/webhook.go

@@ -1,6 +1,7 @@
 package provider_template
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -9,7 +10,7 @@ import (
 )
 
 // AddWebhook to add webhook
-func (p *provider) AddWebhook(webhook models.Webhook) (models.Webhook, error) {
+func (p *provider) AddWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	if webhook.ID == "" {
 		webhook.ID = uuid.New().String()
 	}
@@ -17,31 +18,31 @@ func (p *provider) AddWebhook(webhook models.Webhook) (models.Webhook, error) {
 	webhook.Key = webhook.ID
 	webhook.CreatedAt = time.Now().Unix()
 	webhook.UpdatedAt = time.Now().Unix()
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // UpdateWebhook to update webhook
-func (p *provider) UpdateWebhook(webhook models.Webhook) (models.Webhook, error) {
+func (p *provider) UpdateWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	webhook.UpdatedAt = time.Now().Unix()
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // ListWebhooks to list webhook
-func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, error) {
+func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error) {
 	return nil, nil
 }
 
 // GetWebhookByID to get webhook by id
-func (p *provider) GetWebhookByID(webhookID string) (models.Webhook, error) {
-	return models.Webhook{}, nil
+func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
+	return nil, nil
 }
 
 // GetWebhookByEventName to get webhook by event_name
-func (p *provider) GetWebhookByEventName(eventName string) (models.Webhook, error) {
-	return models.Webhook{}, nil
+func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error) {
+	return nil, nil
 }
 
 // DeleteWebhook to delete webhook
-func (p *provider) DeleteWebhook(webhook models.Webhook) error {
+func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
 	return nil
 }

server/db/providers/provider_template/webhook_log.go

@@ -1,6 +1,7 @@
 package provider_template
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -9,7 +10,7 @@ import (
 )
 
 // AddWebhookLog to add webhook log
-func (p *provider) AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLog, error) {
+func (p *provider) AddWebhookLog(ctx context.Context, webhookLog models.WebhookLog) (*model.WebhookLog, error) {
 	if webhookLog.ID == "" {
 		webhookLog.ID = uuid.New().String()
 	}
@@ -17,10 +18,10 @@ func (p *provider) AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLo
 	webhookLog.Key = webhookLog.ID
 	webhookLog.CreatedAt = time.Now().Unix()
 	webhookLog.UpdatedAt = time.Now().Unix()
-	return webhookLog, nil
+	return webhookLog.AsAPIWebhookLog(), nil
 }
 
 // ListWebhookLogs to list webhook logs
-func (p *provider) ListWebhookLogs(pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
+func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
 	return nil, nil
 }

server/db/providers/providers.go

@@ -1,62 +1,64 @@
 package providers
 
 import (
+	"context"
+
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/authorizerdev/authorizer/server/graph/model"
 )
 
 type Provider interface {
 	// AddUser to save user information in database
-	AddUser(user models.User) (models.User, error)
+	AddUser(ctx context.Context, user models.User) (models.User, error)
 	// UpdateUser to update user information in database
-	UpdateUser(user models.User) (models.User, error)
+	UpdateUser(ctx context.Context, user models.User) (models.User, error)
 	// DeleteUser to delete user information from database
-	DeleteUser(user models.User) error
+	DeleteUser(ctx context.Context, user models.User) error
 	// ListUsers to get list of users from database
-	ListUsers(pagination model.Pagination) (*model.Users, error)
+	ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error)
 	// GetUserByEmail to get user information from database using email address
-	GetUserByEmail(email string) (models.User, error)
+	GetUserByEmail(ctx context.Context, email string) (models.User, error)
 	// GetUserByID to get user information from database using user ID
-	GetUserByID(id string) (models.User, error)
+	GetUserByID(ctx context.Context, id string) (models.User, error)
 
 	// AddVerification to save verification request in database
-	AddVerificationRequest(verificationRequest models.VerificationRequest) (models.VerificationRequest, error)
+	AddVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) (models.VerificationRequest, error)
 	// GetVerificationRequestByToken to get verification request from database using token
-	GetVerificationRequestByToken(token string) (models.VerificationRequest, error)
+	GetVerificationRequestByToken(ctx context.Context, token string) (models.VerificationRequest, error)
 	// GetVerificationRequestByEmail to get verification request by email from database
-	GetVerificationRequestByEmail(email string, identifier string) (models.VerificationRequest, error)
+	GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (models.VerificationRequest, error)
 	// ListVerificationRequests to get list of verification requests from database
-	ListVerificationRequests(pagination model.Pagination) (*model.VerificationRequests, error)
+	ListVerificationRequests(ctx context.Context, pagination model.Pagination) (*model.VerificationRequests, error)
 	// DeleteVerificationRequest to delete verification request from database
-	DeleteVerificationRequest(verificationRequest models.VerificationRequest) error
+	DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error
 
 	// AddSession to save session information in database
-	AddSession(session models.Session) error
+	AddSession(ctx context.Context, session models.Session) error
 	// DeleteSession to delete session information from database
-	DeleteSession(userId string) error
+	DeleteSession(ctx context.Context, userId string) error
 
 	// AddEnv to save environment information in database
-	AddEnv(env models.Env) (models.Env, error)
+	AddEnv(ctx context.Context, env models.Env) (models.Env, error)
 	// UpdateEnv to update environment information in database
-	UpdateEnv(env models.Env) (models.Env, error)
+	UpdateEnv(ctx context.Context, env models.Env) (models.Env, error)
 	// GetEnv to get environment information from database
-	GetEnv() (models.Env, error)
+	GetEnv(ctx context.Context) (models.Env, error)
 
 	// AddWebhook to add webhook
-	AddWebhook(webhook models.Webhook) (models.Webhook, error)
+	AddWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error)
 	// UpdateWebhook to update webhook
-	UpdateWebhook(webhook models.Webhook) (models.Webhook, error)
+	UpdateWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error)
 	// ListWebhooks to list webhook
-	ListWebhook(pagination model.Pagination) (*model.Webhooks, error)
+	ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error)
 	// GetWebhookByID to get webhook by id
-	GetWebhookByID(webhookID string) (models.Webhook, error)
+	GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error)
 	// GetWebhookByEventName to get webhook by event_name
-	GetWebhookByEventName(eventName string) (models.Webhook, error)
+	GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error)
 	// DeleteWebhook to delete webhook
-	DeleteWebhook(webhook models.Webhook) error
+	DeleteWebhook(ctx context.Context, webhook *model.Webhook) error
 
 	// AddWebhookLog to add webhook log
-	AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLog, error)
+	AddWebhookLog(ctx context.Context, webhookLog models.WebhookLog) (*model.WebhookLog, error)
 	// ListWebhookLogs to list webhook logs
-	ListWebhookLogs(pagination model.Pagination, webhookID string) (*model.WebhookLogs, error)
+	ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error)
 }

server/db/providers/sql/env.go

@@ -1,6 +1,7 @@
 package sql
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -8,7 +9,7 @@ import (
 )
 
 // AddEnv to save environment information in database
-func (p *provider) AddEnv(env models.Env) (models.Env, error) {
+func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	if env.ID == "" {
 		env.ID = uuid.New().String()
 	}
@@ -25,7 +26,7 @@ func (p *provider) AddEnv(env models.Env) (models.Env, error) {
 }
 
 // UpdateEnv to update environment information in database
-func (p *provider) UpdateEnv(env models.Env) (models.Env, error) {
+func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	env.UpdatedAt = time.Now().Unix()
 	result := p.db.Save(&env)
 
@@ -36,7 +37,7 @@ func (p *provider) UpdateEnv(env models.Env) (models.Env, error) {
 }
 
 // GetEnv to get environment information from database
-func (p *provider) GetEnv() (models.Env, error) {
+func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
 	var env models.Env
 	result := p.db.First(&env)
 

server/db/providers/sql/session.go

@@ -1,6 +1,7 @@
 package sql
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -9,7 +10,7 @@ import (
 )
 
 // AddSession to save session information in database
-func (p *provider) AddSession(session models.Session) error {
+func (p *provider) AddSession(ctx context.Context, session models.Session) error {
 	if session.ID == "" {
 		session.ID = uuid.New().String()
 	}
@@ -28,7 +29,7 @@ func (p *provider) AddSession(session models.Session) error {
 }
 
 // DeleteSession to delete session information from database
-func (p *provider) DeleteSession(userId string) error {
+func (p *provider) DeleteSession(ctx context.Context, userId string) error {
 	result := p.db.Where("user_id = ?", userId).Delete(&models.Session{})
 
 	if result.Error != nil {

server/db/providers/sql/user.go

@@ -1,6 +1,7 @@
 package sql
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/constants"
@@ -12,7 +13,7 @@ import (
 )
 
 // AddUser to save user information in database
-func (p *provider) AddUser(user models.User) (models.User, error) {
+func (p *provider) AddUser(ctx context.Context, user models.User) (models.User, error) {
 	if user.ID == "" {
 		user.ID = uuid.New().String()
 	}
@@ -42,7 +43,7 @@ func (p *provider) AddUser(user models.User) (models.User, error) {
 }
 
 // UpdateUser to update user information in database
-func (p *provider) UpdateUser(user models.User) (models.User, error) {
+func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.User, error) {
 	user.UpdatedAt = time.Now().Unix()
 
 	result := p.db.Save(&user)
@@ -55,7 +56,7 @@ func (p *provider) UpdateUser(user models.User) (models.User, error) {
 }
 
 // DeleteUser to delete user information from database
-func (p *provider) DeleteUser(user models.User) error {
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
 	result := p.db.Delete(&user)
 
 	if result.Error != nil {
@@ -66,7 +67,7 @@ func (p *provider) DeleteUser(user models.User) error {
 }
 
 // ListUsers to get list of users from database
-func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error) {
+func (p *provider) ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error) {
 	var users []models.User
 	result := p.db.Limit(int(pagination.Limit)).Offset(int(pagination.Offset)).Order("created_at DESC").Find(&users)
 	if result.Error != nil {
@@ -94,7 +95,7 @@ func (p *provider) ListUsers(pagination model.Pagination) (*model.Users, error)
 }
 
 // GetUserByEmail to get user information from database using email address
-func (p *provider) GetUserByEmail(email string) (models.User, error) {
+func (p *provider) GetUserByEmail(ctx context.Context, email string) (models.User, error) {
 	var user models.User
 	result := p.db.Where("email = ?", email).First(&user)
 	if result.Error != nil {
@@ -105,7 +106,7 @@ func (p *provider) GetUserByEmail(email string) (models.User, error) {
 }
 
 // GetUserByID to get user information from database using user ID
-func (p *provider) GetUserByID(id string) (models.User, error) {
+func (p *provider) GetUserByID(ctx context.Context, id string) (models.User, error) {
 	var user models.User
 
 	result := p.db.Where("id = ?", id).First(&user)

server/db/providers/sql/verification_requests.go

@@ -1,6 +1,7 @@
 package sql
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -10,7 +11,7 @@ import (
 )
 
 // AddVerification to save verification request in database
-func (p *provider) AddVerificationRequest(verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
+func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
 	if verificationRequest.ID == "" {
 		verificationRequest.ID = uuid.New().String()
 	}
@@ -31,7 +32,7 @@ func (p *provider) AddVerificationRequest(verificationRequest models.Verificatio
 }
 
 // GetVerificationRequestByToken to get verification request from database using token
-func (p *provider) GetVerificationRequestByToken(token string) (models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 	result := p.db.Where("token = ?", token).First(&verificationRequest)
 
@@ -43,7 +44,7 @@ func (p *provider) GetVerificationRequestByToken(token string) (models.Verificat
 }
 
 // GetVerificationRequestByEmail to get verification request by email from database
-func (p *provider) GetVerificationRequestByEmail(email string, identifier string) (models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 
 	result := p.db.Where("email = ? AND identifier = ?", email, identifier).First(&verificationRequest)
@@ -56,7 +57,7 @@ func (p *provider) GetVerificationRequestByEmail(email string, identifier string
 }
 
 // ListVerificationRequests to get list of verification requests from database
-func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model.VerificationRequests, error) {
+func (p *provider) ListVerificationRequests(ctx context.Context, pagination model.Pagination) (*model.VerificationRequests, error) {
 	var verificationRequests []models.VerificationRequest
 
 	result := p.db.Limit(int(pagination.Limit)).Offset(int(pagination.Offset)).Order("created_at DESC").Find(&verificationRequests)
@@ -85,7 +86,7 @@ func (p *provider) ListVerificationRequests(pagination model.Pagination) (*model
 }
 
 // DeleteVerificationRequest to delete verification request from database
-func (p *provider) DeleteVerificationRequest(verificationRequest models.VerificationRequest) error {
+func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error {
 	result := p.db.Delete(&verificationRequest)
 
 	if result.Error != nil {

server/db/providers/sql/webhook.go

@@ -1,6 +1,7 @@
 package sql
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -9,7 +10,7 @@ import (
 )
 
 // AddWebhook to add webhook
-func (p *provider) AddWebhook(webhook models.Webhook) (models.Webhook, error) {
+func (p *provider) AddWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	if webhook.ID == "" {
 		webhook.ID = uuid.New().String()
 	}
@@ -19,25 +20,25 @@ func (p *provider) AddWebhook(webhook models.Webhook) (models.Webhook, error) {
 	webhook.UpdatedAt = time.Now().Unix()
 	res := p.db.Create(&webhook)
 	if res.Error != nil {
-		return webhook, res.Error
+		return nil, res.Error
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // UpdateWebhook to update webhook
-func (p *provider) UpdateWebhook(webhook models.Webhook) (models.Webhook, error) {
+func (p *provider) UpdateWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	webhook.UpdatedAt = time.Now().Unix()
 
 	result := p.db.Save(&webhook)
 	if result.Error != nil {
-		return webhook, result.Error
+		return nil, result.Error
 	}
 
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // ListWebhooks to list webhook
-func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, error) {
+func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error) {
 	var webhooks []models.Webhook
 
 	result := p.db.Limit(int(pagination.Limit)).Offset(int(pagination.Offset)).Order("created_at DESC").Find(&webhooks)
@@ -65,30 +66,30 @@ func (p *provider) ListWebhook(pagination model.Pagination) (*model.Webhooks, er
 }
 
 // GetWebhookByID to get webhook by id
-func (p *provider) GetWebhookByID(webhookID string) (models.Webhook, error) {
+func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
 	var webhook models.Webhook
 
 	result := p.db.Where("id = ?", webhookID).First(webhook)
 	if result.Error != nil {
-		return webhook, result.Error
+		return nil, result.Error
 	}
-	return webhook, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // GetWebhookByEventName to get webhook by event_name
-func (p *provider) GetWebhookByEventName(eventName string) (models.Webhook, error) {
+func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error) {
 	var webhook models.Webhook
 
 	result := p.db.Where("event_name = ?", eventName).First(webhook)
 	if result.Error != nil {
-		return webhook, result.Error
+		return nil, result.Error
 	}
-	return models.Webhook{}, nil
+	return webhook.AsAPIWebhook(), nil
 }
 
 // DeleteWebhook to delete webhook
-func (p *provider) DeleteWebhook(webhook models.Webhook) error {
-	result := p.db.Delete(&webhook)
+func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
+	result := p.db.Delete(&models.Webhook{}, webhook.ID)
 	if result.Error != nil {
 		return result.Error
 	}

server/db/providers/sql/webhook_log.go

@@ -1,6 +1,7 @@
 package sql
 
 import (
+	"context"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
@@ -11,7 +12,7 @@ import (
 )
 
 // AddWebhookLog to add webhook log
-func (p *provider) AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLog, error) {
+func (p *provider) AddWebhookLog(ctx context.Context, webhookLog models.WebhookLog) (*model.WebhookLog, error) {
 	if webhookLog.ID == "" {
 		webhookLog.ID = uuid.New().String()
 	}
@@ -24,14 +25,14 @@ func (p *provider) AddWebhookLog(webhookLog models.WebhookLog) (models.WebhookLo
 			DoNothing: true,
 		}).Create(&webhookLog)
 	if res.Error != nil {
-		return webhookLog, res.Error
+		return nil, res.Error
 	}
 
-	return webhookLog, nil
+	return webhookLog.AsAPIWebhookLog(), nil
 }
 
 // ListWebhookLogs to list webhook logs
-func (p *provider) ListWebhookLogs(pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
+func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
 	var webhookLogs []models.WebhookLog
 	var result *gorm.DB
 	var totalRes *gorm.DB