From 102816dedcd0db8817ab56763307316baeccdba6 Mon Sep 17 00:00:00 2001
From: Charlie Jacomme <jacomme@crans.org>
Date: Tue, 7 Aug 2018 17:30:58 +0200
Subject: [PATCH 1/3] gitignore aliases_local

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9e2266d..4b61a7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ config.ini
 **/__pycache__/**
 **.list
 generated/*
+aliases_local

From 60c3f1032f96af7ec6284826538798455e771b8d Mon Sep 17 00:00:00 2001
From: Charlie Jacomme <jacomme@crans.org>
Date: Tue, 7 Aug 2018 17:32:20 +0200
Subject: [PATCH 2/3] gitmodule on crans.adm

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 361b0a1..f418c65 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "re2oapi"]
 	path = re2oapi
-	url = https://gitlab.federez.net/re2o/re2oapi.git
+	url = https://gitlab.adm.crans.org/nounous/re2o-re2oapi.git

From 51dcb049cf9b2854be3d7b985daf0a2a98313db5 Mon Sep 17 00:00:00 2001
From: Charlie Jacomme <jacomme@crans.org>
Date: Tue, 7 Aug 2018 19:58:19 +0200
Subject: [PATCH 3/3] update templates for new re2o names

---
 main.py        | 2 +-
 templates/list | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 11bf6e0..f61f773 100755
--- a/main.py
+++ b/main.py
@@ -22,7 +22,7 @@ api_client = Re2oAPIClient(api_hostname, api_username, api_password)
 
 client_hostname = socket.gethostname().split('.', 1)[0]
 
-all_users = api_client.list("mail/alias")
+all_users = api_client.list("localemail/users")
 
 # Création de l'environnement Jinja
 env = Environment(loader=FileSystemLoader('.'))
diff --git a/templates/list b/templates/list
index ff577f3..b88a55a 100644
--- a/templates/list
+++ b/templates/list
@@ -1,10 +1,10 @@
 # Liste d'association alias:addresse des users
 {%- for user in data -%}
-{%- for alias in user.get_mail_aliases -%}
-{%- if user.redirection -%}
-{{alias.valeur}}:{{ user.get_mail }}
+{%- for alias in user.email_address -%}
+{%- if user.local_email_redirect -%}
+{{alias.complete_email_address}}:{{ user.email }}
 {%- else -%}
-{{alias.valeur}}:{{ user.pseudo }}
+{{alias.complete_email_address}}:{{ alias.user }}
 {% endif %}
 {% endfor %}
 {% endfor %}