Bugfix/fix public page (#2065)
* Check for user in request because of public page * Update changelog
This commit is contained in:
parent
2d009aacc4
commit
b4a126280f
@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Fixed an issue with the value nullification related to the investment streaks
|
- Fixed an issue with the value nullification related to the investment streaks
|
||||||
|
- Fixed an issue in the public page related to the impersonation service
|
||||||
|
|
||||||
## 1.278.0 - 2023-06-09
|
## 1.278.0 - 2023-06-09
|
||||||
|
|
||||||
|
@ -12,22 +12,36 @@ export class ImpersonationService {
|
|||||||
) {}
|
) {}
|
||||||
|
|
||||||
public async validateImpersonationId(aId = '') {
|
public async validateImpersonationId(aId = '') {
|
||||||
const accessObject = await this.prismaService.access.findFirst({
|
if (this.request.user) {
|
||||||
where: {
|
const accessObject = await this.prismaService.access.findFirst({
|
||||||
GranteeUser: { id: this.request.user.id },
|
where: {
|
||||||
id: aId
|
GranteeUser: { id: this.request.user.id },
|
||||||
}
|
id: aId
|
||||||
});
|
}
|
||||||
|
});
|
||||||
|
|
||||||
if (accessObject?.userId) {
|
if (accessObject?.userId) {
|
||||||
return accessObject?.userId;
|
return accessObject.userId;
|
||||||
} else if (
|
} else if (
|
||||||
hasPermission(
|
hasPermission(
|
||||||
this.request.user.permissions,
|
this.request.user.permissions,
|
||||||
permissions.impersonateAllUsers
|
permissions.impersonateAllUsers
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
return aId;
|
return aId;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Public access
|
||||||
|
const accessObject = await this.prismaService.access.findFirst({
|
||||||
|
where: {
|
||||||
|
GranteeUser: null,
|
||||||
|
User: { id: aId }
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (accessObject?.userId) {
|
||||||
|
return accessObject.userId;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user