Update provider template for sms verification
This commit is contained in:
parent
9ae616b6b5
commit
6cef9064c3
|
@ -2,14 +2,14 @@ package models
|
||||||
|
|
||||||
// Collections / Tables available for authorizer in the database
|
// Collections / Tables available for authorizer in the database
|
||||||
type CollectionList struct {
|
type CollectionList struct {
|
||||||
User string
|
User string
|
||||||
VerificationRequest string
|
VerificationRequest string
|
||||||
Session string
|
Session string
|
||||||
Env string
|
Env string
|
||||||
Webhook string
|
Webhook string
|
||||||
WebhookLog string
|
WebhookLog string
|
||||||
EmailTemplate string
|
EmailTemplate string
|
||||||
OTP string
|
OTP string
|
||||||
SMSVerificationRequest string
|
SMSVerificationRequest string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,14 +18,14 @@ var (
|
||||||
Prefix = "authorizer_"
|
Prefix = "authorizer_"
|
||||||
// Collections / Tables available for authorizer in the database (used for dbs other than gorm)
|
// Collections / Tables available for authorizer in the database (used for dbs other than gorm)
|
||||||
Collections = CollectionList{
|
Collections = CollectionList{
|
||||||
User: Prefix + "users",
|
User: Prefix + "users",
|
||||||
VerificationRequest: Prefix + "verification_requests",
|
VerificationRequest: Prefix + "verification_requests",
|
||||||
Session: Prefix + "sessions",
|
Session: Prefix + "sessions",
|
||||||
Env: Prefix + "env",
|
Env: Prefix + "env",
|
||||||
Webhook: Prefix + "webhooks",
|
Webhook: Prefix + "webhooks",
|
||||||
WebhookLog: Prefix + "webhook_logs",
|
WebhookLog: Prefix + "webhook_logs",
|
||||||
EmailTemplate: Prefix + "email_templates",
|
EmailTemplate: Prefix + "email_templates",
|
||||||
OTP: Prefix + "otps",
|
OTP: Prefix + "otps",
|
||||||
SMSVerificationRequest: Prefix + "sms_verification_requests",
|
SMSVerificationRequest: Prefix + "sms_verification_requests",
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
@ -2,10 +2,10 @@ package models
|
||||||
|
|
||||||
// SMS verification requests model for database
|
// SMS verification requests model for database
|
||||||
type SMSVerificationRequest struct {
|
type SMSVerificationRequest struct {
|
||||||
ID string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id" dynamo:"id,hash"`
|
ID string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id" dynamo:"id,hash"`
|
||||||
PhoneNumber string `gorm:"unique" json:"phone_number" bson:"phone_number" cql:"phone_number" dynamo:"phone_number" index:"phone_number,hash"`
|
PhoneNumber string `gorm:"unique" json:"phone_number" bson:"phone_number" cql:"phone_number" dynamo:"phone_number" index:"phone_number,hash"`
|
||||||
Code string `json:"code" bson:"code" cql:"code" dynamo:"code"`
|
Code string `json:"code" bson:"code" cql:"code" dynamo:"code"`
|
||||||
CodeExpiresAt int64 `json:"code_expires_at" bson:"code_expires_at" cql:"code_expires_at" dynamo:"code_expires_at"`
|
CodeExpiresAt int64 `json:"code_expires_at" bson:"code_expires_at" cql:"code_expires_at" dynamo:"code_expires_at"`
|
||||||
CreatedAt int64 `json:"created_at" bson:"created_at" cql:"created_at" dynamo:"created_at"`
|
CreatedAt int64 `json:"created_at" bson:"created_at" cql:"created_at" dynamo:"created_at"`
|
||||||
UpdatedAt int64 `json:"updated_at" bson:"updated_at" cql:"updated_at" dynamo:"updated_at"`
|
UpdatedAt int64 `json:"updated_at" bson:"updated_at" cql:"updated_at" dynamo:"updated_at"`
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,20 +4,19 @@ import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/authorizerdev/authorizer/server/db/models"
|
"github.com/authorizerdev/authorizer/server/db/models"
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// SMS verification Request
|
// UpsertSMSRequest adds/updates SMS verification request
|
||||||
func (p *provider) UpsertSMSRequest(ctx context.Context, sms_code *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
func (p *provider) UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
||||||
return sms_code, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetCodeByPhone to get code for a given phone number
|
||||||
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
||||||
var sms_verification_request models.SMSVerificationRequest
|
return nil, nil
|
||||||
|
|
||||||
return &sms_verification_request, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func(p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
// DeleteSMSRequest to delete SMS verification request
|
||||||
|
func (p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,20 +4,19 @@ import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/authorizerdev/authorizer/server/db/models"
|
"github.com/authorizerdev/authorizer/server/db/models"
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// SMS verification Request
|
// UpsertSMSRequest adds/updates SMS verification request
|
||||||
func (p *provider) UpsertSMSRequest(ctx context.Context, sms_code *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
func (p *provider) UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
||||||
return sms_code, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetCodeByPhone to get code for a given phone number
|
||||||
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
||||||
var sms_verification_request models.SMSVerificationRequest
|
return nil, nil
|
||||||
|
|
||||||
return &sms_verification_request, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func(p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
// DeleteSMSRequest to delete SMS verification request
|
||||||
|
func (p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,20 +4,19 @@ import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/authorizerdev/authorizer/server/db/models"
|
"github.com/authorizerdev/authorizer/server/db/models"
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// SMS verification Request
|
// UpsertSMSRequest adds/updates SMS verification request
|
||||||
func (p *provider) UpsertSMSRequest(ctx context.Context, sms_code *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
func (p *provider) UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
||||||
return sms_code, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetCodeByPhone to get code for a given phone number
|
||||||
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
||||||
var sms_verification_request models.SMSVerificationRequest
|
return nil, nil
|
||||||
|
|
||||||
return &sms_verification_request, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func(p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
// DeleteSMSRequest to delete SMS verification request
|
||||||
|
func (p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,20 +4,19 @@ import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/authorizerdev/authorizer/server/db/models"
|
"github.com/authorizerdev/authorizer/server/db/models"
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// SMS verification Request
|
// UpsertSMSRequest adds/updates SMS verification request
|
||||||
func (p *provider) UpsertSMSRequest(ctx context.Context, sms_code *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
func (p *provider) UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
||||||
return sms_code, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetCodeByPhone to get code for a given phone number
|
||||||
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
||||||
var sms_verification_request models.SMSVerificationRequest
|
return nil, nil
|
||||||
|
|
||||||
return &sms_verification_request, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func(p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
// DeleteSMSRequest to delete SMS verification request
|
||||||
|
func (p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,19 +10,21 @@ import (
|
||||||
"go.mongodb.org/mongo-driver/mongo/options"
|
"go.mongodb.org/mongo-driver/mongo/options"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SMS verification Request
|
// UpsertSMSRequest adds/updates SMS verification request
|
||||||
func (p *provider) UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
func (p *provider) UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
||||||
smsVerificationRequest, _ := p.GetCodeByPhone(ctx, smsRequest.PhoneNumber)
|
smsVerificationRequest, err := p.GetCodeByPhone(ctx, smsRequest.PhoneNumber)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// Boolean to check if we should create a new record or update the existing one
|
||||||
shouldCreate := false
|
shouldCreate := false
|
||||||
|
|
||||||
if smsVerificationRequest == nil {
|
if smsVerificationRequest == nil {
|
||||||
id := uuid.NewString()
|
id := uuid.NewString()
|
||||||
|
|
||||||
smsVerificationRequest = &models.SMSVerificationRequest{
|
smsVerificationRequest = &models.SMSVerificationRequest{
|
||||||
ID: id,
|
ID: id,
|
||||||
CreatedAt: time.Now().Unix(),
|
CreatedAt: time.Now().Unix(),
|
||||||
Code: smsRequest.Code,
|
Code: smsRequest.Code,
|
||||||
PhoneNumber: smsRequest.PhoneNumber,
|
PhoneNumber: smsRequest.PhoneNumber,
|
||||||
CodeExpiresAt: smsRequest.CodeExpiresAt,
|
CodeExpiresAt: smsRequest.CodeExpiresAt,
|
||||||
}
|
}
|
||||||
shouldCreate = true
|
shouldCreate = true
|
||||||
|
@ -30,21 +32,18 @@ func (p *provider) UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSV
|
||||||
|
|
||||||
smsVerificationRequest.UpdatedAt = time.Now().Unix()
|
smsVerificationRequest.UpdatedAt = time.Now().Unix()
|
||||||
smsRequestCollection := p.db.Collection(models.Collections.SMSVerificationRequest, options.Collection())
|
smsRequestCollection := p.db.Collection(models.Collections.SMSVerificationRequest, options.Collection())
|
||||||
|
|
||||||
var err error
|
|
||||||
if shouldCreate {
|
if shouldCreate {
|
||||||
_, err = smsRequestCollection.InsertOne(ctx, smsVerificationRequest)
|
_, err = smsRequestCollection.InsertOne(ctx, smsVerificationRequest)
|
||||||
} else {
|
} else {
|
||||||
_, err = smsRequestCollection.UpdateOne(ctx, bson.M{"phone_number": bson.M{"$eq": smsRequest.PhoneNumber}}, bson.M{"$set": smsVerificationRequest}, options.MergeUpdateOptions())
|
_, err = smsRequestCollection.UpdateOne(ctx, bson.M{"phone_number": bson.M{"$eq": smsRequest.PhoneNumber}}, bson.M{"$set": smsVerificationRequest}, options.MergeUpdateOptions())
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return smsVerificationRequest, nil
|
return smsVerificationRequest, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetCodeByPhone to get code for a given phone number
|
||||||
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
||||||
var smsVerificationRequest models.SMSVerificationRequest
|
var smsVerificationRequest models.SMSVerificationRequest
|
||||||
|
|
||||||
|
@ -58,6 +57,7 @@ func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*mod
|
||||||
return &smsVerificationRequest, nil
|
return &smsVerificationRequest, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteSMSRequest to delete SMS verification request
|
||||||
func (p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
func (p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
||||||
smsVerificationRequests := p.db.Collection(models.Collections.SMSVerificationRequest, options.Collection())
|
smsVerificationRequests := p.db.Collection(models.Collections.SMSVerificationRequest, options.Collection())
|
||||||
_, err := smsVerificationRequests.DeleteOne(nil, bson.M{"_id": smsRequest.ID}, options.Delete())
|
_, err := smsVerificationRequests.DeleteOne(nil, bson.M{"_id": smsRequest.ID}, options.Delete())
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
package provider_template
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/authorizerdev/authorizer/server/db/models"
|
||||||
|
)
|
||||||
|
|
||||||
|
// UpsertSMSRequest adds/updates SMS verification request
|
||||||
|
func (p *provider) UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetCodeByPhone to get code for a given phone number
|
||||||
|
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteSMSRequest to delete SMS verification request
|
||||||
|
func (p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -85,10 +85,10 @@ type Provider interface {
|
||||||
// DeleteOTP to delete otp
|
// DeleteOTP to delete otp
|
||||||
DeleteOTP(ctx context.Context, otp *models.OTP) error
|
DeleteOTP(ctx context.Context, otp *models.OTP) error
|
||||||
|
|
||||||
// Upsert SMS code request
|
// UpsertSMSRequest adds/updates SMS verification request
|
||||||
UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error)
|
UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error)
|
||||||
// Get sms code by phone number
|
// GetCodeByPhone to get code for a given phone number
|
||||||
GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error)
|
GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error)
|
||||||
// Delete sms
|
// DeleteSMSRequest to delete SMS verification request
|
||||||
DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error
|
DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,27 +9,24 @@ import (
|
||||||
"gorm.io/gorm/clause"
|
"gorm.io/gorm/clause"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SMS verification Request
|
// UpsertSMSRequest adds/updates SMS verification request
|
||||||
func (p *provider) UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
func (p *provider) UpsertSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) (*models.SMSVerificationRequest, error) {
|
||||||
if smsRequest.ID == "" {
|
if smsRequest.ID == "" {
|
||||||
smsRequest.ID = uuid.New().String()
|
smsRequest.ID = uuid.New().String()
|
||||||
}
|
}
|
||||||
|
|
||||||
smsRequest.CreatedAt = time.Now().Unix()
|
smsRequest.CreatedAt = time.Now().Unix()
|
||||||
smsRequest.UpdatedAt = time.Now().Unix()
|
smsRequest.UpdatedAt = time.Now().Unix()
|
||||||
|
|
||||||
res := p.db.Clauses(clause.OnConflict{
|
res := p.db.Clauses(clause.OnConflict{
|
||||||
Columns: []clause.Column{{Name: "phone_number"}},
|
Columns: []clause.Column{{Name: "phone_number"}},
|
||||||
DoUpdates: clause.AssignmentColumns([]string{"code", "code_expires_at"}),
|
DoUpdates: clause.AssignmentColumns([]string{"code", "code_expires_at", "updated_at"}),
|
||||||
}).Create(smsRequest)
|
}).Create(smsRequest)
|
||||||
if res.Error != nil {
|
if res.Error != nil {
|
||||||
return nil, res.Error
|
return nil, res.Error
|
||||||
}
|
}
|
||||||
|
|
||||||
return smsRequest, nil
|
return smsRequest, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetOTPByEmail to get otp for a given email address
|
// GetCodeByPhone to get code for a given phone number
|
||||||
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*models.SMSVerificationRequest, error) {
|
||||||
var sms_verification_request models.SMSVerificationRequest
|
var sms_verification_request models.SMSVerificationRequest
|
||||||
|
|
||||||
|
@ -40,7 +37,8 @@ func (p *provider) GetCodeByPhone(ctx context.Context, phoneNumber string) (*mod
|
||||||
return &sms_verification_request, nil
|
return &sms_verification_request, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func(p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
// DeleteSMSRequest to delete SMS verification request
|
||||||
|
func (p *provider) DeleteSMSRequest(ctx context.Context, smsRequest *models.SMSVerificationRequest) error {
|
||||||
result := p.db.Delete(&models.SMSVerificationRequest{
|
result := p.db.Delete(&models.SMSVerificationRequest{
|
||||||
ID: smsRequest.ID,
|
ID: smsRequest.ID,
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue
Block a user