XWIKI-6909: Add hasWikiAdminRights method to XWikiRightsService

- Fixed javadoc for hasAdminRights()
- Added a hasWikiAdminRights() method

xwiki-platform-core/pom.xml

@@ -361,6 +361,7 @@
                 <exclude>com/xpn/xwiki/plugin/activitystream/api/ActivityEvent</exclude>
                 <exclude>com/xpn/xwiki/plugin/activitystream/plugin/ActivityEvent</exclude>
                 <exclude>org/xwiki/bridge/DocumentAccessBridge</exclude>
+                <exclude>com/xpn/xwiki/user/api/XWikiRightService</exclude>
               </excludes>
             </configuration>
           </plugin>

xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/user/api/XWikiRightService.java

@@ -43,7 +43,7 @@ public interface XWikiRightService
      * The Guest username.
      */
     public static final String GUEST_USER = "XWikiGuest";
-      
+
     /**
      * The Guest full name.
      */
@@ -58,7 +58,7 @@ public interface XWikiRightService
      * The AllGroup full name.
      */
     public static final String ALLGROUP_GROUP_FULLNAME = "XWiki." + ALLGROUP_GROUP;
-    
+
     /**
      * Checks if the wiki current user has the right to execute (@code action} on the document {@code doc}, along with
      * redirecting to the login if it's not the case and there is no logged in user (the user is the guest user).
@@ -107,14 +107,23 @@ public boolean hasAccessLevel(String right, String username, String docname, XWi
     public boolean hasProgrammingRights(XWikiDocument doc, XWikiContext context);
 
     /**
-     * Checks that the current user in the context (the currently authenticated user) has administration rights on the
-     * current wiki.
+     * Checks that the current user in the context (the currently authenticated user) has administration rights either
+     * on the current wiki or on the current space.
      * 
      * @param context the xwiki context of this request
      * @return {@code true} if the current user in the context has the {@code admin} right, {@code false} otherwise
      */
     public boolean hasAdminRights(XWikiContext context);
 
+    /**
+     * Checks that the current user in the context (the currently authenticated user) has administration rights on the
+     * current wiki, regardless of any space admin rights that might also be available.
+     * 
+     * @param context the xwiki context of this request
+     * @return {@code true} if the current user in the context has the {@code admin} right, {@code false} otherwise
+     */
+    public boolean hasWikiAdminRights(XWikiContext context);
+
     /**
      * @param context the xwiki context of this request
      * @return the list of all the known access levels

xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiRightServiceImpl.java

@@ -991,23 +991,34 @@ public boolean hasProgrammingRights(XWikiDocument doc, XWikiContext context)
      */
     public boolean hasAdminRights(XWikiContext context)
     {
-        boolean hasAdmin = false;
-        try {
-            hasAdmin = hasAccessLevel("admin", context.getUser(), "XWiki.XWikiPreferences", context);
-        } catch (Exception e) {
-            LOG.error("Failed to check admin right for user [" + context.getUser() + "]", e);
-        }
+        boolean hasAdmin = hasWikiAdminRights(context);
 
         if (!hasAdmin) {
             try {
                 hasAdmin =
                     hasAccessLevel("admin", context.getUser(), context.getDoc().getSpace() + ".WebPreferences", context);
             } catch (Exception e) {
-                e.printStackTrace();
+                LOG.error("Failed to check space admin right for user [" + context.getUser() + "]", e);
             }
         }
 
         return hasAdmin;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @see com.xpn.xwiki.user.api.XWikiRightService#hasWikiAdminRights(com.xpn.xwiki.XWikiContext)
+     */
+    @Override
+    public boolean hasWikiAdminRights(XWikiContext context)
+    {
+        try {
+            return hasAccessLevel("admin", context.getUser(), "XWiki.XWikiPreferences", context);
+        } catch (Exception e) {
+            LOG.error("Failed to check wiki admin right for user [" + context.getUser() + "]", e);
+            return false;
+        }
+    }
+
 }