devstack/authorizer
4
0
Fork 0
Code Pull Requests Actions Activity

Update tests

Browse Source
This commit is contained in:
Lakhan Samani
2024-04-02 15:25:11 +05:30
parent 67f866a787
commit 28b574c827
51 changed files with 275 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/db/providers/couchbase/authenticator.go
View File

@@ -30,7 +30,7 @@ func (p *provider) AddAuthenticator(ctx context.Context, authenticators *models.
}
_, err := p.db.Collection(models.Collections.Authenticators).Insert(authenticators.ID, authenticators, &insertOpt)
if err != nil {
return authenticators, err
return nil, err
}
return authenticators, nil
}
@@ -71,11 +71,11 @@ func (p *provider) GetAuthenticatorDetailsByUserId(ctx context.Context, userId s
PositionalParameters: []interface{}{userId, authenticatorType},
})
if err != nil {
return authenticators, err
return nil, err
}
err = q.One(&authenticators)
if err != nil {
return authenticators, err
return nil, err
}
return authenticators, nil
}

8
server/db/providers/couchbase/env.go
View File

@@ -24,7 +24,7 @@ func (p *provider) AddEnv(ctx context.Context, env *models.Env) (*models.Env, er
}
_, err := p.db.Collection(models.Collections.Env).Insert(env.ID, env, &insertOpt)
if err != nil {
return env, err
return nil, err
}
return env, nil
}
@@ -40,7 +40,7 @@ func (p *provider) UpdateEnv(ctx context.Context, env *models.Env) (*models.Env,
PositionalParameters: []interface{}{env.EnvData, env.UpdatedAt, env.UpdatedAt, env.ID},
})
if err != nil {
return env, err
return nil, err
}
return env, nil
}
@@ -55,11 +55,11 @@ func (p *provider) GetEnv(ctx context.Context) (*models.Env, error) {
ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
})
if err != nil {
return env, err
return nil, err
}
err = q.One(&env)
if err != nil {
return env, err
return nil, err
}
env.Hash = env.EncryptionKey
return env, nil

4
server/db/providers/couchbase/otp.go
View File

@@ -50,7 +50,7 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
}
_, err := p.db.Collection(models.Collections.OTP).Insert(otp.ID, otp, &insertOpt)
if err != nil {
return otp, err
return nil, err
}
} else {
query := fmt.Sprintf(`UPDATE %s.%s SET otp=$1, expires_at=$2, updated_at=$3 WHERE _id=$4`, p.scopeName, models.Collections.OTP)
@@ -58,7 +58,7 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
PositionalParameters: []interface{}{otp.Otp, otp.ExpiresAt, otp.UpdatedAt, otp.ID},
})
if err != nil {
return otp, err
return nil, err
}
}
return otp, nil

2
server/db/providers/couchbase/provider.go
View File

@@ -127,7 +127,7 @@ func CreateBucketAndScope(cluster *gocb.Cluster, bucketName string, scopeName st
if scopeName != defaultScope {
err = bucket.Collections().CreateScope(scopeName, nil)
if err != nil && !errors.Is(err, gocb.ErrScopeExists) {
return bucket, err
return nil, err
}
}
return bucket, nil

2
server/db/providers/couchbase/shared.go
View File

@@ -47,7 +47,7 @@ func (p *provider) GetTotalDocs(ctx context.Context, collection string) (int64,
})
queryRes.One(&totalDocs)
if err != nil {
return totalDocs.Total, err
return 0, err
}
return totalDocs.Total, nil
}

18
server/db/providers/couchbase/user.go
View File

@@ -25,7 +25,7 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
if user.Roles == "" {
defaultRoles, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyDefaultRoles)
if err != nil {
return user, err
return nil, err
}
user.Roles = defaultRoles
}
@@ -47,7 +47,7 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
}
_, err := p.db.Collection(models.Collections.User).Insert(user.ID, user, &insertOpt)
if err != nil {
return user, err
return nil, err
}
return user, nil
}
@@ -60,7 +60,7 @@ func (p *provider) UpdateUser(ctx context.Context, user *models.User) (*models.U
}
_, err := p.db.Collection(models.Collections.User).Upsert(user.ID, user, &upsertOpt)
if err != nil {
return user, err
return nil, err
}
return user, nil
}
@@ -122,11 +122,11 @@ func (p *provider) GetUserByEmail(ctx context.Context, email string) (*models.Us
PositionalParameters: []interface{}{email},
})
if err != nil {
return user, err
return nil, err
}
err = q.One(&user)
if err != nil {
return user, err
return nil, err
}
return user, nil
}
@@ -141,11 +141,11 @@ func (p *provider) GetUserByID(ctx context.Context, id string) (*models.User, er
PositionalParameters: []interface{}{id},
})
if err != nil {
return user, err
return nil, err
}
err = q.One(&user)
if err != nil {
return user, err
return nil, err
}
return user, nil
}
@@ -194,11 +194,11 @@ func (p *provider) GetUserByPhoneNumber(ctx context.Context, phoneNumber string)
PositionalParameters: []interface{}{phoneNumber},
})
if err != nil {
return user, err
return nil, err
}
err = q.One(&user)
if err != nil {
return user, err
return nil, err
}
return user, nil
}

8
server/db/providers/couchbase/verification_requests.go
View File

@@ -25,7 +25,7 @@ func (p *provider) AddVerificationRequest(ctx context.Context, verificationReque
}
_, err := p.db.Collection(models.Collections.VerificationRequest).Insert(verificationRequest.ID, verificationRequest, &insertOpt)
if err != nil {
return verificationRequest, err
return nil, err
}
return verificationRequest, nil
}
@@ -44,12 +44,12 @@ func (p *provider) GetVerificationRequestByToken(ctx context.Context, token stri
})
if err != nil {
return verificationRequest, err
return nil, err
}
err = queryResult.One(&verificationRequest)
if err != nil {
return verificationRequest, err
return nil, err
}
return verificationRequest, nil
}
@@ -69,7 +69,7 @@ func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email stri
var verificationRequest *models.VerificationRequest
err = queryResult.One(&verificationRequest)
if err != nil {
return verificationRequest, err
return nil, err
}
return verificationRequest, nil
}

2
server/db/providers/couchbase/webhook.go
View File

@@ -29,7 +29,7 @@ func (p *provider) AddWebhook(ctx context.Context, webhook *models.Webhook) (*mo
}
_, err := p.db.Collection(models.Collections.Webhook).Insert(webhook.ID, webhook, &insertOpt)
if err != nil {
return webhook.AsAPIWebhook(), err
return nil, err
}
return webhook.AsAPIWebhook(), nil
}

2
server/db/providers/couchbase/webhook_log.go
View File

@@ -25,7 +25,7 @@ func (p *provider) AddWebhookLog(ctx context.Context, webhookLog *models.Webhook
}
_, err := p.db.Collection(models.Collections.WebhookLog).Insert(webhookLog.ID, webhookLog, &insertOpt)
if err != nil {
return webhookLog.AsAPIWebhookLog(), err
return nil, err
}
return webhookLog.AsAPIWebhookLog(), nil
}