Gallardo7761/miarma-backend-vertx
Archived
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases 2 Activity

hotfix: merge <<< HEAD ---- >>> SHA1 messages stood on the code somehow

Browse Source
This commit is contained in:
Jose
2025-11-14 19:55:18 +01:00
parent 3a194f2616
commit 18c2f0f00b
5 changed files with 23 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
microservices/core/src/main/java/net/miarma/api/microservices/core/routing/middlewares/CoreAuthGuard.java
View File

@@ -29,10 +29,8 @@ public class CoreAuthGuard extends AbstractAuthGuard<UserEntity, CoreUserRole> {
}
@Override
protected boolean hasPermission(UserEntity member, CoreUserRole userRole, CoreUserRole... allowedRoles) {
if (member == null) return false;
if (member.getGlobal_role() == CoreUserRole.ADMIN) return true;
return false;
protected boolean hasPermission(UserEntity user, CoreUserRole userRole) {
return user.getGlobal_role() == CoreUserRole.ADMIN;
}
}

12
microservices/huertos/src/main/java/net/miarma/api/microservices/huertos/routing/middlewares/HuertosAuthGuard.java
View File

@@ -34,14 +34,8 @@ public class HuertosAuthGuard extends AbstractAuthGuard<MemberEntity, HuertosUse
}
@Override
protected boolean hasPermission(MemberEntity member, HuertosUserRole userRole, HuertosUserRole... allowedRoles) {
if (member == null) return false;
if (member.getRole() == HuertosUserRole.ADMIN || member.getRole() == HuertosUserRole.DEV) return true;
for (HuertosUserRole role : allowedRoles) {
if (member.getRole() == role) return true;
}
return false;
<<<<<<< HEAD
protected boolean hasPermission(MemberEntity member, HuertosUserRole userRole) {
return member.getRole() == HuertosUserRole.ADMIN;
}
@Override
@@ -77,8 +71,6 @@ public class HuertosAuthGuard extends AbstractAuthGuard<MemberEntity, HuertosUse
}
});
};
=======
>>>>>>> refs/remotes/origin/dev
}
}

9
microservices/huertosdecine/src/main/java/net/miarma/api/microservices/huertosdecine/routing/middlewares/CineAuthGuard.java
View File

@@ -29,13 +29,8 @@ public class CineAuthGuard extends AbstractAuthGuard<ViewerEntity, CineUserRole>
}
@Override
protected boolean hasPermission(ViewerEntity member, CineUserRole userRole, CineUserRole... allowedRoles) {
if (member == null) return false;
if (member.getRole() == CineUserRole.ADMIN) return true;
for (CineUserRole role : allowedRoles) {
if (member.getRole() == role) return true;
}
return false;
protected boolean hasPermission(ViewerEntity user, CineUserRole userRole) {
return user.getRole() == CineUserRole.ADMIN;
}
}

9
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/routing/middlewares/MMCAuthGuard.java
View File

@@ -29,13 +29,8 @@ public class MMCAuthGuard extends AbstractAuthGuard<PlayerEntity, MMCUserRole> {
}
@Override
protected boolean hasPermission(PlayerEntity member, MMCUserRole userRole, MMCUserRole... allowedRoles) {
if (member == null) return false;
if (member.getRole() == MMCUserRole.ADMIN) return true;
for (MMCUserRole role : allowedRoles) {
if (member.getRole() == role) return true;
}
return false;
protected boolean hasPermission(PlayerEntity user, MMCUserRole userRole) {
return user.getRole() == MMCUserRole.ADMIN;
}
}