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

change user to uuid

Browse source
This commit is contained in:
Julian Krauser 2025-01-29 08:53:49 +01:00
parent 07f8e2dbcb
commit f89483f878
46 changed files with 146 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/helpers/jwtHelper.ts
View file

@ -50,7 +50,7 @@ export abstract class JWTHelper {
});
}
static async buildToken(id: number): Promise<string> {
static async buildToken(id: string): Promise<string> {
let { firstname, lastname, mail, username, isOwner } = await UserService.getById(id);
let userPermissions = await UserPermissionService.getByUser(id);
let userPermissionStrings = userPermissions.map((e) => e.permission);
@ -86,7 +86,7 @@ export abstract class JWTHelper {
let permissionObject = PermissionHelper.convertToObject(webapiPermissionStrings);
let jwtData: JWTToken = {
userId: id,
userId: id.toString(),
mail: "",
username: title,
firstname: "",

6
src/helpers/newsletterHelper.ts
View file

@ -121,7 +121,7 @@ export abstract class NewsletterHelper {
): Promise<Array<member>> {
let useQuery = newsletter.recipientsByQuery?.query;
let queryMemberIds: Array<number> = [];
let queryMemberIds: Array<string> = [];
if (useQuery) {
let result = await DynamicQueryBuilder.executeQuery(
useQuery.startsWith("{") ? JSON.parse(useQuery) : useQuery,
@ -131,7 +131,7 @@ export abstract class NewsletterHelper {
if (result.stats == "success") {
let keys = Object.keys(result.rows?.[0] ?? {});
let memberKey = keys.find((k) => k.includes("member_id"));
queryMemberIds = result.rows.map((t) => parseInt((t[memberKey] ?? t.id) as string));
queryMemberIds = result.rows.map((t) => (t[memberKey] ?? t.id) as string);
}
}
@ -253,7 +253,7 @@ export abstract class NewsletterHelper {
for (const [index, rec] of [
...pdfRecipients,
{ id: 0, firstname: "Alle Mitglieder", lastname: CLUB_NAME } as member,
{ id: "0", firstname: "Alle Mitglieder", lastname: CLUB_NAME } as member,
].entries()) {
let data = this.buildData(newsletter, dates, rec, printWithAdress.includes(rec.sendNewsletter?.type?.id));