@oneuptime/common 8.0.5574 → 8.0.5575

package/build/dist/Server/Services/StatusPagePrivateUserSessionService.js

@@ -0,0 +1,214 @@
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/StatusPagePrivateUserSession";
+import ObjectID from "../../Types/ObjectID";
+import HashedString from "../../Types/HashedString";
+import { EncryptionSecret } from "../EnvironmentConfig";
+import OneUptimeDate from "../../Types/Date";
+import Text from "../../Types/Text";
+import logger from "../Utils/Logger";
+import BadDataException from "../../Types/Exception/BadDataException";
+export class Service extends DatabaseService {
+    constructor() {
+        super(Model);
+    }
+    async createSession(options) {
+        const refreshToken = options.refreshToken || Service.generateRefreshToken();
+        const refreshTokenExpiresAt = options.refreshTokenExpiresAt || Service.getRefreshTokenExpiry();
+        const session = this.buildSessionModel(options, {
+            refreshToken,
+            refreshTokenExpiresAt,
+        });
+        try {
+            const createdSession = await this.create({
+                data: session,
+                props: {
+                    isRoot: true,
+                },
+            });
+            return {
+                session: createdSession,
+                refreshToken,
+                refreshTokenExpiresAt,
+            };
+        }
+        catch (error) {
+            throw error;
+        }
+    }
+    async findActiveSessionByRefreshToken(refreshToken) {
+        const hashedValue = await HashedString.hashValue(refreshToken, EncryptionSecret);
+        const session = await this.findOneBy({
+            query: {
+                refreshToken: new HashedString(hashedValue, true),
+                isRevoked: false,
+            },
+            select: {
+                _id: true,
+                projectId: true,
+                statusPageId: true,
+                statusPagePrivateUserId: true,
+                refreshTokenExpiresAt: true,
+                lastActiveAt: true,
+                additionalInfo: true,
+                deviceName: true,
+                deviceType: true,
+                deviceOS: true,
+                deviceBrowser: true,
+                ipAddress: true,
+                userAgent: true,
+                isRevoked: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!session) {
+            return null;
+        }
+        if (!session.refreshTokenExpiresAt ||
+            OneUptimeDate.hasExpired(session.refreshTokenExpiresAt)) {
+            return null;
+        }
+        return session;
+    }
+    async renewSessionWithNewRefreshToken(options) {
+        const refreshToken = Service.generateRefreshToken();
+        const refreshTokenExpiresAt = options.refreshTokenExpiresAt || Service.getRefreshTokenExpiry();
+        const updatePayload = {
+            refreshToken: HashedString.fromString(refreshToken),
+            refreshTokenExpiresAt: refreshTokenExpiresAt,
+            lastActiveAt: OneUptimeDate.getCurrentDate(),
+            isRevoked: false,
+        };
+        const ipAddress = Text.truncate(options.ipAddress, Service.SHORT_TEXT_LIMIT);
+        if (ipAddress) {
+            updatePayload.ipAddress = ipAddress;
+        }
+        if (options.userAgent) {
+            updatePayload.userAgent = options.userAgent;
+        }
+        const deviceName = Text.truncate(options.deviceName, Service.SHORT_TEXT_LIMIT);
+        if (deviceName) {
+            updatePayload.deviceName = deviceName;
+        }
+        const deviceType = Text.truncate(options.deviceType, Service.SHORT_TEXT_LIMIT);
+        if (deviceType) {
+            updatePayload.deviceType = deviceType;
+        }
+        const deviceOS = Text.truncate(options.deviceOS, Service.SHORT_TEXT_LIMIT);
+        if (deviceOS) {
+            updatePayload.deviceOS = deviceOS;
+        }
+        const deviceBrowser = Text.truncate(options.deviceBrowser, Service.SHORT_TEXT_LIMIT);
+        if (deviceBrowser) {
+            updatePayload.deviceBrowser = deviceBrowser;
+        }
+        if (options.additionalInfo || options.session.additionalInfo) {
+            updatePayload.additionalInfo = Object.assign(Object.assign({}, (options.session.additionalInfo || {})), (options.additionalInfo || {}));
+        }
+        const updatedSession = await this.updateOneByIdAndFetch({
+            id: options.session.id,
+            data: updatePayload,
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!updatedSession) {
+            throw new BadDataException("Unable to renew status page user session");
+        }
+        return {
+            session: updatedSession,
+            refreshToken,
+            refreshTokenExpiresAt,
+        };
+    }
+    async touchSession(sessionId, options) {
+        const updatePayload = {
+            lastActiveAt: OneUptimeDate.getCurrentDate(),
+        };
+        const ipAddress = Text.truncate(options.ipAddress, Service.SHORT_TEXT_LIMIT);
+        if (ipAddress) {
+            updatePayload.ipAddress = ipAddress;
+        }
+        if (options.userAgent) {
+            updatePayload.userAgent = options.userAgent;
+        }
+        try {
+            await this.updateOneById({
+                id: sessionId,
+                data: updatePayload,
+                props: {
+                    isRoot: true,
+                },
+            });
+        }
+        catch (err) {
+            logger.warn(`Failed to update status page session activity for session ${sessionId.toString()}: ${err.message}`);
+        }
+    }
+    async revokeSessionById(sessionId, options) {
+        var _a;
+        await this.updateOneById({
+            id: sessionId,
+            data: {
+                isRevoked: true,
+                revokedAt: OneUptimeDate.getCurrentDate(),
+                revokedReason: (_a = options === null || options === void 0 ? void 0 : options.reason) !== null && _a !== void 0 ? _a : null,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+    }
+    async revokeSessionByRefreshToken(refreshToken, options) {
+        const session = await this.findActiveSessionByRefreshToken(refreshToken);
+        if (!session || !session.id) {
+            return;
+        }
+        await this.revokeSessionById(session.id, options);
+    }
+    buildSessionModel(options, tokenMeta) {
+        const session = new Model();
+        session.projectId = options.projectId;
+        session.statusPageId = options.statusPageId;
+        session.statusPagePrivateUserId = options.statusPagePrivateUserId;
+        session.refreshToken = HashedString.fromString(tokenMeta.refreshToken);
+        session.refreshTokenExpiresAt = tokenMeta.refreshTokenExpiresAt;
+        session.lastActiveAt = OneUptimeDate.getCurrentDate();
+        if (options.userAgent) {
+            session.userAgent = options.userAgent;
+        }
+        const deviceName = Text.truncate(options.deviceName, Service.SHORT_TEXT_LIMIT);
+        if (deviceName) {
+            session.deviceName = deviceName;
+        }
+        const deviceType = Text.truncate(options.deviceType, Service.SHORT_TEXT_LIMIT);
+        if (deviceType) {
+            session.deviceType = deviceType;
+        }
+        const deviceOS = Text.truncate(options.deviceOS, Service.SHORT_TEXT_LIMIT);
+        if (deviceOS) {
+            session.deviceOS = deviceOS;
+        }
+        const deviceBrowser = Text.truncate(options.deviceBrowser, Service.SHORT_TEXT_LIMIT);
+        if (deviceBrowser) {
+            session.deviceBrowser = deviceBrowser;
+        }
+        const ipAddress = Text.truncate(options.ipAddress, Service.SHORT_TEXT_LIMIT);
+        if (ipAddress) {
+            session.ipAddress = ipAddress;
+        }
+        session.additionalInfo = Object.assign({}, (options.additionalInfo || {}));
+        return session;
+    }
+    static generateRefreshToken() {
+        return ObjectID.generate().toString();
+    }
+    static getRefreshTokenExpiry() {
+        return OneUptimeDate.getSomeDaysAfter(Service.DEFAULT_REFRESH_TOKEN_TTL_DAYS);
+    }
+}
+Service.DEFAULT_REFRESH_TOKEN_TTL_DAYS = 30;
+Service.SHORT_TEXT_LIMIT = 100;
+export default new Service();
+//# sourceMappingURL=StatusPagePrivateUserSessionService.js.map

package/build/dist/Server/Services/StatusPagePrivateUserSessionService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"StatusPagePrivateUserSessionService.js","sourceRoot":"","sources":["../../../../Server/Services/StatusPagePrivateUserSessionService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/UserSessionService.js

@@ -0,0 +1,202 @@
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/UserSession";
+import ObjectID from "../../Types/ObjectID";
+import HashedString from "../../Types/HashedString";
+import { EncryptionSecret } from "../EnvironmentConfig";
+import OneUptimeDate from "../../Types/Date";
+import Text from "../../Types/Text";
+import logger from "../Utils/Logger";
+import BadDataException from "../../Types/Exception/BadDataException";
+export class Service extends DatabaseService {
+    constructor() {
+        super(Model);
+    }
+    async createSession(options) {
+        const refreshToken = options.refreshToken || Service.generateRefreshToken();
+        const refreshTokenExpiresAt = options.refreshTokenExpiresAt || Service.getRefreshTokenExpiry();
+        const session = this.buildSessionModel(options, {
+            refreshToken,
+            refreshTokenExpiresAt,
+        });
+        try {
+            const createdSession = await this.create({
+                data: session,
+                props: {
+                    isRoot: true,
+                },
+            });
+            return {
+                session: createdSession,
+                refreshToken: refreshToken,
+                refreshTokenExpiresAt: refreshTokenExpiresAt,
+            };
+        }
+        catch (error) {
+            throw error;
+        }
+    }
+    async findActiveSessionByRefreshToken(refreshToken) {
+        const hashedValue = await HashedString.hashValue(refreshToken, EncryptionSecret);
+        return await this.findOneBy({
+            query: {
+                refreshToken: new HashedString(hashedValue, true),
+                isRevoked: false,
+            },
+            select: {
+                _id: true,
+                userId: true,
+                refreshTokenExpiresAt: true,
+                lastActiveAt: true,
+                isRevoked: true,
+                additionalInfo: true,
+                deviceName: true,
+                deviceType: true,
+                deviceOS: true,
+                deviceBrowser: true,
+                ipAddress: true,
+                userAgent: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+    }
+    async renewSessionWithNewRefreshToken(options) {
+        const refreshToken = Service.generateRefreshToken();
+        const refreshTokenExpiresAt = options.refreshTokenExpiresAt || Service.getRefreshTokenExpiry();
+        const updatePayload = {
+            refreshToken: HashedString.fromString(refreshToken),
+            refreshTokenExpiresAt: refreshTokenExpiresAt,
+            lastActiveAt: OneUptimeDate.getCurrentDate(),
+            isRevoked: false,
+        };
+        const ipAddress = Text.truncate(options.ipAddress, Service.SHORT_TEXT_LIMIT);
+        if (ipAddress) {
+            updatePayload.ipAddress = ipAddress;
+        }
+        if (options.userAgent) {
+            updatePayload.userAgent = options.userAgent;
+        }
+        const deviceName = Text.truncate(options.deviceName, Service.SHORT_TEXT_LIMIT);
+        if (deviceName) {
+            updatePayload.deviceName = deviceName;
+        }
+        const deviceType = Text.truncate(options.deviceType, Service.SHORT_TEXT_LIMIT);
+        if (deviceType) {
+            updatePayload.deviceType = deviceType;
+        }
+        const deviceOS = Text.truncate(options.deviceOS, Service.SHORT_TEXT_LIMIT);
+        if (deviceOS) {
+            updatePayload.deviceOS = deviceOS;
+        }
+        const deviceBrowser = Text.truncate(options.deviceBrowser, Service.SHORT_TEXT_LIMIT);
+        if (deviceBrowser) {
+            updatePayload.deviceBrowser = deviceBrowser;
+        }
+        if (options.additionalInfo || options.session.additionalInfo) {
+            updatePayload.additionalInfo = Object.assign(Object.assign({}, (options.session.additionalInfo || {})), (options.additionalInfo || {}));
+        }
+        const updatedSession = await this.updateOneByIdAndFetch({
+            id: options.session.id,
+            data: updatePayload,
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!updatedSession) {
+            throw new BadDataException("Unable to renew user session");
+        }
+        return {
+            session: updatedSession,
+            refreshToken: refreshToken,
+            refreshTokenExpiresAt: refreshTokenExpiresAt,
+        };
+    }
+    async touchSession(sessionId, options) {
+        const updatePayload = {
+            lastActiveAt: OneUptimeDate.getCurrentDate(),
+        };
+        const ipAddress = Text.truncate(options.ipAddress, Service.SHORT_TEXT_LIMIT);
+        if (ipAddress) {
+            updatePayload.ipAddress = ipAddress;
+        }
+        if (options.userAgent) {
+            updatePayload.userAgent = options.userAgent;
+        }
+        try {
+            await this.updateOneById({
+                id: sessionId,
+                data: updatePayload,
+                props: {
+                    isRoot: true,
+                },
+            });
+        }
+        catch (err) {
+            logger.warn(`Failed to update session activity timestamp for session ${sessionId.toString()}: ${err.message}`);
+        }
+    }
+    async revokeSessionById(sessionId, options) {
+        var _a;
+        await this.updateOneById({
+            id: sessionId,
+            data: {
+                isRevoked: true,
+                revokedAt: OneUptimeDate.getCurrentDate(),
+                revokedReason: (_a = options === null || options === void 0 ? void 0 : options.reason) !== null && _a !== void 0 ? _a : null,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+    }
+    async revokeSessionByRefreshToken(refreshToken, options) {
+        const session = await this.findActiveSessionByRefreshToken(refreshToken);
+        if (!session || !session.id) {
+            return;
+        }
+        await this.revokeSessionById(session.id, options);
+    }
+    buildSessionModel(options, tokenMeta) {
+        const session = new Model();
+        session.userId = options.userId;
+        session.refreshToken = HashedString.fromString(tokenMeta.refreshToken);
+        session.refreshTokenExpiresAt = tokenMeta.refreshTokenExpiresAt;
+        session.lastActiveAt = OneUptimeDate.getCurrentDate();
+        if (options.userAgent) {
+            session.userAgent = options.userAgent;
+        }
+        const deviceName = Text.truncate(options.deviceName, Service.SHORT_TEXT_LIMIT);
+        if (deviceName) {
+            session.deviceName = deviceName;
+        }
+        const deviceType = Text.truncate(options.deviceType, Service.SHORT_TEXT_LIMIT);
+        if (deviceType) {
+            session.deviceType = deviceType;
+        }
+        const deviceOS = Text.truncate(options.deviceOS, Service.SHORT_TEXT_LIMIT);
+        if (deviceOS) {
+            session.deviceOS = deviceOS;
+        }
+        const deviceBrowser = Text.truncate(options.deviceBrowser, Service.SHORT_TEXT_LIMIT);
+        if (deviceBrowser) {
+            session.deviceBrowser = deviceBrowser;
+        }
+        const ipAddress = Text.truncate(options.ipAddress, Service.SHORT_TEXT_LIMIT);
+        if (ipAddress) {
+            session.ipAddress = ipAddress;
+        }
+        session.additionalInfo = Object.assign(Object.assign({}, (options.additionalInfo || {})), { isGlobalLogin: options.isGlobalLogin });
+        return session;
+    }
+    static generateRefreshToken() {
+        return ObjectID.generate().toString();
+    }
+    static getRefreshTokenExpiry() {
+        return OneUptimeDate.getSomeDaysAfter(Service.DEFAULT_REFRESH_TOKEN_TTL_DAYS);
+    }
+}
+Service.DEFAULT_REFRESH_TOKEN_TTL_DAYS = 30;
+Service.SHORT_TEXT_LIMIT = 100;
+export default new Service();
+//# sourceMappingURL=UserSessionService.js.map

package/build/dist/Server/Services/UserSessionService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserSessionService.js","sourceRoot":"","sources":["../../../../Server/Services/UserSessionService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Cookie.js

@@ -13,8 +13,7 @@ import OneUptimeDate from "../../Types/Date";
 import PositiveNumber from "../../Types/PositiveNumber";
 import CookieName from "../../Types/CookieName";
 import CaptureSpan from "./Telemetry/CaptureSpan";
-export default class CookieUtil {
-    // set cookie with express response
+class CookieUtil {
     static getCookiesFromCookieString(cookieString) {
         const cookies = {};
         cookieString.split(";").forEach((cookie) => {
@@ -45,7 +44,9 @@ export default class CookieUtil {
     }
     static setUserCookie(data) {
         var _a, _b, _c, _d, _e;
-        const { expressResponse: res, user, isGlobalLogin } = data;
+        const { expressResponse: res, user, isGlobalLogin, sessionId, refreshToken, refreshTokenExpiresAt, } = data;
+        const accessTokenExpiresInSeconds = data.accessTokenExpiresInSeconds ||
+            CookieUtil.DEFAULT_ACCESS_TOKEN_EXPIRY_SECONDS;
         const token = JSONWebToken.signUserLoginToken({
             tokenData: {
                 userId: user.id,
@@ -54,12 +55,18 @@ export default class CookieUtil {
                 timezone: user.timezone || null,
                 isMasterAdmin: user.isMasterAdmin,
                 isGlobalLogin: isGlobalLogin, // This is a general login without SSO. So, we will set this to true. This will give access to all the projects that dont require SSO.
+                sessionId: sessionId,
             },
-            expiresInSeconds: OneUptimeDate.getSecondsInDays(new PositiveNumber(30)),
+            expiresInSeconds: accessTokenExpiresInSeconds,
         });
         // Set a cookie with token.
         CookieUtil.setCookie(res, CookieUtil.getUserTokenKey(), token, {
-            maxAge: OneUptimeDate.getMillisecondsInDays(new PositiveNumber(30)),
+            maxAge: accessTokenExpiresInSeconds * 1000,
+            httpOnly: true,
+        });
+        const refreshTokenTtl = Math.max(refreshTokenExpiresAt.getTime() - Date.now(), 0);
+        CookieUtil.setCookie(res, CookieUtil.getRefreshTokenKey(), refreshToken, {
+            maxAge: refreshTokenTtl,
             httpOnly: true,
         });
         if (user.id) {
@@ -105,16 +112,47 @@ export default class CookieUtil {
             });
         }
     }
+    static setStatusPagePrivateUserCookie(data) {
+        const { expressResponse: res, user, statusPageId, sessionId, refreshToken, refreshTokenExpiresAt, } = data;
+        const accessTokenExpiresInSeconds = data.accessTokenExpiresInSeconds ||
+            CookieUtil.DEFAULT_ACCESS_TOKEN_EXPIRY_SECONDS;
+        const token = JSONWebToken.sign({
+            data: {
+                userId: user.id,
+                email: user.email,
+                statusPageId: statusPageId,
+                sessionId: sessionId,
+            },
+            expiresInSeconds: accessTokenExpiresInSeconds,
+        });
+        CookieUtil.setCookie(res, CookieUtil.getUserTokenKey(statusPageId), token, {
+            maxAge: accessTokenExpiresInSeconds * 1000,
+            httpOnly: true,
+        });
+        const refreshTokenTtl = Math.max(refreshTokenExpiresAt.getTime() - Date.now(), 0);
+        CookieUtil.setCookie(res, CookieUtil.getRefreshTokenKey(statusPageId), refreshToken, {
+            maxAge: refreshTokenTtl,
+            httpOnly: true,
+        });
+        return token;
+    }
     static setCookie(res, name, value, options) {
-        res.cookie(name, value, options);
+        const cookieOptions = Object.assign({ path: "/", sameSite: "lax" }, options);
+        res.cookie(name, value, cookieOptions);
     }
     // get cookie with express request
     static getCookieFromExpressRequest(req, name) {
         return req.cookies[name];
     }
+    static getRefreshTokenFromExpressRequest(req, id) {
+        return CookieUtil.getCookieFromExpressRequest(req, CookieUtil.getRefreshTokenKey(id));
+    }
     // delete cookie with express response
     static removeCookie(res, name) {
-        res.clearCookie(name);
+        res.clearCookie(name, {
+            path: "/",
+            sameSite: "lax",
+        });
     }
     // get all cookies with express request
     static getAllCookies(req) {
@@ -126,6 +164,12 @@ export default class CookieUtil {
         }
         return `${CookieName.Token}-${id.toString()}`;
     }
+    static getRefreshTokenKey(id) {
+        if (!id) {
+            return CookieName.RefreshToken;
+        }
+        return `${CookieName.RefreshToken}-${id.toString()}`;
+    }
     static getUserSSOKey(id) {
         return `${this.getSSOKey()}${id.toString()}`;
     }
@@ -138,8 +182,13 @@ export default class CookieUtil {
         for (const key in cookies) {
             this.removeCookie(res, key);
         }
+        // Always attempt to remove refresh token cookie even if not parsed.
+        this.removeCookie(res, this.getRefreshTokenKey());
     }
 }
+// set cookie with express response
+CookieUtil.DEFAULT_ACCESS_TOKEN_EXPIRY_SECONDS = 15 * 60;
+export default CookieUtil;
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
@@ -158,6 +207,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], CookieUtil, "setUserCookie", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", String)
+], CookieUtil, "setStatusPagePrivateUserCookie", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
@@ -170,6 +225,12 @@ __decorate([
     __metadata("design:paramtypes", [Object, String]),
     __metadata("design:returntype", Object)
 ], CookieUtil, "getCookieFromExpressRequest", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, ObjectID]),
+    __metadata("design:returntype", Object)
+], CookieUtil, "getRefreshTokenFromExpressRequest", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
@@ -188,6 +249,12 @@ __decorate([
     __metadata("design:paramtypes", [ObjectID]),
     __metadata("design:returntype", String)
 ], CookieUtil, "getUserTokenKey", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [ObjectID]),
+    __metadata("design:returntype", String)
+], CookieUtil, "getRefreshTokenKey", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),

package/build/dist/Server/Utils/Cookie.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cookie.js","sourceRoot":"","sources":["../../../../Server/Utils/Cookie.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Cookie.js","sourceRoot":"","sources":["../../../../Server/Utils/Cookie.ts"],"names":[],"mappings":"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"}