From 1197e6ce6c5b1b79cce7ee3d033e103233a29692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Delattre?= Date: Mon, 2 Mar 2020 13:07:04 +0100 Subject: [PATCH] Move the tokens into the models By the way, move he sqly package in the models as well --- backend/admins/users.go | 3 +-- backend/auth/auth.go | 9 ++++----- backend/{sqly/sqly.go => models/base.go} | 2 +- backend/models/explorer.go | 3 +-- backend/models/polochons.go | 3 +-- backend/{tokens => models}/tokens.go | 5 ++--- backend/models/users.go | 3 +-- backend/users/handlers.go | 7 +++---- 8 files changed, 14 insertions(+), 21 deletions(-) rename backend/{sqly/sqly.go => models/base.go} (94%) rename backend/{tokens => models}/tokens.go (97%) diff --git a/backend/admins/users.go b/backend/admins/users.go index 4a0e08d..9de717c 100644 --- a/backend/admins/users.go +++ b/backend/admins/users.go @@ -8,7 +8,6 @@ import ( "git.quimbo.fr/odwrtw/canape/backend/events" "git.quimbo.fr/odwrtw/canape/backend/models" - "git.quimbo.fr/odwrtw/canape/backend/tokens" "git.quimbo.fr/odwrtw/canape/backend/web" "github.com/gorilla/mux" @@ -165,7 +164,7 @@ func DeleteUserHandler(env *web.Env, w http.ResponseWriter, r *http.Request) err } log.Infof("deleting user tokens") - if err := tokens.DeleteUserTokens(env.Database, user.Name); err != nil { + if err := models.DeleteUserTokens(env.Database, user.Name); err != nil { return err } diff --git a/backend/auth/auth.go b/backend/auth/auth.go index 5773756..ba5aa10 100644 --- a/backend/auth/auth.go +++ b/backend/auth/auth.go @@ -7,7 +7,6 @@ import ( "time" "git.quimbo.fr/odwrtw/canape/backend/models" - "git.quimbo.fr/odwrtw/canape/backend/tokens" jwt "github.com/dgrijalva/jwt-go" "github.com/jmoiron/sqlx" @@ -57,7 +56,7 @@ func (a *Authorizer) GenHash(password string) (string, error) { } // GenerateJWTToken generates a JWT token for a user -func (a *Authorizer) GenerateJWTToken(r *http.Request, u *models.User) (*tokens.Token, error) { +func (a *Authorizer) GenerateJWTToken(r *http.Request, u *models.User) (*models.Token, error) { // Create a jwt token jwtToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{ // Not before @@ -76,7 +75,7 @@ func (a *Authorizer) GenerateJWTToken(r *http.Request, u *models.User) (*tokens. return nil, err } - return &tokens.Token{ + return &models.Token{ Token: ss, Username: u.Name, IP: getIPFromRequest(r), @@ -84,7 +83,7 @@ func (a *Authorizer) GenerateJWTToken(r *http.Request, u *models.User) (*tokens. } // Login cheks password and creates a jwt token -func (a *Authorizer) Login(r *http.Request, username, password string) (*tokens.Token, error) { +func (a *Authorizer) Login(r *http.Request, username, password string) (*models.Token, error) { u, err := models.GetUser(a.db, username) if err != nil { return nil, err @@ -157,7 +156,7 @@ func (a *Authorizer) CurrentUser(rw http.ResponseWriter, req *http.Request) (*mo } // Check the token in database - token, err := tokens.GetUserToken(a.db, u.Name, tokenStr) + token, err := models.GetUserToken(a.db, u.Name, tokenStr) if err != nil { return nil, ErrInvalidToken } diff --git a/backend/sqly/sqly.go b/backend/models/base.go similarity index 94% rename from backend/sqly/sqly.go rename to backend/models/base.go index 96bf61a..57356fc 100644 --- a/backend/sqly/sqly.go +++ b/backend/models/base.go @@ -1,4 +1,4 @@ -package sqly +package models import ( "time" diff --git a/backend/models/explorer.go b/backend/models/explorer.go index 82821fd..9a4e5d5 100644 --- a/backend/models/explorer.go +++ b/backend/models/explorer.go @@ -3,7 +3,6 @@ package models import ( "github.com/jmoiron/sqlx" "github.com/lib/pq" - "git.quimbo.fr/odwrtw/canape/backend/sqly" ) const ( @@ -24,7 +23,7 @@ const ( // Media represents an external media type Media struct { - sqly.BaseModel + BaseModel Type string `db:"type"` Source string `db:"source"` Category string `db:"category"` diff --git a/backend/models/polochons.go b/backend/models/polochons.go index c284242..952e89b 100644 --- a/backend/models/polochons.go +++ b/backend/models/polochons.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" - "git.quimbo.fr/odwrtw/canape/backend/sqly" "github.com/jmoiron/sqlx" "github.com/odwrtw/papi" ) @@ -32,7 +31,7 @@ var ErrUnknownPolochon = fmt.Errorf("polochons: polochon does'nt exist") // Polochon represents a polochon type Polochon struct { - sqly.BaseModel + BaseModel Name string `db:"name" json:"name"` URL string `db:"url" json:"url"` Token string `db:"token" json:"token"` diff --git a/backend/tokens/tokens.go b/backend/models/tokens.go similarity index 97% rename from backend/tokens/tokens.go rename to backend/models/tokens.go index 18847c5..2b9a680 100644 --- a/backend/tokens/tokens.go +++ b/backend/models/tokens.go @@ -1,4 +1,4 @@ -package tokens +package models import ( "database/sql" @@ -6,7 +6,6 @@ import ( "fmt" "time" - "git.quimbo.fr/odwrtw/canape/backend/sqly" "github.com/jmoiron/sqlx" ) @@ -26,7 +25,7 @@ var ( // Token represents a token type Token struct { - sqly.BaseModel + BaseModel Username string `db:"username" json:"username"` Token string `db:"token" json:"token"` Description string `db:"description" json:"description"` diff --git a/backend/models/users.go b/backend/models/users.go index 7050e7d..303aa79 100644 --- a/backend/models/users.go +++ b/backend/models/users.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" - "git.quimbo.fr/odwrtw/canape/backend/sqly" "github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx/types" "github.com/odwrtw/papi" @@ -42,7 +41,7 @@ var ErrUnknownUser = fmt.Errorf("users: user does'nt exist") // User represents an user type User struct { - sqly.BaseModel + BaseModel Name string `json:"name"` Hash string `json:"-"` Admin bool `json:"admin"` diff --git a/backend/users/handlers.go b/backend/users/handlers.go index 175d57c..7bb09ad 100644 --- a/backend/users/handlers.go +++ b/backend/users/handlers.go @@ -10,7 +10,6 @@ import ( "git.quimbo.fr/odwrtw/canape/backend/config" "git.quimbo.fr/odwrtw/canape/backend/events" "git.quimbo.fr/odwrtw/canape/backend/models" - "git.quimbo.fr/odwrtw/canape/backend/tokens" "git.quimbo.fr/odwrtw/canape/backend/web" "github.com/gorilla/mux" ) @@ -164,7 +163,7 @@ func EditHandler(e *web.Env, w http.ResponseWriter, r *http.Request) error { func GetTokensHandler(e *web.Env, w http.ResponseWriter, r *http.Request) error { user := auth.GetCurrentUser(r, e.Log) - tokens, err := tokens.GetUserTokens(e.Database, user.Name) + tokens, err := models.GetUserTokens(e.Database, user.Name) if err != nil { return err } @@ -179,7 +178,7 @@ func DeleteTokenHandler(e *web.Env, w http.ResponseWriter, r *http.Request) erro user := auth.GetCurrentUser(r, e.Log) - if err := tokens.DeleteToken(e.Database, user.Name, token); err != nil { + if err := models.DeleteToken(e.Database, user.Name, token); err != nil { return err } @@ -193,7 +192,7 @@ func EditTokenHandler(e *web.Env, w http.ResponseWriter, r *http.Request) error user := auth.GetCurrentUser(r, e.Log) - t, err := tokens.GetUserToken(e.Database, user.Name, token) + t, err := models.GetUserToken(e.Database, user.Name, token) if err != nil { return err }