diff --git a/internal/config/config.go b/internal/config/config.go
index 0113ef7..e380626 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -7,59 +7,15 @@ import (
)
type ServerConfigs struct {
- AutoMigrate bool
- ServerAddress string
-
- DataBaseURL string
- JwtSecret string
+ IsProd bool
}
func GetServerConfigs() ServerConfigs {
config := ServerConfigs{}
- // mandatory
-
- config.DataBaseURL = os.Getenv("DATABASE_URL")
- if config.DataBaseURL == "" {
- panic("Missing DATABASE_URL")
- }
-
- config.JwtSecret = os.Getenv("JWT_SECRET")
- if config.JwtSecret == "" {
- panic("Missing JWT_SECRET")
- }
-
- // optional - with defaults
-
- envAutoMigrate := os.Getenv("AUTO_MIGRATE")
- if envAutoMigrate != "" {
- config.AutoMigrate = envAutoMigrate == "true"
- } else {
- config.AutoMigrate = true
- }
-
- envPort := os.Getenv("PORT")
- if envPort != "" {
- config.ServerAddress = ":" + envPort
- } else {
- config.ServerAddress = ":3000"
- }
-
- return config
-}
-
-type MigrateConfigs struct {
- DataBaseURL string
-}
-
-func GetMigrateConfigs() MigrateConfigs {
- config := MigrateConfigs{}
-
- // mandatory
-
- config.DataBaseURL = os.Getenv("DATABASE_URL")
- if config.DataBaseURL == "" {
- panic("Missing DATABASE_URL")
+ config.IsProd = true
+ if os.Getenv("ENV") == "local" {
+ config.IsProd = false
}
return config
diff --git a/internal/controllers/controllers.go b/internal/controllers/controllers.go
deleted file mode 100644
index 152828d..0000000
--- a/internal/controllers/controllers.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package controllers
-
-type Controllers interface {
- UserController | TaskController
-}
diff --git a/internal/controllers/tasks.go b/internal/controllers/tasks.go
deleted file mode 100644
index edfebc9..0000000
--- a/internal/controllers/tasks.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package controllers
-
-import (
- "database/sql"
- "goth/internal/models"
- "goth/internal/repositories/database"
-
- "github.com/gofiber/fiber/v2"
-)
-
-type TaskController struct {
- DbRepo database.Database
-}
-
-func NewTaskController(dbRepo database.Database) *TaskController {
- return &TaskController{
- DbRepo: dbRepo,
- }
-}
-
-func (tc *TaskController) CreateTask(ownerId string) (models.Task, error) {
- task := models.Task{
- Id: models.GenerateId(),
- Title: "New Task",
- Description: "New Task Description",
- OwnerId: ownerId,
- }
- return task, tc.DbRepo.CreateTask(task)
-}
-
-func (tc *TaskController) ListTasks(ownerId string) ([]models.Task, error) {
- return tc.DbRepo.ListTasksByOwner(ownerId)
-}
-
-func (tc *TaskController) RetrieveTask(ownerId, taskId string) (models.Task, error) {
- task, err := tc.DbRepo.RetrieveTaskById(taskId)
- if err != nil {
- if err == sql.ErrNoRows {
- return models.EmptyTask, fiber.ErrNotFound
- }
-
- return models.EmptyTask, err
- }
-
- if task.OwnerId != ownerId {
- return models.EmptyTask, fiber.ErrNotFound
- }
-
- return task, nil
-}
-
-func (tc *TaskController) DeleteTask(ownerId, taskId string) error {
- _, err := tc.RetrieveTask(ownerId, taskId)
- if err != nil {
- return err
- }
-
- return tc.DbRepo.DeleteTask(taskId)
-}
-
-type TaskChange struct {
- Title string `json:"title"`
- Description string `json:"description"`
-}
-
-func (tc *TaskController) UpdateTask(ownerId, taskId string, changes TaskChange) error {
- task, err := tc.RetrieveTask(ownerId, taskId)
- if err != nil {
- return err
- }
-
- if changes.Title != "" {
- task.Title = changes.Title
- }
-
- if changes.Description != "" {
- task.Description = changes.Description
- }
-
- return tc.DbRepo.UpdateTask(task)
-}
diff --git a/internal/controllers/users.go b/internal/controllers/users.go
deleted file mode 100644
index 22a12e0..0000000
--- a/internal/controllers/users.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package controllers
-
-import (
- "errors"
- "goth/internal/models"
- "goth/internal/repositories/database"
- "goth/internal/repositories/jwt"
- "goth/internal/utils"
- "time"
-
- "github.com/gofiber/fiber/v2"
-)
-
-type UserController struct {
- dbRepo database.Database
- jwtRepo jwt.JWT
-}
-
-func NewUserController(dbRepo database.Database, jwtRepo jwt.JWT) *UserController {
- return &UserController{dbRepo, jwtRepo}
-}
-
-func (uc *UserController) VerifyJWTCookie(token string) (models.User, error) {
- id, err := uc.jwtRepo.ParseJWT(token)
- if err != nil {
- return models.EmptyUser, err
- }
-
- return uc.dbRepo.RetrieveUserById(id)
-}
-
-type UserRequest struct {
- Username string `json:"username"`
- Password string `json:"password"`
-}
-
-func (uc *UserController) Login(req UserRequest, cookieName string) (*fiber.Cookie, error) {
- user, err := uc.dbRepo.RetrieveUserByName(req.Username)
- if err != nil {
- return nil, err
- }
-
- // slow checking -> design feature of bcrypt
- if !utils.CheckPasswordHash(req.Password, user.PswdHash) {
- return nil, errors.New("bad username or password")
- }
-
- expiration := time.Now().Add(7 * 24 * time.Hour)
- jwt, err := uc.jwtRepo.GenerateJWT(user.ID, expiration)
- if err != nil {
- return nil, err
- }
-
- return &fiber.Cookie{
- Expires: expiration,
- Name: cookieName,
- Value: jwt,
- }, nil
-}
-
-func (uc *UserController) Register(req UserRequest, cookieName string) (*fiber.Cookie, error) {
- hashedPassword, err := utils.HashPassword(req.Password)
- if err != nil {
- return nil, err
- }
-
- user := models.User{
- ID: models.GenerateId(),
- Username: req.Username,
- PswdHash: hashedPassword,
- }
-
- err = uc.dbRepo.InsertUser(user)
- if err != nil {
- return nil, err
- }
-
- expiration := time.Now().Add(7 * 24 * time.Hour)
- jwt, err := uc.jwtRepo.GenerateJWT(user.ID, expiration)
- if err != nil {
- return nil, err
- }
-
- return &fiber.Cookie{
- Expires: expiration,
- Name: cookieName,
- Value: jwt,
- }, nil
-}
diff --git a/internal/embeded/.gitignore b/internal/embeded/.gitignore
new file mode 100644
index 0000000..3ed09ab
--- /dev/null
+++ b/internal/embeded/.gitignore
@@ -0,0 +1 @@
+assets/
\ No newline at end of file
diff --git a/internal/embeded/statics.go b/internal/embeded/assets.go
similarity index 57%
rename from internal/embeded/statics.go
rename to internal/embeded/assets.go
index 7b05f85..0e9075b 100644
--- a/internal/embeded/statics.go
+++ b/internal/embeded/assets.go
@@ -4,5 +4,5 @@ import "embed"
// Embed a directory
//
-//go:embed statics/*
-var Statics embed.FS
+//go:embed assets/*
+var Assets embed.FS
diff --git a/internal/embeded/migrations.go b/internal/embeded/migrations.go
deleted file mode 100644
index 335ea71..0000000
--- a/internal/embeded/migrations.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package embeded
-
-import "embed"
-
-// Embed a directory
-//
-//go:embed migrations/*.sql
-var Migrations embed.FS
diff --git a/internal/embeded/migrations/01_initial.down.sql b/internal/embeded/migrations/01_initial.down.sql
deleted file mode 100644
index cc1f647..0000000
--- a/internal/embeded/migrations/01_initial.down.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE users;
diff --git a/internal/embeded/migrations/01_initial.up.sql b/internal/embeded/migrations/01_initial.up.sql
deleted file mode 100644
index 7ce5571..0000000
--- a/internal/embeded/migrations/01_initial.up.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- SQLITE
-
-CREATE TABLE users (
- id UUID PRIMARY KEY,
- pswd_hash TEXT NOT NULL,
- username TEXT NOT NULL UNIQUE,
- created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
\ No newline at end of file
diff --git a/internal/embeded/migrations/02_tasks.down.sql b/internal/embeded/migrations/02_tasks.down.sql
deleted file mode 100644
index 87f1ed5..0000000
--- a/internal/embeded/migrations/02_tasks.down.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE tasks;
diff --git a/internal/embeded/migrations/02_tasks.up.sql b/internal/embeded/migrations/02_tasks.up.sql
deleted file mode 100644
index dd98c06..0000000
--- a/internal/embeded/migrations/02_tasks.up.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- SQLITE
-
-CREATE TABLE tasks (
- id UUID PRIMARY KEY,
- title TEXT NOT NULL,
- owner_id UUID NOT NULL,
- description TEXT NOT NULL,
- created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- FOREIGN KEY (owner_id) REFERENCES users (id)
-);
diff --git a/internal/embeded/statics/favicon.ico b/internal/embeded/statics/favicon.ico
deleted file mode 100644
index 2f23f50..0000000
Binary files a/internal/embeded/statics/favicon.ico and /dev/null differ
diff --git a/internal/migrations/1745782908_collections_snapshot.go b/internal/migrations/1745782908_collections_snapshot.go
new file mode 100644
index 0000000..c5d429d
--- /dev/null
+++ b/internal/migrations/1745782908_collections_snapshot.go
@@ -0,0 +1,864 @@
+package migrations
+
+import (
+ "github.com/pocketbase/pocketbase/core"
+ m "github.com/pocketbase/pocketbase/migrations"
+)
+
+func init() {
+ m.Register(func(app core.App) error {
+ jsonData := `[
+ {
+ "createRule": null,
+ "deleteRule": null,
+ "fields": [
+ {
+ "autogeneratePattern": "[a-z0-9]{15}",
+ "hidden": false,
+ "id": "text3208210256",
+ "max": 15,
+ "min": 15,
+ "name": "id",
+ "pattern": "^[a-z0-9]+$",
+ "presentable": false,
+ "primaryKey": true,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text455797646",
+ "max": 0,
+ "min": 0,
+ "name": "collectionRef",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text127846527",
+ "max": 0,
+ "min": 0,
+ "name": "recordRef",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text1582905952",
+ "max": 0,
+ "min": 0,
+ "name": "method",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "hidden": false,
+ "id": "autodate2990389176",
+ "name": "created",
+ "onCreate": true,
+ "onUpdate": false,
+ "presentable": false,
+ "system": true,
+ "type": "autodate"
+ },
+ {
+ "hidden": false,
+ "id": "autodate3332085495",
+ "name": "updated",
+ "onCreate": true,
+ "onUpdate": true,
+ "presentable": false,
+ "system": true,
+ "type": "autodate"
+ }
+ ],
+ "id": "pbc_2279338944",
+ "indexes": [
+ "CREATE INDEX ` + "`" + `idx_mfas_collectionRef_recordRef` + "`" + ` ON ` + "`" + `_mfas` + "`" + ` (collectionRef,recordRef)"
+ ],
+ "listRule": "@request.auth.id != '' && recordRef = @request.auth.id && collectionRef = @request.auth.collectionId",
+ "name": "_mfas",
+ "system": true,
+ "type": "base",
+ "updateRule": null,
+ "viewRule": "@request.auth.id != '' && recordRef = @request.auth.id && collectionRef = @request.auth.collectionId"
+ },
+ {
+ "createRule": null,
+ "deleteRule": null,
+ "fields": [
+ {
+ "autogeneratePattern": "[a-z0-9]{15}",
+ "hidden": false,
+ "id": "text3208210256",
+ "max": 15,
+ "min": 15,
+ "name": "id",
+ "pattern": "^[a-z0-9]+$",
+ "presentable": false,
+ "primaryKey": true,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text455797646",
+ "max": 0,
+ "min": 0,
+ "name": "collectionRef",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text127846527",
+ "max": 0,
+ "min": 0,
+ "name": "recordRef",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "cost": 8,
+ "hidden": true,
+ "id": "password901924565",
+ "max": 0,
+ "min": 0,
+ "name": "password",
+ "pattern": "",
+ "presentable": false,
+ "required": true,
+ "system": true,
+ "type": "password"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": true,
+ "id": "text3866985172",
+ "max": 0,
+ "min": 0,
+ "name": "sentTo",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": false,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "hidden": false,
+ "id": "autodate2990389176",
+ "name": "created",
+ "onCreate": true,
+ "onUpdate": false,
+ "presentable": false,
+ "system": true,
+ "type": "autodate"
+ },
+ {
+ "hidden": false,
+ "id": "autodate3332085495",
+ "name": "updated",
+ "onCreate": true,
+ "onUpdate": true,
+ "presentable": false,
+ "system": true,
+ "type": "autodate"
+ }
+ ],
+ "id": "pbc_1638494021",
+ "indexes": [
+ "CREATE INDEX ` + "`" + `idx_otps_collectionRef_recordRef` + "`" + ` ON ` + "`" + `_otps` + "`" + ` (collectionRef, recordRef)"
+ ],
+ "listRule": "@request.auth.id != '' && recordRef = @request.auth.id && collectionRef = @request.auth.collectionId",
+ "name": "_otps",
+ "system": true,
+ "type": "base",
+ "updateRule": null,
+ "viewRule": "@request.auth.id != '' && recordRef = @request.auth.id && collectionRef = @request.auth.collectionId"
+ },
+ {
+ "createRule": null,
+ "deleteRule": "@request.auth.id != '' && recordRef = @request.auth.id && collectionRef = @request.auth.collectionId",
+ "fields": [
+ {
+ "autogeneratePattern": "[a-z0-9]{15}",
+ "hidden": false,
+ "id": "text3208210256",
+ "max": 15,
+ "min": 15,
+ "name": "id",
+ "pattern": "^[a-z0-9]+$",
+ "presentable": false,
+ "primaryKey": true,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text455797646",
+ "max": 0,
+ "min": 0,
+ "name": "collectionRef",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text127846527",
+ "max": 0,
+ "min": 0,
+ "name": "recordRef",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text2462348188",
+ "max": 0,
+ "min": 0,
+ "name": "provider",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text1044722854",
+ "max": 0,
+ "min": 0,
+ "name": "providerId",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "hidden": false,
+ "id": "autodate2990389176",
+ "name": "created",
+ "onCreate": true,
+ "onUpdate": false,
+ "presentable": false,
+ "system": true,
+ "type": "autodate"
+ },
+ {
+ "hidden": false,
+ "id": "autodate3332085495",
+ "name": "updated",
+ "onCreate": true,
+ "onUpdate": true,
+ "presentable": false,
+ "system": true,
+ "type": "autodate"
+ }
+ ],
+ "id": "pbc_2281828961",
+ "indexes": [
+ "CREATE UNIQUE INDEX ` + "`" + `idx_externalAuths_record_provider` + "`" + ` ON ` + "`" + `_externalAuths` + "`" + ` (collectionRef, recordRef, provider)",
+ "CREATE UNIQUE INDEX ` + "`" + `idx_externalAuths_collection_provider` + "`" + ` ON ` + "`" + `_externalAuths` + "`" + ` (collectionRef, provider, providerId)"
+ ],
+ "listRule": "@request.auth.id != '' && recordRef = @request.auth.id && collectionRef = @request.auth.collectionId",
+ "name": "_externalAuths",
+ "system": true,
+ "type": "base",
+ "updateRule": null,
+ "viewRule": "@request.auth.id != '' && recordRef = @request.auth.id && collectionRef = @request.auth.collectionId"
+ },
+ {
+ "createRule": null,
+ "deleteRule": "@request.auth.id != '' && recordRef = @request.auth.id && collectionRef = @request.auth.collectionId",
+ "fields": [
+ {
+ "autogeneratePattern": "[a-z0-9]{15}",
+ "hidden": false,
+ "id": "text3208210256",
+ "max": 15,
+ "min": 15,
+ "name": "id",
+ "pattern": "^[a-z0-9]+$",
+ "presentable": false,
+ "primaryKey": true,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text455797646",
+ "max": 0,
+ "min": 0,
+ "name": "collectionRef",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text127846527",
+ "max": 0,
+ "min": 0,
+ "name": "recordRef",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text4228609354",
+ "max": 0,
+ "min": 0,
+ "name": "fingerprint",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "hidden": false,
+ "id": "autodate2990389176",
+ "name": "created",
+ "onCreate": true,
+ "onUpdate": false,
+ "presentable": false,
+ "system": true,
+ "type": "autodate"
+ },
+ {
+ "hidden": false,
+ "id": "autodate3332085495",
+ "name": "updated",
+ "onCreate": true,
+ "onUpdate": true,
+ "presentable": false,
+ "system": true,
+ "type": "autodate"
+ }
+ ],
+ "id": "pbc_4275539003",
+ "indexes": [
+ "CREATE UNIQUE INDEX ` + "`" + `idx_authOrigins_unique_pairs` + "`" + ` ON ` + "`" + `_authOrigins` + "`" + ` (collectionRef, recordRef, fingerprint)"
+ ],
+ "listRule": "@request.auth.id != '' && recordRef = @request.auth.id && collectionRef = @request.auth.collectionId",
+ "name": "_authOrigins",
+ "system": true,
+ "type": "base",
+ "updateRule": null,
+ "viewRule": "@request.auth.id != '' && recordRef = @request.auth.id && collectionRef = @request.auth.collectionId"
+ },
+ {
+ "authAlert": {
+ "emailTemplate": {
+ "body": "
Hello,
\n
We noticed a login to your {APP_NAME} account from a new location.
\n
If this was you, you may disregard this email.
\n
If this wasn't you, you should immediately change your {APP_NAME} account password to revoke access from all other locations.
\n
\n Thanks,
\n {APP_NAME} team\n
",
+ "subject": "Login from a new location"
+ },
+ "enabled": true
+ },
+ "authRule": "",
+ "authToken": {
+ "duration": 86400
+ },
+ "confirmEmailChangeTemplate": {
+ "body": "
Hello,
\n
Click on the button below to confirm your new email address.
\n
\n Confirm new email\n
\n
If you didn't ask to change your email address, you can ignore this email.
\n
\n Thanks,
\n {APP_NAME} team\n
",
+ "subject": "Confirm your {APP_NAME} new email address"
+ },
+ "createRule": null,
+ "deleteRule": null,
+ "emailChangeToken": {
+ "duration": 1800
+ },
+ "fields": [
+ {
+ "autogeneratePattern": "[a-z0-9]{15}",
+ "hidden": false,
+ "id": "text3208210256",
+ "max": 15,
+ "min": 15,
+ "name": "id",
+ "pattern": "^[a-z0-9]+$",
+ "presentable": false,
+ "primaryKey": true,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "cost": 0,
+ "hidden": true,
+ "id": "password901924565",
+ "max": 0,
+ "min": 8,
+ "name": "password",
+ "pattern": "",
+ "presentable": false,
+ "required": true,
+ "system": true,
+ "type": "password"
+ },
+ {
+ "autogeneratePattern": "[a-zA-Z0-9]{50}",
+ "hidden": true,
+ "id": "text2504183744",
+ "max": 60,
+ "min": 30,
+ "name": "tokenKey",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "exceptDomains": null,
+ "hidden": false,
+ "id": "email3885137012",
+ "name": "email",
+ "onlyDomains": null,
+ "presentable": false,
+ "required": true,
+ "system": true,
+ "type": "email"
+ },
+ {
+ "hidden": false,
+ "id": "bool1547992806",
+ "name": "emailVisibility",
+ "presentable": false,
+ "required": false,
+ "system": true,
+ "type": "bool"
+ },
+ {
+ "hidden": false,
+ "id": "bool256245529",
+ "name": "verified",
+ "presentable": false,
+ "required": false,
+ "system": true,
+ "type": "bool"
+ },
+ {
+ "hidden": false,
+ "id": "autodate2990389176",
+ "name": "created",
+ "onCreate": true,
+ "onUpdate": false,
+ "presentable": false,
+ "system": true,
+ "type": "autodate"
+ },
+ {
+ "hidden": false,
+ "id": "autodate3332085495",
+ "name": "updated",
+ "onCreate": true,
+ "onUpdate": true,
+ "presentable": false,
+ "system": true,
+ "type": "autodate"
+ }
+ ],
+ "fileToken": {
+ "duration": 180
+ },
+ "id": "pbc_3142635823",
+ "indexes": [
+ "CREATE UNIQUE INDEX ` + "`" + `idx_tokenKey_pbc_3142635823` + "`" + ` ON ` + "`" + `_superusers` + "`" + ` (` + "`" + `tokenKey` + "`" + `)",
+ "CREATE UNIQUE INDEX ` + "`" + `idx_email_pbc_3142635823` + "`" + ` ON ` + "`" + `_superusers` + "`" + ` (` + "`" + `email` + "`" + `) WHERE ` + "`" + `email` + "`" + ` != ''"
+ ],
+ "listRule": null,
+ "manageRule": null,
+ "mfa": {
+ "duration": 1800,
+ "enabled": false,
+ "rule": ""
+ },
+ "name": "_superusers",
+ "oauth2": {
+ "enabled": false,
+ "mappedFields": {
+ "avatarURL": "",
+ "id": "",
+ "name": "",
+ "username": ""
+ }
+ },
+ "otp": {
+ "duration": 180,
+ "emailTemplate": {
+ "body": "
Hello,
\n
Your one-time password is: {OTP}
\n
If you didn't ask for the one-time password, you can ignore this email.
\n
\n Thanks,
\n {APP_NAME} team\n
",
+ "subject": "OTP for {APP_NAME}"
+ },
+ "enabled": false,
+ "length": 8
+ },
+ "passwordAuth": {
+ "enabled": true,
+ "identityFields": [
+ "email"
+ ]
+ },
+ "passwordResetToken": {
+ "duration": 1800
+ },
+ "resetPasswordTemplate": {
+ "body": "
Hello,
\n
Click on the button below to reset your password.
\n
\n Reset password\n
\n
If you didn't ask to reset your password, you can ignore this email.
\n
\n Thanks,
\n {APP_NAME} team\n
",
+ "subject": "Reset your {APP_NAME} password"
+ },
+ "system": true,
+ "type": "auth",
+ "updateRule": null,
+ "verificationTemplate": {
+ "body": "
Hello,
\n
Thank you for joining us at {APP_NAME}.
\n
Click on the button below to verify your email address.
\n
\n Verify\n
\n
\n Thanks,
\n {APP_NAME} team\n
",
+ "subject": "Verify your {APP_NAME} email"
+ },
+ "verificationToken": {
+ "duration": 259200
+ },
+ "viewRule": null
+ },
+ {
+ "authAlert": {
+ "emailTemplate": {
+ "body": "
Hello,
\n
We noticed a login to your {APP_NAME} account from a new location.
\n
If this was you, you may disregard this email.
\n
If this wasn't you, you should immediately change your {APP_NAME} account password to revoke access from all other locations.
\n
\n Thanks,
\n {APP_NAME} team\n
",
+ "subject": "Login from a new location"
+ },
+ "enabled": true
+ },
+ "authRule": "",
+ "authToken": {
+ "duration": 604800
+ },
+ "confirmEmailChangeTemplate": {
+ "body": "
Hello,
\n
Click on the button below to confirm your new email address.
\n
\n Confirm new email\n
\n
If you didn't ask to change your email address, you can ignore this email.
\n
\n Thanks,
\n {APP_NAME} team\n
",
+ "subject": "Confirm your {APP_NAME} new email address"
+ },
+ "createRule": "",
+ "deleteRule": "id = @request.auth.id",
+ "emailChangeToken": {
+ "duration": 1800
+ },
+ "fields": [
+ {
+ "autogeneratePattern": "[a-z0-9]{15}",
+ "hidden": false,
+ "id": "text3208210256",
+ "max": 15,
+ "min": 15,
+ "name": "id",
+ "pattern": "^[a-z0-9]+$",
+ "presentable": false,
+ "primaryKey": true,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "cost": 0,
+ "hidden": true,
+ "id": "password901924565",
+ "max": 0,
+ "min": 8,
+ "name": "password",
+ "pattern": "",
+ "presentable": false,
+ "required": true,
+ "system": true,
+ "type": "password"
+ },
+ {
+ "autogeneratePattern": "[a-zA-Z0-9]{50}",
+ "hidden": true,
+ "id": "text2504183744",
+ "max": 60,
+ "min": 30,
+ "name": "tokenKey",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "exceptDomains": null,
+ "hidden": false,
+ "id": "email3885137012",
+ "name": "email",
+ "onlyDomains": null,
+ "presentable": false,
+ "required": true,
+ "system": true,
+ "type": "email"
+ },
+ {
+ "hidden": false,
+ "id": "bool1547992806",
+ "name": "emailVisibility",
+ "presentable": false,
+ "required": false,
+ "system": true,
+ "type": "bool"
+ },
+ {
+ "hidden": false,
+ "id": "bool256245529",
+ "name": "verified",
+ "presentable": false,
+ "required": false,
+ "system": true,
+ "type": "bool"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text1579384326",
+ "max": 255,
+ "min": 0,
+ "name": "name",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": false,
+ "system": false,
+ "type": "text"
+ },
+ {
+ "hidden": false,
+ "id": "file376926767",
+ "maxSelect": 1,
+ "maxSize": 0,
+ "mimeTypes": [
+ "image/jpeg",
+ "image/png",
+ "image/svg+xml",
+ "image/gif",
+ "image/webp"
+ ],
+ "name": "avatar",
+ "presentable": false,
+ "protected": false,
+ "required": false,
+ "system": false,
+ "thumbs": null,
+ "type": "file"
+ },
+ {
+ "hidden": false,
+ "id": "autodate2990389176",
+ "name": "created",
+ "onCreate": true,
+ "onUpdate": false,
+ "presentable": false,
+ "system": false,
+ "type": "autodate"
+ },
+ {
+ "hidden": false,
+ "id": "autodate3332085495",
+ "name": "updated",
+ "onCreate": true,
+ "onUpdate": true,
+ "presentable": false,
+ "system": false,
+ "type": "autodate"
+ }
+ ],
+ "fileToken": {
+ "duration": 180
+ },
+ "id": "_pb_users_auth_",
+ "indexes": [
+ "CREATE UNIQUE INDEX ` + "`" + `idx_tokenKey__pb_users_auth_` + "`" + ` ON ` + "`" + `users` + "`" + ` (` + "`" + `tokenKey` + "`" + `)",
+ "CREATE UNIQUE INDEX ` + "`" + `idx_email__pb_users_auth_` + "`" + ` ON ` + "`" + `users` + "`" + ` (` + "`" + `email` + "`" + `) WHERE ` + "`" + `email` + "`" + ` != ''"
+ ],
+ "listRule": "id = @request.auth.id",
+ "manageRule": null,
+ "mfa": {
+ "duration": 1800,
+ "enabled": false,
+ "rule": ""
+ },
+ "name": "users",
+ "oauth2": {
+ "enabled": false,
+ "mappedFields": {
+ "avatarURL": "avatar",
+ "id": "",
+ "name": "name",
+ "username": ""
+ }
+ },
+ "otp": {
+ "duration": 180,
+ "emailTemplate": {
+ "body": "
Hello,
\n
Your one-time password is: {OTP}
\n
If you didn't ask for the one-time password, you can ignore this email.
\n
\n Thanks,
\n {APP_NAME} team\n
",
+ "subject": "OTP for {APP_NAME}"
+ },
+ "enabled": false,
+ "length": 8
+ },
+ "passwordAuth": {
+ "enabled": true,
+ "identityFields": [
+ "email"
+ ]
+ },
+ "passwordResetToken": {
+ "duration": 1800
+ },
+ "resetPasswordTemplate": {
+ "body": "
Hello,
\n
Click on the button below to reset your password.
\n
\n Reset password\n
\n
If you didn't ask to reset your password, you can ignore this email.
\n
\n Thanks,
\n {APP_NAME} team\n
",
+ "subject": "Reset your {APP_NAME} password"
+ },
+ "system": false,
+ "type": "auth",
+ "updateRule": "id = @request.auth.id",
+ "verificationTemplate": {
+ "body": "
Hello,
\n
Thank you for joining us at {APP_NAME}.
\n
Click on the button below to verify your email address.
\n
\n Verify\n
\n
\n Thanks,
\n {APP_NAME} team\n
",
+ "subject": "Verify your {APP_NAME} email"
+ },
+ "verificationToken": {
+ "duration": 259200
+ },
+ "viewRule": "id = @request.auth.id"
+ },
+ {
+ "createRule": null,
+ "deleteRule": null,
+ "fields": [
+ {
+ "autogeneratePattern": "[a-z0-9]{15}",
+ "hidden": false,
+ "id": "text3208210256",
+ "max": 15,
+ "min": 15,
+ "name": "id",
+ "pattern": "^[a-z0-9]+$",
+ "presentable": false,
+ "primaryKey": true,
+ "required": true,
+ "system": true,
+ "type": "text"
+ },
+ {
+ "autogeneratePattern": "",
+ "hidden": false,
+ "id": "text724990059",
+ "max": 0,
+ "min": 0,
+ "name": "title",
+ "pattern": "",
+ "presentable": false,
+ "primaryKey": false,
+ "required": true,
+ "system": false,
+ "type": "text"
+ },
+ {
+ "convertURLs": false,
+ "hidden": false,
+ "id": "editor1843675174",
+ "maxSize": 0,
+ "name": "description",
+ "presentable": false,
+ "required": true,
+ "system": false,
+ "type": "editor"
+ },
+ {
+ "hidden": false,
+ "id": "autodate2990389176",
+ "name": "created",
+ "onCreate": true,
+ "onUpdate": false,
+ "presentable": false,
+ "system": false,
+ "type": "autodate"
+ },
+ {
+ "hidden": false,
+ "id": "autodate3332085495",
+ "name": "updated",
+ "onCreate": true,
+ "onUpdate": true,
+ "presentable": false,
+ "system": false,
+ "type": "autodate"
+ }
+ ],
+ "id": "pbc_2602490748",
+ "indexes": [],
+ "listRule": null,
+ "name": "tasks",
+ "system": false,
+ "type": "base",
+ "updateRule": null,
+ "viewRule": null
+ }
+ ]`
+
+ return app.ImportCollectionsByMarshaledJSON([]byte(jsonData), false)
+ }, func(app core.App) error {
+ return nil
+ })
+}
diff --git a/internal/models/tasks.go b/internal/models/tasks.go
index 758b6ef..0f59fc9 100644
--- a/internal/models/tasks.go
+++ b/internal/models/tasks.go
@@ -4,7 +4,6 @@ type Task struct {
Id string `json:"id"`
Title string `json:"title"`
Description string `json:"description"`
- OwnerId string `json:"owner_id"`
}
var EmptyTask = Task{}
diff --git a/internal/models/users.go b/internal/models/users.go
deleted file mode 100644
index c885856..0000000
--- a/internal/models/users.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package models
-
-import "strings"
-
-type User struct {
- ID string `json:"id"`
- Username string `json:"username"`
- PswdHash string `json:"pswd_hash"`
-}
-
-var EmptyUser = User{}
-
-func GenerateNameFromEmail(email string) string {
- return strings.Split(email, "@")[0]
-}
diff --git a/internal/repositories/database/database.go b/internal/repositories/database/database.go
index 702cb2f..58b6ec2 100644
--- a/internal/repositories/database/database.go
+++ b/internal/repositories/database/database.go
@@ -1,110 +1,73 @@
package database
import (
- "database/sql"
- "goth/internal/config"
"goth/internal/models"
- _ "modernc.org/sqlite"
+ "github.com/pocketbase/dbx"
+ "github.com/pocketbase/pocketbase/core"
)
type database struct {
- conn *sql.DB
+ app core.App
}
-func NewDatabaseRepo(cfg config.ServerConfigs) (Database, error) {
- conn, err := sql.Open("sqlite", cfg.DataBaseURL)
- if err != nil {
- return nil, err
- }
-
- return &database{conn}, nil
-}
-
-func (db *database) Close() error {
- return db.conn.Close()
+func NewDatabaseRepo(app core.App) database {
+ return database{app}
}
func (db *database) CreateTask(task models.Task) error {
- query := `INSERT INTO tasks (id, title, description, owner_id) VALUES (?, ?, ?, ?)`
- _, err := db.conn.Exec(query, task.Id, task.Title, task.Description, task.OwnerId)
+ query := `INSERT INTO tasks (id, title, description) VALUES ({:Id}, {:Title}, {:Description})`
+ q := db.app.DB().NewQuery(query).Bind(dbx.Params{
+ "Id": task.Id,
+ "Title": task.Title,
+ "Description": task.Description,
+ })
+
+ _, err := q.Execute()
return err
}
-func (db *database) ListTasksByOwner(ownerId string) ([]models.Task, error) {
- query := `SELECT id, title, owner_id, description FROM tasks WHERE owner_id = ?`
- rows, err := db.conn.Query(query, ownerId)
- if err != nil {
- return nil, err
- }
+func (db *database) ListTasks() ([]models.Task, error) {
+ query := `SELECT id, title, description FROM tasks`
+ q := db.app.DB().NewQuery(query)
- var tasks []models.Task
- for rows.Next() {
- var task models.Task
- err := rows.Scan(&task.Id, &task.Title, &task.OwnerId, &task.Description)
- if err != nil {
- return nil, err
- }
-
- tasks = append(tasks, task)
+ tasks := make([]models.Task, 0)
+ if err := q.All(&tasks); err != nil {
+ return nil, err
}
return tasks, nil
}
func (db *database) RetrieveTaskById(taskId string) (models.Task, error) {
- query := `SELECT id, title, owner_id, description FROM tasks WHERE id = ?`
- row := db.conn.QueryRow(query, taskId)
+ query := `SELECT id, title, description FROM tasks WHERE id = {:Id}`
+ q := db.app.DB().NewQuery(query).Bind(dbx.Params{
+ "Id": taskId,
+ })
var task models.Task
- err := row.Scan(&task.Id, &task.Title, &task.OwnerId, &task.Description)
- if err != nil {
- return models.EmptyTask, err
- }
-
- return task, nil
+ err := q.One(&task)
+ return task, err
}
func (db *database) DeleteTask(taskId string) error {
- query := `DELETE FROM tasks WHERE id = ?`
- _, err := db.conn.Exec(query, taskId)
- return err
-}
+ query := `DELETE FROM tasks WHERE id = {:Id}`
+ q := db.app.DB().NewQuery(query).Bind(dbx.Params{
+ "Id": taskId,
+ })
-func (db *database) UpdateTask(task models.Task) error {
- query := `UPDATE tasks SET title = ?, description = ? WHERE id = ?`
- _, err := db.conn.Exec(query, task.Title, task.Description, task.Id)
+ _, err := q.Execute()
return err
}
-func (db *database) InsertUser(user models.User) error {
- query := `INSERT INTO users (id, username, pswd_hash) VALUES (?, ?, ?)`
- _, err := db.conn.Exec(query, user.ID, user.Username, user.PswdHash)
+func (db *database) UpdateTask(task models.Task) error {
+ query := `UPDATE tasks SET title = {:Title}, description = {:Description} WHERE id = {:Id}`
+ q := db.app.DB().NewQuery(query).Bind(dbx.Params{
+ "Id": task.Id,
+ "Title": task.Title,
+ "Description": task.Description,
+ })
+
+ _, err := q.Execute()
return err
}
-
-func (db *database) RetrieveUserByName(username string) (models.User, error) {
- query := `SELECT id, username, pswd_hash FROM users WHERE username = ?`
- row := db.conn.QueryRow(query, username)
-
- var user models.User
- err := row.Scan(&user.ID, &user.Username, &user.PswdHash)
- if err != nil {
- return models.EmptyUser, err
- }
-
- return user, nil
-}
-
-func (db *database) RetrieveUserById(id string) (models.User, error) {
- query := `SELECT id, username, pswd_hash FROM users WHERE id = ?`
- row := db.conn.QueryRow(query, id)
-
- var user models.User
- err := row.Scan(&user.ID, &user.Username, &user.PswdHash)
- if err != nil {
- return models.EmptyUser, err
- }
-
- return user, nil
-}
diff --git a/internal/repositories/database/fake.go b/internal/repositories/database/fake.go
index b703246..ce4b1a5 100644
--- a/internal/repositories/database/fake.go
+++ b/internal/repositories/database/fake.go
@@ -2,7 +2,6 @@ package database
import (
"database/sql"
- "fmt"
"goth/internal/models"
_ "modernc.org/sqlite"
@@ -10,13 +9,11 @@ import (
type fakeDatabase struct {
tasks map[string]models.Task
- users map[string]models.User
}
func NewFakeDatabaseRepo() (Database, error) {
return &fakeDatabase{
tasks: make(map[string]models.Task),
- users: make(map[string]models.User),
}, nil
}
@@ -29,13 +26,11 @@ func (db *fakeDatabase) CreateTask(task models.Task) error {
return nil
}
-func (db *fakeDatabase) ListTasksByOwner(ownerId string) ([]models.Task, error) {
+func (db *fakeDatabase) ListTasks() ([]models.Task, error) {
tasks := make([]models.Task, 0)
for _, task := range db.tasks {
- if task.OwnerId == ownerId {
- tasks = append(tasks, task)
- }
+ tasks = append(tasks, task)
}
return tasks, nil
@@ -59,32 +54,3 @@ func (db *fakeDatabase) UpdateTask(task models.Task) error {
db.tasks[task.Id] = task
return nil
}
-
-func (db *fakeDatabase) InsertUser(user models.User) error {
- _, ok := db.users[user.ID]
- if ok {
- return fmt.Errorf("non unique email")
- }
-
- db.users[user.ID] = user
- return nil
-}
-
-func (db *fakeDatabase) RetrieveUserById(id string) (models.User, error) {
- user, ok := db.users[id]
- if !ok {
- return models.EmptyUser, sql.ErrNoRows
- }
-
- return user, nil
-}
-
-func (db *fakeDatabase) RetrieveUserByName(username string) (models.User, error) {
- for _, u := range db.users {
- if u.Username == username {
- return u, nil
- }
- }
-
- return models.EmptyUser, sql.ErrNoRows
-}
diff --git a/internal/repositories/database/interface.go b/internal/repositories/database/interface.go
index 459501b..9d540a2 100644
--- a/internal/repositories/database/interface.go
+++ b/internal/repositories/database/interface.go
@@ -13,9 +13,5 @@ type Database interface {
RetrieveTaskById(taskId string) (models.Task, error)
UpdateTask(task models.Task) error
DeleteTask(taskId string) error
- ListTasksByOwner(ownerId string) ([]models.Task, error)
-
- InsertUser(user models.User) error
- RetrieveUserById(id string) (models.User, error)
- RetrieveUserByName(username string) (models.User, error)
+ ListTasks() ([]models.Task, error)
}
diff --git a/internal/repositories/jwt/interface.go b/internal/repositories/jwt/interface.go
deleted file mode 100644
index 723ca49..0000000
--- a/internal/repositories/jwt/interface.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package jwt
-
-import (
- "time"
-)
-
-// type JWTClaims struct {
-// Id string `json:"id"`
-// gojwt.RegisteredClaims
-// }
-
-type JWT interface {
- GenerateJWT(sub string, expiration time.Time) (string, error)
- ParseJWT(token string) (string, error)
-}
diff --git a/internal/repositories/jwt/jwt.go b/internal/repositories/jwt/jwt.go
deleted file mode 100644
index fbd1582..0000000
--- a/internal/repositories/jwt/jwt.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package jwt
-
-import (
- "goth/internal/config"
- "time"
-
- gojwt "github.com/golang-jwt/jwt/v5"
-)
-
-type jwt struct {
- bsecret []byte
-}
-
-func NewJWTRepo(cfg config.ServerConfigs) JWT {
- return &jwt{
- bsecret: []byte(cfg.JwtSecret),
- }
-}
-
-func (j *jwt) GenerateJWT(sub string, expiration time.Time) (string, error) {
- claims := &gojwt.RegisteredClaims{
- Subject: sub,
- IssuedAt: gojwt.NewNumericDate(time.Now()),
- ExpiresAt: gojwt.NewNumericDate(expiration),
- }
-
- jwtoken := gojwt.NewWithClaims(gojwt.SigningMethodHS256, claims)
- return jwtoken.SignedString(j.bsecret)
-}
-
-func (j *jwt) ParseJWT(token string) (string, error) {
- claims := gojwt.RegisteredClaims{}
-
- _, err := gojwt.ParseWithClaims(token, &claims, func(token *gojwt.Token) (interface{}, error) {
- return j.bsecret, nil
- })
-
- if err != nil {
- return "", err
- }
-
- if claims.Subject == "" {
- return "", gojwt.ErrInvalidKey
- }
-
- return claims.Subject, nil
-}
diff --git a/internal/routes/errors.go b/internal/routes/errors.go
deleted file mode 100644
index 91d6a3f..0000000
--- a/internal/routes/errors.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package routes
-
-import (
- "fmt"
- "goth/internal/components"
-
- "github.com/gofiber/fiber/v2"
-)
-
-func ErrorHandler(c *fiber.Ctx, err error) error {
- c.SendStatus(fiber.StatusInternalServerError)
- fmt.Printf("Route Error [%s]: %v\n", c.Path(), err)
- return sendPage(c, components.ErrorPage())
-}
-
-func notFoundHandler(c *fiber.Ctx) error {
- c.SendStatus(fiber.StatusNotFound)
- return sendPage(c, components.NotFoundPage())
-}
diff --git a/internal/routes/init.go b/internal/routes/init.go
deleted file mode 100644
index cf794a5..0000000
--- a/internal/routes/init.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package routes
-
-import (
- "fmt"
- "goth/internal/config"
- "goth/internal/controllers"
- "goth/internal/repositories/database"
- "goth/internal/repositories/jwt"
-
- "github.com/gofiber/fiber/v2"
-)
-
-func healthzHandler(c *fiber.Ctx) error {
- return c.SendStatus(fiber.StatusOK)
-}
-
-func Init(app *fiber.App, cfg config.ServerConfigs) error {
- jwtRepo := jwt.NewJWTRepo(cfg)
-
- dbRepo, err := database.NewDatabaseRepo(cfg)
- if err != nil {
- return fmt.Errorf("[Init] failed to get database: %w", err)
- }
-
- uc := controllers.NewUserController(dbRepo, jwtRepo)
- tc := controllers.NewTaskController(dbRepo)
-
- app.Get("/auth/login", getLoginHandler)
- app.Post("/auth/login", postLoginHandler(uc))
-
- app.Get("/auth/register", getRegisterHandler)
- app.Post("/auth/register", postRegisterHandler(uc))
-
- app.Get("/auth/logout", getLogoutHandler)
-
- app.Get("/", withAuth(uc, tc, taskList))
- app.Get("/new", withAuth(uc, tc, taskNew))
- app.Get("/edit/:id", withAuth(uc, tc, taskEdit))
- app.Post("/edit/:id", withAuth(uc, tc, taskSave))
-
- app.Use("/statics", staticsHandler)
- app.Use("/healthz", healthzHandler)
- app.Use(notFoundHandler)
-
- return nil
-}
diff --git a/internal/routes/render.go b/internal/routes/render.go
index c1cb868..2a290fd 100644
--- a/internal/routes/render.go
+++ b/internal/routes/render.go
@@ -1,13 +1,19 @@
package routes
import (
+ "bytes"
"context"
+ "net/http"
"github.com/a-h/templ"
- "github.com/gofiber/fiber/v2"
+ "github.com/pocketbase/pocketbase/core"
)
-func sendPage(c *fiber.Ctx, page templ.Component) error {
- c.Set("Content-Type", "text/html")
- return page.Render(context.Background(), c)
+func sendPage(e *core.RequestEvent, page templ.Component) error {
+ buf := new(bytes.Buffer)
+ if err := page.Render(context.Background(), buf); err != nil {
+ return err
+ }
+
+ return e.HTML(http.StatusOK, buf.String())
}
diff --git a/internal/routes/setup.go b/internal/routes/setup.go
new file mode 100644
index 0000000..ddd82de
--- /dev/null
+++ b/internal/routes/setup.go
@@ -0,0 +1,27 @@
+package routes
+
+import (
+ "goth/internal/embeded"
+
+ "github.com/pocketbase/pocketbase/core"
+
+ "github.com/pocketbase/pocketbase/apis"
+)
+
+var assetsHandler = apis.Static(embeded.Assets, true)
+
+func healthzHandler(e *core.RequestEvent) error {
+ return e.String(200, "ok")
+}
+
+func SetupRoutes(se *core.ServeEvent) error {
+ se.Router.GET("/", taskList)
+ se.Router.GET("/new", taskNew)
+ se.Router.GET("/edit/{id}", taskEdit)
+ se.Router.POST("/edit/{id}", taskSave)
+
+ se.Router.GET("/healthz", healthzHandler)
+ se.Router.GET("/statics/{path...}", assetsHandler)
+
+ return se.Next()
+}
diff --git a/internal/routes/statics.go b/internal/routes/statics.go
deleted file mode 100644
index 325c09d..0000000
--- a/internal/routes/statics.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package routes
-
-import (
- "goth/internal/embeded"
- "net/http"
-
- "github.com/gofiber/fiber/v2/middleware/filesystem"
-)
-
-var staticsHandler = filesystem.New(filesystem.Config{
- Root: http.FS(embeded.Statics),
- PathPrefix: "statics",
- MaxAge: 60 * 60,
-})
diff --git a/internal/routes/tasks.go b/internal/routes/tasks.go
index 02f33d5..5bc8ec8 100644
--- a/internal/routes/tasks.go
+++ b/internal/routes/tasks.go
@@ -1,53 +1,89 @@
package routes
import (
+ "errors"
"goth/internal/components"
- "goth/internal/controllers"
"goth/internal/models"
+ "goth/internal/repositories/database"
- "github.com/gofiber/fiber/v2"
+ "github.com/pocketbase/pocketbase/core"
)
-func taskList(tc *controllers.TaskController, c *fiber.Ctx, user models.User) error {
- tasks, err := tc.ListTasks(user.ID)
+func taskList(e *core.RequestEvent) error {
+ db := database.NewDatabaseRepo(e.App)
+ tasks, err := db.ListTasks()
if err != nil {
return err
}
- return sendPage(c, components.TaskListPage(tasks))
+ return sendPage(e, components.TaskListPage(tasks))
}
-func taskNew(tc *controllers.TaskController, c *fiber.Ctx, user models.User) error {
- task, err := tc.CreateTask(user.ID)
- if err != nil {
+func taskNew(e *core.RequestEvent) error {
+ db := database.NewDatabaseRepo(e.App)
+
+ task := models.Task{
+ Id: models.GenerateId(),
+ Title: "New Task",
+ Description: "New Task Description",
+ }
+
+ if err := db.CreateTask(task); err != nil {
return err
}
- return c.Redirect("/edit/" + task.Id)
+ return e.Redirect(302, "/edit/"+task.Id)
}
-func taskEdit(tc *controllers.TaskController, c *fiber.Ctx, user models.User) error {
- taskId := c.Params("id")
- task, err := tc.RetrieveTask(user.ID, taskId)
+func taskEdit(e *core.RequestEvent) error {
+ taskId := e.Request.PathValue("id")
+ if taskId == "" {
+ return errors.New("task id is required")
+ }
+
+ db := database.NewDatabaseRepo(e.App)
+ task, err := db.RetrieveTaskById(taskId)
if err != nil {
return err
}
- return sendPage(c, components.TaskEditPage(task))
+ return sendPage(e, components.TaskEditPage(task))
+}
+
+type TaskChange struct {
+ Title string `json:"title" form:"title"`
+ Description string `json:"description" form:"description"`
}
-func taskSave(tc *controllers.TaskController, c *fiber.Ctx, user models.User) error {
- var taskId = c.Params("id")
- var taskChange controllers.TaskChange
- err := c.BodyParser(&taskChange)
+func taskSave(e *core.RequestEvent) error {
+ taskId := e.Request.PathValue("id")
+ if taskId == "" {
+ return errors.New("task id is required")
+ }
+
+ var changes TaskChange
+ if err := e.BindBody(&changes); err != nil {
+ return err
+ }
+
+ db := database.NewDatabaseRepo(e.App)
+ task, err := db.RetrieveTaskById(taskId)
if err != nil {
return err
}
- if err := tc.UpdateTask(user.ID, taskId, taskChange); err != nil {
+ if changes.Title != "" {
+ task.Title = changes.Title
+ }
+
+ if changes.Description != "" {
+ task.Description = changes.Description
+ }
+
+ if err := db.UpdateTask(task); err != nil {
return err
}
- return c.SendStatus(fiber.StatusOK)
+ return e.String(200, "ok")
}
diff --git a/internal/routes/users.go b/internal/routes/users.go
deleted file mode 100644
index aa30857..0000000
--- a/internal/routes/users.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package routes
-
-import (
- "goth/internal/components"
- "goth/internal/controllers"
- "goth/internal/models"
- "goth/internal/utils"
-
- "github.com/gofiber/fiber/v2"
-)
-
-const cookieName = "goth:jwt"
-
-func withAuth[C controllers.Controllers](uController *controllers.UserController, controller *C, handler func(*C, *fiber.Ctx, models.User) error) fiber.Handler {
- return func(ctx *fiber.Ctx) error {
- jwt := ctx.Cookies(cookieName)
- if jwt == "" {
- return ctx.Redirect("/auth/login")
- }
-
- user, err := uController.VerifyJWTCookie(jwt)
- if err != nil {
- return ctx.Redirect("/auth/login")
- }
-
- return handler(controller, ctx, user)
- }
-}
-
-func getLogoutHandler(c *fiber.Ctx) error {
- utils.ClearCookie(c, cookieName)
- return sendPage(c, components.PostLogoutPage())
-}
-
-func getRegisterHandler(c *fiber.Ctx) error {
- utils.ClearCookie(c, cookieName)
- return sendPage(c, components.RegisterPage())
-}
-
-func getLoginHandler(c *fiber.Ctx) error {
- utils.ClearCookie(c, cookieName)
- return sendPage(c, components.LoginPage())
-}
-
-func postLoginHandler(uc *controllers.UserController) fiber.Handler {
- return func(c *fiber.Ctx) error {
- var req controllers.UserRequest
- err := c.BodyParser(&req)
- if err != nil {
- return err
- }
-
- cookie, err := uc.Login(req, cookieName)
- if err != nil {
- return err
- }
-
- c.Cookie(cookie)
- c.Set("HX-Redirect", "/")
- return c.SendStatus(fiber.StatusOK)
- }
-}
-
-func postRegisterHandler(uc *controllers.UserController) fiber.Handler {
- return func(c *fiber.Ctx) error {
- var req controllers.UserRequest
- err := c.BodyParser(&req)
- if err != nil {
- return err
- }
-
- cookie, err := uc.Register(req, cookieName)
- if err != nil {
- return err
- }
-
- c.Cookie(cookie)
- c.Set("HX-Redirect", "/")
- return c.SendStatus(fiber.StatusOK)
- }
-}
diff --git a/internal/utils/cookie.go b/internal/utils/cookie.go
deleted file mode 100644
index cb0a167..0000000
--- a/internal/utils/cookie.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package utils
-
-import (
- "time"
-
- "github.com/gofiber/fiber/v2"
-)
-
-func SetCookie(c *fiber.Ctx, name string, value string, expiration time.Time) {
- c.Cookie(buildCookie(name, value, expiration))
-}
-
-func ClearCookie(c *fiber.Ctx, name string) {
- // c.ClearCookie(name) does not work - https://github.com/gofiber/fiber/issues/1127
- c.Cookie(buildCookie(name, "", time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC)))
-}
-
-func buildCookie(name string, value string, expires time.Time) *fiber.Cookie {
- cookie := new(fiber.Cookie)
- cookie.Name = name
- cookie.Value = value
- cookie.Expires = expires
- // cookie.HTTPOnly = true
- // cookie.Path = "/api/v1/auth/"
- // cookie.Domain = "example.com"
- return cookie
-}
diff --git a/internal/utils/password.go b/internal/utils/password.go
deleted file mode 100644
index f5a443e..0000000
--- a/internal/utils/password.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package utils
-
-import "golang.org/x/crypto/bcrypt"
-
-func HashPassword(password string) (string, error) {
- bytes, err := bcrypt.GenerateFromPassword([]byte(password), 14)
- return string(bytes), err
-}
-
-func CheckPasswordHash(password, hash string) bool {
- err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
- return err == nil
-}
diff --git a/internal/utils/request.go b/internal/utils/request.go
deleted file mode 100644
index 6acec7c..0000000
--- a/internal/utils/request.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package utils
-
-import (
- "bytes"
- "errors"
- "fmt"
- "io"
- "net/http"
- "time"
-)
-
-type Headers map[string]string
-
-type Response struct {
- StatusCode int
- Body []byte
-}
-
-type HTTPClient struct {
- Headers Headers
- BaseUrl string
-}
-
-func (c *HTTPClient) Request(method string, path string, body []byte) (Response, error) {
- url := fmt.Sprintf("%s%s", c.BaseUrl, path)
- bodyReader := bytes.NewReader(body)
-
- req, err := http.NewRequest(method, url, bodyReader)
- if err != nil {
- return Response{}, errors.New("failed to create request: " + err.Error())
- }
-
- for key, value := range c.Headers {
- req.Header.Set(key, value)
- }
-
- client := http.Client{Timeout: 30 * time.Second}
-
- res, err := client.Do(req)
- if err != nil {
- return Response{}, errors.New("failed to perform request: " + err.Error())
- }
-
- rawBody, err := io.ReadAll(res.Body)
- if err != nil {
- return Response{}, errors.New("could not read response body: " + err.Error())
- }
-
- return Response{
- StatusCode: res.StatusCode,
- Body: rawBody,
- }, nil
-}
diff --git a/main.go b/main.go
index c46b1d3..bc63609 100644
--- a/main.go
+++ b/main.go
@@ -5,5 +5,5 @@ import (
)
func main() {
- cmd.Execute()
+ cmd.Root()
}
diff --git a/migrations/.gitignore b/migrations/.gitignore
new file mode 100644
index 0000000..472fecd
--- /dev/null
+++ b/migrations/.gitignore
@@ -0,0 +1 @@
+*.go
\ No newline at end of file