From a7ba473fcc0053bcff6f557929ed288164e8dfed Mon Sep 17 00:00:00 2001
From: Mohamed Karray <mohamed.karray.sr@gmail.com>
Date: Tue, 21 Aug 2018 10:58:47 +0200
Subject: [PATCH] #8771 use the AuthenticationExceptionMapper from v1

---
 .../AuthorizationExceptionMapper.java         | 50 -------------------
 .../resources/PermissionRootResourceTest.java | 11 ++--
 2 files changed, 6 insertions(+), 55 deletions(-)
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/AuthorizationExceptionMapper.java

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AuthorizationExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AuthorizationExceptionMapper.java
deleted file mode 100644
index bf00bbfc5e..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AuthorizationExceptionMapper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-  Copyright (c) 2014, Sebastian Sdorra All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer. 2. Redistributions in
-  binary form must reproduce the above copyright notice, this list of
-  conditions and the following disclaimer in the documentation and/or other
-  materials provided with the distribution. 3. Neither the name of SCM-Manager;
-  nor the names of its contributors may be used to endorse or promote products
-  derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
-  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  http://bitbucket.org/sdorra/scm-manager
-
- */
-
-
-package sonia.scm.api.v2.resources;
-
-
-import org.apache.shiro.authz.AuthorizationException;
-import sonia.scm.api.rest.StatusExceptionMapper;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
-
-/**
- * @author mkarray
- * @since 2.0.0
- */
-@Provider
-public class AuthorizationExceptionMapper extends StatusExceptionMapper<AuthorizationException> {
-
-  public AuthorizationExceptionMapper() {
-    super(AuthorizationException.class, Response.Status.UNAUTHORIZED);
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
index 23cd51c9f9..7236a98151 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
@@ -25,6 +25,7 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.api.rest.AuthorizationExceptionMapper;
 import sonia.scm.repository.*;
 import sonia.scm.web.VndMediaType;
 
@@ -155,11 +156,11 @@ public class PermissionRootResourceTest {
     doThrow(AuthorizationException.class).when(permissionRootResource).checkUserPermitted(mockRepository);
     when(repositoryManager.get(any(NamespaceAndName.class))).thenReturn(mockRepository);
     return createDynamicTestsToAssertResponses(
-      requestGETPermission.expectedResponseStatus(401),
-      requestPOSTPermission.expectedResponseStatus(401),
-      requestGETAllPermissions.expectedResponseStatus(401),
-      requestDELETEPermission.expectedResponseStatus(401),
-      requestPUTPermission.expectedResponseStatus(401));
+      requestGETPermission.expectedResponseStatus(403),
+      requestPOSTPermission.expectedResponseStatus(403),
+      requestGETAllPermissions.expectedResponseStatus(403),
+      requestDELETEPermission.expectedResponseStatus(403),
+      requestPUTPermission.expectedResponseStatus(403));
   }
 
   @Test