The users/me endpoint now provides more accurate information based on…

… various configs (#2602)
Apicurio · Jun 30, 2022 · bc45667 · bc45667
1 parent b5fd988
commit bc45667
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/src/main/java/io/apicurio/registry/auth/AuthConfig.java b/app/src/main/java/io/apicurio/registry/auth/AuthConfig.java
@@ -146,4 +146,12 @@ public boolean isApplicationRbacEnabled() {
         return this.roleBasedAuthorizationEnabled && "application".equals(getRoleSource());
     }
 
+    public boolean isAnonymousReadsEnabled() {
+        return anonymousReadAccessEnabled.get();
+    }
+
+    public boolean isAuthenticatedReadsEnabled() {
+        return authenticatedReadAccessEnabled.get();
+    }
+
 }
diff --git a/app/src/main/java/io/apicurio/registry/rest/v2/UsersResourceImpl.java b/app/src/main/java/io/apicurio/registry/rest/v2/UsersResourceImpl.java
@@ -71,13 +71,19 @@ public UserInfo getCurrentUserInfo() {
             info.setDeveloper(rbac.isDeveloper());
             info.setViewer(rbac.isReadOnly());
         } else {
-            info.setAdmin(false);
+            info.setAdmin(true);
             info.setDeveloper(false);
             info.setViewer(false);
         }
         if (authConfig.isAdminOverrideEnabled() && adminOverride.isAdmin()) {
             info.setAdmin(true);
         }
+        if (securityIdentity.isAnonymous() && authConfig.isAnonymousReadsEnabled()) {
+            info.setViewer(true);
+        }
+        if (!securityIdentity.isAnonymous() && authConfig.isAuthenticatedReadsEnabled()) {
+            info.setViewer(true);
+        }
         return info;
     }