From 55685929307712a6085fa607c66a8488c4d1f61d Mon Sep 17 00:00:00 2001 From: Lari Taskula Date: Thu, 30 Jun 2016 14:36:32 +0300 Subject: [PATCH] Bug 14868: Rename 'x-koha-permission' to 'x-koha-authorization' Since we need to be able to define other authorization options than simply Koha permissions, for example "allow-owner", we should rename x-koha-permission into x-koha-authorization to better describe the object. This patch simply renames all occurences of x-koha-permission into x-koha-authorization. The new specification for authorization: "/patrons/{borrowernumber}": { .. "x-koha-authorization": { "allow-owner": "1", "pemissions": { "borrowers": "1" } } } Signed-off-by: Olli-Antti Kivilahti My name is Olli-Antti Kivilahti and I approve this commit. We have been using the Swagger2.0-driven REST API on Mojolicious for 1 year now in production and I am certain we have a pretty good idea on how to work with the limitations of Swagger2.0 We participated in the development of the Mojolicious::Plugin::Swagger and know it well. We have made an extension to the plugin to provide full CORS support and have been building all our in-house features on the new REST API. --- Koha/REST/V1.pm | 6 +++--- api/v1/swagger/paths/holds.json | 8 ++++---- api/v1/swagger/paths/patrons.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Koha/REST/V1.pm b/Koha/REST/V1.pm index 568cbd5..b8f4f0e 100644 --- a/Koha/REST/V1.pm +++ b/Koha/REST/V1.pm @@ -104,11 +104,11 @@ sub authenticate_api_request { ); } - if ($action_spec->{'x-koha-permission'}) { + if ($action_spec->{'x-koha-authorization'}) { if (_allowOwner($c, $action_spec, $user)) { return $next->($c); } - my $permissions = $action_spec->{'x-koha-permission'}->{'permissions'}; + my $permissions = $action_spec->{'x-koha-authorization'}->{'permissions'}; if (C4::Auth::haspermission($user->userid, $permissions)) { return $next->($c); @@ -129,7 +129,7 @@ sub authenticate_api_request { sub _allowOwner { my ($c, $action_spec, $user) = @_; - my $allowOwner = $action_spec->{'x-koha-permission'}->{'allow-owner'}; + my $allowOwner = $action_spec->{'x-koha-authorization'}->{'allow-owner'}; return unless $allowOwner && $allowOwner == 1; if ($c->param("borrowernumber")) { diff --git a/api/v1/swagger/paths/holds.json b/api/v1/swagger/paths/holds.json index 1371239..72602a6 100644 --- a/api/v1/swagger/paths/holds.json +++ b/api/v1/swagger/paths/holds.json @@ -22,7 +22,7 @@ } } }, - "x-koha-permission": { + "x-koha-authorization": { "allow-owner": "1", "permissions": { "borrowers": "1" @@ -99,7 +99,7 @@ } } }, - "x-koha-permission": { + "x-koha-authorization": { "allow-owner": "1", "permissions": { "reserveforothers": "1" @@ -161,7 +161,7 @@ } } }, - "x-koha-permission": { + "x-koha-authorization": { "permissions": { "reserveforothers": "1" } @@ -189,7 +189,7 @@ } } }, - "x-koha-permission": { + "x-koha-authorization": { "permissions": { "reserveforothers": "1" } diff --git a/api/v1/swagger/paths/patrons.json b/api/v1/swagger/paths/patrons.json index 3db7fe6..6cfafe3 100644 --- a/api/v1/swagger/paths/patrons.json +++ b/api/v1/swagger/paths/patrons.json @@ -23,7 +23,7 @@ } } }, - "x-koha-permission": { + "x-koha-authorization": { "permissions": { "borrowers": "1" } @@ -61,7 +61,7 @@ } } }, - "x-koha-permission": { + "x-koha-authorization": { "allow-owner": "1", "permissions": { "borrowers": "1" -- 1.9.1