all repos — caroster @ f3511f2779032e0280e592bc77adefcaac5b9abb

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

fix: :bug: Use right lang during authentication with Google

#557
Tim Izzo tim@octree.ch
Tue, 10 Dec 2024 10:05:48 +0100
commit

f3511f2779032e0280e592bc77adefcaac5b9abb

parent

d2e622c85d686fafcb7ba38d2d47b959f085de8c

M backend/src/api/event/content-types/event/schema.jsonbackend/src/api/event/content-types/event/schema.json

@@ -22,7 +22,13 @@ "required": true

}, "lang": { "type": "enumeration", - "enum": ["fr", "en", "de", "nl", "it"], + "enum": [ + "fr", + "en", + "de", + "nl", + "it" + ], "default": "en" }, "date": {

@@ -69,7 +75,9 @@ "type": "float"

}, "enabled_modules": { "type": "customField", - "options": ["caroster-plus"], + "options": [ + "caroster-plus" + ], "customField": "plugin::multi-select.multi-select" }, "administrators": {
M backend/src/extensions/users-permissions/content-types/user/schema.jsonbackend/src/extensions/users-permissions/content-types/user/schema.json

@@ -99,8 +99,14 @@ "default": false

}, "lang": { "type": "enumeration", - "enum": ["fr", "en", "de", "nl", "it"], - "default": "fr" + "enum": [ + "fr", + "en", + "de", + "nl", + "it" + ], + "default": "en" }, "newsletterConsent": { "type": "boolean",
M backend/types/generated/contentTypes.d.tsbackend/types/generated/contentTypes.d.ts

@@ -1305,7 +1305,7 @@ 'api::event.event'

>; firstName: Attribute.String; lang: Attribute.Enumeration<['fr', 'en', 'de', 'nl', 'it']> & - Attribute.DefaultTo<'fr'>; + Attribute.DefaultTo<'en'>; lastName: Attribute.String; newsletterConsent: Attribute.Boolean & Attribute.DefaultTo<false>; notificationEnabled: Attribute.Boolean & Attribute.DefaultTo<true>;
M frontend/middleware.tsfrontend/middleware.ts

@@ -52,7 +52,8 @@ body: JSON.stringify({query: print(ProfileDocument)}),

}) .then(async response => { const {data} = await response.json(); - return data?.me?.profile?.lang; + if (data?.me?.profile?.provider === 'local') + return data?.me?.profile?.lang; }) .catch(console.error); };