API - set language on account creation and use it in confirmation email

fittrackee/users/auth.py

@@ -2,7 +2,7 @@ import datetime
 import os
 import re
 import secrets
-from typing import Dict, Tuple, Union
+from typing import Dict, Optional, Tuple, Union
 
 import jwt
 from flask import Blueprint, current_app, request
@@ -43,6 +43,13 @@ HEX_COLOR_REGEX = regex = "^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$"
 NOT_FOUND_MESSAGE = 'the requested URL was not found on the server'
 
 
+def get_language(language: Optional[str]) -> str:
+    # Note: some users may not have language preferences set
+    if not language or language not in current_app.config['LANGUAGES']:
+        language = 'en'
+    return language
+
+
 def send_account_confirmation_email(user: User) -> None:
     if current_app.config['CAN_SEND_EMAILS']:
         ui_url = current_app.config['UI_URL']
@@ -57,7 +64,7 @@ def send_account_confirmation_email(user: User) -> None:
             ),
         }
         user_data = {
-            'language': 'en',
+            'language': get_language(user.language),
             'email': user.email,
         }
         account_confirmation_email.send(user_data, email_data)
@@ -106,6 +113,8 @@ def register_user() -> Union[Tuple[Dict, int], HttpResponse]:
     :<json string username: username (3 to 30 characters required)
     :<json string email: user email
     :<json string password: password (8 characters required)
+    :<json string lang: user language preferences (if not provided or invalid,
+                        fallback to 'en' (english))
 
     :statuscode 200: success
     :statuscode 400:
@@ -138,6 +147,7 @@ def register_user() -> Union[Tuple[Dict, int], HttpResponse]:
     username = post_data.get('username')
     email = post_data.get('email')
     password = post_data.get('password')
+    language = get_language(post_data.get('language'))
 
     try:
         ret = register_controls(username, email, password)
@@ -165,6 +175,7 @@ def register_user() -> Union[Tuple[Dict, int], HttpResponse]:
             new_user = User(username=username, email=email, password=password)
             new_user.timezone = 'Europe/Paris'
             new_user.confirmation_token = secrets.token_urlsafe(30)
+            new_user.language = language
             db.session.add(new_user)
             db.session.commit()
 
@@ -661,9 +672,7 @@ def update_user_account(auth_user: User) -> Union[Dict, HttpResponse]:
         if current_app.config['CAN_SEND_EMAILS']:
             ui_url = current_app.config['UI_URL']
             user_data = {
-                'language': (
-                    'en' if auth_user.language is None else auth_user.language
-                ),
+                'language': get_language(auth_user.language),
                 'email': auth_user.email,
             }
             data = {
@@ -830,7 +839,7 @@ def edit_user_preferences(auth_user: User) -> Union[Dict, HttpResponse]:
         return InvalidPayloadErrorResponse()
 
     imperial_units = post_data.get('imperial_units')
-    language = post_data.get('language')
+    language = get_language(post_data.get('language'))
     timezone = post_data.get('timezone')
     weekm = post_data.get('weekm')
 
@@ -1189,7 +1198,7 @@ def request_password_reset() -> Union[Dict, HttpResponse]:
     if user:
         password_reset_token = user.encode_password_reset_token(user.id)
         ui_url = current_app.config['UI_URL']
-        user_language = 'en' if user.language is None else user.language
+        user_language = get_language(user.language)
         email_data = {
             'expiration_delay': get_readable_duration(
                 current_app.config['PASSWORD_TOKEN_EXPIRATION_SECONDS'],
@@ -1280,9 +1289,7 @@ def update_password() -> Union[Dict, HttpResponse]:
         if current_app.config['CAN_SEND_EMAILS']:
             password_change_email.send(
                 {
-                    'language': (
-                        'en' if user.language is None else user.language
-                    ),
+                    'language': get_language(user.language),
                     'email': user.email,
                 },
                 {

fittrackee/users/users.py

@@ -23,6 +23,7 @@ from fittrackee.responses import (
 from fittrackee.utils import get_readable_duration
 from fittrackee.workouts.models import Record, Workout, WorkoutSegment
 
+from .auth import get_language
 from .decorators import authenticate, authenticate_as_admin
 from .exceptions import InvalidEmailException, UserNotFoundException
 from .models import User, UserSportPreference
@@ -530,7 +531,7 @@ def update_user(auth_user: User, user_name: str) -> Union[Dict, HttpResponse]:
         )
 
         if current_app.config['CAN_SEND_EMAILS']:
-            user_language = 'en' if user.language is None else user.language
+            user_language = get_language(user.language)
             ui_url = current_app.config['UI_URL']
             if reset_password:
                 user_data = {