feat: implement resolvers

server/constants/webhook_event.go

@@ -0,0 +1,18 @@
+package constants
+
+const (
+
+	// UserLoginWebhookEvent name for login event
+	UserLoginWebhookEvent = `user.login`
+	// UserCreatedWebhookEvent name for user creation event
+	// This is triggered when user entry is created but still not verified
+	UserCreatedWebhookEvent = `user.created`
+	// UserSignUpWebhookEvent name for signup event
+	UserSignUpWebhookEvent = `user.signup`
+	// UserAccessRevokedWebhookEvent name for user access revoke event
+	UserAccessRevokedWebhookEvent = `user.access_revoked`
+	// UserAccessEnabledWebhookEvent name for user access enable event
+	UserAccessEnabledWebhookEvent = `user.access_enabled`
+	// UserDeletedWebhookEvent name for user deleted event
+	UserDeletedWebhookEvent = `user.deleted`
+)

server/db/models/webhook.go

@@ -1,6 +1,10 @@
 package models
 
-import "github.com/authorizerdev/authorizer/server/graph/model"
+import (
+	"encoding/json"
+
+	"github.com/authorizerdev/authorizer/server/graph/model"
+)
 
 // Note: any change here should be reflected in providers/casandra/provider.go as it does not have model support in collection creation
 
@@ -9,17 +13,21 @@ type Webhook struct {
 	Key       string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty"` // for arangodb
 	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id"`
 	EventName string `gorm:"unique" json:"event_name" bson:"event_name" cql:"event_name"`
-	EndPoint  string `json:"endpoint" bson:"endpoint" cql:"endpoint"`
+	EndPoint  string `gorm:"type:text" json:"endpoint" bson:"endpoint" cql:"endpoint"`
+	Headers   string `gorm:"type:text" json:"headers" bson:"headers" cql:"headers"`
 	Enabled   bool   `json:"enabled" bson:"enabled" cql:"enabled"`
 	CreatedAt int64  `json:"created_at" bson:"created_at" cql:"created_at"`
 	UpdatedAt int64  `json:"updated_at" bson:"updated_at" cql:"updated_at"`
 }
 
 func (w *Webhook) AsAPIWebhook() *model.Webhook {
+	headersMap := make(map[string]interface{})
+	json.Unmarshal([]byte(w.Headers), &headersMap)
 	return &model.Webhook{
 		ID:        w.ID,
 		EventName: &w.EventName,
 		Endpoint:  &w.EndPoint,
+		Headers:   headersMap,
 		Enabled:   &w.Enabled,
 		CreatedAt: &w.CreatedAt,
 		UpdatedAt: &w.UpdatedAt,

server/db/models/webhook_log.go

@@ -9,9 +9,10 @@ type WebhookLog struct {
 	Key        string  `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty"` // for arangodb
 	ID         string  `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id"`
 	HttpStatus int64   `json:"http_status" bson:"http_status" cql:"http_status"`
-	Response   string `json:"response" bson:"response" cql:"response"`
+	Response   string  `gorm:"type:text" json:"response" bson:"response" cql:"response"`
-	Request    string `json:"request" bson:"request" cql:"request"`
+	Request    string  `gorm:"type:text" json:"request" bson:"request" cql:"request"`
 	WebhookID  string  `gorm:"type:char(36),index:" json:"webhook_id" bson:"webhook_id" cql:"webhook_id"`
+	Webhook    Webhook `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" json:"-" bson:"-" cql:"-"`
 	CreatedAt  int64   `json:"created_at" bson:"created_at" cql:"created_at"`
 	UpdatedAt  int64   `json:"updated_at" bson:"updated_at" cql:"updated_at"`
 }

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)
+	configCollection, _ := p.db.Collection(ctx, models.Collections.Env)
-	meta, err := configCollection.CreateDocument(arangoDriver.WithOverwrite(nil), 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)
+	collection, _ := p.db.Collection(ctx, models.Collections.Env)
-	meta, err := collection.UpdateDocument(nil, env.Key, 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)
+	sessionCollection, _ := p.db.Collection(ctx, models.Collections.Session)
-	_, err := sessionCollection.CreateDocument(nil, 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)
+	userCollection, _ := p.db.Collection(ctx, models.Collections.User)
-	meta, err := userCollection.CreateDocument(arangoDriver.WithOverwrite(nil), 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)
+	collection, _ := p.db.Collection(ctx, models.Collections.User)
-	meta, err := collection.UpdateDocument(nil, user.Key, 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 {
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
-	collection, _ := p.db.Collection(nil, models.Collections.User)
+	collection, _ := p.db.Collection(ctx, models.Collections.User)
-	_, err := collection.RemoveDocument(nil, user.Key)
+	_, 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)
+	verificationRequestRequestCollection, _ := p.db.Collection(ctx, models.Collections.VerificationRequest)
-	meta, err := verificationRequestRequestCollection.CreateDocument(nil, 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)
+	webhookCollection, _ := p.db.Collection(ctx, models.Collections.Webhook)
-	_, err := webhookCollection.CreateDocument(nil, 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)
+	webhookCollection, _ := p.db.Collection(ctx, models.Collections.Webhook)
-	meta, err := webhookCollection.UpdateDocument(nil, webhook.Key, 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())
+	sctx := driver.WithQueryFullCount(ctx)
-	cursor, err := p.db.Query(ctx, query, nil)
+	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 {
+func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
-	webhookCollection, _ := p.db.Collection(nil, models.Collections.Webhook)
+	webhookCollection, _ := p.db.Collection(ctx, models.Collections.Webhook)
-	_, err := webhookCollection.RemoveDocument(nil, webhook.Key)
+	_, 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)
+	webhookLogCollection, _ := p.db.Collection(ctx, models.Collections.WebhookLog)
-	_, err := webhookLogCollection.CreateDocument(nil, 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())
+	sctx := driver.WithQueryFullCount(ctx)
-	cursor, err := p.db.Query(ctx, query, bindVariables)
+	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)
+	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.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
+	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)
+	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.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
+	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) {
+func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
-	return models.Webhook{}, nil
+	return nil, 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) {
-	return models.Webhook{}, nil
+	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 {
+func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
-	result := p.db.Delete(&webhook)
+	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

server/env/persist_env.go

@@ -1,6 +1,7 @@
 package env
 
 import (
+	"context"
 	"encoding/json"
 	"os"
 	"reflect"
@@ -58,7 +59,8 @@ func fixBackwardCompatibility(data map[string]interface{}) (bool, map[string]int
 // GetEnvData returns the env data from database
 func GetEnvData() (map[string]interface{}, error) {
 	var result map[string]interface{}
-	env, err := db.Provider.GetEnv()
+	ctx := context.Background()
+	env, err := db.Provider.GetEnv(ctx)
 	// config not found in db
 	if err != nil {
 		log.Debug("Error while getting env data from db: ", err)
@@ -108,7 +110,8 @@ func GetEnvData() (map[string]interface{}, error) {
 
 // PersistEnv persists the environment variables to the database
 func PersistEnv() error {
-	env, err := db.Provider.GetEnv()
+	ctx := context.Background()
+	env, err := db.Provider.GetEnv(ctx)
 	// config not found in db
 	if err != nil {
 		// AES encryption needs 32 bit key only, so we chop off last 4 characters from 36 bit uuid
@@ -137,7 +140,7 @@ func PersistEnv() error {
 			EnvData: encryptedConfig,
 		}
 
-		env, err = db.Provider.AddEnv(env)
+		env, err = db.Provider.AddEnv(ctx, env)
 		if err != nil {
 			log.Debug("Error while persisting env data to db: ", err)
 			return err
@@ -251,7 +254,7 @@ func PersistEnv() error {
 			}
 
 			env.EnvData = encryptedConfig
-			_, err = db.Provider.UpdateEnv(env)
+			_, err = db.Provider.UpdateEnv(ctx, env)
 			if err != nil {
 				log.Debug("Failed to Update Config: ", err)
 				return err

server/graph/model/models_gen.go

@@ -2,6 +2,13 @@
 
 package model
 
+type AddWebhookRequest struct {
+	EventName string                 `json:"event_name"`
+	Endpoint  string                 `json:"endpoint"`
+	Enabled   bool                   `json:"enabled"`
+	Headers   map[string]interface{} `json:"headers"`
+}
+
 type AdminLoginInput struct {
 	AdminSecret string `json:"admin_secret"`
 }
@@ -192,6 +199,17 @@ type SignUpInput struct {
 	RedirectURI     *string  `json:"redirect_uri"`
 }
 
+type TestEndpointRequest struct {
+	Endpoint  string                 `json:"endpoint"`
+	EventName string                 `json:"event_name"`
+	Headers   map[string]interface{} `json:"headers"`
+}
+
+type TestEndpointResponse struct {
+	HTTPStatus *int64                 `json:"http_status"`
+	Response   map[string]interface{} `json:"response"`
+}
+
 type UpdateAccessInput struct {
 	UserID string `json:"user_id"`
 }
@@ -268,6 +286,14 @@ type UpdateUserInput struct {
 	Roles         []*string `json:"roles"`
 }
 
+type UpdateWebhookRequest struct {
+	ID        string                 `json:"id"`
+	EventName *string                `json:"event_name"`
+	Endpoint  *string                `json:"endpoint"`
+	Enabled   *bool                  `json:"enabled"`
+	Headers   map[string]interface{} `json:"headers"`
+}
+
 type User struct {
 	ID                  string   `json:"id"`
 	Email               string   `json:"email"`
@@ -330,6 +356,7 @@ type Webhook struct {
 	EventName *string                `json:"event_name"`
 	Endpoint  *string                `json:"endpoint"`
 	Enabled   *bool                  `json:"enabled"`
+	Headers   map[string]interface{} `json:"headers"`
 	CreatedAt *int64                 `json:"created_at"`
 	UpdatedAt *int64                 `json:"updated_at"`
 }
@@ -349,6 +376,10 @@ type WebhookLogs struct {
 	WebhookLogs []*WebhookLog `json:"webhook_logs"`
 }
 
+type WebhookRequest struct {
+	ID string `json:"id"`
+}
+
 type Webhooks struct {
 	Pagination *Pagination `json:"pagination"`
 	Webhooks   []*Webhook  `json:"webhooks"`

server/graph/schema.graphqls

@@ -329,6 +329,7 @@ type Webhook {
 	event_name: String
 	endpoint: String
 	enabled: Boolean
+	headers: Map
 	created_at: Int64
 	updated_at: Int64
 }
@@ -348,11 +349,41 @@ type WebhookLog {
 	updated_at: Int64
 }
 
+type TestEndpointResponse {
+	http_status: Int64
+	response: Map
+}
+
 input ListWebhookLogRequest {
 	pagination: PaginatedInput!
 	webhook_id: String
 }
 
+input AddWebhookRequest {
+	event_name: String!
+	endpoint: String!
+	enabled: Boolean!
+	headers: Map
+}
+
+input UpdateWebhookRequest {
+	id: ID!
+	event_name: String
+	endpoint: String
+	enabled: Boolean
+	headers: Map
+}
+
+input WebhookRequest {
+	id: ID!
+}
+
+input TestEndpointRequest {
+	endpoint: String!
+	event_name: String!
+	headers: Map
+}
+
 type WebhookLogs {
 	pagination: Pagination!
 	webhook_logs: [WebhookLog!]!
@@ -380,6 +411,10 @@ type Mutation {
 	_revoke_access(param: UpdateAccessInput!): Response!
 	_enable_access(param: UpdateAccessInput!): Response!
 	_generate_jwt_keys(params: GenerateJWTKeysInput!): GenerateJWTKeysResponse!
+	_add_webhook(params: AddWebhookRequest!): Response!
+	_update_webhook(params: UpdateWebhookRequest!): Response!
+	_delete_webhook(params: WebhookRequest!): Response!
+	_test_endpoint(params: TestEndpointRequest!): TestEndpointResponse!
 }
 
 type Query {
@@ -392,6 +427,7 @@ type Query {
 	_verification_requests(params: PaginatedInput): VerificationRequests!
 	_admin_session: Response!
 	_env: Env!
+	_webhook(params: WebhookRequest!): Webhook!
 	_webhooks(params: PaginatedInput): Webhooks!
-	_webhook_logs(params: ListWebhookLogRequest): WebhookLogs!
+	_webhook_logs(params: ListWebhookLogRequest!): WebhookLogs!
 }

server/graph/schema.resolvers.go

@@ -5,7 +5,6 @@ package graph
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/authorizerdev/authorizer/server/graph/generated"
 	"github.com/authorizerdev/authorizer/server/graph/model"
@@ -92,6 +91,22 @@ func (r *mutationResolver) GenerateJwtKeys(ctx context.Context, params model.Gen
 	return resolvers.GenerateJWTKeysResolver(ctx, params)
 }
 
+func (r *mutationResolver) AddWebhook(ctx context.Context, params model.AddWebhookRequest) (*model.Response, error) {
+	return resolvers.AddWebhookResolver(ctx, params)
+}
+
+func (r *mutationResolver) UpdateWebhook(ctx context.Context, params model.UpdateWebhookRequest) (*model.Response, error) {
+	return resolvers.UpdateWebhookResolver(ctx, params)
+}
+
+func (r *mutationResolver) DeleteWebhook(ctx context.Context, params model.WebhookRequest) (*model.Response, error) {
+	return resolvers.DeleteWebhookResolver(ctx, params)
+}
+
+func (r *mutationResolver) TestEndpoint(ctx context.Context, params model.TestEndpointRequest) (*model.TestEndpointResponse, error) {
+	return resolvers.TestEndpointResolver(ctx, params)
+}
+
 func (r *queryResolver) Meta(ctx context.Context) (*model.Meta, error) {
 	return resolvers.MetaResolver(ctx)
 }
@@ -124,12 +139,16 @@ func (r *queryResolver) Env(ctx context.Context) (*model.Env, error) {
 	return resolvers.EnvResolver(ctx)
 }
 
-func (r *queryResolver) Webhooks(ctx context.Context, params *model.PaginatedInput) (*model.Webhooks, error) {
+func (r *queryResolver) Webhook(ctx context.Context, params model.WebhookRequest) (*model.Webhook, error) {
-	panic(fmt.Errorf("not implemented"))
+	return resolvers.WebhookResolver(ctx, params)
 }
 
-func (r *queryResolver) WebhookLogs(ctx context.Context, params *model.ListWebhookLogRequest) (*model.WebhookLogs, error) {
+func (r *queryResolver) Webhooks(ctx context.Context, params *model.PaginatedInput) (*model.Webhooks, error) {
-	panic(fmt.Errorf("not implemented"))
+	return resolvers.WebhooksResolver(ctx, params)
+}
+
+func (r *queryResolver) WebhookLogs(ctx context.Context, params model.ListWebhookLogRequest) (*model.WebhookLogs, error) {
+	return resolvers.WebhookLogsResolver(ctx, params)
 }
 
 // Mutation returns generated.MutationResolver implementation.

server/handlers/authorize.go

@@ -199,7 +199,7 @@ func AuthorizeHandler() gin.HandlerFunc {
 			return
 		}
 		userID := claims.Subject
-		user, err := db.Provider.GetUserByID(userID)
+		user, err := db.Provider.GetUserByID(gc, userID)
 		if err != nil {
 			if isQuery {
 				gc.Redirect(http.StatusFound, loginURL)

server/handlers/oauth_callback.go

@@ -28,21 +28,21 @@ import (
 
 // OAuthCallbackHandler handles the OAuth callback for various oauth providers
 func OAuthCallbackHandler() gin.HandlerFunc {
-	return func(c *gin.Context) {
+	return func(ctx *gin.Context) {
-		provider := c.Param("oauth_provider")
+		provider := ctx.Param("oauth_provider")
-		state := c.Request.FormValue("state")
+		state := ctx.Request.FormValue("state")
 
 		sessionState, err := memorystore.Provider.GetState(state)
 		if sessionState == "" || err != nil {
 			log.Debug("Invalid oauth state: ", state)
-			c.JSON(400, gin.H{"error": "invalid oauth state"})
+			ctx.JSON(400, gin.H{"error": "invalid oauth state"})
 		}
 		// contains random token, redirect url, role
 		sessionSplit := strings.Split(state, "___")
 
 		if len(sessionSplit) < 3 {
 			log.Debug("Unable to get redirect url from state: ", state)
-			c.JSON(400, gin.H{"error": "invalid redirect url"})
+			ctx.JSON(400, gin.H{"error": "invalid redirect url"})
 			return
 		}
 
@@ -55,7 +55,7 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 		scopes := strings.Split(sessionSplit[3], ",")
 
 		user := models.User{}
-		code := c.Request.FormValue("code")
+		code := ctx.Request.FormValue("code")
 		switch provider {
 		case constants.AuthRecipeMethodGoogle:
 			user, err = processGoogleUserInfo(code)
@@ -74,23 +74,23 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 
 		if err != nil {
 			log.Debug("Failed to process user info: ", err)
-			c.JSON(400, gin.H{"error": err.Error()})
+			ctx.JSON(400, gin.H{"error": err.Error()})
 			return
 		}
 
-		existingUser, err := db.Provider.GetUserByEmail(user.Email)
+		existingUser, err := db.Provider.GetUserByEmail(ctx, user.Email)
 		log := log.WithField("user", user.Email)
 
 		if err != nil {
 			isSignupDisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableSignUp)
 			if err != nil {
 				log.Debug("Failed to get signup disabled env variable: ", err)
-				c.JSON(400, gin.H{"error": err.Error()})
+				ctx.JSON(400, gin.H{"error": err.Error()})
 				return
 			}
 			if isSignupDisabled {
 				log.Debug("Failed to signup as disabled")
-				c.JSON(400, gin.H{"error": "signup is disabled for this instance"})
+				ctx.JSON(400, gin.H{"error": "signup is disabled for this instance"})
 				return
 			}
 			// user not registered, register user and generate session token
@@ -113,19 +113,19 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 
 			if hasProtectedRole {
 				log.Debug("Signup is not allowed with protected roles:", inputRoles)
-				c.JSON(400, gin.H{"error": "invalid role"})
+				ctx.JSON(400, gin.H{"error": "invalid role"})
 				return
 			}
 
 			user.Roles = strings.Join(inputRoles, ",")
 			now := time.Now().Unix()
 			user.EmailVerifiedAt = &now
-			user, _ = db.Provider.AddUser(user)
+			user, _ = db.Provider.AddUser(ctx, user)
 		} else {
 			user = existingUser
 			if user.RevokedTimestamp != nil {
 				log.Debug("User access revoked at: ", user.RevokedTimestamp)
-				c.JSON(400, gin.H{"error": "user access has been revoked"})
+				ctx.JSON(400, gin.H{"error": "user access has been revoked"})
 				return
 			}
 
@@ -175,7 +175,7 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 
 				if hasProtectedRole {
 					log.Debug("Invalid role. User is using protected unassigned role")
-					c.JSON(400, gin.H{"error": "invalid role"})
+					ctx.JSON(400, gin.H{"error": "invalid role"})
 					return
 				} else {
 					user.Roles = existingUser.Roles + "," + strings.Join(unasignedRoles, ",")
@@ -184,18 +184,18 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 				user.Roles = existingUser.Roles
 			}
 
-			user, err = db.Provider.UpdateUser(user)
+			user, err = db.Provider.UpdateUser(ctx, user)
 			if err != nil {
 				log.Debug("Failed to update user: ", err)
-				c.JSON(500, gin.H{"error": err.Error()})
+				ctx.JSON(500, gin.H{"error": err.Error()})
 				return
 			}
 		}
 
-		authToken, err := token.CreateAuthToken(c, user, inputRoles, scopes, provider)
+		authToken, err := token.CreateAuthToken(ctx, user, inputRoles, scopes, provider)
 		if err != nil {
 			log.Debug("Failed to create auth token: ", err)
-			c.JSON(500, gin.H{"error": err.Error()})
+			ctx.JSON(500, gin.H{"error": err.Error()})
 		}
 
 		expiresIn := authToken.AccessToken.ExpiresAt - time.Now().Unix()
@@ -206,7 +206,7 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 		params := "access_token=" + authToken.AccessToken.Token + "&token_type=bearer&expires_in=" + strconv.FormatInt(expiresIn, 10) + "&state=" + stateValue + "&id_token=" + authToken.IDToken.Token
 
 		sessionKey := provider + ":" + user.ID
-		cookie.SetSession(c, authToken.FingerPrintHash)
+		cookie.SetSession(ctx, authToken.FingerPrintHash)
 		memorystore.Provider.SetUserSession(sessionKey, constants.TokenTypeSessionToken+"_"+authToken.FingerPrint, authToken.FingerPrintHash)
 		memorystore.Provider.SetUserSession(sessionKey, constants.TokenTypeAccessToken+"_"+authToken.FingerPrint, authToken.AccessToken.Token)
 
@@ -215,10 +215,10 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 			memorystore.Provider.SetUserSession(sessionKey, constants.TokenTypeRefreshToken+"_"+authToken.FingerPrint, authToken.RefreshToken.Token)
 		}
 
-		go db.Provider.AddSession(models.Session{
+		go db.Provider.AddSession(ctx, models.Session{
 			UserID:    user.ID,
-			UserAgent: utils.GetUserAgent(c.Request),
+			UserAgent: utils.GetUserAgent(ctx.Request),
-			IP:        utils.GetIP(c.Request),
+			IP:        utils.GetIP(ctx.Request),
 		})
 		if strings.Contains(redirectURL, "?") {
 			redirectURL = redirectURL + "&" + params
@@ -226,7 +226,7 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 			redirectURL = redirectURL + "?" + strings.TrimPrefix(params, "&")
 		}
 
-		c.Redirect(http.StatusFound, redirectURL)
+		ctx.Redirect(http.StatusFound, redirectURL)
 	}
 }
 

server/handlers/token.go

@@ -190,7 +190,7 @@ func TokenHandler() gin.HandlerFunc {
 			return
 		}
 
-		user, err := db.Provider.GetUserByID(userID)
+		user, err := db.Provider.GetUserByID(gc, userID)
 		if err != nil {
 			log.Debug("Error getting user: ", err)
 			gc.JSON(http.StatusUnauthorized, gin.H{

server/handlers/userinfo.go

@@ -31,7 +31,7 @@ func UserInfoHandler() gin.HandlerFunc {
 		}
 
 		userID := claims["sub"].(string)
-		user, err := db.Provider.GetUserByID(userID)
+		user, err := db.Provider.GetUserByID(gc, userID)
 		if err != nil {
 			log.Debug("Error getting user: ", err)
 			gc.JSON(http.StatusUnauthorized, gin.H{

server/handlers/verify_email.go

@@ -33,7 +33,7 @@ func VerifyEmailHandler() gin.HandlerFunc {
 			return
 		}
 
-		verificationRequest, err := db.Provider.GetVerificationRequestByToken(tokenInQuery)
+		verificationRequest, err := db.Provider.GetVerificationRequestByToken(c, tokenInQuery)
 		if err != nil {
 			log.Debug("Error getting verification request: ", err)
 			errorRes["error_description"] = err.Error()
@@ -58,7 +58,7 @@ func VerifyEmailHandler() gin.HandlerFunc {
 			return
 		}
 
-		user, err := db.Provider.GetUserByEmail(verificationRequest.Email)
+		user, err := db.Provider.GetUserByEmail(c, verificationRequest.Email)
 		if err != nil {
 			log.Debug("Error getting user: ", err)
 			errorRes["error_description"] = err.Error()
@@ -70,10 +70,10 @@ func VerifyEmailHandler() gin.HandlerFunc {
 		if user.EmailVerifiedAt == nil {
 			now := time.Now().Unix()
 			user.EmailVerifiedAt = &now
-			db.Provider.UpdateUser(user)
+			db.Provider.UpdateUser(c, user)
 		}
 		// delete from verification table
-		db.Provider.DeleteVerificationRequest(verificationRequest)
+		db.Provider.DeleteVerificationRequest(c, verificationRequest)
 
 		state := strings.TrimSpace(c.Query("state"))
 		redirectURL := strings.TrimSpace(c.Query("redirect_uri"))
@@ -131,7 +131,7 @@ func VerifyEmailHandler() gin.HandlerFunc {
 			redirectURL = redirectURL + "?" + strings.TrimPrefix(params, "&")
 		}
 
-		go db.Provider.AddSession(models.Session{
+		go db.Provider.AddSession(c, models.Session{
 			UserID:    user.ID,
 			UserAgent: utils.GetUserAgent(c.Request),
 			IP:        utils.GetIP(c.Request),

server/resolvers/add_webhook.go

@@ -0,0 +1,54 @@
+package resolvers
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/db/models"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/token"
+	"github.com/authorizerdev/authorizer/server/utils"
+	"github.com/authorizerdev/authorizer/server/validators"
+	log "github.com/sirupsen/logrus"
+)
+
+// AddWebhookResolver resolver for add webhook mutation
+func AddWebhookResolver(ctx context.Context, params model.AddWebhookRequest) (*model.Response, error) {
+	gc, err := utils.GinContextFromContext(ctx)
+	if err != nil {
+		log.Debug("Failed to get GinContext: ", err)
+		return nil, err
+	}
+
+	if !token.IsSuperAdmin(gc) {
+		log.Debug("Not logged in as super admin")
+		return nil, fmt.Errorf("unauthorized")
+	}
+
+	if !validators.IsValidWebhookEventName(params.EventName) {
+		log.Debug("Invalid Event Name: ", params.EventName)
+		return nil, fmt.Errorf("invalid event name %s", params.EventName)
+	}
+
+	headerBytes, err := json.Marshal(params.Headers)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = db.Provider.AddWebhook(ctx, models.Webhook{
+		EventName: params.EventName,
+		EndPoint:  params.Endpoint,
+		Enabled:   params.Enabled,
+		Headers:   string(headerBytes),
+	})
+	if err != nil {
+		log.Debug("Failed to add webhook: ", err)
+		return nil, err
+	}
+
+	return &model.Response{
+		Message: `Webhook added successfully`,
+	}, nil
+}

server/resolvers/admin_signup.go

@@ -58,7 +58,7 @@ func AdminSignupResolver(ctx context.Context, params model.AdminSignupInput) (*m
 		return res, err
 	}
 
-	env, err := db.Provider.GetEnv()
+	env, err := db.Provider.GetEnv(ctx)
 	if err != nil {
 		log.Debug("Failed to get env: ", err)
 		return res, err
@@ -71,7 +71,7 @@ func AdminSignupResolver(ctx context.Context, params model.AdminSignupInput) (*m
 	}
 
 	env.EnvData = envData
-	if _, err := db.Provider.UpdateEnv(env); err != nil {
+	if _, err := db.Provider.UpdateEnv(ctx, env); err != nil {
 		log.Debug("Failed to update env: ", err)
 		return res, err
 	}

server/resolvers/delete_user.go

@@ -32,7 +32,7 @@ func DeleteUserResolver(ctx context.Context, params model.DeleteUserInput) (*mod
 		"email": params.Email,
 	})
 
-	user, err := db.Provider.GetUserByEmail(params.Email)
+	user, err := db.Provider.GetUserByEmail(ctx, params.Email)
 	if err != nil {
 		log.Debug("Failed to get user from DB: ", err)
 		return res, err
@@ -40,7 +40,7 @@ func DeleteUserResolver(ctx context.Context, params model.DeleteUserInput) (*mod
 
 	go memorystore.Provider.DeleteAllUserSessions(user.ID)
 
-	err = db.Provider.DeleteUser(user)
+	err = db.Provider.DeleteUser(ctx, user)
 	if err != nil {
 		log.Debug("Failed to delete user: ", err)
 		return res, err

server/resolvers/delete_webhook.go

@@ -0,0 +1,47 @@
+package resolvers
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/token"
+	"github.com/authorizerdev/authorizer/server/utils"
+	log "github.com/sirupsen/logrus"
+)
+
+// DeleteWebhookResolver resolver to delete webhook and its relevant logs
+func DeleteWebhookResolver(ctx context.Context, params model.WebhookRequest) (*model.Response, error) {
+	gc, err := utils.GinContextFromContext(ctx)
+	if err != nil {
+		log.Debug("Failed to get GinContext: ", err)
+		return nil, err
+	}
+
+	if !token.IsSuperAdmin(gc) {
+		log.Debug("Not logged in as super admin")
+		return nil, fmt.Errorf("unauthorized")
+	}
+
+	if params.ID == "" {
+		log.Debug("webhookID is required")
+		return nil, fmt.Errorf("webhook ID required")
+	}
+
+	log := log.WithField("webhook_id", params.ID)
+
+	webhook, err := db.Provider.GetWebhookByID(ctx, params.ID)
+	if err != nil {
+		log.Debug("failed to get webhook: ", err)
+		return nil, err
+	}
+
+	err = db.Provider.DeleteWebhook(ctx, webhook)
+	if err != nil {
+		log.Debug("failed to delete webhook: ", err)
+		return nil, err
+	}
+
+	panic(fmt.Errorf("not implemented"))
+}

server/resolvers/enable_access.go

@@ -31,7 +31,7 @@ func EnableAccessResolver(ctx context.Context, params model.UpdateAccessInput) (
 		"user_id": params.UserID,
 	})
 
-	user, err := db.Provider.GetUserByID(params.UserID)
+	user, err := db.Provider.GetUserByID(ctx, params.UserID)
 	if err != nil {
 		log.Debug("Failed to get user from DB: ", err)
 		return res, err
@@ -39,7 +39,7 @@ func EnableAccessResolver(ctx context.Context, params model.UpdateAccessInput) (
 
 	user.RevokedTimestamp = nil
 
-	user, err = db.Provider.UpdateUser(user)
+	user, err = db.Provider.UpdateUser(ctx, user)
 	if err != nil {
 		log.Debug("Failed to update user: ", err)
 		return res, err

server/resolvers/forgot_password.go

@@ -49,7 +49,7 @@ func ForgotPasswordResolver(ctx context.Context, params model.ForgotPasswordInpu
 	log := log.WithFields(log.Fields{
 		"email": params.Email,
 	})
-	_, err = db.Provider.GetUserByEmail(params.Email)
+	_, err = db.Provider.GetUserByEmail(ctx, params.Email)
 	if err != nil {
 		log.Debug("User not found: ", err)
 		return res, fmt.Errorf(`user with this email not found`)
@@ -71,7 +71,7 @@ func ForgotPasswordResolver(ctx context.Context, params model.ForgotPasswordInpu
 		log.Debug("Failed to create verification token", err)
 		return res, err
 	}
-	_, err = db.Provider.AddVerificationRequest(models.VerificationRequest{
+	_, err = db.Provider.AddVerificationRequest(ctx, models.VerificationRequest{
 		Token:       verificationToken,
 		Identifier:  constants.VerificationTypeForgotPassword,
 		ExpiresAt:   time.Now().Add(time.Minute * 30).Unix(),

server/resolvers/invite_members.go

@@ -70,7 +70,7 @@ func InviteMembersResolver(ctx context.Context, params model.InviteMemberInput)
 	// for each emails check if emails exists in db
 	newEmails := []string{}
 	for _, email := range emails {
-		_, err := db.Provider.GetUserByEmail(email)
+		_, err := db.Provider.GetUserByEmail(ctx, email)
 		if err != nil {
 			log.Debugf("User with %s email not found, so inviting user", email)
 			newEmails = append(newEmails, email)
@@ -140,13 +140,13 @@ func InviteMembersResolver(ctx context.Context, params model.InviteMemberInput)
 
 		}
 
-		user, err = db.Provider.AddUser(user)
+		user, err = db.Provider.AddUser(ctx, user)
 		if err != nil {
 			log.Debugf("Error adding user: %s, err: %v", email, err)
 			return nil, err
 		}
 
-		_, err = db.Provider.AddVerificationRequest(verificationRequest)
+		_, err = db.Provider.AddVerificationRequest(ctx, verificationRequest)
 		if err != nil {
 			log.Debugf("Error adding verification request: %s, err: %v", email, err)
 			return nil, err

server/resolvers/login.go

@@ -45,7 +45,7 @@ func LoginResolver(ctx context.Context, params model.LoginInput) (*model.AuthRes
 		"email": params.Email,
 	})
 	params.Email = strings.ToLower(params.Email)
-	user, err := db.Provider.GetUserByEmail(params.Email)
+	user, err := db.Provider.GetUserByEmail(ctx, params.Email)
 	if err != nil {
 		log.Debug("Failed to get user by email: ", err)
 		return res, fmt.Errorf(`user with this email not found`)
@@ -126,7 +126,7 @@ func LoginResolver(ctx context.Context, params model.LoginInput) (*model.AuthRes
 		memorystore.Provider.SetUserSession(sessionStoreKey, constants.TokenTypeRefreshToken+"_"+authToken.FingerPrint, authToken.RefreshToken.Token)
 	}
 
-	go db.Provider.AddSession(models.Session{
+	go db.Provider.AddSession(ctx, models.Session{
 		UserID:    user.ID,
 		UserAgent: utils.GetUserAgent(gc.Request),
 		IP:        utils.GetIP(gc.Request),

server/resolvers/magic_link_login.go

@@ -59,7 +59,7 @@ func MagicLinkLoginResolver(ctx context.Context, params model.MagicLinkLoginInpu
 	}
 
 	// find user with email
-	existingUser, err := db.Provider.GetUserByEmail(params.Email)
+	existingUser, err := db.Provider.GetUserByEmail(ctx, params.Email)
 	if err != nil {
 		isSignupDisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableSignUp)
 		if err != nil {
@@ -99,7 +99,7 @@ func MagicLinkLoginResolver(ctx context.Context, params model.MagicLinkLoginInpu
 		}
 
 		user.Roles = strings.Join(inputRoles, ",")
-		user, _ = db.Provider.AddUser(user)
+		user, _ = db.Provider.AddUser(ctx, user)
 	} else {
 		user = existingUser
 		// There multiple scenarios with roles here in magic link login
@@ -163,7 +163,7 @@ func MagicLinkLoginResolver(ctx context.Context, params model.MagicLinkLoginInpu
 		}
 
 		user.SignupMethods = signupMethod
-		user, _ = db.Provider.UpdateUser(user)
+		user, _ = db.Provider.UpdateUser(ctx, user)
 		if err != nil {
 			log.Debug("Failed to update user: ", err)
 		}
@@ -205,7 +205,7 @@ func MagicLinkLoginResolver(ctx context.Context, params model.MagicLinkLoginInpu
 		if err != nil {
 			log.Debug("Failed to create verification token: ", err)
 		}
-		_, err = db.Provider.AddVerificationRequest(models.VerificationRequest{
+		_, err = db.Provider.AddVerificationRequest(ctx, models.VerificationRequest{
 			Token:       verificationToken,
 			Identifier:  verificationType,
 			ExpiresAt:   time.Now().Add(time.Minute * 30).Unix(),

server/resolvers/profile.go

@@ -38,7 +38,7 @@ func ProfileResolver(ctx context.Context) (*model.User, error) {
 	log := log.WithFields(log.Fields{
 		"user_id": userID,
 	})
-	user, err := db.Provider.GetUserByID(userID)
+	user, err := db.Provider.GetUserByID(ctx, userID)
 	if err != nil {
 		log.Debug("Failed to get user: ", err)
 		return res, err

server/resolvers/resend_verify_email.go

@@ -39,14 +39,14 @@ func ResendVerifyEmailResolver(ctx context.Context, params model.ResendVerifyEma
 		return res, fmt.Errorf("invalid identifier")
 	}
 
-	verificationRequest, err := db.Provider.GetVerificationRequestByEmail(params.Email, params.Identifier)
+	verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, params.Email, params.Identifier)
 	if err != nil {
 		log.Debug("Failed to get verification request: ", err)
 		return res, fmt.Errorf(`verification request not found`)
 	}
 
 	// delete current verification and create new one
-	err = db.Provider.DeleteVerificationRequest(verificationRequest)
+	err = db.Provider.DeleteVerificationRequest(ctx, verificationRequest)
 	if err != nil {
 		log.Debug("Failed to delete verification request: ", err)
 	}
@@ -62,7 +62,7 @@ func ResendVerifyEmailResolver(ctx context.Context, params model.ResendVerifyEma
 	if err != nil {
 		log.Debug("Failed to create verification token: ", err)
 	}
-	_, err = db.Provider.AddVerificationRequest(models.VerificationRequest{
+	_, err = db.Provider.AddVerificationRequest(ctx, models.VerificationRequest{
 		Token:       verificationToken,
 		Identifier:  params.Identifier,
 		ExpiresAt:   time.Now().Add(time.Minute * 30).Unix(),

server/resolvers/reset_password.go

@@ -39,7 +39,7 @@ func ResetPasswordResolver(ctx context.Context, params model.ResetPasswordInput)
 		return res, fmt.Errorf(`basic authentication is disabled for this instance`)
 	}
 
-	verificationRequest, err := db.Provider.GetVerificationRequestByToken(params.Token)
+	verificationRequest, err := db.Provider.GetVerificationRequestByToken(ctx, params.Token)
 	if err != nil {
 		log.Debug("Failed to get verification request: ", err)
 		return res, fmt.Errorf(`invalid token`)
@@ -72,7 +72,7 @@ func ResetPasswordResolver(ctx context.Context, params model.ResetPasswordInput)
 	log := log.WithFields(log.Fields{
 		"email": email,
 	})
-	user, err := db.Provider.GetUserByEmail(email)
+	user, err := db.Provider.GetUserByEmail(ctx, email)
 	if err != nil {
 		log.Debug("Failed to get user: ", err)
 		return res, err
@@ -94,13 +94,13 @@ func ResetPasswordResolver(ctx context.Context, params model.ResetPasswordInput)
 	}
 
 	// delete from verification table
-	err = db.Provider.DeleteVerificationRequest(verificationRequest)
+	err = db.Provider.DeleteVerificationRequest(ctx, verificationRequest)
 	if err != nil {
 		log.Debug("Failed to delete verification request: ", err)
 		return res, err
 	}
 
-	_, err = db.Provider.UpdateUser(user)
+	_, err = db.Provider.UpdateUser(ctx, user)
 	if err != nil {
 		log.Debug("Failed to update user: ", err)
 		return res, err

server/resolvers/revoke_access.go

@@ -32,7 +32,7 @@ func RevokeAccessResolver(ctx context.Context, params model.UpdateAccessInput) (
 	log := log.WithFields(log.Fields{
 		"user_id": params.UserID,
 	})
-	user, err := db.Provider.GetUserByID(params.UserID)
+	user, err := db.Provider.GetUserByID(ctx, params.UserID)
 	if err != nil {
 		log.Debug("Failed to get user by ID: ", err)
 		return res, err
@@ -41,7 +41,7 @@ func RevokeAccessResolver(ctx context.Context, params model.UpdateAccessInput) (
 	now := time.Now().Unix()
 	user.RevokedTimestamp = &now
 
-	user, err = db.Provider.UpdateUser(user)
+	user, err = db.Provider.UpdateUser(ctx, user)
 	if err != nil {
 		log.Debug("Failed to update user: ", err)
 		return res, err

server/resolvers/session.go

@@ -46,7 +46,7 @@ func SessionResolver(ctx context.Context, params *model.SessionQueryInput) (*mod
 		"user_id": userID,
 	})
 
-	user, err := db.Provider.GetUserByID(userID)
+	user, err := db.Provider.GetUserByID(ctx, userID)
 	if err != nil {
 		return res, err
 	}

server/resolvers/signup.go

@@ -74,7 +74,7 @@ func SignupResolver(ctx context.Context, params model.SignUpInput) (*model.AuthR
 		"email": params.Email,
 	})
 	// find user with email
-	existingUser, err := db.Provider.GetUserByEmail(params.Email)
+	existingUser, err := db.Provider.GetUserByEmail(ctx, params.Email)
 	if err != nil {
 		log.Debug("Failed to get user by email: ", err)
 	}
@@ -167,7 +167,7 @@ func SignupResolver(ctx context.Context, params model.SignUpInput) (*model.AuthR
 		now := time.Now().Unix()
 		user.EmailVerifiedAt = &now
 	}
-	user, err = db.Provider.AddUser(user)
+	user, err = db.Provider.AddUser(ctx, user)
 	if err != nil {
 		log.Debug("Failed to add user: ", err)
 		return res, err
@@ -193,7 +193,7 @@ func SignupResolver(ctx context.Context, params model.SignUpInput) (*model.AuthR
 			log.Debug("Failed to create verification token: ", err)
 			return res, err
 		}
-		_, err = db.Provider.AddVerificationRequest(models.VerificationRequest{
+		_, err = db.Provider.AddVerificationRequest(ctx, models.VerificationRequest{
 			Token:       verificationToken,
 			Identifier:  verificationType,
 			ExpiresAt:   time.Now().Add(time.Minute * 30).Unix(),
@@ -225,7 +225,7 @@ func SignupResolver(ctx context.Context, params model.SignUpInput) (*model.AuthR
 			return res, err
 		}
 
-		go db.Provider.AddSession(models.Session{
+		go db.Provider.AddSession(ctx, models.Session{
 			UserID:    user.ID,
 			UserAgent: utils.GetUserAgent(gc.Request),
 			IP:        utils.GetIP(gc.Request),

server/resolvers/test_endpoint.go

@@ -0,0 +1,109 @@
+package resolvers
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"time"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/token"
+	"github.com/authorizerdev/authorizer/server/utils"
+	"github.com/authorizerdev/authorizer/server/validators"
+	"github.com/google/uuid"
+	log "github.com/sirupsen/logrus"
+)
+
+// TestEndpointResolver resolver to test webhook endpoints
+func TestEndpointResolver(ctx context.Context, params model.TestEndpointRequest) (*model.TestEndpointResponse, error) {
+	gc, err := utils.GinContextFromContext(ctx)
+	if err != nil {
+		log.Debug("Failed to get GinContext: ", err)
+		return nil, err
+	}
+
+	if !token.IsSuperAdmin(gc) {
+		log.Debug("Not logged in as super admin")
+		return nil, fmt.Errorf("unauthorized")
+	}
+
+	if !validators.IsValidWebhookEventName(params.EventName) {
+		log.Debug("Invalid event name: ", params.EventName)
+		return nil, fmt.Errorf("invalid event_name %s", params.EventName)
+	}
+
+	user := model.User{
+		ID:            uuid.NewString(),
+		Email:         "test_endpoint@foo.com",
+		EmailVerified: true,
+		SignupMethods: constants.AuthRecipeMethodMagicLinkLogin,
+		GivenName:     utils.NewStringRef("Foo"),
+		FamilyName:    utils.NewStringRef("Bar"),
+	}
+
+	userBytes, err := json.Marshal(user)
+	if err != nil {
+		log.Debug("error marshalling user obj: ", err)
+		return nil, err
+	}
+	userMap := map[string]interface{}{}
+	err = json.Unmarshal(userBytes, &userMap)
+	if err != nil {
+		log.Debug("error un-marshalling user obj: ", err)
+		return nil, err
+	}
+
+	reqBody := map[string]interface{}{
+		"event_name": constants.UserLoginWebhookEvent,
+		"user":       userMap,
+	}
+
+	if params.EventName == constants.UserLoginWebhookEvent {
+		reqBody["login_method"] = constants.AuthRecipeMethodMagicLinkLogin
+	}
+
+	requestBody, err := json.Marshal(reqBody)
+	if err != nil {
+		log.Debug("error marshalling requestBody obj: ", err)
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", params.Endpoint, bytes.NewBuffer(requestBody))
+	if err != nil {
+		log.Debug("error creating post request: ", err)
+		return nil, err
+	}
+	req.Header.Set("Content-Type", "application/json")
+	for key, val := range params.Headers {
+		req.Header.Set(key, val.(string))
+	}
+	client := &http.Client{Timeout: time.Second * 30}
+	resp, err := client.Do(req)
+	if err != nil {
+		log.Debug("error making request: ", err)
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		log.Debug("error reading response: ", err)
+		return nil, err
+	}
+
+	response := map[string]interface{}{}
+	if err := json.Unmarshal(body, &response); err != nil {
+		log.Debug("error un-marshalling response: ", err)
+		return nil, err
+	}
+
+	statusCode := int64(resp.StatusCode)
+	return &model.TestEndpointResponse{
+		HTTPStatus: &statusCode,
+		Response:   response,
+	}, nil
+}

server/resolvers/update_env.go

@@ -287,7 +287,7 @@ func UpdateEnvResolver(ctx context.Context, params model.UpdateEnvInput) (*model
 	}
 
 	// Fetch the current db store and update it
-	env, err := db.Provider.GetEnv()
+	env, err := db.Provider.GetEnv(ctx)
 	if err != nil {
 		log.Debug("Failed to get env: ", err)
 		return res, err
@@ -314,7 +314,7 @@ func UpdateEnvResolver(ctx context.Context, params model.UpdateEnvInput) (*model
 	}
 
 	env.EnvData = encryptedConfig
-	_, err = db.Provider.UpdateEnv(env)
+	_, err = db.Provider.UpdateEnv(ctx, env)
 	if err != nil {
 		log.Debug("Failed to update env: ", err)
 		return res, err

server/resolvers/update_profile.go

@@ -55,7 +55,7 @@ func UpdateProfileResolver(ctx context.Context, params model.UpdateProfileInput)
 		"user_id": userID,
 	})
 
-	user, err := db.Provider.GetUserByID(userID)
+	user, err := db.Provider.GetUserByID(ctx, userID)
 	if err != nil {
 		log.Debug("Failed to get user by id: ", err)
 		return res, err
@@ -135,7 +135,7 @@ func UpdateProfileResolver(ctx context.Context, params model.UpdateProfileInput)
 			return res, fmt.Errorf("invalid new email address")
 		}
 		// check if user with new email exists
-		_, err := db.Provider.GetUserByEmail(newEmail)
+		_, err := db.Provider.GetUserByEmail(ctx, newEmail)
 		// err = nil means user exists
 		if err == nil {
 			log.Debug("Failed to get user by email: ", newEmail)
@@ -168,7 +168,7 @@ func UpdateProfileResolver(ctx context.Context, params model.UpdateProfileInput)
 				log.Debug("Failed to create verification token: ", err)
 				return res, err
 			}
-			_, err = db.Provider.AddVerificationRequest(models.VerificationRequest{
+			_, err = db.Provider.AddVerificationRequest(ctx, models.VerificationRequest{
 				Token:       verificationToken,
 				Identifier:  verificationType,
 				ExpiresAt:   time.Now().Add(time.Minute * 30).Unix(),
@@ -186,7 +186,7 @@ func UpdateProfileResolver(ctx context.Context, params model.UpdateProfileInput)
 
 		}
 	}
-	_, err = db.Provider.UpdateUser(user)
+	_, err = db.Provider.UpdateUser(ctx, user)
 	if err != nil {
 		log.Debug("Failed to update user: ", err)
 		return res, err

server/resolvers/update_user.go

@@ -50,7 +50,7 @@ func UpdateUserResolver(ctx context.Context, params model.UpdateUserInput) (*mod
 		return res, fmt.Errorf("please enter atleast one param to update")
 	}
 
-	user, err := db.Provider.GetUserByID(params.ID)
+	user, err := db.Provider.GetUserByID(ctx, params.ID)
 	if err != nil {
 		log.Debug("Failed to get user by id: ", err)
 		return res, fmt.Errorf(`User not found`)
@@ -105,7 +105,7 @@ func UpdateUserResolver(ctx context.Context, params model.UpdateUserInput) (*mod
 		}
 		newEmail := strings.ToLower(*params.Email)
 		// check if user with new email exists
-		_, err = db.Provider.GetUserByEmail(newEmail)
+		_, err = db.Provider.GetUserByEmail(ctx, newEmail)
 		// err = nil means user exists
 		if err == nil {
 			log.Debug("User with email already exists: ", newEmail)
@@ -130,7 +130,7 @@ func UpdateUserResolver(ctx context.Context, params model.UpdateUserInput) (*mod
 		if err != nil {
 			log.Debug("Failed to create verification token: ", err)
 		}
-		_, err = db.Provider.AddVerificationRequest(models.VerificationRequest{
+		_, err = db.Provider.AddVerificationRequest(ctx, models.VerificationRequest{
 			Token:       verificationToken,
 			Identifier:  verificationType,
 			ExpiresAt:   time.Now().Add(time.Minute * 30).Unix(),
@@ -189,7 +189,7 @@ func UpdateUserResolver(ctx context.Context, params model.UpdateUserInput) (*mod
 		user.Roles = rolesToSave
 	}
 
-	user, err = db.Provider.UpdateUser(user)
+	user, err = db.Provider.UpdateUser(ctx, user)
 	if err != nil {
 		log.Debug("Failed to update user: ", err)
 		return res, err

server/resolvers/update_webhook.go

@@ -0,0 +1,91 @@
+package resolvers
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/db/models"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/token"
+	"github.com/authorizerdev/authorizer/server/utils"
+	"github.com/authorizerdev/authorizer/server/validators"
+	log "github.com/sirupsen/logrus"
+)
+
+// UpdateWebhookResolver resolver for update webhook mutation
+func UpdateWebhookResolver(ctx context.Context, params model.UpdateWebhookRequest) (*model.Response, error) {
+	gc, err := utils.GinContextFromContext(ctx)
+	if err != nil {
+		log.Debug("Failed to get GinContext: ", err)
+		return nil, err
+	}
+
+	if !token.IsSuperAdmin(gc) {
+		log.Debug("Not logged in as super admin")
+		return nil, fmt.Errorf("unauthorized")
+	}
+
+	webhook, err := db.Provider.GetWebhookByID(ctx, params.ID)
+	if err != nil {
+		log.Debug("failed to get webhook: ", err)
+		return nil, err
+	}
+
+	headersString := ""
+	if webhook.Headers != nil {
+		headerBytes, err := json.Marshal(webhook.Headers)
+		if err != nil {
+			log.Debug("failed to marshall source headers: ", err)
+		}
+		headersString = string(headerBytes)
+	}
+
+	webhookDetails := models.Webhook{
+		ID:        webhook.ID,
+		Key:       webhook.ID,
+		EventName: utils.StringValue(webhook.EventName),
+		EndPoint:  utils.StringValue(webhook.Endpoint),
+		Enabled:   utils.BoolValue(webhook.Enabled),
+		Headers:   headersString,
+	}
+	if webhookDetails.EventName != utils.StringValue(params.EventName) {
+		if isValid := validators.IsValidWebhookEventName(utils.StringValue(params.EventName)); !isValid {
+			log.Debug("invalid event name: ", utils.StringValue(params.EventName))
+			return nil, fmt.Errorf("invalid event name %s", utils.StringValue(params.EventName))
+		}
+		webhookDetails.EventName = utils.StringValue(params.EventName)
+	}
+
+	if webhookDetails.EndPoint != utils.StringValue(params.Endpoint) {
+		webhookDetails.EventName = utils.StringValue(params.EventName)
+	}
+
+	if webhookDetails.Enabled != utils.BoolValue(params.Enabled) {
+		webhookDetails.Enabled = utils.BoolValue(params.Enabled)
+	}
+
+	if params.Headers != nil {
+		for key, val := range params.Headers {
+			webhook.Headers[key] = val
+		}
+
+		headerBytes, err := json.Marshal(webhook.Headers)
+		if err != nil {
+			log.Debug("failed to marshall headers: ", err)
+			return nil, err
+		}
+
+		webhookDetails.Headers = string(headerBytes)
+	}
+
+	_, err = db.Provider.UpdateWebhook(ctx, webhookDetails)
+	if err != nil {
+		return nil, err
+	}
+
+	return &model.Response{
+		Message: `Webhook updated successfully.`,
+	}, nil
+}

server/resolvers/users.go

@@ -28,7 +28,7 @@ func UsersResolver(ctx context.Context, params *model.PaginatedInput) (*model.Us
 
 	pagination := utils.GetPagination(params)
 
-	res, err := db.Provider.ListUsers(pagination)
+	res, err := db.Provider.ListUsers(ctx, pagination)
 	if err != nil {
 		log.Debug("Failed to get users: ", err)
 		return nil, err

server/resolvers/verification_requests.go

@@ -28,7 +28,7 @@ func VerificationRequestsResolver(ctx context.Context, params *model.PaginatedIn
 
 	pagination := utils.GetPagination(params)
 
-	res, err := db.Provider.ListVerificationRequests(pagination)
+	res, err := db.Provider.ListVerificationRequests(ctx, pagination)
 	if err != nil {
 		log.Debug("Failed to get verification requests: ", err)
 		return nil, err

server/resolvers/verify_email.go

@@ -29,7 +29,7 @@ func VerifyEmailResolver(ctx context.Context, params model.VerifyEmailInput) (*m
 		return res, err
 	}
 
-	verificationRequest, err := db.Provider.GetVerificationRequestByToken(params.Token)
+	verificationRequest, err := db.Provider.GetVerificationRequestByToken(ctx, params.Token)
 	if err != nil {
 		log.Debug("Failed to get verification request by token: ", err)
 		return res, fmt.Errorf(`invalid token: %s`, err.Error())
@@ -52,7 +52,7 @@ func VerifyEmailResolver(ctx context.Context, params model.VerifyEmailInput) (*m
 	log := log.WithFields(log.Fields{
 		"email": email,
 	})
-	user, err := db.Provider.GetUserByEmail(email)
+	user, err := db.Provider.GetUserByEmail(ctx, email)
 	if err != nil {
 		log.Debug("Failed to get user by email: ", err)
 		return res, err
@@ -61,13 +61,13 @@ func VerifyEmailResolver(ctx context.Context, params model.VerifyEmailInput) (*m
 	// update email_verified_at in users table
 	now := time.Now().Unix()
 	user.EmailVerifiedAt = &now
-	user, err = db.Provider.UpdateUser(user)
+	user, err = db.Provider.UpdateUser(ctx, user)
 	if err != nil {
 		log.Debug("Failed to update user: ", err)
 		return res, err
 	}
 	// delete from verification table
-	err = db.Provider.DeleteVerificationRequest(verificationRequest)
+	err = db.Provider.DeleteVerificationRequest(gc, verificationRequest)
 	if err != nil {
 		log.Debug("Failed to delete verification request: ", err)
 		return res, err
@@ -86,7 +86,7 @@ func VerifyEmailResolver(ctx context.Context, params model.VerifyEmailInput) (*m
 		return res, err
 	}
 
-	go db.Provider.AddSession(models.Session{
+	go db.Provider.AddSession(ctx, models.Session{
 		UserID:    user.ID,
 		UserAgent: utils.GetUserAgent(gc.Request),
 		IP:        utils.GetIP(gc.Request),

server/resolvers/webhook.go

@@ -0,0 +1,33 @@
+package resolvers
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/token"
+	"github.com/authorizerdev/authorizer/server/utils"
+	log "github.com/sirupsen/logrus"
+)
+
+// WebhookResolver resolver for getting webhook by identifier
+func WebhookResolver(ctx context.Context, params model.WebhookRequest) (*model.Webhook, error) {
+	gc, err := utils.GinContextFromContext(ctx)
+	if err != nil {
+		log.Debug("Failed to get GinContext: ", err)
+		return nil, err
+	}
+
+	if !token.IsSuperAdmin(gc) {
+		log.Debug("Not logged in as super admin")
+		return nil, fmt.Errorf("unauthorized")
+	}
+
+	webhook, err := db.Provider.GetWebhookByID(ctx, params.ID)
+	if err != nil {
+		log.Debug("error getting webhook: ", err)
+		return nil, err
+	}
+	return webhook, nil
+}

server/resolvers/webhook_logs.go

@@ -0,0 +1,35 @@
+package resolvers
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/token"
+	"github.com/authorizerdev/authorizer/server/utils"
+	log "github.com/sirupsen/logrus"
+)
+
+// WebhookLogsResolver resolver for getting the list of webhook_logs based on pagination & webhook identifier
+func WebhookLogsResolver(ctx context.Context, params model.ListWebhookLogRequest) (*model.WebhookLogs, error) {
+	gc, err := utils.GinContextFromContext(ctx)
+	if err != nil {
+		log.Debug("Failed to get GinContext: ", err)
+		return nil, err
+	}
+
+	if !token.IsSuperAdmin(gc) {
+		log.Debug("Not logged in as super admin")
+		return nil, fmt.Errorf("unauthorized")
+	}
+
+	pagination := utils.GetPagination(params.Pagination)
+
+	webhookLogs, err := db.Provider.ListWebhookLogs(ctx, pagination, utils.StringValue(params.WebhookID))
+	if err != nil {
+		log.Debug("failed to get webhook logs: ", err)
+		return nil, err
+	}
+	return webhookLogs, nil
+}

server/resolvers/webhooks.go

@@ -0,0 +1,35 @@
+package resolvers
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/token"
+	"github.com/authorizerdev/authorizer/server/utils"
+	log "github.com/sirupsen/logrus"
+)
+
+// WebhooksResolver resolver for getting the list of webhooks based on pagination
+func WebhooksResolver(ctx context.Context, params *model.PaginatedInput) (*model.Webhooks, error) {
+	gc, err := utils.GinContextFromContext(ctx)
+	if err != nil {
+		log.Debug("Failed to get GinContext: ", err)
+		return nil, err
+	}
+
+	if !token.IsSuperAdmin(gc) {
+		log.Debug("Not logged in as super admin")
+		return nil, fmt.Errorf("unauthorized")
+	}
+
+	pagination := utils.GetPagination(params)
+
+	webhooks, err := db.Provider.ListWebhook(ctx, pagination)
+	if err != nil {
+		log.Debug("failed to get webhook logs: ", err)
+		return nil, err
+	}
+	return webhooks, nil
+}

server/test/enable_access_test.go

@@ -22,7 +22,7 @@ func enableAccessTest(t *testing.T, s TestSetup) {
 			Email: email,
 		})
 		assert.NoError(t, err)
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeMagicLinkLogin)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeMagicLinkLogin)
 		verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
 			Token: verificationRequest.Token,
 		})

server/test/forgot_password_test.go

@@ -26,7 +26,7 @@ func forgotPasswordTest(t *testing.T, s TestSetup) {
 		})
 		assert.Nil(t, err, "no errors for forgot password")
 
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeForgotPassword)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeForgotPassword)
 		assert.Nil(t, err)
 
 		assert.Equal(t, verificationRequest.Identifier, constants.VerificationTypeForgotPassword)

server/test/login_test.go

@@ -29,7 +29,7 @@ func loginTests(t *testing.T, s TestSetup) {
 
 		assert.NotNil(t, err, "should fail because email is not verified")
 		assert.Nil(t, res)
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeBasicAuthSignup)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeBasicAuthSignup)
 		n, err := utils.EncryptNonce(verificationRequest.Nonce)
 		assert.NoError(t, err)
 		assert.NotEmpty(t, n)

server/test/logout_test.go

@@ -24,7 +24,7 @@ func logoutTests(t *testing.T, s TestSetup) {
 			Email: email,
 		})
 
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeMagicLinkLogin)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeMagicLinkLogin)
 		verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
 			Token: verificationRequest.Token,
 		})

server/test/magic_link_login_test.go

@@ -29,7 +29,7 @@ func magicLinkLoginTests(t *testing.T, s TestSetup) {
 		})
 		assert.Nil(t, err, "signup should be successful")
 
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeMagicLinkLogin)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeMagicLinkLogin)
 		verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
 			Token: verificationRequest.Token,
 		})

server/test/profile_test.go

@@ -26,7 +26,7 @@ func profileTests(t *testing.T, s TestSetup) {
 		_, err := resolvers.ProfileResolver(ctx)
 		assert.NotNil(t, err, "unauthorized")
 
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeBasicAuthSignup)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeBasicAuthSignup)
 		verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
 			Token: verificationRequest.Token,
 		})

server/test/reset_password_test.go

@@ -26,7 +26,7 @@ func resetPasswordTest(t *testing.T, s TestSetup) {
 		})
 		assert.Nil(t, err, "no errors for forgot password")
 
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeForgotPassword)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeForgotPassword)
 		assert.Nil(t, err, "should get forgot password request")
 
 		_, err = resolvers.ResetPasswordResolver(ctx, model.ResetPasswordInput{

server/test/resolvers_test.go

@@ -1,6 +1,7 @@
 package test
 
 import (
+	"context"
 	"testing"
 
 	"github.com/authorizerdev/authorizer/server/constants"
@@ -20,6 +21,7 @@ func TestResolvers(t *testing.T) {
 	for dbType, dbURL := range databases {
 		s := testSetup()
 		defer s.Server.Close()
+		ctx := context.Background()
 
 		memorystore.Provider.UpdateEnvVariable(constants.EnvKeyDatabaseURL, dbURL)
 		memorystore.Provider.UpdateEnvVariable(constants.EnvKeyDatabaseType, dbType)
@@ -29,10 +31,10 @@ func TestResolvers(t *testing.T) {
 		}
 
 		// clean the persisted config for test to use fresh config
-		envData, err := db.Provider.GetEnv()
+		envData, err := db.Provider.GetEnv(ctx)
 		if err == nil {
 			envData.EnvData = ""
-			db.Provider.UpdateEnv(envData)
+			db.Provider.UpdateEnv(ctx, envData)
 		}
 		env.PersistEnv()
 

server/test/revoke_access_test.go

@@ -22,7 +22,7 @@ func revokeAccessTest(t *testing.T, s TestSetup) {
 			Email: email,
 		})
 		assert.NoError(t, err)
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeMagicLinkLogin)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeMagicLinkLogin)
 		verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
 			Token: verificationRequest.Token,
 		})

server/test/session_test.go

@@ -29,7 +29,7 @@ func sessionTests(t *testing.T, s TestSetup) {
 		_, err := resolvers.SessionResolver(ctx, &model.SessionQueryInput{})
 		assert.NotNil(t, err, "unauthorized")
 
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeBasicAuthSignup)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeBasicAuthSignup)
 		verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
 			Token: verificationRequest.Token,
 		})

server/test/signup_test.go

@@ -57,7 +57,7 @@ func signupTests(t *testing.T, s TestSetup) {
 
 		assert.NotNil(t, err, "should throw duplicate email error")
 
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeBasicAuthSignup)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeBasicAuthSignup)
 		assert.Nil(t, err)
 		assert.Equal(t, email, verificationRequest.Email)
 		cleanData(email)

server/test/test.go

@@ -33,30 +33,31 @@ type TestSetup struct {
 }
 
 func cleanData(email string) {
-	verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeBasicAuthSignup)
+	ctx := context.Background()
+	verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeBasicAuthSignup)
 	if err == nil {
-		err = db.Provider.DeleteVerificationRequest(verificationRequest)
+		err = db.Provider.DeleteVerificationRequest(ctx, verificationRequest)
 	}
 
-	verificationRequest, err = db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeForgotPassword)
+	verificationRequest, err = db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeForgotPassword)
 	if err == nil {
-		err = db.Provider.DeleteVerificationRequest(verificationRequest)
+		err = db.Provider.DeleteVerificationRequest(ctx, verificationRequest)
 	}
 
-	verificationRequest, err = db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeUpdateEmail)
+	verificationRequest, err = db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeUpdateEmail)
 	if err == nil {
-		err = db.Provider.DeleteVerificationRequest(verificationRequest)
+		err = db.Provider.DeleteVerificationRequest(ctx, verificationRequest)
 	}
 
-	verificationRequest, err = db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeMagicLinkLogin)
+	verificationRequest, err = db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeMagicLinkLogin)
 	if err == nil {
-		err = db.Provider.DeleteVerificationRequest(verificationRequest)
+		err = db.Provider.DeleteVerificationRequest(ctx, verificationRequest)
 	}
 
-	dbUser, err := db.Provider.GetUserByEmail(email)
+	dbUser, err := db.Provider.GetUserByEmail(ctx, email)
 	if err == nil {
-		db.Provider.DeleteUser(dbUser)
+		db.Provider.DeleteUser(ctx, dbUser)
-		db.Provider.DeleteSession(dbUser.ID)
+		db.Provider.DeleteSession(ctx, dbUser.ID)
 	}
 }
 

server/test/update_profile_test.go

@@ -29,7 +29,7 @@ func updateProfileTests(t *testing.T, s TestSetup) {
 		})
 		assert.NotNil(t, err, "unauthorized")
 
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeBasicAuthSignup)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeBasicAuthSignup)
 		verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
 			Token: verificationRequest.Token,
 		})

server/test/verify_email_test.go

@@ -24,7 +24,7 @@ func verifyEmailTest(t *testing.T, s TestSetup) {
 		user := *res.User
 		assert.Equal(t, email, user.Email)
 		assert.Nil(t, res.AccessToken, "access token should be nil")
-		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(email, constants.VerificationTypeBasicAuthSignup)
+		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeBasicAuthSignup)
 		assert.Nil(t, err)
 		assert.Equal(t, email, verificationRequest.Email)
 

server/utils/refs.go

@@ -4,3 +4,27 @@ package utils
 func NewStringRef(v string) *string {
 	return &v
 }
+
+// StringValue returns the value of the given string ref
+func StringValue(r *string, defaultValue ...string) string {
+	if r != nil {
+		return *r
+	}
+	if len(defaultValue) > 0 {
+		return defaultValue[0]
+	}
+	return ""
+}
+
+// NewBoolRef returns a reference to a bool with given value
+func NewBoolRef(v bool) *bool {
+	return &v
+}
+
+// BoolValue returns the value of the given bool ref
+func BoolValue(r *bool) bool {
+	if r != nil {
+		return false
+	}
+	return *r
+}

server/utils/webhook.go

@@ -0,0 +1 @@
+package utils

server/validators/webhook.go

@@ -0,0 +1,12 @@
+package validators
+
+import "github.com/authorizerdev/authorizer/server/constants"
+
+// IsValidWebhookEventName to validate webhook event name
+func IsValidWebhookEventName(eventName string) bool {
+	if eventName != constants.UserCreatedWebhookEvent && eventName != constants.UserLoginWebhookEvent && eventName != constants.UserSignUpWebhookEvent && eventName != constants.UserDeletedWebhookEvent && eventName != constants.UserAccessEnabledWebhookEvent && eventName != constants.UserAccessRevokedWebhookEvent {
+		return false
+	}
+
+	return true
+}