@adonisjs/session 6.2.1 → 6.3.0

package/build/adonis-typings/session.d.ts

@@ -231,7 +231,7 @@ declare module '@ioc:Adonis/Addons/Session' {
         /**
          * Load session data from the driver
          */
-        load(): Promise<{
+        load(cookies: Record<string, any>): Promise<{
             session: Record<string, any>;
             flashMessages: Record<string, any> | null;
         }>;

package/build/src/Bindings/Tests.js

@@ -90,36 +90,42 @@ function defineTestsBindings(ApiRequest, ApiResponse, ApiClient, SessionManager)
         this.assert.notProperty(this.flashMessages(), name);
     });
     /**
-     * Hook into request and persist session data to be available
-     * on the server during the request.
+     * Adding hooks directly on the request object moves the hooks to
+     * the end of the queue (basically after the globally hooks)
      */
-    ApiClient.setup(async (request) => {
+    ApiClient.onRequest((req) => {
         /**
-         * Persist session data and set the session id within the
-         * cookie
+         * Hook into request and persist session data to be available
+         * on the server during the request.
          */
-        const { cookieName, sessionId } = await request.sessionClient.commit();
-        request.cookie(cookieName, sessionId);
+        req.setup(async (request) => {
+            /**
+             * Persist session data and set the session id within the
+             * cookie
+             */
+            const { cookieName, sessionId } = await request.sessionClient.commit();
+            request.cookie(cookieName, sessionId);
+            /**
+             * Cleanup if request has error. Otherwise the teardown
+             * hook will clear
+             */
+            return async (error) => {
+                if (error) {
+                    await request.sessionClient.forget();
+                }
+            };
+        });
         /**
-         * Cleanup if request has error. Otherwise the teardown
-         * hook will clear
+         * Load messages from the session store and keep a reference to it
+         * inside the response object.
+         *
+         * We also destroy the session after getting a copy of the session
+         * data
          */
-        return async (error) => {
-            if (error) {
-                await request.sessionClient.forget();
-            }
-        };
-    });
-    /**
-     * Load messages from the session store and keep a reference to it
-     * inside the response object.
-     *
-     * We also destroy the session after getting a copy of the session
-     * data
-     */
-    ApiClient.teardown(async (response) => {
-        response.sessionJar = await response.request.sessionClient.load();
-        await response.request.sessionClient.forget();
+        req.teardown(async (response) => {
+            response.sessionJar = await response.request.sessionClient.load(response.cookies());
+            await response.request.sessionClient.forget();
+        });
     });
 }
 exports.defineTestsBindings = defineTestsBindings;

package/build/src/Client/index.d.ts

@@ -34,7 +34,7 @@ export declare class SessionClient extends Store implements SessionClientContrac
     /**
      * Load session from the driver
      */
-    load(): Promise<{
+    load(cookies: Record<string, any>): Promise<{
         session: any;
         flashMessages: any;
     }>;

package/build/src/Client/index.js

@@ -45,8 +45,10 @@ class SessionClient extends Store_1.Store {
     /**
      * Load session from the driver
      */
-    async load() {
-        const contents = await this.driver.read(this.sessionId);
+    async load(cookies) {
+        const sessionIdCookie = cookies[this.config.cookieName];
+        const sessionId = sessionIdCookie ? sessionIdCookie.value : this.sessionId;
+        const contents = await this.driver.read(sessionId);
         const store = new Store_1.Store(contents);
         const flashMessages = store.pull(this.flashMessagesKey, null);
         return {

package/build/src/Session/index.d.ts

@@ -34,6 +34,11 @@ export declare class Session implements SessionContract {
      * A copy of previously set flash messages
      */
     flashMessages: Store;
+    /**
+     * Session id for the current request. It will be different
+     * from the "this.sessionId" when regenerate is called.
+     */
+    private currentSessionId;
     /**
      * A instance of store with values read from the driver. The store
      * in initiated inside the [[initiate]] method
@@ -43,7 +48,7 @@ export declare class Session implements SessionContract {
      * Whether or not to re-generate the session id before comitting
      * session values.
      */
-    private regenerateSessionId;
+    private regeneratedSessionId;
     /**
      * A copy of flash messages. The `input` messages
      * are overwritten when any of the input related

package/build/src/Session/index.js

@@ -46,11 +46,16 @@ class Session {
          * A copy of previously set flash messages
          */
         this.flashMessages = new Store_1.Store({});
+        /**
+         * Session id for the current request. It will be different
+         * from the "this.sessionId" when regenerate is called.
+         */
+        this.currentSessionId = this.sessionId;
         /**
          * Whether or not to re-generate the session id before comitting
          * session values.
          */
-        this.regenerateSessionId = false;
+        this.regeneratedSessionId = false;
         /**
          * A copy of flash messages. The `input` messages
          * are overwritten when any of the input related
@@ -180,7 +185,8 @@ class Session {
      */
     regenerate() {
         this.ctx.logger.trace('explicitly re-generating session id');
-        this.regenerateSessionId = true;
+        this.sessionId = (0, helpers_1.cuid)();
+        this.regeneratedSessionId = true;
     }
     /**
      * Set/update session value
@@ -331,9 +337,8 @@ class Session {
             /**
              * Cleanup old session and re-generate new session
              */
-            if (this.regenerateSessionId) {
-                await this.driver.destroy(this.sessionId);
-                this.sessionId = (0, helpers_1.cuid)();
+            if (this.regeneratedSessionId) {
+                await this.driver.destroy(this.currentSessionId);
             }
             /**
              * Touch the session cookie to keep it alive.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/session",
-  "version": "6.2.1",
+  "version": "6.3.0",
   "description": "Session provider for AdonisJS",
   "typings": "./build/adonis-typings/index.d.ts",
   "main": "build/providers/SessionProvider.js",
@@ -12,40 +12,41 @@
     "build/instructions.md"
   ],
   "dependencies": {
-    "@poppinss/utils": "^4.0.3",
-    "fs-extra": "^10.0.1"
+    "@poppinss/utils": "^4.0.4",
+    "fs-extra": "^10.1.0"
   },
   "peerDependencies": {
     "@adonisjs/core": "^5.5.0"
   },
   "devDependencies": {
-    "@adonisjs/core": "^5.7.1",
+    "@adonisjs/core": "^5.8.2",
     "@adonisjs/mrm-preset": "^5.0.3",
     "@adonisjs/redis": "^7.2.0",
     "@adonisjs/require-ts": "^2.0.11",
     "@japa/assert": "^1.3.4",
-    "@japa/preset-adonis": "^1.0.14",
+    "@japa/preset-adonis": "^1.0.15",
     "@japa/run-failed-tests": "^1.0.7",
-    "@japa/runner": "^2.0.7",
+    "@japa/runner": "^2.0.8",
     "@japa/spec-reporter": "^1.1.12",
     "@poppinss/dev-utils": "^2.0.3",
-    "@types/node": "^17.0.23",
+    "@types/node": "^17.0.34",
     "@types/supertest": "^2.0.12",
     "commitizen": "^4.2.4",
     "copyfiles": "^2.4.1",
     "cz-conventional-changelog": "^3.3.0",
     "del-cli": "^4.0.1",
-    "eslint": "^8.12.0",
+    "eslint": "^8.15.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-adonis": "^2.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "github-label-sync": "^2.2.0",
-    "husky": "^7.0.4",
+    "husky": "^8.0.1",
     "mrm": "^4.0.0",
     "np": "^7.6.1",
     "prettier": "^2.6.2",
-    "supertest": "^6.2.2",
-    "typescript": "^4.6.3"
+    "set-cookie-parser": "^2.4.8",
+    "supertest": "^6.2.3",
+    "typescript": "^4.6.4"
   },
   "scripts": {
     "mrm": "mrm --preset=@adonisjs/mrm-preset",