mongoDB: Use Specific Database for Authentication

persistent-mongoDB/ChangeLog.md

@@ -1,5 +1,8 @@
 # Changelog for persistent-mongoDB
 
+## 2.14.0.0
+* MongoDB authentication now allows specifying which database to authenticate against, which may be different from the database that one normally needs to access.
+
 ## 2.13.1.0
 
 * Restore update write concern behavior with MongoDB Driver for MongoDB >= 6.0 [#1550](https://github.com/yesodweb/persistent/pull/1550)

persistent-mongoDB/Database/Persist/MongoDB.hs

@@ -263,7 +263,7 @@ createPipe hostname port = DB.connect (DB.Host hostname port)
 createReplicatSet :: (DB.ReplicaSetName, [DB.Host]) -> Database -> Maybe MongoAuth -> IO Connection
 createReplicatSet rsSeed dbname mAuth = do
     pipe <- DB.openReplicaSet rsSeed >>= DB.primary
-    testAccess pipe dbname mAuth
+    testAccess pipe mAuth
     return $ Connection pipe dbname
 
 createRsPool :: (Trans.MonadIO m) => Database -> ReplicaSetConfig
@@ -280,17 +280,17 @@ createRsPool dbname (ReplicaSetConfig rsName rsHosts) mAuth connectionPoolSize s
                           connectionIdleTime
                           stripeSize
 
-testAccess :: DB.Pipe -> Database -> Maybe MongoAuth -> IO ()
-testAccess pipe dbname mAuth = do
+testAccess :: DB.Pipe -> Maybe MongoAuth -> IO ()
+testAccess pipe mAuth = do
     _ <- case mAuth of
-      Just (MongoAuth user pass) -> DB.access pipe DB.UnconfirmedWrites dbname (DB.auth user pass)
+      Just (MongoAuth dbname user pass) -> DB.access pipe DB.UnconfirmedWrites dbname (DB.auth user pass)
       Nothing -> return undefined
     return ()
 
 createConnection :: Database -> HostName -> DB.PortID -> Maybe MongoAuth -> IO Connection
 createConnection dbname hostname port mAuth = do
     pipe <- createPipe hostname port
-    testAccess pipe dbname mAuth
+    testAccess pipe mAuth
     return $ Connection pipe dbname
 
 createMongoDBPool :: (Trans.MonadIO m) => Database -> HostName -> DB.PortID
@@ -1109,7 +1109,7 @@ dummyFromUnique _ = error "dummyFromUnique"
 dummyFromFilts :: [Filter v] -> v
 dummyFromFilts _ = error "dummyFromFilts"
 
-data MongoAuth = MongoAuth DB.Username DB.Password deriving Show
+data MongoAuth = MongoAuth Database DB.Username DB.Password deriving Show
 
 -- | Information required to connect to a mongo database
 data MongoConf = MongoConf
@@ -1189,7 +1189,7 @@ instance FromJSON MongoConf where
           , mgPort = port
           , mgAuth =
               case (mUser, mPass) of
-                (Just user, Just pass) -> Just (MongoAuth user pass)
+                (Just user, Just pass) -> Just (MongoAuth db user pass)
                 _ -> Nothing
           , mgPoolStripes = poolStripes
           , mgStripeConnections = stripeConnections

persistent-mongoDB/persistent-mongoDB.cabal

@@ -1,5 +1,5 @@
 name:               persistent-mongoDB
-version:            2.13.1.0
+version:            2.14.0.0
 license:            MIT
 license-file:       LICENSE
 author:             Greg Weber <[email protected]>