npm - @lenne.tech/nest-server - Versions diffs - 11.38.0 → 11.40.0 - Mend

@lenne.tech/nest-server 11.38.0 → 11.40.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (91) hide show

package/dist/core/modules/error-code/error-codes.d.ts CHANGED Viewed

@@ -193,6 +193,30 @@ export declare const LtnsErrors: {
             readonly en: "Sign-up is currently disabled.";
         };
     };
+    readonly PASSWORD_TOO_LONG: {
+        readonly code: "LTNS_0028";
+        readonly message: "Password exceeds the maximum length";
+        readonly translations: {
+            readonly de: "Das Passwort ist zu lang. Erlaubt sind standardmäßig höchstens 128 Zeichen.";
+            readonly en: "The password is too long. The default maximum is 128 characters.";
+        };
+    };
+    readonly PASSWORD_TOO_SHORT: {
+        readonly code: "LTNS_0029";
+        readonly message: "Password is below the minimum length";
+        readonly translations: {
+            readonly de: "Das Passwort ist zu kurz. Erforderlich sind standardmäßig mindestens 8 Zeichen.";
+            readonly en: "The password is too short. The default minimum is 8 characters.";
+        };
+    };
+    readonly LINK_INVALID_OR_EXPIRED: {
+        readonly code: "LTNS_0027";
+        readonly message: "Link is invalid or expired";
+        readonly translations: {
+            readonly de: "Dieser Link ist nicht (mehr) gültig. Bitte fordern Sie einen neuen an.";
+            readonly en: "This link is no longer valid. Please request a new one.";
+        };
+    };
     readonly UNAUTHORIZED: {
         readonly code: "LTNS_0100";
         readonly message: "Unauthorized - User is not logged in";
@@ -450,6 +474,9 @@ export declare const ErrorCode: {
     readonly EMAIL_VERIFICATION_TOKEN_INVALID: string;
     readonly EMAIL_ALREADY_VERIFIED: string;
     readonly SIGNUP_DISABLED: string;
+    readonly PASSWORD_TOO_LONG: string;
+    readonly PASSWORD_TOO_SHORT: string;
+    readonly LINK_INVALID_OR_EXPIRED: string;
     readonly UNAUTHORIZED: string;
     readonly ACCESS_DENIED: string;
     readonly RESOURCE_FORBIDDEN: string;

package/dist/core/modules/error-code/error-codes.js CHANGED Viewed

@@ -188,6 +188,30 @@ exports.LtnsErrors = {
             en: 'Sign-up is currently disabled.',
         },
     },
+    PASSWORD_TOO_LONG: {
+        code: 'LTNS_0028',
+        message: 'Password exceeds the maximum length',
+        translations: {
+            de: 'Das Passwort ist zu lang. Erlaubt sind standardmäßig höchstens 128 Zeichen.',
+            en: 'The password is too long. The default maximum is 128 characters.',
+        },
+    },
+    PASSWORD_TOO_SHORT: {
+        code: 'LTNS_0029',
+        message: 'Password is below the minimum length',
+        translations: {
+            de: 'Das Passwort ist zu kurz. Erforderlich sind standardmäßig mindestens 8 Zeichen.',
+            en: 'The password is too short. The default minimum is 8 characters.',
+        },
+    },
+    LINK_INVALID_OR_EXPIRED: {
+        code: 'LTNS_0027',
+        message: 'Link is invalid or expired',
+        translations: {
+            de: 'Dieser Link ist nicht (mehr) gültig. Bitte fordern Sie einen neuen an.',
+            en: 'This link is no longer valid. Please request a new one.',
+        },
+    },
     UNAUTHORIZED: {
         code: 'LTNS_0100',
         message: 'Unauthorized - User is not logged in',

package/dist/core/modules/error-code/error-codes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"error-codes.js","sourceRoot":"","sources":["../../../../src/core/modules/error-code/error-codes.ts"],"names":[],"mappings":";;;~~AAgpBA~~,wDAEC;AA2BD,0CAOC;~~AAxmBY~~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"}
1	+ {"version":3,"file":"error-codes.js","sourceRoot":"","sources":["../../../../src/core/modules/error-code/error-codes.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/hub/core-hub.service.js CHANGED Viewed

@@ -26,6 +26,7 @@ const FRAMEWORK_SECRET_FIELDS = [
     'password',
     'verificationToken',
     'passwordResetToken',
+    'passwordResetTokenExpiresAt',
     'refreshTokens',
     'tempTokens',
     'apiKeyEncrypted',

package/dist/core/modules/hub/core-hub.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"core-hub.service.js","sourceRoot":"","sources":["../../../../src/core/modules/hub/core-hub.service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"core-hub.service.js","sourceRoot":"","sources":["../../../../src/core/modules/hub/core-hub.service.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/user/core-user.model.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export declare abstract class CoreUserModel extends CorePersistenceModel {
     roles: string[];
     username: string;
     passwordResetToken: string;
+    passwordResetTokenExpiresAt: Date;
     refreshTokens: Record<string, CoreTokenData>;
     tempTokens: Record<string, {
         createdAt: number;

package/dist/core/modules/user/core-user.model.js CHANGED Viewed

@@ -25,6 +25,7 @@ let CoreUserModel = class CoreUserModel extends core_persistence_model_1.CorePer
     roles = undefined;
     username = undefined;
     passwordResetToken = undefined;
+    passwordResetTokenExpiresAt = undefined;
     refreshTokens = undefined;
     tempTokens = undefined;
     verificationToken = undefined;
@@ -120,11 +121,20 @@ __decorate([
 __decorate([
     (0, unified_field_decorator_1.UnifiedField)({
         isOptional: true,
-        mongoose: true,
+        mongoose: { index: { partialFilterExpression: { passwordResetToken: { $type: 'string' } } } },
         roles: role_enum_1.RoleEnum.S_NO_ONE,
     }),
     __metadata("design:type", String)
 ], CoreUserModel.prototype, "passwordResetToken", void 0);
+__decorate([
+    (0, unified_field_decorator_1.UnifiedField)({
+        isOptional: true,
+        mongoose: true,
+        roles: role_enum_1.RoleEnum.S_NO_ONE,
+        type: () => Date,
+    }),
+    __metadata("design:type", Date)
+], CoreUserModel.prototype, "passwordResetTokenExpiresAt", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({ isArray: true }),
     (0, swagger_1.ApiProperty)({

package/dist/core/modules/user/core-user.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"core-user.model.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-user.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA6C;AAC7C,+CAAuE;AACvE,6CAA8D;AAG9D,uFAA0E;AAC1E,6FAA+E;AAC/E,4DAAwD;AACxD,uFAAkF;AAY3E,IAAe,aAAa,GAA5B,MAAe,aAAc,SAAQ,6CAAoB;IAc9D,KAAK,GAAW,SAAS,CAAC;IAW1B,SAAS,GAAW,SAAS,CAAC;IAW9B,QAAQ,GAAW,SAAS,CAAC;IAU7B,QAAQ,GAAW,SAAS,CAAC;IAa7B,KAAK,GAAa,SAAS,CAAC;IAW5B,QAAQ,GAAW,SAAS,CAAC;~~IAU7B~~,kBAAkB,GAAW,SAAS,CAAC;~~IA8CvC~~,aAAa,GAAkC,SAAS,CAAC;IAgDzD,UAAU,GAA6E,SAAS,CAAC;IAUjG,iBAAiB,GAAW,SAAS,CAAC;IAYtC,QAAQ,GAAY,SAAS,CAAC;IAW9B,UAAU,GAAS,SAAS,CAAC;IAgB7B,KAAK,GAAW,SAAS,CAAC;IAa1B,gBAAgB,GAAY,SAAS,CAAC;IAetC,yBAAyB,GAAS,SAAS,CAAC;IASrC,OAAO,CAAC,KAAwB;QACrC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7F,CAAC;IAKM,WAAW,CAAC,KAAwB;QACzC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IAKe,IAAI;QAClB,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAKQ,GAAG,CAAC,KAAK;QAChB,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAGjB,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;~~AA7SqB~~,sCAAa;AAcjC;IANC,IAAA,sCAAY,EAAC;QACZ,WAAW,EAAE,mBAAmB;QAChC,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;QACtD,KAAK,EAAE,oBAAQ,CAAC,UAAU;KAC3B,CAAC;;4CACwB;AAW1B;IANC,IAAA,sCAAY,EAAC;QACZ,WAAW,EAAE,wBAAwB;QACrC,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,oBAAQ,CAAC,UAAU;KAC3B,CAAC;;gDAC4B;AAW9B;IANC,IAAA,sCAAY,EAAC;QACZ,WAAW,EAAE,uBAAuB;QACpC,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,oBAAQ,CAAC,UAAU;KAC3B,CAAC;;+CAC2B;AAU7B;IALC,IAAA,sCAAY,EAAC;QACZ,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,oBAAQ,CAAC,QAAQ;KACzB,CAAC;;+CAC2B;AAa7B;IARC,IAAA,sCAAY,EAAC;QACZ,WAAW,EAAE,mBAAmB;QAChC,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,CAAC,MAAM,CAAC;QAClB,KAAK,EAAE,oBAAQ,CAAC,UAAU;QAC1B,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM;KACnB,CAAC;;4CAC0B;AAW5B;IANC,IAAA,sCAAY,EAAC;QACZ,WAAW,EAAE,sBAAsB;QACnC,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,oBAAQ,CAAC,UAAU;KAC3B,CAAC;;+CAC2B;~~AAU7B~~;~~IALC~~,IAAA,sCAAY,EAAC;QACZ,UAAU,EAAE,IAAI;~~QAChB~~,QAAQ,EAAE,~~IAAI~~;~~QACd~~,KAAK,EAAE,oBAAQ,CAAC,QAAQ;KACzB,CAAC;;yDACqC;~~AA8CvC~~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~~wBA3PxB~~,aAAa;IAJlC,IAAA,wBAAc,EAAC,6CAAoB,CAAC;IACpC,IAAA,iBAAc,EAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACpC,IAAA,oBAAU,EAAC,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACrD,IAAA,iCAAU,EAAC,oBAAQ,CAAC,UAAU,CAAC;GACV,aAAa,~~CA6SlC~~"}
1	+ {"version":3,"file":"core-user.model.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-user.model.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/user/core-user.service.d.ts CHANGED Viewed

@@ -17,6 +17,7 @@ export declare abstract class CoreUserService<TUser extends CoreUserModel, TUser
     protected readonly options?: CoreUserServiceOptions;
     protected readonly userServiceLogger: Logger;
     protected constructor(configService: ConfigService, emailService: EmailService, mainDbModel: Model<Document & TUser>, mainModelConstructor: CoreModelConstructor<TUser>, options?: CoreUserServiceOptions);
+    protected warnOnAmbiguousResetLinkConvention(): void;
     create(input: any, serviceOptions?: ServiceOptions): Promise<TUser>;
     getViaEmail(email: string, serviceOptions?: ServiceOptions): Promise<TUser>;
     getByIdOrIamId(idOrIamId: string): Promise<null | TUser>;
@@ -24,6 +25,14 @@ export declare abstract class CoreUserService<TUser extends CoreUserModel, TUser
     verify(token: string, serviceOptions?: ServiceOptions): Promise<string | TUser>;
     resetPassword(token: string, newPassword: string, serviceOptions?: ServiceOptions): Promise<TUser>;
     setPasswordResetTokenForEmail(email: string, serviceOptions?: ServiceOptions): Promise<null | TUser>;
+    createPasswordResetToken(email: string, serviceOptions?: ServiceOptions): Promise<null | {
+        token: string;
+        user: TUser;
+    }>;
+    protected passwordResetTokenExpiryMinutes(): number;
+    protected passwordResetTokenExpiry(): Date | null;
+    protected isPasswordResetTokenExpired(expiresAt: Date | null | undefined): boolean;
+    buildPasswordResetLink(token: string): null | string;
     setRoles(userId: string, roles: string[], serviceOptions?: ServiceOptions): Promise<TUser>;
     update(id: string, input: TUserInput, serviceOptions?: ServiceOptions): Promise<TUser>;
     delete(id: string, serviceOptions?: ServiceOptions): Promise<TUser>;

package/dist/core/modules/user/core-user.service.js CHANGED Viewed

@@ -6,9 +6,12 @@ const bcrypt = require("bcrypt");
 const crypto = require("crypto");
 const js_sha256_1 = require("js-sha256");
 const role_enum_1 = require("../../common/enums/role.enum");
+const cookies_helper_1 = require("../../common/helpers/cookies.helper");
 const logging_helper_1 = require("../../common/helpers/logging.helper");
 const input_helper_1 = require("../../common/helpers/input.helper");
 const crud_service_1 = require("../../common/services/crud.service");
+const error_codes_1 = require("../error-code/error-codes");
+const DEFAULT_PASSWORD_RESET_TOKEN_EXPIRY_MINUTES = 60;
 class CoreUserService extends crud_service_1.CrudService {
     configService;
     emailService;
@@ -23,6 +26,21 @@ class CoreUserService extends crud_service_1.CrudService {
         this.mainDbModel = mainDbModel;
         this.mainModelConstructor = mainModelConstructor;
         this.options = options;
+        this.warnOnAmbiguousResetLinkConvention();
+    }
+    warnOnAmbiguousResetLinkConvention() {
+        const configured = this.configService.getFastButReadOnly('email.passwordResetLink');
+        if (typeof configured !== 'string' || !configured.trim().length || configured.includes('{token}')) {
+            return;
+        }
+        this.userServiceLogger.warn(`email.passwordResetLink is set without a {token} placeholder ("${configured.trim()}"), so the token is ` +
+            'appended as a PATH segment. Leaving the option unset would instead produce "?token=", the shape the ' +
+            'reset page shipped by nuxt-base-starter reads. Both are supported — add {token} where your page ' +
+            'expects it (".../reset-password/{token}" or ".../reset-password?token={token}") to state which, and ' +
+            'to silence this warning. FIRST make sure the mail is built by ' +
+            'CoreUserService.buildPasswordResetLink(): it is the only thing that substitutes {token}, so a ' +
+            'sendPasswordResetMail() that still concatenates the link itself would mail the placeholder ' +
+            'verbatim ("/reset-password/{token}/<token>").');
     }
     async create(input, serviceOptions) {
         serviceOptions = (0, input_helper_1.prepareServiceOptionsForCreate)(serviceOptions);
@@ -74,6 +92,9 @@ class CoreUserService extends crud_service_1.CrudService {
         return byIamId;
     }
     async getVerifiedState(token, _serviceOptions) {
+        if (!(0, input_helper_1.isQueryableString)(token)) {
+            return false;
+        }
         const user = await this.mainDbModel.findOne({ verificationToken: token }).exec();
         if (!user) {
             throw new common_1.NotFoundException(`No user found with verify token: ${token}`);
@@ -81,6 +102,9 @@ class CoreUserService extends crud_service_1.CrudService {
         return user.verified;
     }
     async verify(token, serviceOptions) {
+        if (!(0, input_helper_1.isQueryableString)(token)) {
+            throw new common_1.NotFoundException(error_codes_1.ErrorCode.INVALID_TOKEN);
+        }
         const dbObject = await this.mainDbModel.findOne({ verificationToken: token }).exec();
         if (!dbObject) {
             throw new common_1.NotFoundException(`No user found with verify token: ${token}`);
@@ -97,9 +121,18 @@ class CoreUserService extends crud_service_1.CrudService {
         }, { dbObject, serviceOptions });
     }
     async resetPassword(token, newPassword, serviceOptions) {
+        if (!(0, input_helper_1.isQueryableString)(token)) {
+            throw new common_1.NotFoundException(error_codes_1.ErrorCode.LINK_INVALID_OR_EXPIRED);
+        }
         const dbObject = await this.mainDbModel.findOne({ passwordResetToken: token }).exec();
-        if (!dbObject) {
-            throw new common_1.NotFoundException('Invalid or expired password reset token');
+        if (dbObject && this.isPasswordResetTokenExpired(dbObject.passwordResetTokenExpiresAt)) {
+            await this.mainDbModel
+                .updateOne({ _id: dbObject._id }, { $unset: { passwordResetToken: 1, passwordResetTokenExpiresAt: 1 } })
+                .exec();
+            this.userServiceLogger.debug(`Rejected an expired password-reset token for ${(0, logging_helper_1.maskEmail)(dbObject.email)}`);
+        }
+        if (!dbObject || this.isPasswordResetTokenExpired(dbObject.passwordResetTokenExpiresAt)) {
+            throw new common_1.NotFoundException(error_codes_1.ErrorCode.LINK_INVALID_OR_EXPIRED);
         }
         const passwordForIamSync = newPassword;
         return this.process(async () => {
@@ -109,6 +142,7 @@ class CoreUserService extends crud_service_1.CrudService {
             const updatedUser = await (0, input_helper_1.assignPlain)(dbObject, {
                 password: await bcrypt.hash(newPassword, 10),
                 passwordResetToken: null,
+                passwordResetTokenExpiresAt: null,
                 refreshTokens: {},
             }).save();
             if (this.options?.betterAuthUserMapper && passwordForIamSync && dbObject.email) {
@@ -127,6 +161,12 @@ class CoreUserService extends crud_service_1.CrudService {
         }, { dbObject, serviceOptions });
     }
     async setPasswordResetTokenForEmail(email, serviceOptions) {
+        return (await this.createPasswordResetToken(email, serviceOptions))?.user ?? null;
+    }
+    async createPasswordResetToken(email, serviceOptions) {
+        if (!(0, input_helper_1.isQueryableString)(email)) {
+            return null;
+        }
         const dbObject = await this.mainDbModel.findOne({ email }).exec();
         if (!dbObject) {
             const preventEnumeration = this.configService.getFastButReadOnly('auth')?.passwordReset?.preventUserEnumeration !== false;
@@ -137,11 +177,63 @@ class CoreUserService extends crud_service_1.CrudService {
             this.userServiceLogger.debug(`Password reset requested for an unknown address (${(0, logging_helper_1.maskEmail)(email)})`);
             return null;
         }
-        return this.process(async () => {
-            dbObject.passwordResetToken = crypto.randomBytes(32).toString('hex');
+        const token = crypto.randomBytes(32).toString('hex');
+        const expiresAt = this.passwordResetTokenExpiry();
+        const user = await this.process(async () => {
+            dbObject.passwordResetToken = token;
+            dbObject.passwordResetTokenExpiresAt = expiresAt;
             await dbObject.save();
             return dbObject;
         }, { dbObject, serviceOptions });
+        return { token, user };
+    }
+    passwordResetTokenExpiryMinutes() {
+        const raw = this.configService.getFastButReadOnly('auth.passwordReset.tokenExpiresInMinutes');
+        if (typeof raw === 'string' && !raw.trim().length) {
+            return DEFAULT_PASSWORD_RESET_TOKEN_EXPIRY_MINUTES;
+        }
+        const value = typeof raw === 'string' ? Number(raw) : raw;
+        if (typeof value === 'number' && Number.isFinite(value) && value >= 0) {
+            return value;
+        }
+        return DEFAULT_PASSWORD_RESET_TOKEN_EXPIRY_MINUTES;
+    }
+    passwordResetTokenExpiry() {
+        const minutes = this.passwordResetTokenExpiryMinutes();
+        return minutes > 0 ? new Date(Date.now() + minutes * 60_000) : null;
+    }
+    isPasswordResetTokenExpired(expiresAt) {
+        if (this.passwordResetTokenExpiryMinutes() === 0) {
+            return false;
+        }
+        if (!expiresAt) {
+            return true;
+        }
+        const time = expiresAt instanceof Date ? expiresAt.getTime() : new Date(expiresAt).getTime();
+        return !Number.isFinite(time) || time <= Date.now();
+    }
+    buildPasswordResetLink(token) {
+        const configured = this.configService.getFastButReadOnly('email.passwordResetLink');
+        const appUrl = (0, cookies_helper_1.resolveAppUrlFromConfig)(this.configService);
+        let target = typeof configured === 'string' && configured.trim().length ? configured.trim() : undefined;
+        if (!target) {
+            if (!appUrl) {
+                this.userServiceLogger.error('Cannot build a password-reset link: neither `email.passwordResetLink` nor `appUrl` is configured');
+                return null;
+            }
+            target = `${appUrl.replace(/\/$/, '')}/auth/reset-password?token={token}`;
+        }
+        if (target.startsWith('/')) {
+            if (!appUrl) {
+                this.userServiceLogger.error('Cannot build a password-reset link: `email.passwordResetLink` is relative and `appUrl` is not configured');
+                return null;
+            }
+            target = `${appUrl.replace(/\/$/, '')}${target}`;
+        }
+        if (target.includes('{token}')) {
+            return target.replace(/\{token\}/g, encodeURIComponent(token));
+        }
+        return `${target.replace(/\/$/, '')}/${encodeURIComponent(token)}`;
     }
     async setRoles(userId, roles, serviceOptions) {
         if (!Array.isArray(roles)) {

package/dist/core/modules/user/core-user.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"core-user.service.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-user.service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"core-user.service.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-user.service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/error-code/error-codes.d.ts CHANGED Viewed

@@ -40,6 +40,9 @@ export declare const ErrorCode: {
     EMAIL_VERIFICATION_TOKEN_INVALID: string;
     EMAIL_ALREADY_VERIFIED: string;
     SIGNUP_DISABLED: string;
+    PASSWORD_TOO_LONG: string;
+    PASSWORD_TOO_SHORT: string;
+    LINK_INVALID_OR_EXPIRED: string;
     UNAUTHORIZED: string;
     ACCESS_DENIED: string;
     RESOURCE_FORBIDDEN: string;

package/dist/server/modules/user/user.model.d.ts CHANGED Viewed

@@ -94,6 +94,11 @@ export declare const UserSchema: Schema<User, import("mongoose").Model<User, any
     }> & {
         __v: number;
     }>;
+    passwordResetTokenExpiresAt?: import("mongoose").SchemaDefinitionProperty<Date, User, Document<unknown, {}, User, {}, import("mongoose").DefaultSchemaOptions> & User & Required<{
+        _id: import("mongoose").Types.ObjectId;
+    }> & {
+        __v: number;
+    }>;
     refreshTokens?: import("mongoose").SchemaDefinitionProperty<Record<string, import("../../..").CoreTokenData>, User, Document<unknown, {}, User, {}, import("mongoose").DefaultSchemaOptions> & User & Required<{
         _id: import("mongoose").Types.ObjectId;
     }> & {

package/dist/server/modules/user/user.service.js CHANGED Viewed

@@ -58,22 +58,28 @@ let UserService = class UserService extends core_user_service_1.CoreUserService
         return super.update(id, input, serviceOptions);
     }
     async sendPasswordResetMail(email, serviceOptions) {
-        const user = await super.setPasswordResetTokenForEmail(email, serviceOptions);
-        if (!user) {
+        const created = await this.createPasswordResetToken(email, serviceOptions);
+        if (!created) {
             return null;
         }
+        const link = this.buildPasswordResetLink(created.token);
+        if (!link) {
+            this.userServiceLogger.error('Password reset mail not sent: no reset link could be built. Set `email.passwordResetLink` or `appUrl`.');
+            return created.user;
+        }
         void this.emailService
-            .sendMail(user.email, 'Password reset', {
+            .sendMail(created.user.email, 'Password reset', {
             htmlTemplate: 'password-reset',
             templateData: {
-                link: `${this.configService.configFastButReadOnly.email.passwordResetLink}/${user.passwordResetToken}`,
-                name: user.username,
+                link,
+                linkExpiresInMinutes: this.passwordResetTokenExpiryMinutes(),
+                name: created.user.username,
             },
         })
             .catch((error) => {
             this.userServiceLogger.error(`Failed to send the password-reset mail: ${error instanceof Error ? error.message : String(error)}`);
         });
-        return user;
+        return created.user;
     }
     async setAvatar(avatarId, user) {
         const dbUser = await this.mainDbModel.findById(user.id).exec();

package/dist/server/modules/user/user.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmH;AACnH,+CAA+C;AAC/C,iEAA+C;AAC/C,uCAAiC;AAEjC,mGAAqH;AAErH,iFAA6E;AAC7E,+EAA2E;AAE3E,iHAA0G;AAC1G,oFAA+E;AAG/E,6CAAkD;AAM3C,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,mCAAiD;IASlD;IACA;IACsB;IACD;IACX;IACT;IAN/B,YAC8B,aAA4B,EAC5B,YAA0B,EACJ,oBAAgD,EACjD,WAAgC,EAC3C,MAAc,EACvB,oBAA+C;QAE5E,KAAK,CAAC,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,oBAAoB,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAPpE,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAc;QACJ,yBAAoB,GAApB,oBAAoB,CAA4B;QACjD,gBAAW,GAAX,WAAW,CAAqB;QAC3C,WAAM,GAAN,MAAM,CAAQ;QACvB,yBAAoB,GAApB,oBAAoB,CAA2B;IAG9E,CAAC;IASQ,KAAK,CAAC,MAAM,CAAC,KAAsB,EAAE,cAA+B;QAE3E,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAIrD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,IAAI,IAAI,EAAE,CAAC,CAAC;QAC1G,CAAC;QAGD,IAAI,cAAc,EAAE,MAAM,KAAK,SAAS,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;YAClE,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,iBAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,CAAC;QAGD,OAAO,IAAI,CAAC;IACd,CAAC;IAEQ,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAgB,EAAE,cAA+B;QACjF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;QACrD,IAAI,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAChE,KAAK,GAAG,IAAA,uCAAc,EAAC,cAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAqB,EAAE,IAAA,oDAA2B,EAAC,iBAAI,CAAC,CAAC,CAAC;QACnH,CAAC;QACD,OAAO,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IACjD,CAAC;IAoBD,KAAK,CAAC,qBAAqB,CAAC,KAAa,EAAE,cAA+B;~~QAExE~~,MAAM,~~IAAI~~,GAAG,MAAM,~~KAAK~~,CAAC,~~6BAA6B~~,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;~~QAE9E~~,IAAI,CAAC,~~IAAI~~,EAAE,CAAC;~~YAEV~~,OAAO,IAAI,CAAC;QACd,CAAC;QAGD,KAAK,IAAI,CAAC,YAAY;aACnB,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,gBAAgB,EAAE;~~YACtC~~,YAAY,EAAE,gBAAgB;YAC9B,YAAY,EAAE;gBACZ,IAAI,EAAE,~~GAAG,~~IAAI,CAAC,~~aAAa,CAAC,qBAAqB,CAAC,KAAK,CAAC,iBAAiB,IAAI,IAAI,CAAC,kBAAkB,~~EAAE;~~gBACtG~~,IAAI,EAAE,IAAI,CAAC,QAAQ;~~aACpB~~;SACF,CAAC;aACD,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YACxB,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAC1B,2CAA2C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACpG,CAAC;QACJ,CAAC,CAAC,CAAC;QAGL,OAAO,IAAI,CAAC;~~IACd~~,CAAC;IAaD,KAAK,CAAC,SAAS,CAAC,QAAgB,EAAE,IAAU;QAK1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAG/D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,8BAAqB,CAAC,8CAA8C,CAAC,CAAC;QAClF,CAAC;QAGD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,qCAA4B,CAAC,qBAAqB,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;QAGrC,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC;QAEzB,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAEpB,OAAO,cAAc,CAAC;IACxB,CAAC;CACF,CAAA;~~AAzIY~~,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAYR,WAAA,IAAA,eAAM,EAAC,YAAY,CAAC,CAAA;IACpB,WAAA,IAAA,sBAAW,EAAC,MAAM,CAAC,CAAA;IACnB,WAAA,IAAA,eAAM,EAAC,SAAS,CAAC,CAAA;IACjB,WAAA,IAAA,iBAAQ,GAAE,CAAA;qCALgC,8BAAa;QACd,4BAAY,UAEQ,gBAAK;QACrB,8BAAM;QACA,uDAAwB;GAdnE,WAAW,~~CAyIvB~~"}
1	+ {"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmH;AACnH,+CAA+C;AAC/C,iEAA+C;AAC/C,uCAAiC;AAEjC,mGAAqH;AAErH,iFAA6E;AAC7E,+EAA2E;AAE3E,iHAA0G;AAC1G,oFAA+E;AAG/E,6CAAkD;AAM3C,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,mCAAiD;IASlD;IACA;IACsB;IACD;IACX;IACT;IAN/B,YAC8B,aAA4B,EAC5B,YAA0B,EACJ,oBAAgD,EACjD,WAAgC,EAC3C,MAAc,EACvB,oBAA+C;QAE5E,KAAK,CAAC,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,oBAAoB,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAPpE,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAc;QACJ,yBAAoB,GAApB,oBAAoB,CAA4B;QACjD,gBAAW,GAAX,WAAW,CAAqB;QAC3C,WAAM,GAAN,MAAM,CAAQ;QACvB,yBAAoB,GAApB,oBAAoB,CAA2B;IAG9E,CAAC;IASQ,KAAK,CAAC,MAAM,CAAC,KAAsB,EAAE,cAA+B;QAE3E,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAIrD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,IAAI,IAAI,EAAE,CAAC,CAAC;QAC1G,CAAC;QAGD,IAAI,cAAc,EAAE,MAAM,KAAK,SAAS,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;YAClE,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,iBAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,CAAC;QAGD,OAAO,IAAI,CAAC;IACd,CAAC;IAEQ,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAgB,EAAE,cAA+B;QACjF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;QACrD,IAAI,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAChE,KAAK,GAAG,IAAA,uCAAc,EAAC,cAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAqB,EAAE,IAAA,oDAA2B,EAAC,iBAAI,CAAC,CAAC,CAAC;QACnH,CAAC;QACD,OAAO,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IACjD,CAAC;IAoBD,KAAK,CAAC,qBAAqB,CAAC,KAAa,EAAE,cAA+B;QAIxE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAE3E,IAAI,CAAC,OAAO,EAAE,CAAC;YAEb,OAAO,IAAI,CAAC;QACd,CAAC;QAID,MAAM,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,EAAE,CAAC;YAIV,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAC1B,wGAAwG,CACzG,CAAC;YACF,OAAO,OAAO,CAAC,IAAI,CAAC;QACtB,CAAC;QAGD,KAAK,IAAI,CAAC,YAAY;aACnB,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,gBAAgB,EAAE;YAC9C,YAAY,EAAE,gBAAgB;YAC9B,YAAY,EAAE;gBACZ,IAAI;gBAIJ,oBAAoB,EAAE,IAAI,CAAC,+BAA+B,EAAE;gBAC5D,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ;aAC5B;SACF,CAAC;aACD,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YACxB,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAC1B,2CAA2C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACpG,CAAC;QACJ,CAAC,CAAC,CAAC;QAGL,OAAO,OAAO,CAAC,IAAI,CAAC;IACtB,CAAC;IAaD,KAAK,CAAC,SAAS,CAAC,QAAgB,EAAE,IAAU;QAK1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAG/D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,8BAAqB,CAAC,8CAA8C,CAAC,CAAC;QAClF,CAAC;QAGD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,qCAA4B,CAAC,qBAAqB,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;QAGrC,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC;QAEzB,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAEpB,OAAO,cAAc,CAAC;IACxB,CAAC;CACF,CAAA;AA5JY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAYR,WAAA,IAAA,eAAM,EAAC,YAAY,CAAC,CAAA;IACpB,WAAA,IAAA,sBAAW,EAAC,MAAM,CAAC,CAAA;IACnB,WAAA,IAAA,eAAM,EAAC,SAAS,CAAC,CAAA;IACjB,WAAA,IAAA,iBAAQ,GAAE,CAAA;qCALgC,8BAAa;QACd,4BAAY,UAEQ,gBAAK;QACrB,8BAAM;QACA,uDAAwB;GAdnE,WAAW,CA4JvB"}

package/dist/templates/password-reset-de.ejs CHANGED Viewed

@@ -50,6 +50,18 @@
                 Falls die Schaltfläche nicht funktioniert, kopiere diesen Link in deinen Browser:<br>
                 <a href="<%= link %>" style="color:#1d4ed8; word-break:break-all; overflow-wrap:break-word;"><%= link %></a>
               </p>
+              <%
+                /* Optional, like `appName`: a caller that omits it must not turn a password-reset
+                   mail into a 500. Rendered only for a real, positive value — a deployment that
+                   switched the expiry off (`0`) has no deadline to announce. */
+                const expiryMinutes = (typeof linkExpiresInMinutes !== 'undefined' && Number(linkExpiresInMinutes) > 0)
+                  ? Number(linkExpiresInMinutes) : 0;
+              -%>
+              <% if (expiryMinutes) { %>
+              <p style="margin:16px 0 0 0; font-size:13px; line-height:20px; color:#737373;">
+                Der Link ist <%= expiryMinutes %> Minuten lang gültig. Danach kannst du einfach einen neuen anfordern.
+              </p>
+              <% } %>
             </td>
           </tr>
           <tr>

package/dist/templates/password-reset-en.ejs CHANGED Viewed

@@ -50,6 +50,18 @@
                 If the button doesn't work, copy and paste this link into your browser:<br>
                 <a href="<%= link %>" style="color:#1d4ed8; word-break:break-all; overflow-wrap:break-word;"><%= link %></a>
               </p>
+              <%
+                /* Optional, like `appName`: a caller that omits it must not turn a password-reset
+                   mail into a 500. Rendered only for a real, positive value — a deployment that
+                   switched the expiry off (`0`) has no deadline to announce. */
+                const expiryMinutes = (typeof linkExpiresInMinutes !== 'undefined' && Number(linkExpiresInMinutes) > 0)
+                  ? Number(linkExpiresInMinutes) : 0;
+              -%>
+              <% if (expiryMinutes) { %>
+              <p style="margin:16px 0 0 0; font-size:13px; line-height:20px; color:#737373;">
+                This link is valid for <%= expiryMinutes %> minutes. After that, just request a new one.
+              </p>
+              <% } %>
             </td>
           </tr>
           <tr>

package/dist/templates/password-reset.ejs CHANGED Viewed

@@ -1,3 +1,4 @@
 <h1>Hello <%= name %>,</h1>
 <p>you requested a link for setting a new password. Here it is.</p><br />
 <a href="<%= link %>">Reset password</a>
+<% if (typeof linkExpiresInMinutes !== 'undefined' && Number(linkExpiresInMinutes) > 0) { %><br /><p>This link is valid for <%= Number(linkExpiresInMinutes) %> minutes. After that, just request a new one.</p><% } %>