Merge branch 'auth_source_name' into 'master'

Allow to configure the authentication provider name displayed in login page

Closes #7

See merge request hito/ositah!2

ositah/main.py

@@ -314,14 +314,14 @@ def make_app(environ=None, start_response=None, options=None):
         options.configuration_file = default_config_path()
         options.debug = True
 
-    define_config_params(options.configuration_file)
+    config = define_config_params(options.configuration_file)
 
     # Despite db is not used directly here, it is important to have it imported once after the
     # configuration has been defined and before the app.run_server(in fact the Flaks app.server())
     # is executed
     from ositah.utils.hito_db import db  # noqa: F401
 
-    configure_multipass_ldap(app.server, "IJCLab Account")
+    configure_multipass_ldap(app.server, config["server"]["authentication"]["provider_name"])
     multipass.init_app(app.server)
 
     app.server.secret_key = "ositah-dashboard"

ositah/ositah.example.cfg

@@ -80,6 +80,7 @@ server:
       base_dn: 'ou=ijclab,dc=ijclab,dc=in2p3,dc=fr'
       bind_dn: 'CN=Non-Interactive Queries,OU=SI,OU=Services techniques,OU=Laboratoire,DC=lal,DC=in2p3,DC=fr'
       password: 'ldap_bind_password'
+    provider_name: "MyLab account"
 
 # Options related to declarations
 declaration:

ositah/utils/authentication.py

@@ -111,7 +111,7 @@ class OSITAHMultipass(Multipass):
         )
 
 
-def configure_multipass_ldap(app, provider_title: str = "IJCLab Account"):
+def configure_multipass_ldap(app, provider_title):
     """
     Configure Flask_multipass from configuration. Inspired from Indico and its configuration file.
     Required flask_multipass with PR #42.

ositah/utils/utils.py

@@ -287,6 +287,12 @@ def define_config_params(file):
             for param in ["uri", "base_dn", "bind_dn", "password"]:
                 if param not in global_params.ldap:
                     raise ConfigMissingParam(f"server/authentication/ldap/{param}", file)
+        else:
+            raise ConfigMissingParam("server/authentication/ldap", file)
+        if "provider_name" not in config["server"]["authentication"]:
+            raise ConfigMissingParam("server/authentication/provider_name", file)
+    else:
+        raise ConfigMissingParam("server/authentication", file)
 
     if "hito" not in config:
         raise ConfigMissingParam("hito", file)

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ositah"
-version = "22.10"
+version = "22.11"
 description = "Outils de Suivi d'Activités basé sur Hito"
 readme = "README.md"
 requires-python = ">=3.8"