Skip to content

refactor(db): use new store interface#831

Open
scottmckendry wants to merge 5 commits intomainfrom
store-refactor
Open

refactor(db): use new store interface#831
scottmckendry wants to merge 5 commits intomainfrom
store-refactor

Conversation

@scottmckendry
Copy link
Copy Markdown
Member

@scottmckendry scottmckendry commented Apr 30, 2026

lays the groundwork for adding more storage drivers in the future (postgres, redis) with slightly lower effort and easier maintainability in the future.

moves sqlite specific queries, migrations and generated go code into subdirs.

Summary by CodeRabbit

  • New Features

    • Added configurable database driver support with options for SQLite and in-memory storage.
    • Introduced abstracted database layer enabling flexible storage implementations.
  • Tests

    • Refactored tests to use in-memory storage for faster, database-independent execution.
  • Chores

    • Updated code generation workflow with automated validation in CI pipeline.

Review Change Stack

@dosubot dosubot Bot added the size:L This PR changes 100-499 lines, ignoring generated files. label Apr 30, 2026
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 30, 2026

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review
📝 Walkthrough

Walkthrough

This PR abstracts the persistence layer by introducing a repository.Store interface, providing both SQLite and in-memory implementations, refactoring services to depend on the abstraction, updating bootstrap wiring to support driver selection, and migrating all tests to use in-memory persistence.

Changes

Persistence Abstraction & Full Integration

Layer / File(s) Summary
Store Interface & Data Models
internal/repository/store.go, internal/repository/models.go
repository.Store interface defines context-based CRUD operations for sessions, OIDC codes/tokens/userinfo. Exported parameter types (CreateSessionParams, CreateOidcCodeParams, etc.) extracted. ErrNotFound sentinel error for consistent "not found" signaling across implementations.
SQLite Backend Implementation
internal/repository/sqlite/store.go, internal/repository/sqlite/db.go, internal/repository/sqlite/models.go, internal/repository/sqlite/oidc_queries.sql.go, internal/repository/sqlite/session_queries.sql.go
SQLite-backed Store wraps sqlc-generated Queries, maps sql.ErrNoRows to repository.ErrNotFound, converts sqlc model types to repository types. Separate sqlite package namespace for generated code metadata updates.
In-Memory Backend Implementation
internal/repository/memory/store.go, internal/repository/memory/oidc_queries.go, internal/repository/memory/session_queries.go
In-memory, thread-safe Store using sync.RWMutex. Destructive reads for OIDC codes (DELETE...RETURNING semantics). Uniqueness constraints on code/token Sub enforced at creation. Returns repository.ErrNotFound when entries missing.
Service Layer Refactoring
internal/service/auth_service.go, internal/service/oidc_service.go
AuthService and OIDCService store repository.Store instead of *repository.Queries. Constructors accept Store parameter. All "not found" checks changed from sql.ErrNoRows to repository.ErrNotFound via errors.Is. database/sql imports removed.
Bootstrap Wiring & Configuration
internal/bootstrap/db_bootstrap.go, internal/bootstrap/app_bootstrap.go, internal/bootstrap/service_bootstrap.go, internal/model/config.go
SetupStore() selects implementation by config.Database.Driver (memory vs sqlite). initServices and dbCleanupRoutine updated to accept Store. DatabaseConfig extended with Driver field, default set to sqlite. SetupDatabase() removed.
Test Migration to In-Memory Store
internal/controller/oidc_controller_test.go, internal/controller/proxy_controller_test.go, internal/controller/user_controller_test.go, internal/controller/well_known_controller_test.go, internal/middleware/context_middleware_test.go
Tests use memory.New() instead of bootstrapping SQLite. Removed tempDir, database file creation, bootstrap app initialization, and t.Cleanup database close. Services constructed with in-memory Store. Session seeding via store.CreateSession(...) instead of queries.CreateSession(...).
Code Generation & Build Configuration
sqlc.yml, internal/repository/sqlite/generate.go, Makefile, .github/workflows/ci.yml, go.mod, internal/assets/assets.go
sqlc.yml refactored to separate sqlite paths and package namespace. Added generate.go with //go:generate directive. Makefile changed from go run ./gen to go generate ./internal/repository/.... CI adds codegen freshness check. go.mod updated with golang.org/x/tools and golang.org/x/mod dependencies. go:embed narrowed from migrations/*.sql to migrations/sqlite/*.sql.

🎯 4 (Complex) | ⏱️ ~60 minutes

Possibly related PRs

  • tinyauthapp/tinyauth#541: Both PRs modify the persistence wiring (bootstrap DB setup, sqlc-generated repository layer, service constructors), with #541 introducing sqlc-based repository.Queries and this PR evolving that into a repository.Store abstraction with dual implementations.
  • tinyauthapp/tinyauth#605: Both PRs touch OIDC end-to-end functionality at the code level, including persistence layer, service wiring, and OIDC controller integration.
  • tinyauthapp/tinyauth#829: Both PRs modify internal/bootstrap/service_bootstrap.go's initServices function signature and service initialization plumbing.

Suggested labels

size:XXL, lgtm

Suggested reviewers

  • Rycochet
  • steveiliop56

🐰 Whisker-wiggle — The rabbit hops through the abstraction maze,
Store interface blooming where concrete queries once rested,
SQLite and memory dance in duet, thread-safe and swift,
Tests skip the DB file, in-memory springs delight,
Happy refactoring bounces!

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 29.41% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title 'refactor(db): use new store interface' directly and clearly summarizes the main change: introducing and adopting a new store interface abstraction for the database layer.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch store-refactor

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

  • Generate code and open pull requests
  • Plan features and break down work
  • Investigate incidents and troubleshoot customer tickets together
  • Automate recurring tasks and respond to alerts with triggers
  • Summarize progress and report instantly

Built for teams:

  • Shared memory across your entire org—no repeating context
  • Per-thread sandboxes to safely plan and execute work
  • Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
internal/bootstrap/db_bootstrap.go (1)

19-69: ⚠️ Potential issue | 🟠 Major | 🏗️ Heavy lift

Preserve DB cleanup when hiding the concrete SQLite store.

SetupStore / NewSQLiteStore now return only repository.Store, so callers can no longer close the underlying *sql.DB. The controller tests used to db.Close(), but after this refactor those handles stay open until process exit, which can leak file descriptors and leave temp SQLite files locked on some platforms. setupSQLite also leaks the opened DB on migration/setup error paths. Please return a closer alongside the store, or wrap the store in a type that also exposes Close() and use it in the tests/startup cleanup path.

🧹 Nitpick comments (1)
internal/repository/models.go (1)

8-19: 🏗️ Heavy lift

Define canonical repository models instead of aliasing SQLite types.

Aliasing repository.* directly to sqlite.* keeps the abstraction coupled to one backend. If you want multi-driver support to stay clean, define canonical types in repository and map in each driver implementation.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@internal/repository/models.go` around lines 8 - 19, The current file defines
repository models as direct aliases to sqlite types (e.g., Session, OidcCode,
OidcToken, OidcUserinfo and param types like CreateSessionParams,
UpdateSessionParams, CreateOidcCodeParams, etc.), which couples the repository
API to one driver; replace these type aliases with canonical repository types
(structs/interfaces) in internal/repository/models.go and remove the "type X =
sqlite.X" lines, then implement conversion helpers in the sqlite driver (e.g.,
functions to convert between repository.Session <-> sqlite.Session and
repository.CreateSessionParams <-> sqlite.CreateSessionParams) so other drivers
can map their native types to the repository canonical types without depending
on sqlite symbols.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@internal/controller/proxy_controller_test.go`:
- Around line 395-396: The Store returned by NewSQLiteStore leaks the underlying
*sql.DB because setupSQLite opens the DB but neither Store nor sqlite.Queries
expose a Close; update the API so tests can close the DB: either add Close()
error to the Store interface and implement Close on sqlite.Queries to call the
underlying *sql.DB.Close(), or change setupSQLite/NewSQLiteStore to return the
*sql.DB alongside the Store so callers (tests like proxy_controller_test,
oidc_controller_test, user_controller_test, well_known_controller_test) can
explicitly defer db.Close(); update all call sites and implementations (Store
interface, sqlite.Queries, setupSQLite, NewSQLiteStore) consistently.

---

Nitpick comments:
In `@internal/repository/models.go`:
- Around line 8-19: The current file defines repository models as direct aliases
to sqlite types (e.g., Session, OidcCode, OidcToken, OidcUserinfo and param
types like CreateSessionParams, UpdateSessionParams, CreateOidcCodeParams,
etc.), which couples the repository API to one driver; replace these type
aliases with canonical repository types (structs/interfaces) in
internal/repository/models.go and remove the "type X = sqlite.X" lines, then
implement conversion helpers in the sqlite driver (e.g., functions to convert
between repository.Session <-> sqlite.Session and repository.CreateSessionParams
<-> sqlite.CreateSessionParams) so other drivers can map their native types to
the repository canonical types without depending on sqlite symbols.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: c386e1b5-70c0-4440-93d8-eec72b28f642

📥 Commits

Reviewing files that changed from the base of the PR and between 956d2f5 and 1d0a462.

📒 Files selected for processing (40)
  • internal/assets/assets.go
  • internal/assets/migrations/sqlite/000001_init_sqlite.down.sql
  • internal/assets/migrations/sqlite/000001_init_sqlite.up.sql
  • internal/assets/migrations/sqlite/000002_oauth_name.down.sql
  • internal/assets/migrations/sqlite/000002_oauth_name.up.sql
  • internal/assets/migrations/sqlite/000003_oauth_sub.down.sql
  • internal/assets/migrations/sqlite/000003_oauth_sub.up.sql
  • internal/assets/migrations/sqlite/000004_created_at.down.sql
  • internal/assets/migrations/sqlite/000004_created_at.up.sql
  • internal/assets/migrations/sqlite/000005_oidc_session.down.sql
  • internal/assets/migrations/sqlite/000005_oidc_session.up.sql
  • internal/assets/migrations/sqlite/000006_oidc_nonce.down.sql
  • internal/assets/migrations/sqlite/000006_oidc_nonce.up.sql
  • internal/assets/migrations/sqlite/000007_oidc_pkce.down.sql
  • internal/assets/migrations/sqlite/000007_oidc_pkce.up.sql
  • internal/assets/migrations/sqlite/000008_oidc_code_reuse.down.sql
  • internal/assets/migrations/sqlite/000008_oidc_code_reuse.up.sql
  • internal/assets/migrations/sqlite/000009_oidc_userinfo_profile.down.sql
  • internal/assets/migrations/sqlite/000009_oidc_userinfo_profile.up.sql
  • internal/bootstrap/app_bootstrap.go
  • internal/bootstrap/db_bootstrap.go
  • internal/bootstrap/service_bootstrap.go
  • internal/config/config.go
  • internal/controller/oidc_controller_test.go
  • internal/controller/proxy_controller_test.go
  • internal/controller/user_controller_test.go
  • internal/controller/well_known_controller_test.go
  • internal/repository/models.go
  • internal/repository/sqlite/db.go
  • internal/repository/sqlite/models.go
  • internal/repository/sqlite/oidc_queries.sql.go
  • internal/repository/sqlite/session_queries.sql.go
  • internal/repository/store.go
  • internal/service/auth_service.go
  • internal/service/oidc_service.go
  • sql/sqlite/oidc_queries.sql
  • sql/sqlite/oidc_schemas.sql
  • sql/sqlite/session_queries.sql
  • sql/sqlite/session_schemas.sql
  • sqlc.yml

Comment thread internal/controller/proxy_controller_test.go Outdated
@dosubot dosubot Bot added size:XL This PR changes 500-999 lines, ignoring generated files. and removed size:L This PR changes 100-499 lines, ignoring generated files. labels May 3, 2026
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
internal/bootstrap/db_bootstrap.go (1)

37-69: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Close the SQLite handle on every failure after sql.Open.

If iofs.New, sqlite3.WithInstance, or migrate.NewWithInstance fails, the opened *sql.DB is never closed. That leaks a live connection/file handle on startup failures and in test helpers.

♻️ Proposed fix
 func (app *BootstrapApp) setupSQLite(databasePath string) (repository.Store, error) {
 	dir := filepath.Dir(databasePath)
@@
 	db, err := sql.Open("sqlite", databasePath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to open database: %w", err)
 	}
+	closeOnError := true
+	defer func() {
+		if closeOnError {
+			_ = db.Close()
+		}
+	}()
@@
 	if err != nil {
 		return nil, fmt.Errorf("failed to migrate database: %w", err)
 	}
 
+	closeOnError = false
 	return sqlite.NewStore(sqlite.New(db)), nil
 }
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@internal/bootstrap/db_bootstrap.go` around lines 37 - 69, After sql.Open
succeeds, ensure the opened *sql.DB is closed on any subsequent failure to avoid
leaking handles: either add a deferred close that only runs when the function
will return an error (e.g., capture the returned err via a named return or a
closure checking a local err variable) or explicitly call db.Close() before
every early return after calls to iofs.New, sqlite3.WithInstance,
migrate.NewWithInstance, and migrator.Up; update the error return paths around
iofs.New, sqlite3.WithInstance, migrate.NewWithInstance, and migrator.Up so they
close db before returning, while leaving the final successful return
(sqlite.NewStore/sqlite.New) untouched.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In @.github/workflows/ci.yml:
- Around line 29-32: The CI step "Check store codegen is up to date" currently
runs "go generate ./internal/repository/..." then "git diff --exit-code --
internal/repository/" which misses brand-new untracked files; after running go
generate, run "git add -N internal/repository || true" (or "git add -N
./internal/repository || true") to stage intent for new files so they show up in
diffs, then run "git diff --exit-code -- internal/repository/" as before; update
the step commands in the "Check store codegen is up to date" job to include that
git add -N command between the generate and diff commands.

---

Outside diff comments:
In `@internal/bootstrap/db_bootstrap.go`:
- Around line 37-69: After sql.Open succeeds, ensure the opened *sql.DB is
closed on any subsequent failure to avoid leaking handles: either add a deferred
close that only runs when the function will return an error (e.g., capture the
returned err via a named return or a closure checking a local err variable) or
explicitly call db.Close() before every early return after calls to iofs.New,
sqlite3.WithInstance, migrate.NewWithInstance, and migrator.Up; update the error
return paths around iofs.New, sqlite3.WithInstance, migrate.NewWithInstance, and
migrator.Up so they close db before returning, while leaving the final
successful return (sqlite.NewStore/sqlite.New) untouched.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 2a1c97b5-1768-4f54-8215-b27651cd4eb8

📥 Commits

Reviewing files that changed from the base of the PR and between 1d0a462 and 14c1027.

⛔ Files ignored due to path filters (1)
  • cmd/gen/sqlc-wrapper/main.go is excluded by !**/gen/**
📒 Files selected for processing (6)
  • .github/workflows/ci.yml
  • go.mod
  • internal/bootstrap/db_bootstrap.go
  • internal/repository/models.go
  • internal/repository/sqlite/generate.go
  • internal/repository/sqlite/store.go
✅ Files skipped from review due to trivial changes (2)
  • internal/repository/sqlite/generate.go
  • internal/repository/sqlite/store.go

Comment thread .github/workflows/ci.yml Outdated
@scottmckendry
Copy link
Copy Markdown
Member Author

The code gen added in the most recent commit was largely written by an LLM. I have vetted to the best of my ability, but this is a new concept to me - hence this disclaimer.

that out of the way, the generate code satisfies the store interface and correctly wraps all of the sqlc-generated code.

@scottmckendry scottmckendry force-pushed the store-refactor branch 2 times, most recently from 75a00a1 to 0244f39 Compare May 3, 2026 02:11
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
internal/bootstrap/db_bootstrap.go (1)

38-68: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Close the opened DB on sqlite bootstrap failures.

After Line 38 opens the DB, failures on Lines 48–67 return early without db.Close(). Repeated failed startups can leak file descriptors/locks.

🔧 Suggested patch
 func (app *BootstrapApp) setupSQLite(databasePath string) (repository.Store, error) {
@@
 	db, err := sql.Open("sqlite", databasePath)
 
 	if err != nil {
 		return nil, fmt.Errorf("failed to open database: %w", err)
 	}
+	closeOnErr := func(err error) (repository.Store, error) {
+		_ = db.Close()
+		return nil, err
+	}
@@
 	migrations, err := iofs.New(assets.Migrations, "migrations/sqlite")
 
 	if err != nil {
-		return nil, fmt.Errorf("failed to create migrations: %w", err)
+		return closeOnErr(fmt.Errorf("failed to create migrations: %w", err))
 	}
@@
 	target, err := sqlite3.WithInstance(db, &sqlite3.Config{})
 
 	if err != nil {
-		return nil, fmt.Errorf("failed to create sqlite3 instance: %w", err)
+		return closeOnErr(fmt.Errorf("failed to create sqlite3 instance: %w", err))
 	}
@@
 	migrator, err := migrate.NewWithInstance("iofs", migrations, "sqlite3", target)
 
 	if err != nil {
-		return nil, fmt.Errorf("failed to create migrator: %w", err)
+		return closeOnErr(fmt.Errorf("failed to create migrator: %w", err))
 	}
@@
 	if err := migrator.Up(); err != nil && err != migrate.ErrNoChange {
-		return nil, fmt.Errorf("failed to migrate database: %w", err)
+		return closeOnErr(fmt.Errorf("failed to migrate database: %w", err))
 	}
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@internal/bootstrap/db_bootstrap.go` around lines 38 - 68, The DB opened by
sql.Open is never closed on subsequent error paths (iofs.New,
sqlite3.WithInstance, migrate.NewWithInstance, migrator.Up), leaking file
descriptors; ensure the DB is closed before every early return after opening
(either call db.Close() immediately before each error return or add a defer that
closes db only on error using a named return or an "opened" flag and clear it on
success), referencing the db variable and the failing expressions iofs.New,
sqlite3.WithInstance, migrate.NewWithInstance, and migrator.Up so all those
error branches are covered.
🧹 Nitpick comments (1)
internal/repository/memory/oidc_queries.go (1)

13-17: 🏗️ Heavy lift

Normalize unique-conflict errors via a shared repository sentinel.

Returning hardcoded SQL-style strings here couples service behavior to backend-specific text. Consider adding a shared repository.ErrConflict (or equivalent) and returning wrapped sentinel errors from all drivers.

♻️ Directional patch (memory side)
-			return repository.OidcCode{}, fmt.Errorf("UNIQUE constraint failed: oidc_codes.sub")
+			return repository.OidcCode{}, fmt.Errorf("%w: oidc_codes.sub", repository.ErrConflict)
@@
-			return repository.OidcToken{}, fmt.Errorf("UNIQUE constraint failed: oidc_tokens.sub")
+			return repository.OidcToken{}, fmt.Errorf("%w: oidc_tokens.sub", repository.ErrConflict)

And define/map the same sentinel in internal/repository/store.go + sqlite wrapper so behavior stays backend-agnostic.

Also applies to: 106-110

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@internal/repository/memory/oidc_queries.go` around lines 13 - 17, Replace the
hardcoded SQL-style UNIQUE error string returned from the in-memory OIDC code
check (the loop over s.oidcCodes in oidc_queries.go that currently returns
fmt.Errorf("UNIQUE constraint failed: oidc_codes.sub")) with the shared
repository sentinel error (e.g., repository.ErrConflict) wrapped or returned
directly; update the Create/Insert OIDC methods that reference s.oidcCodes /
repository.OidcCode to use this sentinel for uniqueness conflicts. Also add or
map the same repository.ErrConflict sentinel in the store abstraction
(internal/repository/store.go) and ensure the sqlite driver wrapper maps its
DB-specific UNIQUE errors to repository.ErrConflict so all backends return the
same sentinel.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@internal/controller/oidc_controller_test.go`:
- Around line 850-853: The test currently creates a shared store via
memory.New() and a shared OIDC service via service.NewOIDCService(...) with
oidcService.Init() before running multiple t.Run subtests, which can cause state
bleed; move the creation and initialization of the memory store and oidcService
into each subtest (or a per-subtest setup helper) so each t.Run gets its own
memory.New() and service.NewOIDCService(...)+oidcService.Init() instance,
ensuring codes/tokens/sessions are isolated and tests are order-independent.

---

Outside diff comments:
In `@internal/bootstrap/db_bootstrap.go`:
- Around line 38-68: The DB opened by sql.Open is never closed on subsequent
error paths (iofs.New, sqlite3.WithInstance, migrate.NewWithInstance,
migrator.Up), leaking file descriptors; ensure the DB is closed before every
early return after opening (either call db.Close() immediately before each error
return or add a defer that closes db only on error using a named return or an
"opened" flag and clear it on success), referencing the db variable and the
failing expressions iofs.New, sqlite3.WithInstance, migrate.NewWithInstance, and
migrator.Up so all those error branches are covered.

---

Nitpick comments:
In `@internal/repository/memory/oidc_queries.go`:
- Around line 13-17: Replace the hardcoded SQL-style UNIQUE error string
returned from the in-memory OIDC code check (the loop over s.oidcCodes in
oidc_queries.go that currently returns fmt.Errorf("UNIQUE constraint failed:
oidc_codes.sub")) with the shared repository sentinel error (e.g.,
repository.ErrConflict) wrapped or returned directly; update the Create/Insert
OIDC methods that reference s.oidcCodes / repository.OidcCode to use this
sentinel for uniqueness conflicts. Also add or map the same
repository.ErrConflict sentinel in the store abstraction
(internal/repository/store.go) and ensure the sqlite driver wrapper maps its
DB-specific UNIQUE errors to repository.ErrConflict so all backends return the
same sentinel.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 421b1e3a-4a34-4570-b12f-b189f5afaa46

📥 Commits

Reviewing files that changed from the base of the PR and between 0244f39 and 04b8e98.

⛔ Files ignored due to path filters (1)
  • cmd/gen/sqlc-wrapper/main.go is excluded by !**/gen/**
📒 Files selected for processing (13)
  • internal/bootstrap/db_bootstrap.go
  • internal/config/config.go
  • internal/controller/oidc_controller_test.go
  • internal/controller/proxy_controller_test.go
  • internal/controller/user_controller_test.go
  • internal/controller/well_known_controller_test.go
  • internal/repository/memory/oidc_queries.go
  • internal/repository/memory/session_queries.go
  • internal/repository/memory/store.go
  • internal/repository/sqlite/store.go
  • internal/repository/store.go
  • internal/service/auth_service.go
  • internal/service/oidc_service.go
✅ Files skipped from review due to trivial changes (1)
  • internal/config/config.go
🚧 Files skipped from review as they are similar to previous changes (2)
  • internal/service/auth_service.go
  • internal/repository/sqlite/store.go

Comment thread internal/controller/oidc_controller_test.go
@codecov
Copy link
Copy Markdown

codecov Bot commented May 7, 2026

removes the sqlite dependency for tests, also brings back the option for
users to run zero persistence instances of tinyauth.

adds new mapErr fn for sqlc wrapper gen to prevent sql errors from
leaking out of the store implementation.
@scottmckendry
Copy link
Copy Markdown
Member Author

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 9, 2026

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
internal/middleware/context_middleware_test.go (1)

273-313: ⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Avoid sharing one in-memory store across all subtests.

Using a single memory.New() instance for the whole suite allows session data to leak across test cases, which can make tests order-dependent over time.

Suggested isolation pattern
- store := memory.New()
-
- ldap := service.NewLdapService(service.LdapServiceConfig{})
- err := ldap.Init()
- require.NoError(t, err)
-
- broker := service.NewOAuthBrokerService(oauthBrokerCfgs)
- err = broker.Init()
- require.NoError(t, err)
-
- authService := service.NewAuthService(authServiceCfg, ldap, store, broker)
- err = authService.Init()
- require.NoError(t, err)
-
- contextMiddleware := middleware.NewContextMiddleware(middlewareCfg, authService, broker)
- err = contextMiddleware.Init()
- require.NoError(t, err)
-
 for _, test := range tests {
-	authService.ClearRateLimitsTestingOnly()
 	t.Run(test.description, func(t *testing.T) {
+		store := memory.New()
+		ldap := service.NewLdapService(service.LdapServiceConfig{})
+		require.NoError(t, ldap.Init())
+		broker := service.NewOAuthBrokerService(oauthBrokerCfgs)
+		require.NoError(t, broker.Init())
+		authService := service.NewAuthService(authServiceCfg, ldap, store, broker)
+		require.NoError(t, authService.Init())
+		contextMiddleware := middleware.NewContextMiddleware(middlewareCfg, authService, broker)
+		require.NoError(t, contextMiddleware.Init())
+		authService.ClearRateLimitsTestingOnly()
+
 		gin.SetMode(gin.TestMode)
 		...
 		test.run(t, runArgs{do: do, queries: store})
 	})
 }
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@internal/middleware/context_middleware_test.go` around lines 273 - 313, Tests
currently share a single in-memory store (memory.New()) across all subtests
which allows session data to leak; to fix, create a fresh store per subtest and
re-initialize the services that depend on it: move the memory.New() call into
the t.Run loop and recreate the auth service and context middleware there (use
service.NewAuthService(...) and middleware.NewContextMiddleware(...), then call
Init() and require.NoError for each), while keeping reusable services like
ldap/broker outside if desired; ensure authService.ClearRateLimitsTestingOnly()
still operates on the per-test instance.
🧹 Nitpick comments (1)
internal/service/auth_service.go (1)

423-425: ⚡ Quick win

Preserve the not-found sentinel when remapping the error.

Returning errors.New("session not found") drops type information and prevents upstream errors.Is(..., repository.ErrNotFound) checks.

Proposed adjustment
 	if err != nil {
 		if errors.Is(err, repository.ErrNotFound) {
-			return nil, errors.New("session not found")
+			return nil, fmt.Errorf("session not found: %w", repository.ErrNotFound)
 		}
 		return nil, err
 	}
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@internal/service/auth_service.go` around lines 423 - 425, The current
remapping returns a new error via errors.New("session not found") which drops
the sentinel; instead wrap the original not-found error so upstream
errors.Is(..., repository.ErrNotFound) still matches. Replace the return in the
errors.Is(err, repository.ErrNotFound) branch to return a wrapped error that
includes context and the original error (use fmt.Errorf with %w or
errors.Wrap-style wrapping) so repository.ErrNotFound is preserved when checking
later.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Outside diff comments:
In `@internal/middleware/context_middleware_test.go`:
- Around line 273-313: Tests currently share a single in-memory store
(memory.New()) across all subtests which allows session data to leak; to fix,
create a fresh store per subtest and re-initialize the services that depend on
it: move the memory.New() call into the t.Run loop and recreate the auth service
and context middleware there (use service.NewAuthService(...) and
middleware.NewContextMiddleware(...), then call Init() and require.NoError for
each), while keeping reusable services like ldap/broker outside if desired;
ensure authService.ClearRateLimitsTestingOnly() still operates on the per-test
instance.

---

Nitpick comments:
In `@internal/service/auth_service.go`:
- Around line 423-425: The current remapping returns a new error via
errors.New("session not found") which drops the sentinel; instead wrap the
original not-found error so upstream errors.Is(..., repository.ErrNotFound)
still matches. Replace the return in the errors.Is(err, repository.ErrNotFound)
branch to return a wrapped error that includes context and the original error
(use fmt.Errorf with %w or errors.Wrap-style wrapping) so repository.ErrNotFound
is preserved when checking later.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 8d40c9d4-416c-4970-aef0-32255fea7eaa

📥 Commits

Reviewing files that changed from the base of the PR and between 0244f39 and db911a4.

⛔ Files ignored due to path filters (2)
  • cmd/gen/sqlc-wrapper/sqlc_wrapper.go is excluded by !**/gen/**
  • cmd/gen/sqlc-wrapper/store.tmpl is excluded by !**/gen/**
📒 Files selected for processing (49)
  • .github/workflows/ci.yml
  • Makefile
  • go.mod
  • internal/assets/assets.go
  • internal/assets/migrations/sqlite/000001_init_sqlite.down.sql
  • internal/assets/migrations/sqlite/000001_init_sqlite.up.sql
  • internal/assets/migrations/sqlite/000002_oauth_name.down.sql
  • internal/assets/migrations/sqlite/000002_oauth_name.up.sql
  • internal/assets/migrations/sqlite/000003_oauth_sub.down.sql
  • internal/assets/migrations/sqlite/000003_oauth_sub.up.sql
  • internal/assets/migrations/sqlite/000004_created_at.down.sql
  • internal/assets/migrations/sqlite/000004_created_at.up.sql
  • internal/assets/migrations/sqlite/000005_oidc_session.down.sql
  • internal/assets/migrations/sqlite/000005_oidc_session.up.sql
  • internal/assets/migrations/sqlite/000006_oidc_nonce.down.sql
  • internal/assets/migrations/sqlite/000006_oidc_nonce.up.sql
  • internal/assets/migrations/sqlite/000007_oidc_pkce.down.sql
  • internal/assets/migrations/sqlite/000007_oidc_pkce.up.sql
  • internal/assets/migrations/sqlite/000008_oidc_code_reuse.down.sql
  • internal/assets/migrations/sqlite/000008_oidc_code_reuse.up.sql
  • internal/assets/migrations/sqlite/000009_oidc_userinfo_profile.down.sql
  • internal/assets/migrations/sqlite/000009_oidc_userinfo_profile.up.sql
  • internal/bootstrap/app_bootstrap.go
  • internal/bootstrap/db_bootstrap.go
  • internal/bootstrap/service_bootstrap.go
  • internal/controller/oidc_controller_test.go
  • internal/controller/proxy_controller_test.go
  • internal/controller/user_controller_test.go
  • internal/controller/well_known_controller_test.go
  • internal/middleware/context_middleware_test.go
  • internal/model/config.go
  • internal/repository/memory/oidc_queries.go
  • internal/repository/memory/session_queries.go
  • internal/repository/memory/store.go
  • internal/repository/models.go
  • internal/repository/sqlite/db.go
  • internal/repository/sqlite/generate.go
  • internal/repository/sqlite/models.go
  • internal/repository/sqlite/oidc_queries.sql.go
  • internal/repository/sqlite/session_queries.sql.go
  • internal/repository/sqlite/store.go
  • internal/repository/store.go
  • internal/service/auth_service.go
  • internal/service/oidc_service.go
  • sql/sqlite/oidc_queries.sql
  • sql/sqlite/oidc_schemas.sql
  • sql/sqlite/session_queries.sql
  • sql/sqlite/session_schemas.sql
  • sqlc.yml
✅ Files skipped from review due to trivial changes (3)
  • internal/repository/sqlite/generate.go
  • sqlc.yml
  • internal/repository/sqlite/models.go
🚧 Files skipped from review as they are similar to previous changes (20)
  • internal/repository/sqlite/db.go
  • internal/repository/sqlite/oidc_queries.sql.go
  • internal/assets/assets.go
  • internal/repository/sqlite/session_queries.sql.go
  • internal/bootstrap/db_bootstrap.go
  • go.mod
  • .github/workflows/ci.yml
  • internal/repository/memory/session_queries.go
  • internal/repository/memory/store.go
  • internal/bootstrap/service_bootstrap.go
  • internal/controller/well_known_controller_test.go
  • internal/repository/store.go
  • internal/service/oidc_service.go
  • internal/repository/sqlite/store.go
  • internal/controller/proxy_controller_test.go
  • internal/controller/user_controller_test.go
  • internal/bootstrap/app_bootstrap.go
  • internal/controller/oidc_controller_test.go
  • internal/repository/memory/oidc_queries.go
  • internal/repository/models.go

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XL This PR changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant