kris/Go-Back-Skeleton
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor auth pkg into libraries

Browse source
This commit is contained in:
dhax 2017-10-31 19:10:09 +01:00
parent 521f081ba0
commit aaf0a0928d
26 changed files with 592 additions and 504 deletions
Download patch file Download diff file Expand all files Collapse all files

17
database/accountStore.go
View file

@ -1,7 +1,8 @@
package database
import (
"github.com/dhax/go-base/auth"
"github.com/dhax/go-base/auth/jwt"
"github.com/dhax/go-base/auth/pwdless"
"github.com/dhax/go-base/models"
"github.com/go-pg/pg"
)
@ -19,8 +20,8 @@ func NewAccountStore(db *pg.DB) *AccountStore {
}
// Get an account by ID.
func (s *AccountStore) Get(id int) (*auth.Account, error) {
a := auth.Account{ID: id}
func (s *AccountStore) Get(id int) (*pwdless.Account, error) {
a := pwdless.Account{ID: id}
err := s.db.Model(&a).
Where("account.id = ?id").
Column("account.*", "Token").
@ -29,7 +30,7 @@ func (s *AccountStore) Get(id int) (*auth.Account, error) {
}
// Update an account.
func (s *AccountStore) Update(a *auth.Account) error {
func (s *AccountStore) Update(a *pwdless.Account) error {
_, err := s.db.Model(a).
Column("email", "name").
Update()
@ -37,9 +38,9 @@ func (s *AccountStore) Update(a *auth.Account) error {
}
// Delete an account.
func (s *AccountStore) Delete(a *auth.Account) error {
func (s *AccountStore) Delete(a *pwdless.Account) error {
err := s.db.RunInTransaction(func(tx *pg.Tx) error {
if _, err := tx.Model(&auth.Token{}).
if _, err := tx.Model(&jwt.Token{}).
Where("account_id = ?", a.ID).
Delete(); err != nil {
return err
@ -55,7 +56,7 @@ func (s *AccountStore) Delete(a *auth.Account) error {
}
// UpdateToken updates a jwt refresh token.
func (s *AccountStore) UpdateToken(t *auth.Token) error {
func (s *AccountStore) UpdateToken(t *jwt.Token) error {
_, err := s.db.Model(t).
Column("identifier").
Update()
@ -63,7 +64,7 @@ func (s *AccountStore) UpdateToken(t *auth.Token) error {
}
// DeleteToken deletes a jwt refresh token.
func (s *AccountStore) DeleteToken(t *auth.Token) error {
func (s *AccountStore) DeleteToken(t *jwt.Token) error {
err := s.db.Delete(t)
return err
}

19
database/admAccountStore.go
View file

@ -3,7 +3,8 @@ package database
import (
"errors"
"github.com/dhax/go-base/auth"
"github.com/dhax/go-base/auth/jwt"
"github.com/dhax/go-base/auth/pwdless"
"github.com/dhax/go-base/models"
"github.com/go-pg/pg"
)
@ -26,8 +27,8 @@ func NewAdmAccountStore(db *pg.DB) *AdmAccountStore {
}
// List applies a filter and returns paginated array of matching results and total count.
func (s *AdmAccountStore) List(f auth.AccountFilter) ([]auth.Account, int, error) {
a := []auth.Account{}
func (s *AdmAccountStore) List(f pwdless.AccountFilter) ([]pwdless.Account, int, error) {
a := []pwdless.Account{}
count, err := s.db.Model(&a).
Apply(f.Filter).
SelectAndCount()
@ -38,7 +39,7 @@ func (s *AdmAccountStore) List(f auth.AccountFilter) ([]auth.Account, int, error
}
// Create creates a new account.
func (s *AdmAccountStore) Create(a *auth.Account) error {
func (s *AdmAccountStore) Create(a *pwdless.Account) error {
count, _ := s.db.Model(a).
Where("email = ?email").
Count()
@ -62,22 +63,22 @@ func (s *AdmAccountStore) Create(a *auth.Account) error {
}
// Get account by ID.
func (s *AdmAccountStore) Get(id int) (*auth.Account, error) {
a := auth.Account{ID: id}
func (s *AdmAccountStore) Get(id int) (*pwdless.Account, error) {
a := pwdless.Account{ID: id}
err := s.db.Select(&a)
return &a, err
}
// Update account.
func (s *AdmAccountStore) Update(a *auth.Account) error {
func (s *AdmAccountStore) Update(a *pwdless.Account) error {
err := s.db.Update(a)
return err
}
// Delete account.
func (s *AdmAccountStore) Delete(a *auth.Account) error {
func (s *AdmAccountStore) Delete(a *pwdless.Account) error {
err := s.db.RunInTransaction(func(tx *pg.Tx) error {
if _, err := tx.Model(&auth.Token{}).
if _, err := tx.Model(&jwt.Token{}).
Where("account_id = ?", a.ID).
Delete(); err != nil {
return err

60
database/authStore.go
View file

@ -3,11 +3,12 @@ package database
import (
"time"
"github.com/dhax/go-base/auth"
"github.com/dhax/go-base/auth/jwt"
"github.com/dhax/go-base/auth/pwdless"
"github.com/go-pg/pg"
)
// AuthStore implements database operations for account authentication.
// AuthStore implements database operations for account pwdlessentication.
type AuthStore struct {
db *pg.DB
}
@ -19,9 +20,9 @@ func NewAuthStore(db *pg.DB) *AuthStore {
}
}
// GetByID returns an account by ID.
func (s *AuthStore) GetByID(id int) (*auth.Account, error) {
a := auth.Account{ID: id}
// GetAccount returns an account by ID.
func (s *AuthStore) GetAccount(id int) (*pwdless.Account, error) {
a := pwdless.Account{ID: id}
err := s.db.Model(&a).
Column("account.*").
Where("id = ?id").
@ -29,9 +30,9 @@ func (s *AuthStore) GetByID(id int) (*auth.Account, error) {
return &a, err
}
// GetByEmail returns an account by email.
func (s *AuthStore) GetByEmail(e string) (*auth.Account, error) {
a := auth.Account{Email: e}
// GetAccountByEmail returns an account by email.
func (s *AuthStore) GetAccountByEmail(e string) (*pwdless.Account, error) {
a := pwdless.Account{Email: e}
err := s.db.Model(&a).
Column("id", "active", "email", "name").
Where("email = ?email").
@ -39,35 +40,26 @@ func (s *AuthStore) GetByEmail(e string) (*auth.Account, error) {
return &a, err
}
// GetByRefreshToken returns an account and refresh token by token identifier.
func (s *AuthStore) GetByRefreshToken(t string) (*auth.Account, *auth.Token, error) {
token := auth.Token{Token: t}
err := s.db.Model(&token).
Where("token = ?token").
First()
if err != nil {
return nil, nil, err
}
a := auth.Account{ID: token.AccountID}
err = s.db.Model(&a).
Column("account.*").
Where("id = ?id").
First()
return &a, &token, err
}
// UpdateAccount upates account data related to authentication.
func (s *AuthStore) UpdateAccount(a *auth.Account) error {
// UpdateAccount upates account data related to pwdlessentication.
func (s *AuthStore) UpdateAccount(a *pwdless.Account) error {
_, err := s.db.Model(a).
Column("last_login").
Update()
return err
}
// SaveRefreshToken creates or updates a refresh token.
func (s *AuthStore) SaveRefreshToken(t *auth.Token) error {
// GetToken returns refresh token by token identifier.
func (s *AuthStore) GetToken(t string) (*jwt.Token, error) {
token := jwt.Token{Token: t}
err := s.db.Model(&token).
Where("token = ?token").
First()
return &token, err
}
// CreateOrUpdateToken creates or updates an existing refresh token.
func (s *AuthStore) CreateOrUpdateToken(t *jwt.Token) error {
var err error
if t.ID == 0 {
err = s.db.Insert(t)
@ -77,15 +69,15 @@ func (s *AuthStore) SaveRefreshToken(t *auth.Token) error {
return err
}
// DeleteRefreshToken deletes a refresh token.
func (s *AuthStore) DeleteRefreshToken(t *auth.Token) error {
// DeleteToken deletes a refresh token.
func (s *AuthStore) DeleteToken(t *jwt.Token) error {
err := s.db.Delete(t)
return err
}
// PurgeExpiredToken deletes expired refresh token.
func (s *AuthStore) PurgeExpiredToken() error {
_, err := s.db.Model(&auth.Token{}).
_, err := s.db.Model(&jwt.Token{}).
Where("expiry < ?", time.Now()).
Delete()