Browse Source

Merge branch 'main' into feature/clean-up-user-database-schema

pull/1242/head
Thomas Kaul 3 years ago
committed by GitHub
parent
commit
309ed2fc47
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      CHANGELOG.md
  2. 7
      apps/api/src/app/user/user.controller.ts

4
CHANGELOG.md

@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Removed the `currency` and `viewMode` from the `User` database schema
### Fixed
- Allowed the date range change for the demo user
## 1.190.0 - 10.09.2022
### Added

7
apps/api/src/app/user/user.controller.ts

@ -22,6 +22,7 @@ import { JwtService } from '@nestjs/jwt';
import { AuthGuard } from '@nestjs/passport';
import { User as UserModel } from '@prisma/client';
import { StatusCodes, getReasonPhrase } from 'http-status-codes';
import { size } from 'lodash';
import { UserItem } from './interfaces/user-item.interface';
import { UpdateUserSettingDto } from './update-user-setting.dto';
@ -100,6 +101,12 @@ export class UserController {
@UseGuards(AuthGuard('jwt'))
public async updateUserSetting(@Body() data: UpdateUserSettingDto) {
if (
size(data) === 1 &&
data.dateRange &&
this.request.user.role === 'DEMO'
) {
// Allow date range change for demo user
} else if (
!hasPermission(
this.request.user.permissions,
permissions.updateUserSettings

Loading…
Cancel
Save