Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 18 Pull requests Projects Releases 14 Packages Wiki Activity Actions

patches v1.3.5 #74

Merged
jkeffects merged 10 commits from develop into main 2025-03-12 08:52:49 +00:00
Conversation 0 Commits 10 Files changed 176 +8 -8
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7904a98d5f - Show all commits

4
src/controller/inviteController.ts
View file

@ -59,7 +59,7 @@ export async function inviteUser(req: Request, res: Response, isInvite: boolean
throw new CustomRequestException(409, "Username and Mail are already in use");
}
var secret = speakeasy.generateSecret({ length: 20, name: `Mitgliederverwaltung ${CLUB_NAME}` });
var secret = speakeasy.generateSecret({ length: 20, name: `FF Admin ${CLUB_NAME}` });
let createInvite: CreateInviteCommand = {
username: username,
@ -92,7 +92,7 @@ export async function verifyInvite(req: Request, res: Response): Promise<any> {
let { secret, username } = await InviteService.getByMailAndToken(mail, token);
const url = `otpauth://totp/Mitgliederverwaltung ${CLUB_NAME}?secret=${secret}`;
const url = `otpauth://totp/FF Admin ${CLUB_NAME}?secret=${secret}`;
QRCode.toDataURL(url)
.then((result) => {

4
src/controller/resetController.ts
View file

@ -31,7 +31,7 @@ export async function startReset(req: Request, res: Response): Promise<any> {
let { mail } = await UserService.getByUsername(username);
var secret = speakeasy.generateSecret({ length: 20, name: `Mitgliederverwaltung ${CLUB_NAME}` });
var secret = speakeasy.generateSecret({ length: 20, name: `FF Admin ${CLUB_NAME}` });
let createReset: CreateResetCommand = {
username: username,
@ -62,7 +62,7 @@ export async function verifyReset(req: Request, res: Response): Promise<any> {
let { secret } = await ResetService.getByMailAndToken(mail, token);
const url = `otpauth://totp/Mitgliederverwaltung ${CLUB_NAME}?secret=${secret}`;
const url = `otpauth://totp/FF Admin ${CLUB_NAME}?secret=${secret}`;
QRCode.toDataURL(url)
.then((result) => {

2
src/controller/userController.ts
View file

@ -33,7 +33,7 @@ export async function getMyTotp(req: Request, res: Response): Promise<any> {
let { secret } = await UserService.getById(userId);
const url = `otpauth://totp/Mitgliederverwaltung ${CLUB_NAME}?secret=${secret}`;
const url = `otpauth://totp/FF Admin ${CLUB_NAME}?secret=${secret}`;
QRCode.toDataURL(url)
.then((result) => {

4
src/helpers/pdfExport.ts
View file

@ -7,13 +7,13 @@ import { PDFDocument } from "pdf-lib";
export abstract class PdfExport {
static async renderFile({
template,
title = "pdf-export Mitgliederverwaltung",
title = "pdf-export FF Admin",
filename = null,
data = {},
saveToDisk = true,
folder = "",
}: {
template: `${PermissionModule}`|`${PermissionModule}.${string}`;
template: `${PermissionModule}` | `${PermissionModule}.${string}`;
title?: string;
filename?: string;
data?: any;

2
src/helpers/templateHelper.ts
View file

@ -29,7 +29,7 @@ export abstract class TemplateHelper {
static async renderFileForModule({
module,
title = "pdf-export Mitgliederverwaltung",
title = "pdf-export FF Admin",
headerData = {},
bodyData = {},
footerData = {},