Streamlines API Architecture and Enhances Authentication

.air.toml

@@ -4,8 +4,8 @@ tmp_dir = "tmp"
 
 [build]
 args_bin = []
-bin = "./tmp/codex"
-cmd = "go build -o ./tmp/codex ./api/cmd/codex"
+bin = "./tmp/web"
+cmd = "go build -o ./tmp/web ./api/cmd/web"
 delay = 1000
 exclude_dir = [
     ".git",
@@ -15,6 +15,7 @@ exclude_dir = [
     "node_modules",
     ".vscode",
     ".idea",
+    ".github",
 ]
 exclude_file = []
 exclude_regex = ["_test\\.go$", "\\.git", "\\.DS_Store"]

api/cmd/web/main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	cmn "Codex-Backend/api/internal/common"
-	firestore_server "Codex-Backend/api/internal/interfaces/rest"
+	cmn "Codex-Backend/api/common"
+	firestore_server "Codex-Backend/api/internal/server"
 	"os"
 
 	_ "github.com/heroku/x/hmetrics/onload"

api/cmd/worker/main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	cmn "Codex-Backend/api/internal/common"
-	queue "Codex-Backend/api/internal/common/river"
+	cmn "Codex-Backend/api/common"
+	queue "Codex-Backend/api/common/river"
 	"context"
 	"log"
 	"os"

api/internal/common/env.go → api/common/env.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"strings"
 
 	"github.com/joho/godotenv"
 )
@@ -24,3 +25,14 @@ func GetEnvVariable(v string) string {
 
 	return env_variable
 }
+
+func GetDomains(v string) []string {
+	env_variable := os.Getenv(v)
+	if env_variable == "" {
+		log.Fatal(&Error{Err: errors.New("Environmental Variable " + v + " Not Found"), Status: http.StatusNotFound})
+	}
+
+	result := strings.Split(env_variable, ",")
+
+	return result
+}

api/internal/common/river/client.go → api/common/river/client.go

@@ -1,7 +1,7 @@
 package queue
 
 import (
-	"Codex-Backend/api/internal/usecases/worker"
+	"Codex-Backend/api/internal/service/worker"
 	"context"
 	"log"
 	"log/slog"

api/internal/infrastructure/client/client.go → api/internal/database/client/client.go

@@ -1,7 +1,7 @@
 package firestore_client
 
 import (
-	cmn "Codex-Backend/api/internal/common"
+	cmn "Codex-Backend/api/common"
 	"context"
 	"errors"
 	"net/http"

api/internal/infrastructure/collections/chapters.go → api/internal/database/collections/chapters.go

@@ -1,7 +1,7 @@
 package firestore_collections
 
 import (
-	cmn "Codex-Backend/api/internal/common"
+	cmn "Codex-Backend/api/common"
 	"Codex-Backend/api/internal/domain"
 	"context"
 	"errors"

api/internal/infrastructure/collections/novels.go → api/internal/database/collections/novels.go

@@ -1,7 +1,7 @@
 package firestore_collections
 
 import (
-	cmn "Codex-Backend/api/internal/common"
+	cmn "Codex-Backend/api/common"
 	"Codex-Backend/api/internal/domain"
 	"context"
 	"errors"

api/internal/infrastructure/collections/users.go → api/internal/database/collections/users.go

@@ -1,7 +1,7 @@
 package firestore_collections
 
 import (
-	cmn "Codex-Backend/api/internal/common"
+	cmn "Codex-Backend/api/common"
 	"Codex-Backend/api/internal/domain"
 	"context"
 	"errors"

api/internal/domain/token.go

@@ -0,0 +1,52 @@
+package domain
+
+import (
+	"sync"
+	"time"
+
+	"github.com/golang-jwt/jwt/v5"
+)
+
+type Claims struct {
+	ID    string `json:"id"`
+	Email string `json:"email"`
+	Type  string `json:"type"`
+	jwt.RegisteredClaims
+}
+
+type TokenConfig struct {
+	SigningKey string
+	AccessTTL  time.Duration
+	RefreshTTL time.Duration
+	Issuer     string // e.g., "your-app-name"
+	Audience   string // e.g., "your-app-users"
+}
+
+type TokenPair struct {
+	AccessToken  string    `json:"access_token"`
+	RefreshToken string    `json:"refresh_token"`
+	ExpiresAt    time.Time `json:"expires_at"`
+	TokenType    string    `json:"token_type"`
+}
+
+// TokenCache interface for optional token caching
+type TokenCache interface {
+	Get(key string) (any, bool)
+	Set(key string, value any, duration time.Duration)
+	Delete(key string)
+}
+
+type LookupUser struct {
+	Cache         TokenCache
+	CacheDuration time.Duration
+}
+
+type InMemoryCache struct {
+	mu    sync.RWMutex
+	items map[string]cacheItem
+}
+
+type cacheItem struct {
+	value     any
+	expiresAt time.Time
+}

api/internal/domain/user.go

@@ -1,7 +1,5 @@
 package domain
 
-import "github.com/golang-jwt/jwt/v5"
-
 type User struct {
 	ID        string `json:"id"`
 	Username  string `json:"username"`
@@ -17,11 +15,6 @@ type Credentials struct {
 	Password string `json:"password"`
 }
 
-type Claims struct {
-	Email string `json:"email"`
-	jwt.RegisteredClaims
-}
-
 type NewUser struct {
 	Username string `json:"username"`
 	Password string `json:"password"`