diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts index 660806d3d..20efb0cb9 100644 --- a/backend/src/graphql/directive/isAuthorized.ts +++ b/backend/src/graphql/directive/isAuthorized.ts @@ -37,14 +37,18 @@ export const isAuthorized: AuthChecker = async ({ context }, rights) => }) // console.log('isAuthorized user=', user) context.user = user + context.role = ROLE_USER if (user.userRoles && user.userRoles.length > 0) { - if (user.userRoles[0].role === ROLE_NAMES.ROLE_NAME_ADMIN) { - context.role = ROLE_ADMIN - } else if (user.userRoles[0].role === ROLE_NAMES.ROLE_NAME_MODERATOR) { - context.role = ROLE_MODERATOR + switch (user.userRoles[0].role) { + case ROLE_NAMES.ROLE_NAME_ADMIN: + context.role = ROLE_ADMIN + break + case ROLE_NAMES.ROLE_NAME_MODERATOR: + context.role = ROLE_MODERATOR + break + default: + context.role = ROLE_USER } - } else { - context.role = ROLE_USER } // console.log('context.role=', context.role) } catch { diff --git a/frontend/src/assets/News/news.json b/frontend/src/assets/News/news.json index 259a8d0f0..57abf6532 100644 --- a/frontend/src/assets/News/news.json +++ b/frontend/src/assets/News/news.json @@ -1,14 +1,14 @@ [ { "locale": "de", - "date": "4. juni 2023", + "date": "4. Juli 2023", "text": "Neue Funktion verfügbar: Jetzt Benutzernamen eintragen!", "url": "/settings", "extra": "Deine persönlichen Daten sind uns wichtig, und wir legen großen Wert auf deren Schutz. Wir wissen, dass nicht jeder seine E-Mail-Adresse anderen Benutzern preisgeben möchte. Aus diesem Grund kannst du nun einen Benutzernamen deiner Wahl in den Einstellungen angeben. Dies ist auch ein wichtiger Bestandteil unserer Vorbereitung für die bevorstehende Einführung unserer dezentralen Community-Server." }, { "locale": "en", - "date": "4 july 2023", + "date": "4 July 2023", "text": "New function available: Enter username now!", "url": "/settings", "extra": "Your personal information is important to us, and we take great care to protect it. We know that not everyone wants to reveal their email address to other users. For this reason, you can now enter a username of your choice in the settings. This is also an important part of our preparation for the upcoming launch of our decentralized community servers."