Bug 22071: (follow-up) Simplify code
authorTomas Cohen Arazi <tomascohen@theke.io>
Mon, 7 Jan 2019 10:31:43 +0000 (07:31 -0300)
committerJesse Maseto <jesse@bywatersolutions.com>
Fri, 11 Jan 2019 19:32:51 +0000 (19:32 +0000)
commit053eb7a4e76a95da38c981b2f0371f92d4942bda
treefc55161e1cfba952dee5b9dc1318e76f9f251be6
parent8793c0e59180326c2859ac19d5fbec94b19e8cf7
Bug 22071: (follow-up) Simplify code

In order to add features to this method, the current code would force us
to do it for each authentication method.

There's duplicated code that could be simplified. This patch makes the
authentication code just set $user on each block (oauth and cookie
authentication) and moves the final permissions check to the end of the
authenticate_api_request method.

Overall, the behaviour remains unchanged.

To test:
- Run:
  $ kshell
 k$ prove t/db_dependent/api/v1/auth_authenticate_api_request.t \
          t/db_dependent/api/v1/oauth.t
=> SUCCESS: Tests pass! Nothing changed!
- Sign off :-D

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 0d5058b7b29d90cc7c8e533ee56388fbb5a96d52)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit a6dc145ce966338ec0ae96f7e32968149647c02f)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
Koha/REST/V1/Auth.pm