Migrate MongoDbBasicStore to golib version

2 files changed, 5 insertions, 7 deletions

diff --git a/cmd/register/register.go b/cmd/register/register.go
index fdd083c..c00b54b 100644
--- a/cmd/register/register.go
+++ b/cmd/register/register.go
@@ -10,7 +10,6 @@ import (
         glecho "code.crute.us/mcrute/golib/echo"
         "code.crute.us/mcrute/ssh-proxy/app"
         "code.crute.us/mcrute/ssh-proxy/app/models"
-        "code.crute.us/mcrute/ssh-proxy/db"
         "github.com/spf13/cobra"
 )
 
@@ -43,13 +42,13 @@ func registerMain(cfg app.Config, username string) {
                 log.Fatalf("Error connecting to mongodb: %s", err)
         }
 
-        userStore := &db.MongoDbBasicStore[*models.User]{
+        userStore := &mongodb.MongoDbBasicStore[*models.User]{
                 Db:             mongo,
                 CollectionName: "users",
         }
 
         authSessionStore := &models.AuthSessionStoreMongodb{
-                MongoDbBasicStore: &db.MongoDbBasicStore[*models.AuthSession]{
+                MongoDbBasicStore: &mongodb.MongoDbBasicStore[*models.AuthSession]{
                         Db:             mongo,
                         CollectionName: "oauth_sessions",
                 },
diff --git a/cmd/web/server.go b/cmd/web/server.go
index 83f4fc8..19c1bb7 100644
--- a/cmd/web/server.go
+++ b/cmd/web/server.go
@@ -14,7 +14,6 @@ import (
         "code.crute.us/mcrute/ssh-proxy/app/controllers"
         "code.crute.us/mcrute/ssh-proxy/app/middleware"
         "code.crute.us/mcrute/ssh-proxy/app/models"
-        "code.crute.us/mcrute/ssh-proxy/db"
 
         "code.crute.us/mcrute/golib/cli"
         "code.crute.us/mcrute/golib/clients/autocert/v2"
@@ -127,18 +126,18 @@ func webMain(cfg app.Config, embeddedTemplates, embeddedClients fs.FS, appVersio
                 log.Fatalf("Error creating session store: %s", err)
         }
 
-        userStore := &db.MongoDbBasicStore[*models.User]{
+        userStore := &mongodb.MongoDbBasicStore[*models.User]{
                 Db:             mongo,
                 CollectionName: "users",
         }
 
-        oauthClientStore := &db.MongoDbBasicStore[*models.OauthClient]{
+        oauthClientStore := &mongodb.MongoDbBasicStore[*models.OauthClient]{
                 Db:             mongo,
                 CollectionName: "oauth_clients",
         }
 
         authSessionStore := &models.AuthSessionStoreMongodb{
-                MongoDbBasicStore: &db.MongoDbBasicStore[*models.AuthSession]{
+                MongoDbBasicStore: &mongodb.MongoDbBasicStore[*models.AuthSession]{
                         Db:             mongo,
                         CollectionName: "oauth_sessions",
                 },