mirror/phylum
1
0
Fork 0
mirror of https://codeberg.org/shroff/phylum.git synced 2026-05-02 18:20:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Hide app.Db

Browse Source
This commit is contained in:
Abhishek Shroff
2024-08-06 22:16:52 +05:30
parent bed9003a39
commit eaf1c0b0c3
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/internal/app/app.go
+3 -3
View File
@@ -10,7 +10,7 @@ import (
type App struct {
Debug bool
Db *db.DbHandler
db *db.DbHandler
Cs storage.Storage
adminUserID int32
}
@@ -30,7 +30,7 @@ func Initialize(db *db.DbHandler, contentDir string, debug bool) error {
} else {
Default = &App{
Debug: debug,
Db: db,
db: db,
Cs: cs,
adminUserID: adminUserID,
}
@@ -43,5 +43,5 @@ func (a App) OpenFileSystem(ctx context.Context, user int32) (core.FileSystem, e
if user <= 0 {
user = a.adminUserID
}
return core.OpenFileSystem(a.Db, ctx, a.Cs, nil, user)
return core.OpenFileSystem(a.db, ctx, a.Cs, nil, user)
}
server/internal/app/auth.go
+3 -3
View File
@@ -26,7 +26,7 @@ var ErrTokenInvalid = errors.New("token invalid")
var ErrTokenExpired = errors.New("token expired")
func (a App) VerifyUserPassword(ctx context.Context, username, password string) (int32, error) {
if user, err := a.Db.Queries().UserByUsername(context.Background(), username); err != nil {
if user, err := a.db.Queries().UserByUsername(context.Background(), username); err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return 0, ErrCredentialsInvalid
}
@@ -47,7 +47,7 @@ func (a App) CreateAccessToken(username, password string) (sql.AccessToken, erro
if userID, err := a.VerifyUserPassword(context.Background(), username, password); err != nil {
return sql.AccessToken{}, err
} else {
if token, err := a.Db.Queries().InsertAccessToken(context.Background(), sql.InsertAccessTokenParams{
if token, err := a.db.Queries().InsertAccessToken(context.Background(), sql.InsertAccessTokenParams{
ID: GenerateRandomString(accessTokenLength),
Validity: accessTokenValiditiy,
UserID: userID,
@@ -60,7 +60,7 @@ func (a App) CreateAccessToken(username, password string) (sql.AccessToken, erro
}
func (a App) VerifyAccessToken(accessToken string) (int32, error) {
token, err := a.Db.Queries().AccessTokenById(context.Background(), accessToken)
token, err := a.db.Queries().AccessTokenById(context.Background(), accessToken)
if errors.Is(err, pgx.ErrNoRows) {
return 0, ErrTokenInvalid
} else if err != nil {
server/internal/app/users.go
+4 -4
View File
@@ -30,14 +30,14 @@ func (u user) DisplayName() string { return u.displayName }
func (a App) CreateUser(ctx context.Context, username, displayName, password string) error {
if hash, err := cryptutil.GenerateArgon2EncodedHash(password, cryptutil.DefaultArgon2Params()); err != nil {
return err
} else if err = a.Db.Queries().CreateUser(ctx, sql.CreateUserParams{Username: username, DisplayName: displayName, PasswordHash: hash}); err != nil {
} else if err = a.db.Queries().CreateUser(ctx, sql.CreateUserParams{Username: username, DisplayName: displayName, PasswordHash: hash}); err != nil {
return err
}
return nil
}
func (a App) ListUsers(ctx context.Context) ([]User, error) {
results, err := a.Db.Queries().ListUsers(ctx)
results, err := a.db.Queries().ListUsers(ctx)
if err != nil {
return nil, err
}
@@ -53,7 +53,7 @@ func (a App) ListUsers(ctx context.Context) ([]User, error) {
}
func (a App) UserByUsername(ctx context.Context, username string) (User, error) {
result, err := a.Db.Queries().UserByUsername(ctx, username)
result, err := a.db.Queries().UserByUsername(ctx, username)
if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
err = ErrUserNotFound
@@ -68,7 +68,7 @@ func (a App) UserByUsername(ctx context.Context, username string) (User, error)
}
func (a App) UserByID(ctx context.Context, userID int32) (User, error) {
result, err := a.Db.Queries().UserByID(ctx, userID)
result, err := a.db.Queries().UserByID(ctx, userID)
if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
err = ErrUserNotFound