From c2669c96a6e753dfbd7f8b4b7359d65ea2c3586e Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Feb 11 2019 10:11:57 +0000 Subject: Propose a better API endpoint name repo/token/create Previous endpoint was poorly named. This patch proposes a better name. --- diff --git a/pagure/api/project.py b/pagure/api/project.py index a035daf..c33295f 100644 --- a/pagure/api/project.py +++ b/pagure/api/project.py @@ -2135,11 +2135,11 @@ def api_modify_project_options(repo, username=None, namespace=None): return flask.jsonify({"message": message, "status": "ok"}) -@API.route("//createapitoken", methods=["POST"]) -@API.route("///createapitoken", methods=["POST"]) -@API.route("/fork///createapitoken", methods=["POST"]) +@API.route("//token/create", methods=["POST"]) +@API.route("///token/create", methods=["POST"]) +@API.route("/fork///token/create", methods=["POST"]) @API.route( - "/fork////createapitoken", methods=["POST"] + "/fork////token/create", methods=["POST"] ) @api_login_required(acls=["modify_project"]) @api_method @@ -2153,13 +2153,13 @@ def api_project_create_api_token(repo, namespace=None, username=None): :: - POST /api/0//createapitoken - POST /api/0///createapitoken + POST /api/0//token/create + POST /api/0///token/create :: - POST /api/0/fork///createapitoken - POST /api/0/fork////createapitoken + POST /api/0/fork///token/create + POST /api/0/fork////token/create Input diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py index 39d3022..560e82c 100644 --- a/tests/test_pagure_flask_api_project.py +++ b/tests/test_pagure_flask_api_project.py @@ -4122,7 +4122,7 @@ class PagureFlaskApiProjectCreateAPITokenTests(tests.Modeltests): 'description': tdescription, 'acl': 'pull_request_merge,pull_request_comment' } - output = self.app.post('/api/0/test/createapitoken', + output = self.app.post('/api/0/test/token/create', headers=headers, data=data) self.assertEqual(output.status_code, 200) data = json.loads(output.get_data(as_text=True)) @@ -4142,7 +4142,7 @@ class PagureFlaskApiProjectCreateAPITokenTests(tests.Modeltests): 'description': tdescription, 'acl': 'foo,bar' } - output = self.app.post('/api/0/test/createapitoken', + output = self.app.post('/api/0/test/token/create', headers=headers, data=data) self.assertEqual(output.status_code, 400) @@ -4178,7 +4178,7 @@ class PagureFlaskApiProjectCreateAPITokenTests(tests.Modeltests): 'description': tdescription, 'acl': 'pull_request_merge,pull_request_comment' } - output = self.app.post('/api/0/test/createapitoken', + output = self.app.post('/api/0/test/token/create', headers=headers, data=data) self.assertEqual(output.status_code, 200) data = json.loads(output.get_data(as_text=True)) @@ -4227,7 +4227,7 @@ class PagureFlaskApiProjectCreateAPITokenTests(tests.Modeltests): 'description': tdescription, 'acl': 'pull_request_merge,pull_request_comment' } - output = self.app.post('/api/0/test/createapitoken', + output = self.app.post('/api/0/test/token/create', headers=headers, data=data) self.assertEqual(output.status_code, 401) @@ -4265,7 +4265,7 @@ class PagureFlaskApiProjectCreateAPITokenTests(tests.Modeltests): 'description': tdescription, 'acl': 'pull_request_merge,pull_request_comment' } - output = self.app.post('/api/0/test/createapitoken', + output = self.app.post('/api/0/test/token/create', headers=headers, data=data) self.assertEqual(output.status_code, 401)