@smg-automotive/auth 7.1.0-auth0-update-tweaks.2 → 7.1.0-auth0-update-tweaks.3

package/dist/cjs/server/helpers/getUser.d.ts

@@ -1,10 +1,13 @@
-import { NextApiRequest } from 'next';
-import { IncomingMessage } from 'http';
+import { NextApiRequest, NextApiResponse } from 'next';
+import { IncomingMessage, ServerResponse } from 'http';
 import { Brand } from 'src/types/brand';
 import { EnrichedSessionUser, SessionUser } from 'src/types';
 import { GetAuth0InstanceContext } from '../getAuth0Instance';
 export declare const getUser: (context: GetAuth0InstanceContext) => Promise<SessionUser | null>;
-export declare const getEnrichedUser: ({ brand, request, ...context }: GetAuth0InstanceContext & {
+export declare const getEnrichedUser: ({ brand, context, ...auth0context }: GetAuth0InstanceContext & {
     brand: Brand;
-    request?: NextApiRequest | IncomingMessage;
+    context?: {
+        request: NextApiRequest | IncomingMessage;
+        response: NextApiResponse | ServerResponse<IncomingMessage>;
+    };
 }) => Promise<EnrichedSessionUser | null>;

package/dist/cjs/server/helpers/getUser.js

@@ -10,17 +10,20 @@ const getUser = async (context) => {
         return null;
     return sessionData.user;
 };
-const getEnrichedUser = async ({ brand, request, ...context }) => {
-    const auth0Instance = getAuth0Instance.getAuth0Instance(context);
-    const sessionData = await (request
-        ? auth0Instance.getSession(request)
-        : auth0Instance.getSession());
+const getEnrichedUser = async ({ brand, context, ...auth0context }) => {
+    const auth0Instance = getAuth0Instance.getAuth0Instance(auth0context);
+    const sessionData = context?.request
+        ? await auth0Instance.getSession(context.request)
+        : await auth0Instance.getSession();
     if (!sessionData || !sessionData.user)
         return null;
     const user = sessionData.user;
+    const { token } = context?.request
+        ? await auth0Instance.getAccessToken(context.request, context.response)
+        : await auth0Instance.getAccessToken();
     return session.enrichUser({
         user,
-        accessToken: sessionData.tokenSet.accessToken,
+        accessToken: token,
         brand,
     });
 };

package/dist/cjs/server/helpers/getUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUser.js","sources":["../../../../../src/server/helpers/getUser.ts"],"sourcesContent":[null],"names":["getAuth0Instance","enrichUser"],"mappings":";;;;;MAUa,OAAO,GAAG,OACrB,OAAgC,KACD;AAC/B,IAAA,MAAM,aAAa,GAAGA,iCAAgB,CAAC,OAAO,CAAC;AAC/C,IAAA,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE;AAEpD,IAAA,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;IAElD,OAAO,WAAW,CAAC,IAAmB;AACxC;AAEO,MAAM,eAAe,GAAG,OAAO,EACpC,KAAK,EACL,OAAO,EACP,GAAG,OAAO,EAIX,KAAyC;AACxC,IAAA,MAAM,aAAa,GAAGA,iCAAgB,CAAC,OAAO,CAAC;AAC/C,IAAA,MAAM,WAAW,GAAG,OAAO;AACzB,UAAE,aAAa,CAAC,UAAU,CAAC,OAAO;AAClC,UAAE,aAAa,CAAC,UAAU,EAAE,CAAC;AAE/B,IAAA,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;AAElD,IAAA,MAAM,IAAI,GAAG,WAAW,CAAC,IAAmB;AAC5C,IAAA,OAAOC,kBAAU,CAAC;QAChB,IAAI;AACJ,QAAA,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,WAAW;QAC7C,KAAK;AACN,KAAA,CAAC;AACJ;;;;;"}
+{"version":3,"file":"getUser.js","sources":["../../../../../src/server/helpers/getUser.ts"],"sourcesContent":[null],"names":["getAuth0Instance","enrichUser"],"mappings":";;;;;MAUa,OAAO,GAAG,OACrB,OAAgC,KACD;AAC/B,IAAA,MAAM,aAAa,GAAGA,iCAAgB,CAAC,OAAO,CAAC;AAC/C,IAAA,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE;AAEpD,IAAA,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;IAElD,OAAO,WAAW,CAAC,IAAmB;AACxC;AAEO,MAAM,eAAe,GAAG,OAAO,EACpC,KAAK,EACL,OAAO,EACP,GAAG,YAAY,EAOhB,KAAyC;AACxC,IAAA,MAAM,aAAa,GAAGA,iCAAgB,CAAC,YAAY,CAAC;AACpD,IAAA,MAAM,WAAW,GAAG,OAAO,EAAE;UACzB,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO;AAChD,UAAE,MAAM,aAAa,CAAC,UAAU,EAAE;AAEpC,IAAA,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;AAElD,IAAA,MAAM,IAAI,GAAG,WAAW,CAAC,IAAmB;AAC5C,IAAA,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE;AACzB,UAAE,MAAM,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ;AACtE,UAAE,MAAM,aAAa,CAAC,cAAc,EAAE;AACxC,IAAA,OAAOC,kBAAU,CAAC;QAChB,IAAI;AACJ,QAAA,WAAW,EAAE,KAAK;QAClB,KAAK;AACN,KAAA,CAAC;AACJ;;;;;"}

package/dist/esm/server/helpers/getUser.d.ts

@@ -1,10 +1,13 @@
-import { NextApiRequest } from 'next';
-import { IncomingMessage } from 'http';
+import { NextApiRequest, NextApiResponse } from 'next';
+import { IncomingMessage, ServerResponse } from 'http';
 import { Brand } from 'src/types/brand';
 import { EnrichedSessionUser, SessionUser } from 'src/types';
 import { GetAuth0InstanceContext } from '../getAuth0Instance';
 export declare const getUser: (context: GetAuth0InstanceContext) => Promise<SessionUser | null>;
-export declare const getEnrichedUser: ({ brand, request, ...context }: GetAuth0InstanceContext & {
+export declare const getEnrichedUser: ({ brand, context, ...auth0context }: GetAuth0InstanceContext & {
     brand: Brand;
-    request?: NextApiRequest | IncomingMessage;
+    context?: {
+        request: NextApiRequest | IncomingMessage;
+        response: NextApiResponse | ServerResponse<IncomingMessage>;
+    };
 }) => Promise<EnrichedSessionUser | null>;

package/dist/esm/server/helpers/getUser.js

@@ -8,17 +8,20 @@ const getUser = async (context) => {
         return null;
     return sessionData.user;
 };
-const getEnrichedUser = async ({ brand, request, ...context }) => {
-    const auth0Instance = getAuth0Instance(context);
-    const sessionData = await (request
-        ? auth0Instance.getSession(request)
-        : auth0Instance.getSession());
+const getEnrichedUser = async ({ brand, context, ...auth0context }) => {
+    const auth0Instance = getAuth0Instance(auth0context);
+    const sessionData = context?.request
+        ? await auth0Instance.getSession(context.request)
+        : await auth0Instance.getSession();
     if (!sessionData || !sessionData.user)
         return null;
     const user = sessionData.user;
+    const { token } = context?.request
+        ? await auth0Instance.getAccessToken(context.request, context.response)
+        : await auth0Instance.getAccessToken();
     return enrichUser({
         user,
-        accessToken: sessionData.tokenSet.accessToken,
+        accessToken: token,
         brand,
     });
 };

package/dist/esm/server/helpers/getUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUser.js","sources":["../../../../../src/server/helpers/getUser.ts"],"sourcesContent":[null],"names":[],"mappings":";;;MAUa,OAAO,GAAG,OACrB,OAAgC,KACD;AAC/B,IAAA,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC;AAC/C,IAAA,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE;AAEpD,IAAA,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;IAElD,OAAO,WAAW,CAAC,IAAmB;AACxC;AAEO,MAAM,eAAe,GAAG,OAAO,EACpC,KAAK,EACL,OAAO,EACP,GAAG,OAAO,EAIX,KAAyC;AACxC,IAAA,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC;AAC/C,IAAA,MAAM,WAAW,GAAG,OAAO;AACzB,UAAE,aAAa,CAAC,UAAU,CAAC,OAAO;AAClC,UAAE,aAAa,CAAC,UAAU,EAAE,CAAC;AAE/B,IAAA,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;AAElD,IAAA,MAAM,IAAI,GAAG,WAAW,CAAC,IAAmB;AAC5C,IAAA,OAAO,UAAU,CAAC;QAChB,IAAI;AACJ,QAAA,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,WAAW;QAC7C,KAAK;AACN,KAAA,CAAC;AACJ;;;;"}
+{"version":3,"file":"getUser.js","sources":["../../../../../src/server/helpers/getUser.ts"],"sourcesContent":[null],"names":[],"mappings":";;;MAUa,OAAO,GAAG,OACrB,OAAgC,KACD;AAC/B,IAAA,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC;AAC/C,IAAA,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE;AAEpD,IAAA,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;IAElD,OAAO,WAAW,CAAC,IAAmB;AACxC;AAEO,MAAM,eAAe,GAAG,OAAO,EACpC,KAAK,EACL,OAAO,EACP,GAAG,YAAY,EAOhB,KAAyC;AACxC,IAAA,MAAM,aAAa,GAAG,gBAAgB,CAAC,YAAY,CAAC;AACpD,IAAA,MAAM,WAAW,GAAG,OAAO,EAAE;UACzB,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO;AAChD,UAAE,MAAM,aAAa,CAAC,UAAU,EAAE;AAEpC,IAAA,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;AAElD,IAAA,MAAM,IAAI,GAAG,WAAW,CAAC,IAAmB;AAC5C,IAAA,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE;AACzB,UAAE,MAAM,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ;AACtE,UAAE,MAAM,aAAa,CAAC,cAAc,EAAE;AACxC,IAAA,OAAO,UAAU,CAAC;QAChB,IAAI;AACJ,QAAA,WAAW,EAAE,KAAK;QAClB,KAAK;AACN,KAAA,CAAC;AACJ;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smg-automotive/auth",
-  "version": "7.1.0-auth0-update-tweaks.2",
+  "version": "7.1.0-auth0-update-tweaks.3",
   "description": "SMG Automotive auth package",
   "exports": {
     ".": {