fixing some issues
This commit is contained in:
@@ -115,28 +115,23 @@ func (psql PostgresqlStorage) LocalAuthentication(namespace string, username *st
|
||||
var (
|
||||
data, metadata, emailValidation, phoneValidation []byte
|
||||
)
|
||||
|
||||
requested_field := ""
|
||||
requested_value := ""
|
||||
if username != nil {
|
||||
requested_field = "username"
|
||||
requested_value = *username
|
||||
} else if email != nil {
|
||||
requested_field = "email"
|
||||
requested_value = *email
|
||||
} else if phone_number != nil {
|
||||
requested_field = "phone_number"
|
||||
requested_value = *phone_number
|
||||
} else {
|
||||
return nil, fmt.Errorf("localauthentication func error PSQL")
|
||||
}
|
||||
|
||||
req := fmt.Sprintf(`SELECT id, namespace, data, metadata, username, password, email, email_validation, phone_number, phone_number_validation
|
||||
FROM %s INNER JOIN %s ON id = account_id
|
||||
WHERE account_namespace = $1 AND %s = $2;`, psql.Tables["accounts"], psql.Tables["accounts_auth_local"], requested_field)
|
||||
WHERE account_namespace = '%s'`, psql.Tables["accounts"], psql.Tables["accounts_auth_local"], namespace)
|
||||
|
||||
if username != nil && *username != "" {
|
||||
req += fmt.Sprintf(` AND username = '%s'`, *username)
|
||||
}
|
||||
if email != nil && *email != "" {
|
||||
req += fmt.Sprintf(` AND email = '%s'`, *email)
|
||||
}
|
||||
if phone_number != nil && *phone_number != "" {
|
||||
req += fmt.Sprintf(` AND phone_number = '%s'`, *phone_number)
|
||||
}
|
||||
req += ";"
|
||||
|
||||
account.Authentication.Local = &LocalAuth{}
|
||||
err := psql.DbConnection.QueryRow(req, namespace, requested_value).Scan(
|
||||
err := psql.DbConnection.QueryRow(req).Scan(
|
||||
&account.ID,
|
||||
&account.Namespace, &data, &metadata,
|
||||
&account.Authentication.Local.Username,
|
||||
@@ -145,7 +140,6 @@ func (psql PostgresqlStorage) LocalAuthentication(namespace string, username *st
|
||||
&emailValidation,
|
||||
&account.Authentication.Local.PhoneNumber,
|
||||
&phoneValidation)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ func init() {
|
||||
cfg.SetDefault("storage.db.psql.port", "5432")
|
||||
cfg.SetDefault("storage.db.psql.user", "postgres")
|
||||
cfg.SetDefault("storage.db.psql.password", "postgres")
|
||||
cfg.SetDefault("storage.db.psql.dbname", "mobilityaccounts_tests")
|
||||
cfg.SetDefault("storage.db.psql.dbname", "coopgo_platform")
|
||||
cfg.SetDefault("storage.db.psql.sslmode", "disable")
|
||||
cfg.SetDefault("storage.db.psql.schema", "mobilityaccounts")
|
||||
cfg.SetDefault("storage.db.psql.tables.accounts", "accounts")
|
||||
|
||||
Reference in New Issue
Block a user