resolve conflict with base branch

server/db/providers/dynamodb/provider.go

@@ -1,16 +1,15 @@
 package dynamodb
 
 import (
-	"os"
-
-	"github.com/authorizerdev/authorizer/server/constants"
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/authorizerdev/authorizer/server/memorystore"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/guregu/dynamo"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/db/models"
+	"github.com/authorizerdev/authorizer/server/memorystore"
 )
 
 type provider struct {
@@ -20,28 +19,29 @@ type provider struct {
 // NewProvider returns a new Dynamo provider
 func NewProvider() (*provider, error) {
 	dbURL := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseURL
-	awsRegion := os.Getenv(constants.EnvAwsRegion)
-	accessKey := os.Getenv(constants.EnvAwsAccessKey)
-	secretKey := os.Getenv(constants.EnvAwsSecretKey)
+	awsRegion := memorystore.RequiredEnvStoreObj.GetRequiredEnv().AwsRegion
+	awsAccessKeyID := memorystore.RequiredEnvStoreObj.GetRequiredEnv().AwsAccessKeyID
+	awsSecretAccessKey := memorystore.RequiredEnvStoreObj.GetRequiredEnv().AwsSecretAccessKey
 
 	config := aws.Config{
 		MaxRetries:                    aws.Int(3),
 		CredentialsChainVerboseErrors: aws.Bool(true), // for full error logs
+
 	}
 
 	if awsRegion != "" {
 		config.Region = aws.String(awsRegion)
 	}
 
-	// custom accessKey, secretkey took first priority, if not then fetch config from aws credentials
-	if accessKey != "" && secretKey != "" {
-		config.Credentials = credentials.NewStaticCredentials(accessKey, secretKey, "")
+	// custom awsAccessKeyID, awsSecretAccessKey took first priority, if not then fetch config from aws credentials
+	if awsAccessKeyID != "" && awsSecretAccessKey != "" {
+		config.Credentials = credentials.NewStaticCredentials(awsAccessKeyID, awsSecretAccessKey, "")
 	} else if dbURL != "" {
 		// static config in case of testing or local-setup
 		config.Credentials = credentials.NewStaticCredentials("key", "key", "")
 		config.Endpoint = aws.String(dbURL)
 	} else {
-		log.Info("REGION, AWS_ACCESS_KEY and AWS_SECRET_KEY not found in .env, trying to load default profile from aws credentials")
+		log.Debugf("%s or %s or %s not found. Trying to load default credentials from aws config", constants.EnvAwsRegion, constants.EnvAwsAccessKeyID, constants.EnvAwsSecretAccessKey)
 	}
 
 	session := session.Must(session.NewSession(&config))

server/db/providers/dynamodb/user.go

@@ -180,7 +180,7 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},
 
 		for _, user := range allUsers {
 			err = UpdateByHashKey(userCollection, "id", user.ID, data)
-			if err != nil {
+			if err == nil {
 				res = res + 1
 			}
 		}

server/db/providers/sql/provider.go

@@ -1,6 +1,7 @@
 package sql
 
 import (
+	"fmt"
 	"log"
 	"os"
 	"time"
@@ -21,6 +22,16 @@ type provider struct {
 	db *gorm.DB
 }
 
+const (
+	phoneNumberIndexName  = "UQ_phone_number"
+	phoneNumberColumnName = "phone_number"
+)
+
+type indexInfo struct {
+	IndexName  string `json:"index_name"`
+	ColumnName string `json:"column_name"`
+}
+
 // NewProvider returns a new SQL provider
 func NewProvider() (*provider, error) {
 	var sqlDB *gorm.DB
@@ -65,6 +76,32 @@ func NewProvider() (*provider, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	// unique constraint on phone number does not work with multiple null values for sqlserver
+	// for more information check https://stackoverflow.com/a/767702
+	if dbType == constants.DbTypeSqlserver {
+		var indexInfos []indexInfo
+		// remove index on phone number if present with different name
+		res := sqlDB.Raw("SELECT i.name AS index_name, i.type_desc AS index_algorithm, CASE i.is_unique WHEN 1 THEN 'TRUE' ELSE 'FALSE' END AS is_unique, ac.Name AS column_name FROM sys.tables AS t INNER JOIN sys.indexes AS i ON t.object_id = i.object_id INNER JOIN sys.index_columns AS ic ON ic.object_id = i.object_id AND ic.index_id = i.index_id INNER JOIN sys.all_columns AS ac ON ic.object_id = ac.object_id AND ic.column_id = ac.column_id WHERE t.name = 'authorizer_users' AND SCHEMA_NAME(t.schema_id) = 'dbo';").Scan(&indexInfos)
+		if res.Error != nil {
+			return nil, res.Error
+		}
+
+		for _, val := range indexInfos {
+			if val.ColumnName == phoneNumberColumnName && val.IndexName != phoneNumberIndexName {
+				// drop index & create new
+				if res := sqlDB.Exec(fmt.Sprintf(`ALTER TABLE authorizer_users DROP CONSTRAINT "%s";`, val.IndexName)); res.Error != nil {
+					return nil, res.Error
+				}
+
+				// create index
+				if res := sqlDB.Exec(fmt.Sprintf("CREATE UNIQUE NONCLUSTERED INDEX %s ON authorizer_users(phone_number) WHERE phone_number IS NOT NULL;", phoneNumberIndexName)); res.Error != nil {
+					return nil, res.Error
+				}
+			}
+		}
+	}
+
 	return &provider{
 		db: sqlDB,
 	}, nil