From 346ee5375990c77d65dd14596ecf603d5cea8287 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Feb 01 2019 11:12:15 +0000
Subject: Api: project connector endpoint: complete returned data


Add the expriration status of API tokens to the returned
data set.

---

diff --git a/pagure/api/project.py b/pagure/api/project.py
index 4e706d1..02d7672 100644
--- a/pagure/api/project.py
+++ b/pagure/api/project.py
@@ -2030,7 +2030,11 @@ def api_get_project_connector(repo, username=None, namespace=None):
     connector = {
         'hook_token': project.hook_token,
         'api_tokens': [
-            {'name': t.description, 'id': t.id} for t in user_project_tokens]
+            {'description': t.description,
+             'id': t.id,
+             'expired': t.expired
+             } for t in user_project_tokens
+        ]
     }
 
     return flask.jsonify({"connector": connector, "status": "ok"})
diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py
index 486d6e9..eeae27a 100644
--- a/tests/test_pagure_flask_api_project.py
+++ b/tests/test_pagure_flask_api_project.py
@@ -4136,7 +4136,9 @@ class PagureFlaskApiProjectConnectorTests(tests.Modeltests):
             {"connector": {
                 "hook_token": project.hook_token,
                 "api_tokens": [
-                    {'name': t.description, 'id': t.id} for t in ctokens]
+                    {'description': t.description,
+                     'id': t.id,
+                     'expired': False} for t in ctokens]
             },
             "status": "ok"
             }
@@ -4184,7 +4186,9 @@ class PagureFlaskApiProjectConnectorTests(tests.Modeltests):
             {"connector": {
                 "hook_token": project.hook_token,
                 "api_tokens": [
-                    {'name': t.description, 'id': t.id} for t in ctokens]
+                    {'description': t.description,
+                     'id': t.id,
+                     'expired': False} for t in ctokens]
             },
             "status": "ok"
             }