From 1a6b69737fbe342fea65a0ffc2e6d936b41eabb1 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Feb 11 2019 11:28:06 +0000 Subject: Align new token API endpoint with UI endpoint This patch changes endpoint path from /token/create to /token/new. --- diff --git a/pagure/api/project.py b/pagure/api/project.py index 83da8ac..20c6e8a 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("//token/create", methods=["POST"]) -@API.route("///token/create", methods=["POST"]) -@API.route("/fork///token/create", methods=["POST"]) +@API.route("//token/new", methods=["POST"]) +@API.route("///token/new", methods=["POST"]) +@API.route("/fork///token/new", methods=["POST"]) @API.route( - "/fork////token/create", methods=["POST"] + "/fork////token/new", 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//token/create - POST /api/0///token/create + POST /api/0//token/new + POST /api/0///token/new :: - POST /api/0/fork///token/create - POST /api/0/fork////token/create + POST /api/0/fork///token/new + POST /api/0/fork////token/new Input diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py index d4fd8fb..1175abb 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, 'acls': ['pull_request_merge', 'pull_request_comment'] } - output = self.app.post('/api/0/test/token/create', + output = self.app.post('/api/0/test/token/new', 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/token/create', + output = self.app.post('/api/0/test/token/new', headers=headers, data=data) self.assertEqual(output.status_code, 400) @@ -4176,7 +4176,7 @@ class PagureFlaskApiProjectCreateAPITokenTests(tests.Modeltests): 'description': tdescription, 'acls': ['pull_request_merge', 'pull_request_comment'] } - output = self.app.post('/api/0/test/token/create', + output = self.app.post('/api/0/test/token/new', headers=headers, data=data) self.assertEqual(output.status_code, 200) data = json.loads(output.get_data(as_text=True)) @@ -4225,7 +4225,7 @@ class PagureFlaskApiProjectCreateAPITokenTests(tests.Modeltests): 'description': tdescription, 'acls': ['pull_request_merge', 'pull_request_comment'] } - output = self.app.post('/api/0/test/token/create', + output = self.app.post('/api/0/test/token/new', headers=headers, data=data) self.assertEqual(output.status_code, 401) @@ -4263,7 +4263,7 @@ class PagureFlaskApiProjectCreateAPITokenTests(tests.Modeltests): 'description': tdescription, 'acls': ['pull_request_merge', 'pull_request_comment'] } - output = self.app.post('/api/0/test/token/create', + output = self.app.post('/api/0/test/token/new', headers=headers, data=data) self.assertEqual(output.status_code, 401)