Merge pull request #66 from Probesys/imp/azure-oauth

Imp/azure oauth
Probesys · Dec 8, 2023 · 0fe8c5a · 0fe8c5a
2 parents aae736c + d57c494
commit 0fe8c5a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/app/templates/user/_form.html.twig b/app/templates/user/_form.html.twig
@@ -1,4 +1,12 @@
 {{ form_start(form) }}
+{% if user.office365PrincipalName is not null %}
+<div class="form-group row">
+  <div class="col-form-label col-sm-2 required">{{ 'Entities.User.fields.office365PrincipalName' | trans }}</div>
+  <div class="col-sm-10">
+  {{ user.office365PrincipalName }}
+  </div>
+    </div>
+{% endif %}
 {{ form_widget(form) }}
 <div class="d-flex justify-content-center">
   <input type="submit" class="btn btn-primary mr-2" value="{{ button_label|default('Generics.actions.save'|trans)}}" >

diff --git a/app/translations/messages.en.yml b/app/translations/messages.en.yml
@@ -245,9 +245,9 @@ Message:
         We are trying to solve this problem as quickly as possible.<br/><br/> Please
         excuse us for the inconvenience'
   Connector:
-    resultImportUser: "$NB_USER_CREATED users created, $NB_USER_UPDATED updated"
-    resultImportGroup: "$NB_GROUP_CREATED groups created, $NB_GROUP_UPDATED updated"
-    resultImportAliase: "$NB_ALIAS_CREATED alias created, $NB_ALIAS_UPDATED users updated"
+    resultImportUser: "$NB_USER_CREATED users created, $NB_USER_UPDATED synchronized"
+    resultImportGroup: "$NB_GROUP_CREATED groups created, $NB_GROUP_UPDATED synchronized"
+    resultImportAliase: "$NB_ALIAS_CREATED alias created, $NB_ALIAS_UPDATED synchronized"
     tokenError: "Unable to get access token from graph API. Please check your parameters"
   Toast:
     defaultTitle: Information
@@ -437,6 +437,7 @@ Entities:
       report: 'Send report'
       bypassHumanAuth: 'Deactivate human authentication'
       policy: "Policy"
+      office365PrincipalName: "M365 principal mail"
   Message:
     index: 'List of messages'
     untreated: 'No treaties'

diff --git a/app/translations/messages.fr.yml b/app/translations/messages.fr.yml
@@ -248,9 +248,9 @@ Message:
         \ <br /><br /> Nous nous efforçons de régler ce problème le plus rapidement\
         \ possible.<br /><br /> Veuillez nous excuser pour la gêne occasionnée"
   Connector:
-    resultImportUser: "$NB_USER_CREATED utilisateurs créé(s), $NB_USER_UPDATED mis à jour"
-    resultImportGroup: "$NB_GROUP_CREATED groupes créé(s), $NB_GROUP_UPDATED mis à jour"
-    resultImportAliase: "$NB_ALIAS_CREATED alias created, $NB_ALIAS_UPDATED users updated"  
+    resultImportUser: "$NB_USER_CREATED utilisateurs créé(s), $NB_USER_UPDATED synchronisés"
+    resultImportGroup: "$NB_GROUP_CREATED groupes créé(s), $NB_GROUP_UPDATED synchronisés"
+    resultImportAliase: "$NB_ALIAS_CREATED alias créés, $NB_ALIAS_UPDATED  synchronisés"  
     tokenError: "Impossible se connecter à votre compte Microsoft. Veuillez vérifier vos paramètres"
   Toast:
     defaultTitle: Information
@@ -447,6 +447,7 @@ Entities:
       report: Envoyer le rapport
       bypassHumanAuth: Désactiver l'authentification humaine
       policy: "Stratégie"
+      office365PrincipalName: "Nom principal M365"
   Message:
     index: Liste des messages
     untreated: Non traités