This commit is contained in:
parent
8d58ad7aed
commit
862ff1ff7b
@ -5,7 +5,7 @@ tmp_dir = ".air-tmp"
|
|||||||
bin = "./tijl.dev"
|
bin = "./tijl.dev"
|
||||||
cmd = "just build"
|
cmd = "just build"
|
||||||
delay = 1000
|
delay = 1000
|
||||||
exclude_dir = ["node_modules","modules/database","web/static"]
|
exclude_dir = ["node_modules","internal/queries","web/static"]
|
||||||
exclude_unchanged = false
|
exclude_unchanged = false
|
||||||
follow_symlink = false
|
follow_symlink = false
|
||||||
include_ext = ["go", "html", "js", "ts"]
|
include_ext = ["go", "html", "js", "ts"]
|
||||||
|
@ -1 +0,0 @@
|
|||||||
package middleware
|
|
@ -1 +0,0 @@
|
|||||||
package middleware
|
|
@ -6,10 +6,10 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/db"
|
"git.tijl.dev/tijl/tijl.dev/internal/queries"
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/user"
|
"git.tijl.dev/tijl/tijl.dev/internal/user"
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/utils"
|
"git.tijl.dev/tijl/tijl.dev/internal/utils"
|
||||||
"git.tijl.dev/tijl/tijl.dev/modules/database"
|
"git.tijl.dev/tijl/tijl.dev/modules/db"
|
||||||
log "git.tijl.dev/tijl/tijl.dev/modules/logger"
|
log "git.tijl.dev/tijl/tijl.dev/modules/logger"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
)
|
)
|
||||||
@ -53,7 +53,7 @@ func HandleCallback(c *fiber.Ctx) error {
|
|||||||
|
|
||||||
_, err = db.Queries.GetUser(ctx, idToken.Subject)
|
_, err = db.Queries.GetUser(ctx, idToken.Subject)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
db.Queries.UpdateUserData(ctx, database.UpdateUserDataParams{
|
db.Queries.UpdateUserData(ctx, queries.UpdateUserDataParams{
|
||||||
Uid: idToken.Subject,
|
Uid: idToken.Subject,
|
||||||
Email: claims.Email,
|
Email: claims.Email,
|
||||||
EmailVerified: claims.EmailVerified,
|
EmailVerified: claims.EmailVerified,
|
||||||
@ -61,7 +61,7 @@ func HandleCallback(c *fiber.Ctx) error {
|
|||||||
FullName: claims.Name,
|
FullName: claims.Name,
|
||||||
})
|
})
|
||||||
} else if err == sql.ErrNoRows {
|
} else if err == sql.ErrNoRows {
|
||||||
db.Queries.CreateUser(ctx, database.CreateUserParams{
|
db.Queries.CreateUser(ctx, queries.CreateUserParams{
|
||||||
Uid: idToken.Subject,
|
Uid: idToken.Subject,
|
||||||
Email: claims.Email,
|
Email: claims.Email,
|
||||||
EmailVerified: claims.EmailVerified,
|
EmailVerified: claims.EmailVerified,
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
// versions:
|
// versions:
|
||||||
// sqlc v1.27.0
|
// sqlc v1.27.0
|
||||||
|
|
||||||
package database
|
package queries
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
@ -2,7 +2,7 @@
|
|||||||
// versions:
|
// versions:
|
||||||
// sqlc v1.27.0
|
// sqlc v1.27.0
|
||||||
|
|
||||||
package database
|
package queries
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
@ -3,7 +3,7 @@
|
|||||||
// sqlc v1.27.0
|
// sqlc v1.27.0
|
||||||
// source: sessions.sql
|
// source: sessions.sql
|
||||||
|
|
||||||
package database
|
package queries
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
@ -3,7 +3,7 @@
|
|||||||
// sqlc v1.27.0
|
// sqlc v1.27.0
|
||||||
// source: users.sql
|
// source: users.sql
|
||||||
|
|
||||||
package database
|
package queries
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
@ -7,11 +7,11 @@ import (
|
|||||||
|
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/assets"
|
"git.tijl.dev/tijl/tijl.dev/internal/assets"
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/config"
|
"git.tijl.dev/tijl/tijl.dev/internal/config"
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/db"
|
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/handlers"
|
"git.tijl.dev/tijl/tijl.dev/internal/handlers"
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/i18n"
|
"git.tijl.dev/tijl/tijl.dev/internal/i18n"
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/oidc"
|
"git.tijl.dev/tijl/tijl.dev/internal/oidc"
|
||||||
webinternal "git.tijl.dev/tijl/tijl.dev/internal/web"
|
webinternal "git.tijl.dev/tijl/tijl.dev/internal/web"
|
||||||
|
"git.tijl.dev/tijl/tijl.dev/modules/db"
|
||||||
"git.tijl.dev/tijl/tijl.dev/modules/logger"
|
"git.tijl.dev/tijl/tijl.dev/modules/logger"
|
||||||
"git.tijl.dev/tijl/tijl.dev/modules/web"
|
"git.tijl.dev/tijl/tijl.dev/modules/web"
|
||||||
webf "git.tijl.dev/tijl/tijl.dev/web"
|
webf "git.tijl.dev/tijl/tijl.dev/web"
|
||||||
|
@ -4,14 +4,14 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/db"
|
"git.tijl.dev/tijl/tijl.dev/internal/queries"
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/utils"
|
"git.tijl.dev/tijl/tijl.dev/internal/utils"
|
||||||
"git.tijl.dev/tijl/tijl.dev/modules/database"
|
"git.tijl.dev/tijl/tijl.dev/modules/db"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewSession(uid string, c *fiber.Ctx) (string, error) {
|
func NewSession(uid string, c *fiber.Ctx) (string, error) {
|
||||||
createSessionParams := database.CreateSessionParams{
|
createSessionParams := queries.CreateSessionParams{
|
||||||
Uid: uid,
|
Uid: uid,
|
||||||
Token: utils.RandString(64),
|
Token: utils.RandString(64),
|
||||||
}
|
}
|
||||||
@ -25,7 +25,7 @@ func NewSession(uid string, c *fiber.Ctx) (string, error) {
|
|||||||
Secure: true,
|
Secure: true,
|
||||||
})
|
})
|
||||||
|
|
||||||
_, err = db.Queries.QuickUpdateSession(context.TODO(), database.QuickUpdateSessionParams{
|
_, err = db.Queries.QuickUpdateSession(context.TODO(), queries.QuickUpdateSessionParams{
|
||||||
Token: createSessionParams.Token,
|
Token: createSessionParams.Token,
|
||||||
IpAddress: c.IP(),
|
IpAddress: c.IP(),
|
||||||
Agent: string(c.Context().UserAgent()),
|
Agent: string(c.Context().UserAgent()),
|
||||||
@ -41,7 +41,7 @@ func GetSession(c *fiber.Ctx) (string, error) {
|
|||||||
if c.Cookies("session") == "" {
|
if c.Cookies("session") == "" {
|
||||||
return "", errors.New("no cookie found")
|
return "", errors.New("no cookie found")
|
||||||
}
|
}
|
||||||
uid, err := db.Queries.QuickUpdateSession(context.TODO(), database.QuickUpdateSessionParams{
|
uid, err := db.Queries.QuickUpdateSession(context.TODO(), queries.QuickUpdateSessionParams{
|
||||||
Token: c.Cookies("session"),
|
Token: c.Cookies("session"),
|
||||||
IpAddress: c.IP(),
|
IpAddress: c.IP(),
|
||||||
Agent: string(c.Context().UserAgent()),
|
Agent: string(c.Context().UserAgent()),
|
||||||
|
@ -3,14 +3,14 @@ package user
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/db"
|
"git.tijl.dev/tijl/tijl.dev/internal/queries"
|
||||||
"git.tijl.dev/tijl/tijl.dev/modules/database"
|
"git.tijl.dev/tijl/tijl.dev/modules/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetUser(uid string) (error, database.User) {
|
func GetUser(uid string) (error, queries.User) {
|
||||||
user, err := db.Queries.GetUser(context.TODO(), uid)
|
user, err := db.Queries.GetUser(context.TODO(), uid)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, database.User{}
|
return err, queries.User{}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, user
|
return nil, user
|
||||||
|
@ -5,8 +5,8 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"git.tijl.dev/tijl/tijl.dev/internal/config"
|
"git.tijl.dev/tijl/tijl.dev/internal/config"
|
||||||
|
"git.tijl.dev/tijl/tijl.dev/internal/queries"
|
||||||
"git.tijl.dev/tijl/tijl.dev/migrations"
|
"git.tijl.dev/tijl/tijl.dev/migrations"
|
||||||
dbmanager "git.tijl.dev/tijl/tijl.dev/modules/database"
|
|
||||||
log "git.tijl.dev/tijl/tijl.dev/modules/logger"
|
log "git.tijl.dev/tijl/tijl.dev/modules/logger"
|
||||||
"github.com/golang-migrate/migrate/v4"
|
"github.com/golang-migrate/migrate/v4"
|
||||||
"github.com/golang-migrate/migrate/v4/database/pgx/v5"
|
"github.com/golang-migrate/migrate/v4/database/pgx/v5"
|
||||||
@ -15,7 +15,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var DB *sql.DB
|
var DB *sql.DB
|
||||||
var Queries *dbmanager.Queries
|
var Queries *queries.Queries
|
||||||
|
|
||||||
func Load() {
|
func Load() {
|
||||||
var err error
|
var err error
|
||||||
@ -24,7 +24,7 @@ func Load() {
|
|||||||
log.Fatal().Err(err).Msg("failed to connect to database")
|
log.Fatal().Err(err).Msg("failed to connect to database")
|
||||||
}
|
}
|
||||||
//defer DB.Close()
|
//defer DB.Close()
|
||||||
Queries = dbmanager.New(DB)
|
Queries = queries.New(DB)
|
||||||
log.Info().Msg("connected to database")
|
log.Info().Msg("connected to database")
|
||||||
|
|
||||||
/*
|
/*
|
@ -1,10 +1,10 @@
|
|||||||
version: "2"
|
version: "2"
|
||||||
sql:
|
sql:
|
||||||
- engine: "postgresql"
|
- engine: "postgresql"
|
||||||
queries: "modules/database/*.sql"
|
queries: "internal/queries/*.sql"
|
||||||
schema: "migrations/*.sql"
|
schema: "migrations/*.sql"
|
||||||
gen:
|
gen:
|
||||||
go:
|
go:
|
||||||
package: "database"
|
package: "queries"
|
||||||
out: "modules/database/"
|
out: "internal/queries/"
|
||||||
sql_package: "database/sql"
|
sql_package: "database/sql"
|
||||||
|
Loading…
Reference in New Issue
Block a user