fix(express-session-mikro-orm): fix update query for mongodb (#108)

use nativeUpdate instead of persist and flush for session update fix #107
tenseijs · Jun 17, 2021 · b7b0a22 · b7b0a22
1 parent 73e16a7
commit b7b0a22
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/examples/blog/example_bloggg b/examples/blog/example_bloggg
diff --git a/examples/blog/index.js b/examples/blog/index.js
@@ -45,7 +45,8 @@ tensei()
     ])
     .plugins([
         welcome(),
-        cms().plugin(),
+        cms()
+        .plugin(),
         auth().rolesAndPermissions().refreshTokens()
         // .cookieSessions()
         .plugin(),
@@ -54,6 +55,7 @@ tensei()
     ])
     .databaseConfig({
         debug: true,
+        type: 'mongo'
     })
     .start()
     .catch(console.error)
diff --git a/packages/components/src/Icon/Icon.tsx b/packages/components/src/Icon/Icon.tsx
@@ -32,7 +32,6 @@ const Icon: React.FC<IconProps> = ({
     height = 28,
     active = false
 }) => {
-    console.log('@@@@@@->', icon)
     const iconName = `${toPascalCase(icon)}Icon`
 
     const Icon =

diff --git a/packages/express-session-mikro-orm/src/index.ts b/packages/express-session-mikro-orm/src/index.ts
@@ -98,14 +98,16 @@ const StoreFactory = (Store: any, sessionConfig?: SessionConfig) => {
                 })
                 .then((session: any) => {
                     if (session) {
-                        this.orm.em.assign(session, {
+                        const updates = {
                             data: JSON.stringify(payload),
                             expires
-                        })
+                        }
 
-                        return this.orm.em
-                            .persistAndFlush(session)
-                            .then(() => session)
+                        this.orm.em.assign(session, updates)
+
+                        return this.orm.em.nativeUpdate(this.entityName, {
+                            session_id: session.session_id
+                        }, updates).then(() => session)
                     }
 
                     const newSession = this.orm.em.create(this.entityName, {

diff --git a/packages/tests/helpers/index.ts b/packages/tests/helpers/index.ts
@@ -70,7 +70,7 @@ export const getDatabaseCredentials = () => {
 
     const config: DatabaseConfiguration = {
         type: databaseType,
-        forceUtcTimezone: true
+        forceUtcTimezone: true,
     }
 
     if (databaseType === 'postgresql') {

diff --git a/packages/tests/packages/cms/admin.spec.ts b/packages/tests/packages/cms/admin.spec.ts
@@ -20,6 +20,7 @@ test('can passwordlessly register a new administrator user', async () => {
             orm: { em }
         }
     } = await setup([cms().plugin(), setupFakeMailer(mailerMock)], false)
+    await em.nativeDelete('AdminUserSession', {})
 
     const client = (SupertestSession(app) as unknown) as SI<any>
 
@@ -48,6 +49,21 @@ test('can passwordlessly register a new administrator user', async () => {
 
     expect(loginResponse.status).toBe(302)
     expect(loginResponse.headers['location']).toBe('/cms')
+
+    const session = await em.find<{
+        data: string
+    }>('AdminUserSession', {})
+
+    const authUser = await em.findOne<{
+        id: string,
+        email: string
+    }>('AdminUser', {
+        email
+    })
+
+    const sessionData = JSON.parse(session[0].data)
+
+    expect(sessionData?.user?.id?.toString()).toBe(authUser.id.toString())
 })
 
 test('cannot register another administrator if a super admin already exists', async () => {