Skip to content

Commit fab3c2f

Browse files
lakhansamanilakhansamani
authored
Merge pull request #375 from authorizerdev/fix-db-refs
Fix db refs
2 parents 146561b + 3fefcfc commit fab3c2f

File tree

93 files changed

+444
-735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+444
-735
lines changed

‎dashboard/yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,9 +1222,9 @@
12221222
dependencies:
12231223
"is-arrayish" "^0.2.1"
12241224

1225-
"esbuild-linux-64@0.14.9":
1226-
"integrity" "sha512-WoEI+R6/PLZAxS7XagfQMFgRtLUi5cjqqU9VCfo3tnWmAXh/wt8QtUfCVVCcXVwZLS/RNvI19CtfjlrJU61nOg=="
1227-
"resolved" "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.9.tgz"
1225+
"esbuild-darwin-arm64@0.14.9":
1226+
"integrity" "sha512-3ue+1T4FR5TaAu4/V1eFMG8Uwn0pgAwQZb/WwL1X78d5Cy8wOVQ67KNH1lsjU+y/9AcwMKZ9x0GGNxBB4a1Rbw=="
1227+
"resolved" "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.9.tgz"
12281228
"version" "0.14.9"
12291229

12301230
"esbuild@^0.14.9":

‎server/db/providers/arangodb/email_template.go‎

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ import (
1212
)
1313

1414
// AddEmailTemplate to add EmailTemplate
15-
func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {
15+
func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
1616
if emailTemplate.ID == "" {
1717
emailTemplate.ID = uuid.New().String()
1818
emailTemplate.Key = emailTemplate.ID
1919
}
20-
2120
emailTemplate.Key = emailTemplate.ID
2221
emailTemplate.CreatedAt = time.Now().Unix()
2322
emailTemplate.UpdatedAt = time.Now().Unix()
24-
2523
emailTemplateCollection, _ := p.db.Collection(ctx, models.Collections.EmailTemplate)
2624
_, err := emailTemplateCollection.CreateDocument(ctx, emailTemplate)
2725
if err != nil {
@@ -31,74 +29,63 @@ func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate models.Em
3129
}
3230

3331
// UpdateEmailTemplate to update EmailTemplate
34-
func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {
32+
func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
3533
emailTemplate.UpdatedAt = time.Now().Unix()
36-
3734
emailTemplateCollection, _ := p.db.Collection(ctx, models.Collections.EmailTemplate)
3835
meta, err := emailTemplateCollection.UpdateDocument(ctx, emailTemplate.Key, emailTemplate)
3936
if err != nil {
4037
return nil, err
4138
}
42-
4339
emailTemplate.Key = meta.Key
4440
emailTemplate.ID = meta.ID.String()
4541
return emailTemplate.AsAPIEmailTemplate(), nil
4642
}
4743

4844
// ListEmailTemplates to list EmailTemplate
49-
func (p *provider) ListEmailTemplate(ctx context.Context, pagination model.Pagination) (*model.EmailTemplates, error) {
45+
func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagination) (*model.EmailTemplates, error) {
5046
emailTemplates := []*model.EmailTemplate{}
51-
5247
query := fmt.Sprintf("FOR d in %s SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.EmailTemplate, pagination.Offset, pagination.Limit)
53-
5448
sctx := arangoDriver.WithQueryFullCount(ctx)
5549
cursor, err := p.db.Query(sctx, query, nil)
5650
if err != nil {
5751
return nil, err
5852
}
5953
defer cursor.Close()
60-
6154
paginationClone := pagination
6255
paginationClone.Total = cursor.Statistics().FullCount()
63-
6456
for {
65-
var emailTemplate models.EmailTemplate
57+
var emailTemplate *models.EmailTemplate
6658
meta, err := cursor.ReadDocument(ctx, &emailTemplate)
67-
6859
if arangoDriver.IsNoMoreDocuments(err) {
6960
break
7061
} else if err != nil {
7162
return nil, err
7263
}
73-
7464
if meta.Key != "" {
7565
emailTemplates = append(emailTemplates, emailTemplate.AsAPIEmailTemplate())
7666
}
7767
}
78-
7968
return &model.EmailTemplates{
80-
Pagination: &paginationClone,
69+
Pagination: paginationClone,
8170
EmailTemplates: emailTemplates,
8271
}, nil
8372
}
8473

8574
// GetEmailTemplateByID to get EmailTemplate by id
8675
func (p *provider) GetEmailTemplateByID(ctx context.Context, emailTemplateID string) (*model.EmailTemplate, error) {
87-
var emailTemplate models.EmailTemplate
76+
var emailTemplate *models.EmailTemplate
8877
query := fmt.Sprintf("FOR d in %s FILTER d._key == @email_template_id RETURN d", models.Collections.EmailTemplate)
8978
bindVars := map[string]interface{}{
9079
"email_template_id": emailTemplateID,
9180
}
92-
9381
cursor, err := p.db.Query(ctx, query, bindVars)
9482
if err != nil {
9583
return nil, err
9684
}
9785
defer cursor.Close()
98-
9986
for {
10087
if !cursor.HasMore() {
101-
if emailTemplate.Key == "" {
88+
if emailTemplate == nil {
10289
return nil, fmt.Errorf("email template not found")
10390
}
10491
break
@@ -113,21 +100,19 @@ func (p *provider) GetEmailTemplateByID(ctx context.Context, emailTemplateID str
113100

114101
// GetEmailTemplateByEventName to get EmailTemplate by event_name
115102
func (p *provider) GetEmailTemplateByEventName(ctx context.Context, eventName string) (*model.EmailTemplate, error) {
116-
var emailTemplate models.EmailTemplate
103+
var emailTemplate *models.EmailTemplate
117104
query := fmt.Sprintf("FOR d in %s FILTER d.event_name == @event_name RETURN d", models.Collections.EmailTemplate)
118105
bindVars := map[string]interface{}{
119106
"event_name": eventName,
120107
}
121-
122108
cursor, err := p.db.Query(ctx, query, bindVars)
123109
if err != nil {
124110
return nil, err
125111
}
126112
defer cursor.Close()
127-
128113
for {
129114
if !cursor.HasMore() {
130-
if emailTemplate.Key == "" {
115+
if emailTemplate == nil {
131116
return nil, fmt.Errorf("email template not found")
132117
}
133118
break

‎server/db/providers/arangodb/env.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
// AddEnv to save environment information in database
15-
func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, error) {
15+
func (p *provider) AddEnv(ctx context.Context, env *models.Env) (*models.Env, error) {
1616
if env.ID == "" {
1717
env.ID = uuid.New().String()
1818
env.Key = env.ID
@@ -31,7 +31,7 @@ func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, erro
3131
}
3232

3333
// UpdateEnv to update environment information in database
34-
func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
34+
func (p *provider) UpdateEnv(ctx context.Context, env *models.Env) (*models.Env, error) {
3535
env.UpdatedAt = time.Now().Unix()
3636
collection, _ := p.db.Collection(ctx, models.Collections.Env)
3737
meta, err := collection.UpdateDocument(ctx, env.Key, env)
@@ -45,19 +45,17 @@ func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, e
4545
}
4646

4747
// GetEnv to get environment information from database
48-
func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
49-
var env models.Env
48+
func (p *provider) GetEnv(ctx context.Context) (*models.Env, error) {
49+
var env *models.Env
5050
query := fmt.Sprintf("FOR d in %s RETURN d", models.Collections.Env)
51-
5251
cursor, err := p.db.Query(ctx, query, nil)
5352
if err != nil {
5453
return env, err
5554
}
5655
defer cursor.Close()
57-
5856
for {
5957
if !cursor.HasMore() {
60-
if env.Key == "" {
58+
if env == nil {
6159
return env, fmt.Errorf("config not found")
6260
}
6361
break

‎server/db/providers/arangodb/otp.go‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,44 +44,38 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
4444
otp.Otp = otpParam.Otp
4545
otp.ExpiresAt = otpParam.ExpiresAt
4646
}
47-
4847
otp.UpdatedAt = time.Now().Unix()
4948
otpCollection, _ := p.db.Collection(ctx, models.Collections.OTP)
50-
5149
var meta driver.DocumentMeta
5250
var err error
5351
if shouldCreate {
5452
meta, err = otpCollection.CreateDocument(ctx, otp)
5553
} else {
5654
meta, err = otpCollection.UpdateDocument(ctx, otp.Key, otp)
5755
}
58-
5956
if err != nil {
6057
return nil, err
6158
}
62-
6359
otp.Key = meta.Key
6460
otp.ID = meta.ID.String()
6561
return otp, nil
6662
}
6763

6864
// GetOTPByEmail to get otp for a given email address
6965
func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*models.OTP, error) {
70-
var otp models.OTP
66+
var otp *models.OTP
7167
query := fmt.Sprintf("FOR d in %s FILTER d.email == @email RETURN d", models.Collections.OTP)
7268
bindVars := map[string]interface{}{
7369
"email": emailAddress,
7470
}
75-
7671
cursor, err := p.db.Query(ctx, query, bindVars)
7772
if err != nil {
7873
return nil, err
7974
}
8075
defer cursor.Close()
81-
8276
for {
8377
if !cursor.HasMore() {
84-
if otp.Key == "" {
78+
if otp == nil {
8579
return nil, fmt.Errorf("otp with given email not found")
8680
}
8781
break
@@ -91,13 +85,12 @@ func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*mod
9185
return nil, err
9286
}
9387
}
94-
95-
return &otp, nil
88+
return otp, nil
9689
}
9790

9891
// GetOTPByPhoneNumber to get otp for a given phone number
9992
func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string) (*models.OTP, error) {
100-
var otp models.OTP
93+
var otp *models.OTP
10194
query := fmt.Sprintf("FOR d in %s FILTER d.phone_number == @phone_number RETURN d", models.Collections.OTP)
10295
bindVars := map[string]interface{}{
10396
"phone_number": phoneNumber,
@@ -109,7 +102,7 @@ func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string)
109102
defer cursor.Close()
110103
for {
111104
if !cursor.HasMore() {
112-
if otp.Key == "" {
105+
if otp == nil {
113106
return nil, fmt.Errorf("otp with given phone_number not found")
114107
}
115108
break
@@ -119,8 +112,7 @@ func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string)
119112
return nil, err
120113
}
121114
}
122-
123-
return &otp, nil
115+
return otp, nil
124116
}
125117

126118
// DeleteOTP to delete otp
@@ -130,6 +122,5 @@ func (p *provider) DeleteOTP(ctx context.Context, otp *models.OTP) error {
130122
if err != nil {
131123
return err
132124
}
133-
134125
return nil
135126
}

‎server/db/providers/arangodb/provider.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ func NewProvider() (*provider, error) {
6161
if err != nil {
6262
return nil, err
6363
}
64-
6564
var arangodb arangoDriver.Database
6665
dbName := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseName
6766
arangodb_exists, err := arangoClient.DatabaseExists(ctx, dbName)
@@ -79,7 +78,6 @@ func NewProvider() (*provider, error) {
7978
return nil, err
8079
}
8180
}
82-
8381
userCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.User)
8482
if err != nil {
8583
return nil, err
@@ -113,7 +111,6 @@ func NewProvider() (*provider, error) {
113111
return nil, err
114112
}
115113
}
116-
117114
verificationRequestCollection, err := arangodb.Collection(ctx, models.Collections.VerificationRequest)
118115
if err != nil {
119116
return nil, err
@@ -136,15 +133,13 @@ func NewProvider() (*provider, error) {
136133
return nil, err
137134
}
138135
}
139-
140136
sessionCollection, err := arangodb.Collection(ctx, models.Collections.Session)
141137
if err != nil {
142138
return nil, err
143139
}
144140
sessionCollection.EnsureHashIndex(ctx, []string{"user_id"}, &arangoDriver.EnsureHashIndexOptions{
145141
Sparse: true,
146142
})
147-
148143
envCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.Env)
149144
if err != nil {
150145
return nil, err
@@ -155,7 +150,6 @@ func NewProvider() (*provider, error) {
155150
return nil, err
156151
}
157152
}
158-
159153
webhookCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.Webhook)
160154
if err != nil {
161155
return nil, err
@@ -166,7 +160,6 @@ func NewProvider() (*provider, error) {
166160
return nil, err
167161
}
168162
}
169-
170163
webhookCollection, err := arangodb.Collection(ctx, models.Collections.Webhook)
171164
if err != nil {
172165
return nil, err
@@ -186,15 +179,13 @@ func NewProvider() (*provider, error) {
186179
return nil, err
187180
}
188181
}
189-
190182
webhookLogCollection, err := arangodb.Collection(ctx, models.Collections.WebhookLog)
191183
if err != nil {
192184
return nil, err
193185
}
194186
webhookLogCollection.EnsureHashIndex(ctx, []string{"webhook_id"}, &arangoDriver.EnsureHashIndexOptions{
195187
Sparse: true,
196188
})
197-
198189
emailTemplateCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.EmailTemplate)
199190
if err != nil {
200191
return nil, err
@@ -205,7 +196,6 @@ func NewProvider() (*provider, error) {
205196
return nil, err
206197
}
207198
}
208-
209199
emailTemplateCollection, err := arangodb.Collection(ctx, models.Collections.EmailTemplate)
210200
if err != nil {
211201
return nil, err
@@ -214,7 +204,6 @@ func NewProvider() (*provider, error) {
214204
Unique: true,
215205
Sparse: true,
216206
})
217-
218207
otpCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.OTP)
219208
if err != nil {
220209
return nil, err

‎server/db/providers/arangodb/session.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ import (
99
)
1010

1111
// AddSession to save session information in database
12-
func (p *provider) AddSession(ctx context.Context, session models.Session) error {
12+
func (p *provider) AddSession(ctx context.Context, session *models.Session) error {
1313
if session.ID == "" {
1414
session.ID = uuid.New().String()
1515
session.Key = session.ID
1616
}
17-
1817
session.CreatedAt = time.Now().Unix()
1918
session.UpdatedAt = time.Now().Unix()
2019
sessionCollection, _ := p.db.Collection(ctx, models.Collections.Session)
@@ -24,3 +23,8 @@ func (p *provider) AddSession(ctx context.Context, session models.Session) error
2423
}
2524
return nil
2625
}
26+
27+
// DeleteSession to delete session information from database
28+
func (p *provider) DeleteSession(ctx context.Context, userId string) error {
29+
return nil
30+
}

0 commit comments

Comments
 (0)