Resolve conflicts and resolve condition bug in isNotSecretaryOrAdmin
This commit is contained in:
		| @ -47,7 +47,7 @@ public class AuthenticatorService { | ||||
|         User poster = getUserFromToken(authorization); | ||||
|         if (poster == null) return true; | ||||
|  | ||||
|         return poster.getRole() != Role.Secretary || poster.getRole() != Role.Admin; | ||||
|         return poster.getRole() != Role.Secretary && poster.getRole() != Role.Admin; | ||||
|     } | ||||
|  | ||||
|     public boolean IsNotIn(Role[] roles, String token){ | ||||
|  | ||||
		Reference in New Issue
	
	Block a user