fix: tests + version

- Update code as per go 1.19.3
- Fix tests for unused vars

server/db/db.go

@@ -10,6 +10,7 @@ import (
 	"github.com/authorizerdev/authorizer/server/db/providers/dynamodb"
 	"github.com/authorizerdev/authorizer/server/db/providers/mongodb"
 	"github.com/authorizerdev/authorizer/server/db/providers/sql"
+	"github.com/authorizerdev/authorizer/server/db/providers/surrealdb"
 	"github.com/authorizerdev/authorizer/server/memorystore"
 )
 
@@ -21,11 +22,12 @@ func InitDB() error {
 
 	envs := memorystore.RequiredEnvStoreObj.GetRequiredEnv()
 
-	isSQL := envs.DatabaseType != constants.DbTypeArangodb && envs.DatabaseType != constants.DbTypeMongodb && envs.DatabaseType != constants.DbTypeCassandraDB && envs.DatabaseType != constants.DbTypeScyllaDB && envs.DatabaseType != constants.DbTypeDynamoDB
+	isSQL := envs.DatabaseType != constants.DbTypeArangodb && envs.DatabaseType != constants.DbTypeMongodb && envs.DatabaseType != constants.DbTypeCassandraDB && envs.DatabaseType != constants.DbTypeScyllaDB && envs.DatabaseType != constants.DbTypeDynamoDB && envs.DatabaseType != constants.DbTypeSurrealDB
 	isArangoDB := envs.DatabaseType == constants.DbTypeArangodb
 	isMongoDB := envs.DatabaseType == constants.DbTypeMongodb
 	isCassandra := envs.DatabaseType == constants.DbTypeCassandraDB || envs.DatabaseType == constants.DbTypeScyllaDB
 	isDynamoDB := envs.DatabaseType == constants.DbTypeDynamoDB
+	isSurrealDB := envs.DatabaseType == constants.DbTypeSurrealDB
 
 	if isSQL {
 		log.Info("Initializing SQL Driver for: ", envs.DatabaseType)
@@ -72,5 +74,14 @@ func InitDB() error {
 		}
 	}
 
+	if isSurrealDB {
+		log.Info("Initializing Surreal Driver")
+		Provider, err = surrealdb.NewProvider()
+		if err != nil {
+			log.Fatal("Failed to initialize Surreal driver: ", err)
+			return err
+		}
+	}
+
 	return nil
 }

server/db/models/email_templates.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"encoding/json"
 	"strings"
 
 	"github.com/authorizerdev/authorizer/server/graph/model"
@@ -35,3 +36,10 @@ func (e *EmailTemplate) AsAPIEmailTemplate() *model.EmailTemplate {
 		UpdatedAt: refs.NewInt64Ref(e.UpdatedAt),
 	}
 }
+
+func (e *EmailTemplate) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(e) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}

server/db/models/env.go

@@ -1,5 +1,7 @@
 package models
 
+import "encoding/json"
+
 // Note: any change here should be reflected in providers/casandra/provider.go as it does not have model support in collection creation
 
 // Env model for db
@@ -11,3 +13,10 @@ type Env struct {
 	UpdatedAt int64  `json:"updated_at" bson:"updated_at" cql:"updated_at" dynamo:"updated_at"`
 	CreatedAt int64  `json:"created_at" bson:"created_at" cql:"created_at" dynamo:"created_at"`
 }
+
+func (env *Env) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(env) // Convert to a json string
+	json.Unmarshal(data, &res)   // Convert to a map
+	return res
+}

server/db/models/model.go

@@ -13,6 +13,10 @@ type CollectionList struct {
 }
 
 var (
+	// DB/Namespace
+	DBNamespace = "authorizer"
+	// Identifier field used for surreal db
+	SurrealDbIdentifier = "identifier"
 	// Prefix for table name / collection names
 	Prefix = "authorizer_"
 	// Collections / Tables available for authorizer in the database (used for dbs other than gorm)

server/db/models/otp.go

@@ -1,5 +1,7 @@
 package models
 
+import "encoding/json"
+
 // OTP model for database
 type OTP struct {
 	Key       string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty" dynamo:"key,omitempty"` // for arangodb
@@ -14,3 +16,10 @@ type OTP struct {
 type Paging struct {
 	ID string `json:"id,omitempty" dynamo:"id,hash"`
 }
+
+func (o *OTP) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(o) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}

server/db/models/session.go

@@ -1,5 +1,7 @@
 package models
 
+import "encoding/json"
+
 // Note: any change here should be reflected in providers/casandra/provider.go as it does not have model support in collection creation
 
 // Session model for db
@@ -12,3 +14,10 @@ type Session struct {
 	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"`
 }
+
+func (s *Session) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(s) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}

server/db/models/verification_requests.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"encoding/json"
 	"strings"
 
 	"github.com/authorizerdev/authorizer/server/graph/model"
@@ -41,3 +42,10 @@ func (v *VerificationRequest) AsAPIVerificationRequest() *model.VerificationRequ
 		UpdatedAt:   refs.NewInt64Ref(v.UpdatedAt),
 	}
 }
+
+func (v *VerificationRequest) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(v) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}

server/db/models/webhook.go

@@ -42,3 +42,10 @@ func (w *Webhook) AsAPIWebhook() *model.Webhook {
 		UpdatedAt: refs.NewInt64Ref(w.UpdatedAt),
 	}
 }
+
+func (w *Webhook) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(w) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}

server/db/models/webhook_log.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"encoding/json"
 	"strings"
 
 	"github.com/authorizerdev/authorizer/server/graph/model"
@@ -37,3 +38,10 @@ func (w *WebhookLog) AsAPIWebhookLog() *model.WebhookLog {
 		UpdatedAt:  refs.NewInt64Ref(w.UpdatedAt),
 	}
 }
+
+func (w *WebhookLog) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(w) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}

server/db/providers/surrealdb/env.go

@@ -2,10 +2,12 @@ package surrealdb
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/google/uuid"
+	"github.com/surrealdb/surrealdb.go"
 )
 
 // AddEnv to save environment information in database
@@ -16,12 +18,28 @@ func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, erro
 
 	env.CreatedAt = time.Now().Unix()
 	env.UpdatedAt = time.Now().Unix()
+
+	mapData := env.ToMap()
+	mapData[models.SurrealDbIdentifier] = env.ID
+
+	_, err := p.db.Create(models.Collections.Env, mapData)
+	if err != nil {
+		return env, err
+	}
 	return env, nil
 }
 
 // UpdateEnv to update environment information in database
 func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	env.UpdatedAt = time.Now().Unix()
+
+	mapData := env.ToMap()
+	mapData[models.SurrealDbIdentifier] = env.ID
+
+	_, err := p.db.Update(models.Collections.Env, mapData)
+	if err != nil {
+		return env, err
+	}
 	return env, nil
 }
 
@@ -29,5 +47,22 @@ func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, e
 func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
 	var env models.Env
 
+	mapData, err := p.db.Select(models.Collections.Env)
+	if err != nil {
+		return env, err
+	}
+
+	envs := []models.Env{}
+	err = surrealdb.Unmarshal(mapData, &envs)
+	if err != nil {
+		return env, err
+	}
+
+	if len(envs) > 0 {
+		env = envs[0]
+	} else {
+		return env, fmt.Errorf("env record not found")
+	}
+
 	return env, nil
 }

server/db/providers/surrealdb/provider.go

@@ -1,20 +1,42 @@
 package surrealdb
 
 import (
-	"gorm.io/gorm"
+	"github.com/authorizerdev/authorizer/server/db/models"
+	"github.com/authorizerdev/authorizer/server/memorystore"
+	"github.com/surrealdb/surrealdb.go"
 )
 
 // TODO change following provider to new db provider
 type provider struct {
-	db *gorm.DB
+	db *surrealdb.DB
 }
 
 // NewProvider returns a new SQL provider
 // TODO change following provider to new db provider
 func NewProvider() (*provider, error) {
-	var sqlDB *gorm.DB
+	dbURL := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseURL
+	db, err := surrealdb.New(dbURL)
+	if err != nil {
+		return nil, err
+	}
+
+	dbUsername := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseUsername
+	dbPassword := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabasePassword
+
+	_, err = db.Signin(map[string]interface{}{
+		"user": dbUsername,
+		"pass": dbPassword,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = db.Use(models.DBNamespace, models.DBNamespace)
+	if err != nil {
+		return nil, err
+	}
 
 	return &provider{
-		db: sqlDB,
+		db: db,
 	}, nil
 }