Skip to content

Commit

Permalink
Renamed "UserRoles" to "Roles".
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmihajlovski
nmihajlovski committed Oct 11, 2015
1 parent 399a6e7 commit 7b4cd1f
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 47 deletions.
4 changes: 2 additions & 2 deletions rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java
View file
Expand Up @@ -23,7 +23,7 @@
import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Authors;
import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Since;
import org.rapidoid.app.GUI; import org.rapidoid.app.GUI;
import org.rapidoid.ctx.UserRoles; import org.rapidoid.ctx.Roles;
import org.rapidoid.html.Tag; import org.rapidoid.html.Tag;
import org.rapidoid.security.annotation.DevMode; import org.rapidoid.security.annotation.DevMode;
import org.rapidoid.util.U; import org.rapidoid.util.U;
Expand All @@ -39,7 +39,7 @@ public Object content() {
Tag caption = titleBox("Debug Mode - User Information"); Tag caption = titleBox("Debug Mode - User Information");
if (AppCtx.isLoggedIn()) { if (AppCtx.isLoggedIn()) {
Object userDetails = show(AppCtx.user(), "name", "username", "email"); Object userDetails = show(AppCtx.user(), "name", "username", "email");
FormWidget userRoles = show(U.map("roles", UserRoles.getUserRoles(AppCtx.username()))); FormWidget userRoles = show(U.map("roles", Roles.getRolesFor(AppCtx.username())));
return row(caption, userDetails, userRoles); return row(caption, userDetails, userRoles);
} else { } else {
return row(caption, h4("Not logged in!")); return row(caption, h4("Not logged in!"));
Expand Down
5 changes: 3 additions & 2 deletions ...main/java/org/rapidoid/ctx/UserRoles.java → ...src/main/java/org/rapidoid/ctx/Roles.java
View file
Expand Up @@ -31,7 +31,7 @@


@Authors("Nikolche Mihajlovski") @Authors("Nikolche Mihajlovski")
@Since("4.4.0") @Since("4.4.0")
public class UserRoles { public class Roles {


public static final String ANYBODY = "ANYBODY"; public static final String ANYBODY = "ANYBODY";


Expand All @@ -56,8 +56,9 @@ public class UserRoles {
public static final List<String> COMMON_ROLES = Collections.unmodifiableList(Arrays.asList(ADMIN, MANAGER, public static final List<String> COMMON_ROLES = Collections.unmodifiableList(Arrays.asList(ADMIN, MANAGER,
MODERATOR, LOGGED_IN, OWNER, RESTARTER)); MODERATOR, LOGGED_IN, OWNER, RESTARTER));


public static Set<String> getUserRoles(String username) { public static Set<String> getRolesFor(String username) {
Set<String> roles = new HashSet<String>(); Set<String> roles = new HashSet<String>();
// FIXME implement this
return roles; return roles;
} }


Expand Down
2 changes: 1 addition & 1 deletion rapidoid-ctx/src/main/java/org/rapidoid/ctx/UserInfo.java
View file
Expand Up @@ -64,7 +64,7 @@ public UserInfo(String username, String email, String name) {
} }


public UserInfo(String username, String email, String name, String oauthId, String oauthProvider) { public UserInfo(String username, String email, String name, String oauthId, String oauthProvider) {
this(username, email, name, oauthId, oauthProvider, UserRoles.getUserRoles(username)); this(username, email, name, oauthId, oauthProvider, Roles.getRolesFor(username));
} }


public UserInfo(String username, String email, String name, String oauthId, String oauthProvider, Set<String> roles) { public UserInfo(String username, String email, String name, String oauthId, String oauthProvider, Set<String> roles) {
Expand Down
18 changes: 9 additions & 9 deletions rapidoid-security/src/main/java/org/rapidoid/security/AppSecurity.java
View file
Expand Up @@ -32,7 +32,7 @@
import org.rapidoid.beany.Beany; import org.rapidoid.beany.Beany;
import org.rapidoid.beany.Metadata; import org.rapidoid.beany.Metadata;
import org.rapidoid.config.Conf; import org.rapidoid.config.Conf;
import org.rapidoid.ctx.UserRoles; import org.rapidoid.ctx.Roles;
import org.rapidoid.security.annotation.Admin; import org.rapidoid.security.annotation.Admin;
import org.rapidoid.security.annotation.LoggedIn; import org.rapidoid.security.annotation.LoggedIn;
import org.rapidoid.security.annotation.Manager; import org.rapidoid.security.annotation.Manager;
Expand All @@ -55,13 +55,13 @@ public String[] getRolesAllowed(Map<Class<?>, Annotation> annotations) {
Class<? extends Annotation> type = ann.annotationType(); Class<? extends Annotation> type = ann.annotationType();


if (type.equals(Admin.class)) { if (type.equals(Admin.class)) {
roles.add(UserRoles.ADMIN); roles.add(Roles.ADMIN);
} else if (type.equals(Manager.class)) { } else if (type.equals(Manager.class)) {
roles.add(UserRoles.MANAGER); roles.add(Roles.MANAGER);
} else if (type.equals(Moderator.class)) { } else if (type.equals(Moderator.class)) {
roles.add(UserRoles.MODERATOR); roles.add(Roles.MODERATOR);
} else if (type.equals(LoggedIn.class)) { } else if (type.equals(LoggedIn.class)) {
roles.add(UserRoles.LOGGED_IN); roles.add(Roles.LOGGED_IN);
} else if (type.equals(HasRole.class)) { } else if (type.equals(HasRole.class)) {
Role[] values = ((HasRole) ann).value(); Role[] values = ((HasRole) ann).value();
U.must(values.length > 0, "At least one role must be specified in @Roles annotation!"); U.must(values.length > 0, "At least one role must be specified in @Roles annotation!");
Expand Down Expand Up @@ -90,7 +90,7 @@ public boolean canAccessClass(String username, Class<?> clazz) {


public boolean hasRole(String username, String role, Class<?> clazz, Object record) { public boolean hasRole(String username, String role, Class<?> clazz, Object record) {


if (UserRoles.ANYBODY.equalsIgnoreCase(role)) { if (Roles.ANYBODY.equalsIgnoreCase(role)) {
return true; return true;
} }


Expand All @@ -100,11 +100,11 @@ public boolean hasRole(String username, String role, Class<?> clazz, Object reco


if (record != null) { if (record != null) {


if (role.equalsIgnoreCase(UserRoles.OWNER)) { if (role.equalsIgnoreCase(Roles.OWNER)) {
return isOwnerOf(username, record); return isOwnerOf(username, record);
} }


if (role.equalsIgnoreCase(UserRoles.SHARED_WITH)) { if (role.equalsIgnoreCase(Roles.SHARED_WITH)) {
return isSharedWith(username, record); return isSharedWith(username, record);
} }
} }
Expand All @@ -121,7 +121,7 @@ protected boolean hasRole(String username, String role) {
return true; return true;
} }


if (role.equalsIgnoreCase(UserRoles.LOGGED_IN)) { if (role.equalsIgnoreCase(Roles.LOGGED_IN)) {
return !U.isEmpty(username); return !U.isEmpty(username);
} }


Expand Down
10 changes: 5 additions & 5 deletions rapidoid-security/src/test/java/org/rapidoid/security/DataPermissionsTest.java
View file
Expand Up @@ -20,11 +20,11 @@
* #L% * #L%
*/ */


import static org.rapidoid.ctx.UserRoles.ANYBODY; import static org.rapidoid.ctx.Roles.ANYBODY;
import static org.rapidoid.ctx.UserRoles.MANAGER; import static org.rapidoid.ctx.Roles.MANAGER;
import static org.rapidoid.ctx.UserRoles.MODERATOR; import static org.rapidoid.ctx.Roles.MODERATOR;
import static org.rapidoid.ctx.UserRoles.OWNER; import static org.rapidoid.ctx.Roles.OWNER;
import static org.rapidoid.ctx.UserRoles.SHARED_WITH; import static org.rapidoid.ctx.Roles.SHARED_WITH;


import java.util.List; import java.util.List;


Expand Down
6 changes: 3 additions & 3 deletions rapidoid-security/src/test/java/org/rapidoid/security/RoleBasedSecurityTest.java
View file
Expand Up @@ -20,9 +20,9 @@
* #L% * #L%
*/ */


import static org.rapidoid.ctx.UserRoles.LOGGED_IN; import static org.rapidoid.ctx.Roles.LOGGED_IN;
import static org.rapidoid.ctx.UserRoles.OWNER; import static org.rapidoid.ctx.Roles.OWNER;
import static org.rapidoid.ctx.UserRoles.SHARED_WITH; import static org.rapidoid.ctx.Roles.SHARED_WITH;


import java.util.List; import java.util.List;


Expand Down
6 changes: 3 additions & 3 deletions rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbClassSecurityTest.java
View file
Expand Up @@ -26,7 +26,7 @@
import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Since;
import org.rapidoid.ctx.Ctxs; import org.rapidoid.ctx.Ctxs;
import org.rapidoid.ctx.UserInfo; import org.rapidoid.ctx.UserInfo;
import org.rapidoid.ctx.UserRoles; import org.rapidoid.ctx.Roles;
import org.rapidoid.security.annotation.CanChange; import org.rapidoid.security.annotation.CanChange;
import org.rapidoid.security.annotation.CanInsert; import org.rapidoid.security.annotation.CanInsert;
import org.rapidoid.security.annotation.CanRead; import org.rapidoid.security.annotation.CanRead;
Expand All @@ -46,11 +46,11 @@ class Foo extends XEntity {
@SuppressWarnings("serial") @SuppressWarnings("serial")
class Bar extends XEntity { class Bar extends XEntity {


@CanRead(UserRoles.MODERATOR) @CanRead(Roles.MODERATOR)
@CanChange({}) @CanChange({})
public String name = "no name"; public String name = "no name";


@CanChange(UserRoles.MANAGER) @CanChange(Roles.MANAGER)
public String desc = "desc"; public String desc = "desc";
} }


Expand Down
6 changes: 3 additions & 3 deletions rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbInterfaceSecurityTest.java
View file
Expand Up @@ -26,7 +26,7 @@
import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Since;
import org.rapidoid.ctx.Ctxs; import org.rapidoid.ctx.Ctxs;
import org.rapidoid.ctx.UserInfo; import org.rapidoid.ctx.UserInfo;
import org.rapidoid.ctx.UserRoles; import org.rapidoid.ctx.Roles;
import org.rapidoid.entity.IEntity; import org.rapidoid.entity.IEntity;
import org.rapidoid.security.annotation.CanChange; import org.rapidoid.security.annotation.CanChange;
import org.rapidoid.security.annotation.CanInsert; import org.rapidoid.security.annotation.CanInsert;
Expand All @@ -45,11 +45,11 @@ interface IFoo extends IEntity {
@CanChange("MANAGER") @CanChange("MANAGER")
interface IBar extends IEntity { interface IBar extends IEntity {


@CanRead(UserRoles.MODERATOR) @CanRead(Roles.MODERATOR)
@CanChange({}) @CanChange({})
DbColumn<String> name(); DbColumn<String> name();


@CanChange(UserRoles.MANAGER) @CanChange(Roles.MANAGER)
DbColumn<String> desc(); DbColumn<String> desc();
} }


Expand Down
13 changes: 4 additions & 9 deletions rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/NewTaskScreen.java
View file
Expand Up @@ -28,7 +28,6 @@
import org.rapidoid.annotation.Session; import org.rapidoid.annotation.Session;
import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Since;
import org.rapidoid.app.GUI; import org.rapidoid.app.GUI;
import org.rapidoid.app.UsersTool;
import org.rapidoid.html.FieldType; import org.rapidoid.html.FieldType;
import org.rapidoid.html.Tag; import org.rapidoid.html.Tag;
import org.rapidoid.util.U; import org.rapidoid.util.U;
Expand All @@ -37,7 +36,6 @@
import org.rapidoid.widget.GridWidget; import org.rapidoid.widget.GridWidget;
import org.rapidoidx.db.XDB; import org.rapidoidx.db.XDB;
import org.rapidoidx.demo.taskplanner.model.Task; import org.rapidoidx.demo.taskplanner.model.Task;
import org.rapidoidx.demo.taskplanner.model.User;


@Order(1) @Order(1)
@Authors("Nikolche Mihajlovski") @Authors("Nikolche Mihajlovski")
Expand Down Expand Up @@ -74,13 +72,10 @@ public Object content() {
} }


public void onAdd() { public void onAdd() {
User user = UsersTool.current(User.class); task.owner.set(null);
if (user != null) { task.description = v.get();
task.owner.set(user); XDB.insert(task);
task.description = v.get(); task = new Task();
XDB.insert(task);
task = new Task();
}
} }


public void onCancel() { public void onCancel() {
Expand Down
20 changes: 10 additions & 10 deletions rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/model/Task.java
View file
Expand Up @@ -7,9 +7,9 @@
import org.rapidoid.annotation.Scaffold; import org.rapidoid.annotation.Scaffold;
import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Since;
import org.rapidoid.annotation.ToString; import org.rapidoid.annotation.ToString;
import org.rapidoid.ctx.Roles;
import org.rapidoid.security.annotation.CanChange; import org.rapidoid.security.annotation.CanChange;
import org.rapidoid.security.annotation.CanRead; import org.rapidoid.security.annotation.CanRead;
import org.rapidoid.util.CommonRoles;
import org.rapidoidx.db.DbList; import org.rapidoidx.db.DbList;
import org.rapidoidx.db.DbRef; import org.rapidoidx.db.DbRef;
import org.rapidoidx.db.DbSet; import org.rapidoidx.db.DbSet;
Expand Down Expand Up @@ -39,37 +39,37 @@


@Scaffold @Scaffold
@SuppressWarnings("serial") @SuppressWarnings("serial")
// @CanRead(CommonRoles.LOGGED_IN) // @CanRead(UserRoles.LOGGED_IN)
// @CanChange({ CommonRoles.OWNER }) // @CanChange({ UserRoles.OWNER })
// @CanInsert(CommonRoles.LOGGED_IN) // @CanInsert(UserRoles.LOGGED_IN)
// @CanDelete({ CommonRoles.OWNER, CommonRoles.ADMIN }) // @CanDelete({ UserRoles.OWNER, UserRoles.ADMIN })
@DbEntity @DbEntity
@Authors("Nikolche Mihajlovski") @Authors("Nikolche Mihajlovski")
@Since("3.0.0") @Since("3.0.0")
public class Task extends XEntity { public class Task extends XEntity {


@ToString @ToString
@CanChange({ MODERATOR, OWNER }) @CanChange({ Roles.MODERATOR, Roles.OWNER })
public String title; public String title;


@ToString @ToString
@CanChange({ MODERATOR, OWNER, SHARED_WITH }) @CanChange({ Roles.MODERATOR, Roles.OWNER, Roles.SHARED_WITH })
public Priority priority = Priority.MEDIUM; public Priority priority = Priority.MEDIUM;


@Optional @Optional
@CanChange({ MODERATOR, OWNER, SHARED_WITH }) @CanChange({ Roles.MODERATOR, Roles.OWNER, Roles.SHARED_WITH })
public String description; public String description;


public int rating; public int rating;


@Programmatic @Programmatic
public final DbRef<User> owner = XDB.ref(this, "^owns"); public final DbRef<User> owner = XDB.ref(this, "^owns");


@CanRead({ CommonRoles.OWNER }) @CanRead({ Roles.OWNER })
public final DbSet<User> sharedWith = XDB.set(this, "sharedWith"); public final DbSet<User> sharedWith = XDB.set(this, "sharedWith");


@Programmatic @Programmatic
@CanRead({ CommonRoles.OWNER, CommonRoles.SHARED_WITH }) @CanRead({ Roles.OWNER, Roles.SHARED_WITH })
public final DbList<Comment> comments = XDB.list(this, "has"); public final DbList<Comment> comments = XDB.list(this, "has");


@Programmatic @Programmatic
Expand Down

0 comments on commit 7b4cd1f

Please sign in to comment.