diff --git a/gradle.properties b/gradle.properties index 9547524..3535251 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group = org.xbib name = net -version = 4.3.2 +version = 4.4.0 diff --git a/net/src/main/java/org/xbib/net/SecurityRealm.java b/net/src/main/java/org/xbib/net/SecurityRealm.java index 82c85da..8408dbb 100644 --- a/net/src/main/java/org/xbib/net/SecurityRealm.java +++ b/net/src/main/java/org/xbib/net/SecurityRealm.java @@ -18,17 +18,4 @@ public abstract class SecurityRealm { public abstract Authenticator getAuthenticator(); - /** - * @return {@link UsersProvider} associated with this realm, null if not supported - */ - public UsersProvider getUsersProvider() { - return null; - } - - /** - * @return {@link GroupsProvider} associated with this realm, null if not supported - */ - public GroupsProvider getGroupsProvider() { - return null; - } } diff --git a/net/src/main/java/org/xbib/net/UserProfile.java b/net/src/main/java/org/xbib/net/UserProfile.java index 1bf7561..0acb77e 100644 --- a/net/src/main/java/org/xbib/net/UserProfile.java +++ b/net/src/main/java/org/xbib/net/UserProfile.java @@ -4,7 +4,9 @@ import java.util.List; public interface UserProfile { - boolean isLoggedIn(); + void setName(String name); + + String getName(); void setUserId(String uid); @@ -14,46 +16,28 @@ public interface UserProfile { String getEffectiveUserId(); - void setName(String name); - - String getName(); - void addRole(String role); - void addEffectiveRole(String role); - List getRoles(); + void addEffectiveRole(String role); + List getEffectiveRoles(); - boolean hasRole(String role); - - boolean hasEffectiveRole(String role); - - boolean hasAnyRole(String[] expectedRoles); - - boolean hasAnyEffectiveRole(String[] expectedRoles); - - boolean hasAllRoles(String[] expectedRoles); - - boolean hasAllEffectiveRoles(String[] expectedRoles); - void addPermission(String permission); - void removePermission(String permission); - List getPermissions(); + void addEffectivePermission(String permission); + List getEffectivePermissions(); - Attributes attributes(); + Attributes getAttributes(); - Attributes effectiveAttributes(); + Attributes getEffectiveAttributes(); void setRemembered(boolean remembered); boolean isRemembered(); - boolean hasAccess(String requireAnyRole, String requireAllRoles); - } diff --git a/net/src/main/java/org/xbib/net/package-info.java b/net/src/main/java/org/xbib/net/package-info.java deleted file mode 100644 index 740f554..0000000 --- a/net/src/main/java/org/xbib/net/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Classes for URL building and parsing. - */ -package org.xbib.net;