all repos — caroster @ 44a9c4d6a42c23de9ece77ee2968e31c3ea93732

[Octree] Group carpool to your event https://caroster.io

🐛 Fixes after PO demo
Tim Izzo tim@5ika.ch
Fri, 10 Jan 2025 09:38:06 +0100
commit

44a9c4d6a42c23de9ece77ee2968e31c3ea93732

parent

d0199a618f39b2f8fdedf40f720c37ba7ab1e11c

M backend/src/extensions/users-permissions/routes/user.tsbackend/src/extensions/users-permissions/routes/user.ts

@@ -39,6 +39,7 @@ email,

username: email, provider: "local", confirmed: true, + lang: payload.lang, role: 1, // authenticated }); const jwt = strapi
M backend/src/extensions/users-permissions/services/magic-link.tsbackend/src/extensions/users-permissions/services/magic-link.ts

@@ -2,7 +2,7 @@ import jwt from "jsonwebtoken";

const MAGICLINK_SECRET = process.env.MAGICLINK_SECRET; -export const generateMagicToken = async (email: string) => { +export const generateMagicToken = async (email: string, lang: string) => { const existingUser = await strapi.db .query("plugin::users-permissions.user") .findOne({

@@ -17,7 +17,7 @@ throw new Error("GoogleAccount");

} if (!MAGICLINK_SECRET) throw new Error("No MAGICLINK_SECRET provided"); - return jwt.sign({ email }, MAGICLINK_SECRET, { expiresIn: "20m" }); + return jwt.sign({ email, lang }, MAGICLINK_SECRET, { expiresIn: "20m" }); }; export const verifyMagicToken = (token: string) =>
M backend/src/graphql/user/index.tsbackend/src/graphql/user/index.ts

@@ -101,7 +101,7 @@ async resolve(_root, args) {

const { email, lang } = args; const magicToken = await strapi.services[ "plugin::users-permissions.user" - ].magicLink.generateMagicToken(email); + ].magicLink.generateMagicToken(email, lang); const magicLink = `${strapi.config.get( "server.url" )}/auth/magic-link?token=${magicToken}`;
M frontend/containers/MapActions/SearchField.tsxfrontend/containers/MapActions/SearchField.tsx

@@ -21,6 +21,8 @@

return ( <PlaceInput place={meetingFilter.place} + latitude={meetingFilter.latitude} + longitude={meetingFilter.longitude} onSelect={onSelect} textFieldProps={{ variant: 'outlined',