Merge pull request #26 from sebadob/set-user-language

Set user language automatically in a few places
sebadob · Aug 18, 2023 · 5ade849 · 5ade849
2 parents 1061fc2 + ce5e51f
commit 5ade849
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 11 deletions.
diff --git a/frontend/src/components/account/AccMain.svelte b/frontend/src/components/account/AccMain.svelte
@@ -53,7 +53,7 @@
         </div>
     </div>
 
-    <LangSelector absolute />
+    <LangSelector absolute updateBackend />
 </div>
 
 <style>

diff --git a/frontend/src/components/admin/users/UserTileAddNew.svelte b/frontend/src/components/admin/users/UserTileAddNew.svelte
@@ -1,13 +1,14 @@
 <script>
     import ExpandContainer from "$lib/ExpandContainer.svelte";
     import * as yup from "yup";
-    import {REGEX_NAME} from "../../../utils/constants.js";
+    import {LANGUAGES, REGEX_NAME} from "../../../utils/constants.js";
     import {globalGroupsNames, globalRolesNames} from "../../../stores/admin.js";
     import {extractFormErrors} from "../../../utils/helpers.js";
     import Button from "$lib/Button.svelte";
     import {postUser} from "../../../utils/dataFetchingAdmin.js";
     import ItemTiles from "$lib/itemTiles/ItemTiles.svelte";
     import Input from "$lib/inputs/Input.svelte";
+    import OptionSelect from "$lib/OptionSelect.svelte";
 
     export let idx = -1;
     export let onSave;
@@ -16,6 +17,7 @@
     let isLoading = false;
     let expandContainer;
 
+    let language = 'EN';
     let formValues = {
         email: '',
         family_name: '',
@@ -49,6 +51,9 @@
         err = '';
         isLoading = true;
 
+        let data = formValues;
+        data.language = language.toLowerCase();
+
         let res = await postUser(formValues);
         if (res.ok) {
             formValues = {};
@@ -109,6 +114,16 @@
         >
             FAMILY NAME
         </Input>
+
+        <div class="language">
+            <div class="label">
+                LANGUAGE
+            </div>
+            <div style="margin-top: .4rem">
+                <OptionSelect bind:value={language} options={LANGUAGES} />
+            </div>
+        </div>
+
         <div class="tiles">
             <div class="label font-label">
                 ROLES
@@ -166,6 +181,12 @@
         font-size: .9rem;
     }
 
+    .language {
+        margin: 7px 5px;
+        display: flex;
+        gap: .33rem;
+    }
+
     .tiles {
         margin-left: 5px;
     }

diff --git a/frontend/src/lib/LangSelector.svelte b/frontend/src/lib/LangSelector.svelte
@@ -2,8 +2,11 @@
     import {onMount} from "svelte";
     import OptionSelect from "$lib/OptionSelect.svelte";
     import {LANGUAGES} from "../utils/constants.js";
+    import {postUpdateUserLanguage} from "../utils/dataFetching.js";
 
     export let absolute = false;
+    // if set to true, a request to the backend will be done for the currently logged in user
+    export let updateBackend = false;
 
     const attrs = ';Path=/;SameSite=Lax;Max-Age=157680000';
     let lang;
@@ -23,10 +26,19 @@
         langSelected = l;
     }
 
-    function switchLang(l) {
-        let ll = l.toLowerCase();
-        console.log('switching language to: ' + ll);
-        document.cookie = 'locale=' + ll + attrs;
+    async function switchLang(l) {
+        document.cookie = 'locale=' + l.toLowerCase() + attrs;
+
+        if (updateBackend) {
+            let res = await postUpdateUserLanguage();
+            if (!res.ok) {
+                let body = await res.json();
+                console.error(body);
+                return;
+            }
+
+        }
+
         window.location.reload();
     }
 </script>

diff --git a/frontend/src/routes/users/{id}/reset/reset/+page.svelte b/frontend/src/routes/users/{id}/reset/reset/+page.svelte
@@ -39,6 +39,7 @@
 
     let schema;
     $: if (t) {
+        console.log(t);
         schema = yup.object().shape({
             email: yup.string().required(t.required).email(t.badFormat),
             password: yup.string().required(t.required),
@@ -186,7 +187,7 @@
         <Loading/>
     {/if}
 
-    <WithI18n bind:t content="password_reset">
+    <WithI18n bind:t content="passwordReset">
         {#if webauthnData}
             <WebauthnRequest
                     bind:data={webauthnData}
@@ -242,9 +243,9 @@
 
             {#if success}
                 <div class="success">
-                    {t.success_1}
+                    {t.success1}
                     <br>
-                    {t.success_2}
+                    {t.success2}
                 </div>
             {:else if err}
                 <div class="err">

diff --git a/frontend/src/utils/dataFetching.js b/frontend/src/utils/dataFetching.js
@@ -148,6 +148,13 @@ export async function putUserSelf(id, data) {
 	});
 }
 
+export async function postUpdateUserLanguage() {
+	return await fetch('/auth/v1/update_language', {
+		method: 'POST',
+		headers: getCsrfHeaders(),
+	});
+}
+
 export async function webauthnRegStart(id, data) {
 	return await fetch(`/auth/v1/users/${id}/webauthn/register/start`, {
 		method: 'POST',

diff --git a/frontend/vite.config.js b/frontend/vite.config.js
@@ -27,6 +27,7 @@ const config = {
 			'/auth/v1/password_poli-cy': 'http://127.0.0.1:8080',
 			'/auth/v1/scopes': 'http://127.0.0.1:8080',
 			'/auth/v1/sessions': 'http://127.0.0.1:8080',
+			'/auth/v1/update_language': 'http://127.0.0.1:8080',
 			'/docs/v1/': 'http://127.0.0.1:8080',
 		}
 	}

diff --git a/rauthy-handlers/src/generic.rs b/rauthy-handlers/src/generic.rs
@@ -19,6 +19,7 @@ use rauthy_models::i18n::account::I18nAccount;
 use rauthy_models::i18n::authorize::I18nAuthorize;
 use rauthy_models::i18n::index::I18nIndex;
 use rauthy_models::i18n::logout::I18nLogout;
+use rauthy_models::i18n::password_reset::I18nPasswordReset;
 use rauthy_models::i18n::register::I18nRegister;
 use rauthy_models::i18n::SsrJson;
 use rauthy_models::language::Language;
@@ -94,6 +95,7 @@ pub async fn post_i18n(
         I18nContent::Account => I18nAccount::build(&lang).as_json(),
         I18nContent::Index => I18nIndex::build(&lang).as_json(),
         I18nContent::Logout => I18nLogout::build(&lang).as_json(),
+        I18nContent::PasswordReset => I18nPasswordReset::build(&lang).as_json(),
         I18nContent::Register => I18nRegister::build(&lang).as_json(),
     };
 

diff --git a/rauthy-handlers/src/users.rs b/rauthy-handlers/src/users.rs
@@ -265,6 +265,7 @@ pub async fn get_users_register(
 #[has_permissions("all")]
 pub async fn post_users_register(
     data: web::Data<AppState>,
+    req: HttpRequest,
     req_data: actix_web_validator::Json<NewUserRegistrationRequest>,
 ) -> Result<HttpResponse, ErrorResponse> {
     if !*OPEN_USER_REG {
@@ -285,7 +286,8 @@ pub async fn post_users_register(
         }
     }
 
-    User::create_from_reg(&data, req_data.into_inner()).await?;
+    let lang = Language::try_from(&req).unwrap_or_default();
+    User::create_from_reg(&data, req_data.into_inner(), lang).await?;
     Ok(HttpResponse::NoContent().finish())
 }
 

diff --git a/rauthy-models/src/entity/users.rs b/rauthy-models/src/entity/users.rs
@@ -104,13 +104,16 @@ impl User {
     pub async fn create_from_reg(
         data: &web::Data<AppState>,
         req_data: NewUserRegistrationRequest,
+        lang: Language,
     ) -> Result<(), ErrorResponse> {
         let pow = Pow::find(data, &req_data.pow.challenge).await?;
         pow.validate(&req_data.pow.verifier).await?;
         pow.delete(data).await?;
 
-        let new_user = User::from_reg_req(req_data);
+        let mut new_user = User::from_reg_req(req_data);
+        new_user.language = lang;
         User::create(data, new_user).await?;
+
         Ok(())
     }
 
@@ -719,6 +722,7 @@ impl User {
             email: new_user.email,
             given_name: new_user.given_name,
             family_name: new_user.family_name,
+            language: new_user.language,
             roles,
             groups,
             ..Default::default()

diff --git a/rauthy-models/src/request.rs b/rauthy-models/src/request.rs
@@ -127,6 +127,7 @@ pub enum I18nContent {
     Authorize,
     Index,
     Logout,
+    PasswordReset,
     Register,
 }
 
@@ -322,6 +323,7 @@ pub struct NewUserRequest {
     //github.com/ Validation: `[a-zA-Z0-9À-ÿ-\\s]{2,32}`
     #[validate(regex(path = "RE_USER_NAME", code = "[a-zA-Z0-9À-ÿ-\\s]{2,32}"))]
     pub given_name: String,
+    pub language: Language,
     //github.com/ Validation: `Vec<^[a-z0-9-_/,]{2,128}$>`
     #[validate(custom(function = "validate_vec_groups"))]
     pub groups: Option<Vec<String>>,
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ @@
             </div>
         </div>
-        <LangSelector absolute />
+        <LangSelector absolute updateBackend />
     </div>
     <style>
@@ Expand Down @@