Skip to content

Commit

Permalink
Merge pull request #286 from lenneTech/develop
Browse files Browse the repository at this point in the history
Release 9.2.1
  • Loading branch information
kaihaase authored Feb 14, 2023
2 parents 3a190a2 + b006a9a commit ecaba88
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 26 deletions.
60 changes: 40 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lenne.tech/nest-server",
"version": "9.2.0",
"version": "9.2.1",
"description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
"keywords": [
"node",
Expand Down
5 changes: 3 additions & 2 deletions src/core/common/interceptors/check-security.interceptor.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Injectable, NestInterceptor, ExecutionContext, CallHandler } from '@nestjs/common';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { AuthResolver } from '../../../server/modules/auth/auth.resolver';
import { getContextData } from '../helpers/context.helper';
import { processDeep } from '../helpers/input.helper';

Expand All @@ -17,7 +16,9 @@ export class CheckSecurityInterceptor implements NestInterceptor {
// Set force mode for sign in and sign up
let force = false;
if (!user) {
if (context.getClass() === AuthResolver) {
// Here the name is used and not the class itself, because the concrete class is located in the respective project.
// In case of an override it is better to use the concrete class directly (context.getClass() instead of context.getClasss()?.name).
if (context.getClass()?.name === 'AuthResolver') {
force = true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/modules/file/core-file.controller.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BadRequestException, Controller, Get, NotFoundException, Param, Res } from '@nestjs/common';
import { User } from '../../../server/modules/user/user.model';
import { RESTUser } from '../../common/decorators/rest-user.decorator';
import { CoreUserModel } from '../user/core-user.model';
import { CoreFileService } from './core-file.service';

/**
Expand All @@ -17,7 +17,7 @@ export abstract class CoreFileController {
* Download file
*/
@Get(':filename')
async getFile(@Param('filename') filename: string, @Res() res, @RESTUser() user: User) {
async getFile(@Param('filename') filename: string, @Res() res, @RESTUser() user: CoreUserModel) {
if (!filename) {
throw new BadRequestException('Missing filename for download');
}
Expand Down
1 change: 0 additions & 1 deletion src/core/modules/user/core-user.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Field, ObjectType } from '@nestjs/graphql';
import { Prop, raw, Schema as MongooseSchema } from '@nestjs/mongoose';
import { IsEmail, IsOptional } from 'class-validator';
import { Document } from 'mongoose';
import { User } from '../../../server/modules/user/user.model';
import { CorePersistenceModel } from '../../common/models/core-persistence.model';

export type CoreUserModelDocument = CoreUserModel & Document;
Expand Down

0 comments on commit ecaba88

Please sign in to comment.