mirror of
https://github.com/mainflux/mainflux.git
synced 2025-04-28 13:48:49 +08:00

* user service - wraping errors Signed-off-by: Ivan Milošević <iva@blokovi.com> * wrapping more errors unwrap only wrapped errors Signed-off-by: Ivan Milošević <iva@blokovi.com> * Add internal database error Wrap internal database error Signed-off-by: Ivan Milošević <iva@blokovi.com> * Wrap user not found error Signed-off-by: Ivan Milošević <iva@blokovi.com> * Wrapping errors in idp and hasher Signed-off-by: Ivan Milošević <iva@blokovi.com> * Use error.Is for testing errors in Identify test Signed-off-by: Ivan Milošević <iva@blokovi.com> * Get wraper from wrapped errors Signed-off-by: Ivan Milošević <iva@blokovi.com> * Switch order of wrapping errors Remove dead code (comments) Signed-off-by: Ivan Milošević <iva@blokovi.com> * assert true in tests Signed-off-by: Ivan Milošević <iva@blokovi.com> * Change comparing errors in tests (assert.True) Signed-off-by: Ivan Milošević <iva@blokovi.com> * Add errorRes structure to API responses in body in things service Signed-off-by: Ivan Milošević <iva@blokovi.com> * resolve conflicts after rebasing Signed-off-by: Ivan Milošević <iva@blokovi.com> * Create errors package Signed-off-by: Ivan Milošević <iva@blokovi.com> * implement new errors package Signed-off-by: Ivan Milošević <iva@blokovi.com> * Modify tests Signed-off-by: Ivan Milošević <iva@blokovi.com> * return copyright comments Signed-off-by: Ivan Milošević <iva@blokovi.com> * remove changes from .gitignore Signed-off-by: Ivan Milošević <iva@blokovi.com> * Move logging to encode errors Comment exported vars and methods Formatting Signed-off-by: Ivan Milošević <iva@blokovi.com> * Login function returns errors.Error Signed-off-by: Ivan Milošević <iva@blokovi.com> * Modify login tests to meet login returning errors.Error Signed-off-by: Ivan Milošević <iva@blokovi.com> * Error interface Signed-off-by: Ivan Milošević <iva@blokovi.com> * Change parameter in Wrapper to interface Error Signed-off-by: Ivan Milošević <iva@blokovi.com> * implement new error interface Signed-off-by: Ivan Milošević <iva@blokovi.com> * Modify tests to use new Error interface Signed-off-by: Ivan Milošević <iva@blokovi.com> * Fix Login Signed-off-by: Ivan Milošević <iva@blokovi.com> * Remove unnecessary errir casting Signed-off-by: Ivan Milošević <iva@blokovi.com> * new error interface implementation Signed-off-by: Ivan Milošević <iva@blokovi.com> * check if Error is empty in registrationEndpoint Signed-off-by: Ivan Milošević <iva@blokovi.com> * Add Empty factory function Use new Empty factory function Use isEmpty method Signed-off-by: Ivan Milošević <iva@blokovi.com> * Lose else in encodeError Signed-off-by: Ivan Milošević <iva@blokovi.com> * Modify tests Signed-off-by: Ivan Milošević <iva@blokovi.com> * Remove *json.UnmarshalTypeError and *json.SyntaxError types from encodeError type switch Signed-off-by: Ivan Milošević <iva@blokovi.com> * Fix nil error value in jwtIdentityProvider Signed-off-by: Ivan Milošević <iva@blokovi.com> * Fix gprc to use new error package Signed-off-by: Ivan Milošević <iva@blokovi.com> * rename receiver in errors package grpc errors Signed-off-by: Ivan Milošević <iva@blokovi.com> * remove debugging code Signed-off-by: Ivan Milošević <iva@blokovi.com> * Resolving conflicts after rebase Signed-off-by: Ivan Milošević <iva@blokovi.com> * Remove comment Signed-off-by: Ivan Milošević <iva@blokovi.com> * Remove Empty from custom error Implement custom error on new methods Signed-off-by: Ivan Milošević <iva@blokovi.com> * WIP tests Signed-off-by: Ivan Milošević <iva@blokovi.com> * remove wrap from Error interface Signed-off-by: Ivan Milošević <iva@blokovi.com> * password-change related tests remove debug code Signed-off-by: Ivan Milošević <iva@blokovi.com> * remove dead code Signed-off-by: Ivan Milošević <iva@blokovi.com> * Move all errors casting to errors package Signed-off-by: Ivan Milošević <iva@blokovi.com> * Fix comment in error package Signed-off-by: Ivan Milošević <iva@blokovi.com> * Change struct pointer to interface in package methods Signed-off-by: Ivan Milošević <iva@blokovi.com> * resolving reviews Signed-off-by: Ivan Milošević <iva@blokovi.com> * fix return in database.go Signed-off-by: Ivan Milošević <iva@blokovi.com> * Fix copyright header Signed-off-by: Ivan Milošević <iva@blokovi.com> * Fix comment in hasher Signed-off-by: Ivan Milošević <iva@blokovi.com>
165 lines
3.6 KiB
Go
165 lines
3.6 KiB
Go
// Copyright (c) Mainflux
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package postgres
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"database/sql/driver"
|
|
"encoding/json"
|
|
|
|
"github.com/mainflux/mainflux/errors"
|
|
"github.com/mainflux/mainflux/users"
|
|
)
|
|
|
|
var (
|
|
errSaveUserDB = errors.New("Save user to DB failed")
|
|
errUpdateDB = errors.New("Update user email to DB failed")
|
|
errUpdateUserDB = errors.New("Update user metadata to DB failed")
|
|
errRetrieveDB = errors.New("Retreiving from DB failed")
|
|
errUpdatePasswordDB = errors.New("Update password to DB failed")
|
|
)
|
|
|
|
var _ users.UserRepository = (*userRepository)(nil)
|
|
|
|
const errDuplicate = "unique_violation"
|
|
|
|
type userRepository struct {
|
|
db Database
|
|
}
|
|
|
|
// New instantiates a PostgreSQL implementation of user
|
|
// repository.
|
|
func New(db Database) users.UserRepository {
|
|
return &userRepository{
|
|
db: db,
|
|
}
|
|
}
|
|
|
|
func (ur userRepository) Save(ctx context.Context, user users.User) errors.Error {
|
|
q := `INSERT INTO users (email, password, metadata) VALUES (:email, :password, :metadata)`
|
|
|
|
dbu := toDBUser(user)
|
|
if _, err := ur.db.NamedExecContext(ctx, q, dbu); err != nil {
|
|
return errors.Wrap(errSaveUserDB, err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (ur userRepository) Update(ctx context.Context, user users.User) errors.Error {
|
|
q := `UPDATE users SET(email, password, metadata) VALUES (:email, :password, :metadata) WHERE email = :email`
|
|
|
|
dbu := toDBUser(user)
|
|
if _, err := ur.db.NamedExecContext(ctx, q, dbu); err != nil {
|
|
return errors.Wrap(errUpdateDB, err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (ur userRepository) UpdateUser(ctx context.Context, user users.User) errors.Error {
|
|
q := `UPDATE users SET metadata = :metadata WHERE email = :email`
|
|
|
|
dbu := toDBUser(user)
|
|
if _, err := ur.db.NamedExecContext(ctx, q, dbu); err != nil {
|
|
return errors.Wrap(errUpdateUserDB, err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (ur userRepository) RetrieveByID(ctx context.Context, email string) (users.User, errors.Error) {
|
|
q := `SELECT password, metadata FROM users WHERE email = $1`
|
|
|
|
dbu := dbUser{
|
|
Email: email,
|
|
}
|
|
if err := ur.db.QueryRowxContext(ctx, q, email).StructScan(&dbu); err != nil {
|
|
if err == sql.ErrNoRows {
|
|
return users.User{}, errors.Wrap(users.ErrNotFound, err)
|
|
|
|
}
|
|
return users.User{}, errors.Wrap(errRetrieveDB, err)
|
|
}
|
|
|
|
user := toUser(dbu)
|
|
|
|
return user, nil
|
|
}
|
|
|
|
func (ur userRepository) UpdatePassword(ctx context.Context, email, password string) errors.Error {
|
|
q := `UPDATE users SET password = :password WHERE email = :email`
|
|
|
|
db := dbUser{
|
|
Email: email,
|
|
Password: password,
|
|
}
|
|
|
|
if _, err := ur.db.NamedExecContext(ctx, q, db); err != nil {
|
|
return errors.Wrap(errUpdatePasswordDB, err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// dbMetadata type for handling metadata properly in database/sql
|
|
type dbMetadata map[string]interface{}
|
|
|
|
// Scan - Implement the database/sql scanner interface
|
|
func (m *dbMetadata) Scan(value interface{}) error {
|
|
if value == nil {
|
|
m = nil
|
|
return nil
|
|
}
|
|
|
|
b, ok := value.([]byte)
|
|
if !ok {
|
|
m = &dbMetadata{}
|
|
return users.ErrScanMetadata
|
|
}
|
|
|
|
if err := json.Unmarshal(b, m); err != nil {
|
|
m = &dbMetadata{}
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Value Implements valuer
|
|
func (m dbMetadata) Value() (driver.Value, error) {
|
|
if len(m) == 0 {
|
|
return nil, nil
|
|
}
|
|
|
|
b, err := json.Marshal(m)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return b, err
|
|
}
|
|
|
|
type dbUser struct {
|
|
Email string `db:"email"`
|
|
Password string `db:"password"`
|
|
Metadata dbMetadata `db:"metadata"`
|
|
}
|
|
|
|
func toDBUser(u users.User) dbUser {
|
|
return dbUser{
|
|
Email: u.Email,
|
|
Password: u.Password,
|
|
Metadata: u.Metadata,
|
|
}
|
|
}
|
|
|
|
func toUser(dbu dbUser) users.User {
|
|
return users.User{
|
|
Email: dbu.Email,
|
|
Password: dbu.Password,
|
|
Metadata: dbu.Metadata,
|
|
}
|
|
}
|