RaidBuilder/RaidBuilderAPI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Buttons hidden by permissions

Browse Source
This commit is contained in:
Mattrixwv
2025-03-15 16:51:10 -04:00
parent 8eb3c424c3
commit a86f0302de
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/mattrixwv/raidbuilder/aspect/RaidGroupAuthorizationAspect.java
View File

@@ -40,7 +40,7 @@ public class RaidGroupAuthorizationAspect{
private final RaidGroupPermissionService raidGroupPermissionService; private final RaidGroupPermissionService raidGroupPermissionService;
@Pointcut("@annotation(com.mattrixwv.raidbuilder.annotations.RaidGroupAuthorization)") @Pointcut("@annotation(com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization)")
public void raidGroupAuthorization(){ public void raidGroupAuthorization(){
//Intentionally blank //Intentionally blank
} }
@@ -90,6 +90,7 @@ public class RaidGroupAuthorizationAspect{
//Return if the account has a matching permission //Return if the account has a matching permission
List<RaidGroupPermission> raidGroupPermissions = raidGroupPermissionService.getByAccountId(account.getAccountId()); List<RaidGroupPermission> raidGroupPermissions = raidGroupPermissionService.getByAccountId(account.getAccountId());
log.debug("account permissions {}", raidGroupPermissions.stream().map(rgp -> rgp.getPermission()));
for(RaidGroupPermission permission : raidGroupPermissions){ for(RaidGroupPermission permission : raidGroupPermissions){
for(RaidGroupPermissionType permissionType : raidGroupAuthorization.permissions()){ for(RaidGroupPermissionType permissionType : raidGroupAuthorization.permissions()){
if((permission.getRaidGroupId().equals(raidGroupId)) && (permission.getPermission() == permissionType)){ if((permission.getRaidGroupId().equals(raidGroupId)) && (permission.getPermission() == permissionType)){

5
src/main/java/com/mattrixwv/raidbuilder/config/TokenService.java
View File

@@ -15,6 +15,7 @@ import org.springframework.security.oauth2.jwt.JwtEncoderParameters;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.mattrixwv.raidbuilder.entity.Account; import com.mattrixwv.raidbuilder.entity.Account;
import com.mattrixwv.raidbuilder.entity.AccountPermission;
import com.mattrixwv.raidbuilder.entity.GamePermission; import com.mattrixwv.raidbuilder.entity.GamePermission;
import com.mattrixwv.raidbuilder.entity.RaidGroupPermission; import com.mattrixwv.raidbuilder.entity.RaidGroupPermission;
import com.mattrixwv.raidbuilder.entity.RaidGroupRequest; import com.mattrixwv.raidbuilder.entity.RaidGroupRequest;
@@ -46,7 +47,8 @@ public class TokenService{
log.debug("Generating access token for account {}", account.getAccountId()); log.debug("Generating access token for account {}", account.getAccountId());
String scope = accountPermissionService.getByAccountId(account.getAccountId()).stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(" ")); List<AccountPermission> accountPermissions = accountPermissionService.getByAccountId(account.getAccountId());
String scope = accountPermissions.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(" "));
List<GamePermission> gamePermissions = gamePermissionService.getByAccountId(account.getAccountId()); List<GamePermission> gamePermissions = gamePermissionService.getByAccountId(account.getAccountId());
List<RaidGroupPermission> raidGroupPermissions = raidGroupPermissionService.getByAccountId(account.getAccountId()); List<RaidGroupPermission> raidGroupPermissions = raidGroupPermissionService.getByAccountId(account.getAccountId());
List<RaidGroupRequest> raidGroupRequests = raidGroupRequestService.getByAccountId(account.getAccountId()); List<RaidGroupRequest> raidGroupRequests = raidGroupRequestService.getByAccountId(account.getAccountId());
@@ -59,6 +61,7 @@ public class TokenService{
.subject(account.getUsername()) .subject(account.getUsername())
.claim("scope", scope) .claim("scope", scope)
.claim("accountId", account.getAccountId().toString()) .claim("accountId", account.getAccountId().toString())
.claim("accountPermissions", mapper.valueToTree(accountPermissions).toString())
.claim("raidGroupPermissions", mapper.valueToTree(raidGroupPermissions).toString()) .claim("raidGroupPermissions", mapper.valueToTree(raidGroupPermissions).toString())
.claim("gamePermissions", mapper.valueToTree(gamePermissions).toString()) .claim("gamePermissions", mapper.valueToTree(gamePermissions).toString())
.claim("raidGroupRequests", mapper.valueToTree(raidGroupRequests).toString()) .claim("raidGroupRequests", mapper.valueToTree(raidGroupRequests).toString())

26
src/main/java/com/mattrixwv/raidbuilder/service/AccountService.java
View File

@@ -55,19 +55,6 @@ public class AccountService implements UserDetailsService{
//Save account //Save account
account = accountRepository.save(account); account = accountRepository.save(account);
//Return the new account
return account;
}
public Account confirmAccount(Account account){
//Setup the confirmed values
account.setRefreshToken(null);
account.setRefreshTokenExpiration(null);
account.setAccountStatus(AccountStatus.ACTIVE);
//Save the account
account = accountRepository.save(account);
//Give account default permissions //Give account default permissions
AccountPermission accountPermission = new AccountPermission(); AccountPermission accountPermission = new AccountPermission();
accountPermission.setAccountId(account.getAccountId()); accountPermission.setAccountId(account.getAccountId());
@@ -84,6 +71,19 @@ public class AccountService implements UserDetailsService{
accountTutorialStatus.setInstanceTutorialStatus(TutorialStatus.NOT_COMPLETED); accountTutorialStatus.setInstanceTutorialStatus(TutorialStatus.NOT_COMPLETED);
accountTutorialStatus = accountTutorialStatusService.createAccountTutorialStatus(accountTutorialStatus); accountTutorialStatus = accountTutorialStatusService.createAccountTutorialStatus(accountTutorialStatus);
//Return the new account
return account;
}
public Account confirmAccount(Account account){
//Setup the confirmed values
account.setRefreshToken(null);
account.setRefreshTokenExpiration(null);
account.setAccountStatus(AccountStatus.ACTIVE);
//Save the account
account = accountRepository.save(account);
//Return the account //Return the account
return account; return account;
} }