@bmostickit/common 1.0.29 → 1.0.31

package/build/auth/session.d.ts

@@ -0,0 +1,19 @@
+export interface AuthenticatedUserPayload {
+    id: string;
+    email: string;
+    isAdmin: boolean;
+    hasSubscription: boolean;
+    subscriptionStatus?: string | null;
+    currentPeriodEnd?: string | null;
+    cancelAtPeriodEnd?: boolean;
+    sessionVersion: number;
+}
+export interface SessionCookie {
+    accessToken?: string;
+    refreshToken?: string;
+}
+export declare const verifyAuthenticatedUserToken: (token: string) => AuthenticatedUserPayload;
+export declare const parseCookieHeader: (cookieHeader: string) => {
+    [k: string]: string;
+};
+export declare const parseSessionCookie: (cookieValue: string) => SessionCookie | null;

package/build/auth/session.js

@@ -0,0 +1,48 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseSessionCookie = exports.parseCookieHeader = exports.verifyAuthenticatedUserToken = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const getJwtKey = () => {
+    if (!process.env.JWT_KEY) {
+        throw new Error('JWT_KEY must be defined');
+    }
+    return process.env.JWT_KEY;
+};
+const verifyAuthenticatedUserToken = (token) => jsonwebtoken_1.default.verify(token, getJwtKey());
+exports.verifyAuthenticatedUserToken = verifyAuthenticatedUserToken;
+const parseCookieHeader = (cookieHeader) => Object.fromEntries(cookieHeader
+    .split(';')
+    .map((part) => part.trim())
+    .filter(Boolean)
+    .map((part) => {
+    const separatorIndex = part.indexOf('=');
+    if (separatorIndex === -1) {
+        return [part, ''];
+    }
+    return [
+        part.slice(0, separatorIndex),
+        decodeURIComponent(part.slice(separatorIndex + 1)),
+    ];
+}));
+exports.parseCookieHeader = parseCookieHeader;
+const parseSessionCookie = (cookieValue) => {
+    const normalizedValue = cookieValue.startsWith('j:')
+        ? cookieValue.slice(2)
+        : cookieValue;
+    const candidates = [normalizedValue];
+    try {
+        candidates.push(Buffer.from(normalizedValue, 'base64').toString('utf8'));
+    }
+    catch (err) { }
+    for (const candidate of candidates) {
+        try {
+            return JSON.parse(candidate);
+        }
+        catch (err) { }
+    }
+    return null;
+};
+exports.parseSessionCookie = parseSessionCookie;

package/build/events/subjects.d.ts

@@ -3,7 +3,8 @@ export declare enum Subjects {
     QuizUpdated = "QUIZ.updated",
     QuizDeleted = "QUIZ.deleted",
     QuizSelected = "QUIZ.selected",
-    PaymentCreated = "PAYMENT.created",
+    SubscriptionUpdated = "SUBSCRIPTION.updated",
+    UserSessionVersionUpdated = "USER.sessionVersionUpdated",
     ImageSaved = "IMAGE.saved",
     TtsGenerationResult = "TTS.generationResult",
     MediaDeleted = "MEDIA.deleted"

package/build/events/subjects.js

@@ -7,7 +7,8 @@ var Subjects;
     Subjects["QuizUpdated"] = "QUIZ.updated";
     Subjects["QuizDeleted"] = "QUIZ.deleted";
     Subjects["QuizSelected"] = "QUIZ.selected";
-    Subjects["PaymentCreated"] = "PAYMENT.created";
+    Subjects["SubscriptionUpdated"] = "SUBSCRIPTION.updated";
+    Subjects["UserSessionVersionUpdated"] = "USER.sessionVersionUpdated";
     Subjects["ImageSaved"] = "IMAGE.saved";
     Subjects["TtsGenerationResult"] = "TTS.generationResult";
     Subjects["MediaDeleted"] = "MEDIA.deleted";

package/build/events/subscription-updated-event.d.ts

@@ -0,0 +1,14 @@
+import { Subjects } from './subjects';
+export interface SubscriptionUpdatedEvent {
+    subject: Subjects.SubscriptionUpdated;
+    data: {
+        eventId: string;
+        userId: string;
+        status: string;
+        hasAccess: boolean;
+        currentPeriodEnd?: string | null;
+        cancelAtPeriodEnd: boolean;
+        stripeSubscriptionId?: string | null;
+        stripeCustomerId?: string | null;
+    };
+}

package/build/events/subscription-updated-event.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/events/user-session-version-updated-event.d.ts

@@ -0,0 +1,9 @@
+import { Subjects } from './subjects';
+export interface UserSessionVersionUpdatedEvent {
+    subject: Subjects.UserSessionVersionUpdated;
+    data: {
+        eventId: string;
+        userId: string;
+        sessionVersion: number;
+    };
+}

package/build/events/user-session-version-updated-event.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/index.d.ts

@@ -5,6 +5,7 @@ export * from './errors/forbidden-error';
 export * from './errors/not-authorized-error';
 export * from './errors/not-found-error';
 export * from './errors/request-validation-error';
+export * from './auth/session';
 export * from './middlewares/current-user';
 export * from './middlewares/error-handler';
 export * from './middlewares/require-auth';
@@ -18,6 +19,8 @@ export * from './events/quiz-created-event';
 export * from './events/quiz-updated-event';
 export * from './events/quiz-deleted-event';
 export * from './events/quiz-selected-event';
+export * from './events/subscription-updated-event';
+export * from './events/user-session-version-updated-event';
 export * from './events/types/expirations';
 export * from './events/types/game-status';
 export * from './events/types/question-type';

package/build/index.js

@@ -21,6 +21,7 @@ __exportStar(require("./errors/forbidden-error"), exports);
 __exportStar(require("./errors/not-authorized-error"), exports);
 __exportStar(require("./errors/not-found-error"), exports);
 __exportStar(require("./errors/request-validation-error"), exports);
+__exportStar(require("./auth/session"), exports);
 __exportStar(require("./middlewares/current-user"), exports);
 __exportStar(require("./middlewares/error-handler"), exports);
 __exportStar(require("./middlewares/require-auth"), exports);
@@ -34,6 +35,8 @@ __exportStar(require("./events/quiz-created-event"), exports);
 __exportStar(require("./events/quiz-updated-event"), exports);
 __exportStar(require("./events/quiz-deleted-event"), exports);
 __exportStar(require("./events/quiz-selected-event"), exports);
+__exportStar(require("./events/subscription-updated-event"), exports);
+__exportStar(require("./events/user-session-version-updated-event"), exports);
 __exportStar(require("./events/types/expirations"), exports);
 __exportStar(require("./events/types/game-status"), exports);
 __exportStar(require("./events/types/question-type"), exports);

package/build/middlewares/current-user.d.ts

@@ -1,16 +1,10 @@
 import { Request, Response, NextFunction } from 'express';
-interface UserPayload {
-    id: string;
-    email: string;
-    isAdmin: boolean;
-    hasSubscription: boolean;
-}
+import { AuthenticatedUserPayload } from '../auth/session';
 declare global {
     namespace Express {
         interface Request {
-            currentUser?: UserPayload;
+            currentUser?: AuthenticatedUserPayload;
         }
     }
 }
 export declare const currentUser: (req: Request, res: Response, next: NextFunction) => void;
-export {};

package/build/middlewares/current-user.js

@@ -1,17 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.currentUser = void 0;
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const session_1 = require("../auth/session");
 const currentUser = (req, res, next) => {
     var _a;
     if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.accessToken)) {
         return next();
     }
     try {
-        const payload = jsonwebtoken_1.default.verify(req.session.accessToken, process.env.JWT_KEY);
+        const payload = (0, session_1.verifyAuthenticatedUserToken)(req.session.accessToken);
         req.currentUser = payload;
     }
     catch (err) { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bmostickit/common",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",