diff --git a/pagure/api/project.py b/pagure/api/project.py index 02d7672..2ba4f91 100644 --- a/pagure/api/project.py +++ b/pagure/api/project.py @@ -1973,7 +1973,7 @@ def api_get_project_connector(repo, username=None, namespace=None): """ Get project connector --------------------- - Allow project owner and admins to retrieve connector tokens. + Allow project owners and admins to retrieve their own connector tokens. Connector tokens are the API tokens and the Web Hook token of the project. Connector tokens make possible for an external application to listen and verify project notifications and act @@ -1998,8 +1998,12 @@ def api_get_project_connector(repo, username=None, namespace=None): "connector": { "hook_token": "aaabbbccc", "api_token": [ - {'name': 'foo token', 'id': "abcdefoo"} - {'name': 'bar token', 'id': "abcdebar"} + {'name': 'foo token', + 'id': "abcdefoo", + 'expired': True} + {'name': 'bar token', + 'id': "abcdebar", + 'expired': False} ] }, "status": "ok" diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py index eeae27a..22ea91f 100644 --- a/tests/test_pagure_flask_api_project.py +++ b/tests/test_pagure_flask_api_project.py @@ -4125,6 +4125,7 @@ class PagureFlaskApiProjectConnectorTests(tests.Modeltests): username='pingou') ctokens = pagure.lib.query.search_token( self.session, ['pull_request_merge'], user='pingou') + self.assertEqual(len(ctokens), 1) # Call the connector with pingou user token and verify content headers = {'Authorization': 'token aaabbbcccddd'} @@ -4175,6 +4176,7 @@ class PagureFlaskApiProjectConnectorTests(tests.Modeltests): username='foo') ctokens = pagure.lib.query.search_token( self.session, ['pull_request_merge'], user='foo') + self.assertEqual(len(ctokens), 1) # Call the connector with foo user token and verify content headers = {'Authorization': 'token %s' % mtoken.id}