@websolutespa/bom-mixer-models 1.8.13 → 1.8.15

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @websolutespa/bom-mixer-models
 
+## 1.8.15
+
+### Patch Changes
+
+- Modified: request & response types
+- Updated dependencies
+  - @websolutespa/bom-mixer-store@1.8.8
+
+## 1.8.14
+
+### Patch Changes
+
+- Modified: request & response types
+- Updated dependencies
+- Updated dependencies
+  - @websolutespa/bom-mixer-store@1.8.7
+  - @websolutespa/bom-core@1.8.15
+
 ## 1.8.13
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { IOption, ILayout, IPage, IRouteParams, QueryParams, ICategory, IEquatable, ICategorized, IEntity, IPaginationResult, INamedEntity, ILabel, IComponent, PageProps, ILocale, IMarket, IMenu, IRoute, IRedirect, IRouteLink, IQuerable, IMedia } from '@websolutespa/bom-core';
 import { AppProps } from 'next/app';
 import { FC, ReactNode, ComponentType } from 'react';
-import { GetServerSideProps, Redirect } from 'next';
+import { GetServerSideProps, Redirect, NextApiRequest, NextApiResponse } from 'next';
 import { DynamicOptions, Loader } from 'next/dynamic';
 import * as _websolutespa_bom_mixer_store from '@websolutespa/bom-mixer-store';
 import { NextRequest, NextFetchEvent, NextResponse } from 'next/server';
@@ -205,12 +205,20 @@ declare function resolveRoute(route: IRoute & {
 type SeoWeight = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
 declare const getSeoWeight: (index?: number, seoWeight?: SeoWeight) => (subIndex?: number) => SeoWeight;
 
-declare function getSession<T extends object = Record<string, any>>(request: Request | IncomingMessage, response: Response | ServerResponse): Promise<IronSession<T>>;
+declare function getSession<T extends object = Record<string, any>>(request: NextRequest | NextApiRequest | (IncomingMessage & {
+    cookies: Partial<{
+        [key: string]: string;
+    }>;
+}), response: NextResponse | NextApiResponse | ServerResponse<IncomingMessage>): Promise<IronSession<T>>;
 type SessionWithToken<T extends object = Record<string, any>> = T & Partial<{
     token: string;
     exp: number;
 }>;
-declare function getSessionToken<T extends SessionWithToken>(request: Request | IncomingMessage, response: Response | ServerResponse): Promise<string | null>;
+declare function getSessionToken<T extends SessionWithToken>(request: NextRequest | NextApiRequest | (IncomingMessage & {
+    cookies: Partial<{
+        [key: string]: string;
+    }>;
+}), response: NextResponse | NextApiResponse | ServerResponse<IncomingMessage>): Promise<string | undefined>;
 
 declare const getSiteMapIndexProps: GetServerSideProps;
 declare const getSiteMapXMLProps: GetServerSideProps;

package/dist/index.js

@@ -885,7 +885,7 @@ async function getSessionToken(request, response) {
     session.exp = void 0;
     await session.save();
     session.destroy();
-    return null;
+    return;
   }
 }
 

package/dist/index.mjs

@@ -783,7 +783,7 @@ async function getSessionToken(request, response) {
     session.exp = void 0;
     await session.save();
     session.destroy();
-    return null;
+    return;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-models",
-  "version": "1.8.13",
+  "version": "1.8.15",
   "description": "Mixer Models module of the BOM Repository",
   "keywords": [
     "bom",

package/src/session/session.service.ts

@@ -1,10 +1,14 @@
 import { isDevelopment } from '@websolutespa/bom-core';
 import { IncomingMessage, ServerResponse } from 'http';
 import { getIronSession, IronSession, SessionOptions } from 'iron-session';
+import { NextApiRequest, NextApiResponse } from 'next';
+import { NextRequest, NextResponse } from 'next/server';
 
 export async function getSession<T extends object = Record<string, any>>(
-  request: Request | IncomingMessage,
-  response: Response | ServerResponse
+  request: NextRequest | NextApiRequest | IncomingMessage & {
+    cookies: Partial<{ [key: string]: string }>;
+  },
+  response: NextResponse | NextApiResponse | ServerResponse<IncomingMessage>
 ): Promise<IronSession<T>> {
   const COOKIE_NAME = 'websolutespa-next-js';
   const COOKIE_PASSWORD = process.env.SECRET_COOKIE_PASSWORD as string || 'SECRET_COOKIE_PASSWORD_32_CHARS_LONG';
@@ -26,9 +30,11 @@ export type SessionWithToken<T extends object = Record<string, any>> = T & Parti
 }>;
 
 export async function getSessionToken<T extends SessionWithToken>(
-  request: Request | IncomingMessage,
-  response: Response | ServerResponse
-): Promise<string | null> {
+  request: NextRequest | NextApiRequest | IncomingMessage & {
+    cookies: Partial<{ [key: string]: string }>;
+  },
+  response: NextResponse | NextApiResponse | ServerResponse<IncomingMessage>
+): Promise<string | undefined> {
   const session = await getSession<T>(request, response);
   if (session.token && session.exp && session.exp > Math.floor(new Date().getTime() / 1000)) {
     return session.token;
@@ -37,6 +43,6 @@ export async function getSessionToken<T extends SessionWithToken>(
     session.exp = undefined;
     await session.save();
     session.destroy();
-    return null;
+    return;
   }
 }