diff --git a/src/attachments/attachments.service.spec.ts b/src/attachments/attachments.service.spec.ts index 817fabd63..7cb7ed094 100644 --- a/src/attachments/attachments.service.spec.ts +++ b/src/attachments/attachments.service.spec.ts @@ -24,6 +24,7 @@ const mockAttachment: Attachment = { describe("AttachmentsService", () => { let service: AttachmentsService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let attachmentModel: Model; beforeEach(async () => { diff --git a/src/auth/access-group-provider/access-group-from-multiple-providers.service.ts b/src/auth/access-group-provider/access-group-from-multiple-providers.service.ts index 64936eda5..1107f2b72 100644 --- a/src/auth/access-group-provider/access-group-from-multiple-providers.service.ts +++ b/src/auth/access-group-provider/access-group-from-multiple-providers.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Logger } from "@nestjs/common"; +import { Injectable } from "@nestjs/common"; import { UserPayload } from "../interfaces/userPayload.interface"; import { AccessGroupService } from "./access-group.service"; @@ -11,10 +11,7 @@ export class AccessGroupFromMultipleProvidersService extends AccessGroupService super(); } - async getAccessGroups( - //idpPayload: Record, - userPayload: UserPayload, - ): Promise { + async getAccessGroups(userPayload: UserPayload): Promise { const accessGroups: string[] = []; for (const accessGroupProvider of this.accessGroupProviders) { diff --git a/src/auth/access-group-provider/access-group-from-static-values.service.ts b/src/auth/access-group-provider/access-group-from-static-values.service.ts index 01b6a8091..e99c00bc4 100644 --- a/src/auth/access-group-provider/access-group-from-static-values.service.ts +++ b/src/auth/access-group-provider/access-group-from-static-values.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Logger } from "@nestjs/common"; +import { Injectable } from "@nestjs/common"; import { AccessGroupService } from "./access-group.service"; /** @@ -11,10 +11,6 @@ export class AccessGroupFromStaticValuesService extends AccessGroupService { } async getAccessGroups(): Promise { - // Logger.log( - // "Static access group getAccessGroups : " + - // this.staticAccessGroups.join(","), - // ); return this.staticAccessGroups; } } diff --git a/src/auth/auth.controller.spec.ts b/src/auth/auth.controller.spec.ts index 619bf72e8..894b3257d 100644 --- a/src/auth/auth.controller.spec.ts +++ b/src/auth/auth.controller.spec.ts @@ -4,15 +4,15 @@ import { AuthService } from "./auth.service"; import { ConfigService } from "@nestjs/config"; class AuthServiceMock { - login(req: Record) { + login() { return { username: "Test User", email: "testUser@gmail.com" }; } - adLogin(req: Record) { + adLogin() { return { username: "Test User", email: "testUser@gmail.com" }; } - whoami(req: Record) { + whoami() { return { username: "Test User", email: "testUser@gmail.com" }; } } diff --git a/src/auth/guards/jwt-auth.guard.ts b/src/auth/guards/jwt-auth.guard.ts index 3e5ec6b73..f6ea04813 100644 --- a/src/auth/guards/jwt-auth.guard.ts +++ b/src/auth/guards/jwt-auth.guard.ts @@ -1,8 +1,4 @@ -import { - ExecutionContext, - Injectable, - UnauthorizedException, -} from "@nestjs/common"; +import { ExecutionContext, Injectable } from "@nestjs/common"; import { Reflector } from "@nestjs/core"; import { AuthGuard } from "@nestjs/passport"; @@ -26,8 +22,6 @@ export class JwtAuthGuard extends AuthGuard("jwt") { err: unknown, // eslint-disable-next-line @typescript-eslint/no-explicit-any user: any, - info: unknown, - context: ExecutionContext, ) { // const allowAny = this.reflector.get( // "allow-any", diff --git a/src/auth/strategies/ldap.strategy.ts b/src/auth/strategies/ldap.strategy.ts index 16af253b8..f77721041 100644 --- a/src/auth/strategies/ldap.strategy.ts +++ b/src/auth/strategies/ldap.strategy.ts @@ -87,7 +87,7 @@ export class LdapStrategy extends PassportStrategy(Strategy, "ldap") { const foundUser = await this.usersService.findOne(userFilter); const jsonUser = JSON.parse(JSON.stringify(foundUser)); - const { password, ...user } = jsonUser; + const { ...user } = jsonUser; user.userId = user._id; // update user identity if needed diff --git a/src/auth/strategies/oidc.strategy.ts b/src/auth/strategies/oidc.strategy.ts index 92a25fb45..974e36b8a 100644 --- a/src/auth/strategies/oidc.strategy.ts +++ b/src/auth/strategies/oidc.strategy.ts @@ -142,7 +142,7 @@ export class OidcStrategy extends PassportStrategy(Strategy, "oidc") { } const jsonUser = JSON.parse(JSON.stringify(user)); - const { password, ...returnUser } = jsonUser; + const { ...returnUser } = jsonUser; returnUser.userId = returnUser._id; return returnUser; diff --git a/src/common/pipes/filter.pipe.ts b/src/common/pipes/filter.pipe.ts index 905c12d0c..55091ffba 100644 --- a/src/common/pipes/filter.pipe.ts +++ b/src/common/pipes/filter.pipe.ts @@ -1,4 +1,4 @@ -import { PipeTransform, Injectable, ArgumentMetadata } from "@nestjs/common"; +import { PipeTransform, Injectable } from "@nestjs/common"; @Injectable() export class FilterPipe @@ -8,10 +8,10 @@ export class FilterPipe { filter?: string; fields?: string } > { - transform( - inValue: { filter?: string; fields?: string }, - metadata: ArgumentMetadata, - ): { filter?: string; fields?: string } { + transform(inValue: { filter?: string; fields?: string }): { + filter?: string; + fields?: string; + } { /* * intercept filter and make sure to convert loopback operators to mongo operators */ diff --git a/src/config/configuration.ts b/src/config/configuration.ts index c3fe42a32..e73d42a72 100644 --- a/src/config/configuration.ts +++ b/src/config/configuration.ts @@ -1,4 +1,3 @@ -import { Logger } from "@nestjs/common"; import * as fs from "fs"; import { merge } from "lodash"; import localconfiguration from "./localconfiguration"; @@ -58,20 +57,6 @@ const configuration = () => { } }); - // Logger.log("Config SETUP"); - // Logger.log("- Access groups statisc values : " + accessGroupsStaticValues); - // Logger.log("- Admin groups : " + adminGroups); - // Logger.log("- Delete groups : " + deleteGroups ); - // Logger.log("- Create dataset groups : " + createDatasetGroups); - // Logger.log( - // "- Create dataset with pid groups : " + createDatasetWithPidGroups, - // ); - // Logger.log( - // "- Create dataset privileged groups : " + createDatasetPrivilegedGroups, - // ); - // Logger.log("- Create job groups : " + createJobGroups); - // Logger.log("- Update job groups : " + updateJobGroups); - const config = { loggerConfigs: jsonConfigMap.loggers || [defaultLogger], adminGroups: adminGroups.split(",").map((v) => v.trim()) ?? [], diff --git a/src/datablocks/datablocks.service.spec.ts b/src/datablocks/datablocks.service.spec.ts index 94a4c4031..c8881f80f 100644 --- a/src/datablocks/datablocks.service.spec.ts +++ b/src/datablocks/datablocks.service.spec.ts @@ -35,6 +35,7 @@ const mockDatablock: Datablock = { describe("DatablocksService", () => { let service: DatablocksService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let model: Model; beforeEach(async () => { diff --git a/src/datasets/datasets.controller.ts b/src/datasets/datasets.controller.ts index eba085099..6655d3b5f 100644 --- a/src/datasets/datasets.controller.ts +++ b/src/datasets/datasets.controller.ts @@ -21,7 +21,6 @@ import { InternalServerErrorException, ConflictException, BadRequestException, - Header, } from "@nestjs/common"; import { MongoError } from "mongodb"; import { @@ -97,7 +96,6 @@ import { TechniqueClass } from "./schemas/technique.schema"; import { RelationshipClass } from "./schemas/relationship.schema"; import { JWTUser } from "src/auth/interfaces/jwt-user.interface"; import { LogbooksService } from "src/logbooks/logbooks.service"; -import { Logbook } from "src/logbooks/schemas/logbook.schema"; import configuration from "src/config/configuration"; import { DatasetType } from "./dataset-type.enum"; @@ -548,10 +546,7 @@ export class DatasetsController { @Req() request: Request, @Body() createDatasetDto: CreateRawDatasetDto | CreateDerivedDatasetDto, ): Promise<{ valid: boolean }> { - const datasetDTO = await this.checkPermissionsForDatasetCreate( - request, - createDatasetDto, - ); + await this.checkPermissionsForDatasetCreate(request, createDatasetDto); const dtoTestRawCorrect = plainToInstance( CreateRawDatasetDto, @@ -923,8 +918,6 @@ export class DatasetsController { @Headers() headers: Record, @Query(new FilterPipe()) queryFilter: { filter?: string }, ): Promise { - const user: JWTUser = request.user as JWTUser; - const mergedFilters = replaceLikeOperator( this.updateMergedFiltersForList( request, @@ -1343,7 +1336,7 @@ export class DatasetsController { @Req() request: Request, @Param("pid") pid: string, ): Promise> { - const dataset = await this.checkPermissionsForDatasetExtended( + await this.checkPermissionsForDatasetExtended( request, pid, Action.DatasetRead, @@ -1439,7 +1432,7 @@ export class DatasetsController { @Req() request: Request, @Param("pid") pid: string, ): Promise { - const dataset = await this.checkPermissionsForDatasetExtended( + await this.checkPermissionsForDatasetExtended( request, pid, Action.DatasetAttachmentRead, @@ -1483,7 +1476,7 @@ export class DatasetsController { @Param("aid") aid: string, @Body() updateAttachmentDto: UpdateAttachmentDto, ): Promise { - const dataset = await this.checkPermissionsForDatasetExtended( + await this.checkPermissionsForDatasetExtended( request, pid, Action.DatasetAttachmentUpdate, @@ -1527,7 +1520,7 @@ export class DatasetsController { @Param("pid") pid: string, @Param("aid") aid: string, ): Promise { - const dataset = await this.checkPermissionsForDatasetExtended( + await this.checkPermissionsForDatasetExtended( request, pid, Action.DatasetAttachmentDelete, @@ -1637,7 +1630,7 @@ export class DatasetsController { @Param("pid") pid: string, @Body() createOrigDatablock: unknown, ): Promise<{ valid: boolean; errors: ValidationError[] }> { - const dataset = await this.checkPermissionsForDatasetExtended( + await this.checkPermissionsForDatasetExtended( request, pid, Action.DatasetOrigdatablockCreate, @@ -1682,7 +1675,7 @@ export class DatasetsController { @Req() request: Request, @Param("pid") pid: string, ): Promise { - const dataset = await this.checkPermissionsForDatasetExtended( + await this.checkPermissionsForDatasetExtended( request, pid, Action.DatasetOrigdatablockRead, @@ -1913,7 +1906,7 @@ export class DatasetsController { @Req() request: Request, @Param("pid") pid: string, ): Promise { - const dataset = await this.checkPermissionsForDatasetExtended( + await this.checkPermissionsForDatasetExtended( request, pid, Action.DatasetDatablockRead, diff --git a/src/datasets/datasets.service.spec.ts b/src/datasets/datasets.service.spec.ts index 9b62fcdc2..9cea8700e 100644 --- a/src/datasets/datasets.service.spec.ts +++ b/src/datasets/datasets.service.spec.ts @@ -87,6 +87,7 @@ const mockDataset: DatasetClass = { describe("DatasetsService", () => { let service: DatasetsService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let model: Model; beforeEach(async () => { diff --git a/src/elastic-search/elastic-search.service.ts b/src/elastic-search/elastic-search.service.ts index 992004c9c..59d9b4244 100644 --- a/src/elastic-search/elastic-search.service.ts +++ b/src/elastic-search/elastic-search.service.ts @@ -9,7 +9,6 @@ import { import { Client } from "@elastic/elasticsearch"; import { SearchQueryService } from "./providers/query-builder.service"; import { - SearchTotalHits, SearchRequest, AggregationsAggregate, SortOrder, diff --git a/src/initial-datasets/initial-datasets.service.spec.ts b/src/initial-datasets/initial-datasets.service.spec.ts index e016e50dc..9067f4239 100644 --- a/src/initial-datasets/initial-datasets.service.spec.ts +++ b/src/initial-datasets/initial-datasets.service.spec.ts @@ -10,6 +10,7 @@ const mockInitialDataset: InitialDataset = { describe("InitialDatasetsService", () => { let service: InitialDatasetsService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let initialDatasetModel: Model; beforeEach(async () => { diff --git a/src/instruments/instruments.service.spec.ts b/src/instruments/instruments.service.spec.ts index 68793cefe..d25cac17a 100644 --- a/src/instruments/instruments.service.spec.ts +++ b/src/instruments/instruments.service.spec.ts @@ -14,6 +14,7 @@ const mockInstrument: Instrument = { describe("InstrumentsService", () => { let service: InstrumentsService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let model: Model; beforeEach(async () => { diff --git a/src/jobs/jobs.service.spec.ts b/src/jobs/jobs.service.spec.ts index 63be7f982..e9bc33034 100644 --- a/src/jobs/jobs.service.spec.ts +++ b/src/jobs/jobs.service.spec.ts @@ -30,6 +30,7 @@ class PoliciesServiceMock {} describe("JobsService", () => { let service: JobsService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let model: Model; beforeEach(async () => { diff --git a/src/origdatablocks/origdatablocks.service.spec.ts b/src/origdatablocks/origdatablocks.service.spec.ts index 31268303a..7d5ca7999 100644 --- a/src/origdatablocks/origdatablocks.service.spec.ts +++ b/src/origdatablocks/origdatablocks.service.spec.ts @@ -32,6 +32,7 @@ const mockOrigDatablock: OrigDatablock = { describe("OrigdatablocksService", () => { let service: OrigDatablocksService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let model: Model; beforeEach(async () => { diff --git a/src/policies/policies.service.spec.ts b/src/policies/policies.service.spec.ts index 075c0aadc..9ca0c1877 100644 --- a/src/policies/policies.service.spec.ts +++ b/src/policies/policies.service.spec.ts @@ -33,6 +33,7 @@ const mockPolicy: Policy = { describe("PoliciesService", () => { let service: PoliciesService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let policyModel: Model; beforeEach(async () => { diff --git a/src/proposals/proposals.service.spec.ts b/src/proposals/proposals.service.spec.ts index f53af3ad9..736369e04 100644 --- a/src/proposals/proposals.service.spec.ts +++ b/src/proposals/proposals.service.spec.ts @@ -30,6 +30,7 @@ const mockProposal: ProposalClass = { describe("ProposalsService", () => { let service: ProposalsService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let model: Model; beforeEach(async () => { diff --git a/src/proposals/schemas/proposal.schema.ts b/src/proposals/schemas/proposal.schema.ts index b4d3a4ce6..8ebbe4baa 100644 --- a/src/proposals/schemas/proposal.schema.ts +++ b/src/proposals/schemas/proposal.schema.ts @@ -1,10 +1,7 @@ import { Prop, Schema, SchemaFactory } from "@nestjs/mongoose"; -import { ApiProperty, getSchemaPath } from "@nestjs/swagger"; +import { ApiProperty } from "@nestjs/swagger"; import { Document } from "mongoose"; -import { - Attachment, - AttachmentSchema, -} from "src/attachments/schemas/attachment.schema"; + import { OwnableClass } from "src/common/schemas/ownable.schema"; import { MeasurementPeriodClass, diff --git a/src/published-data/published-data.controller.ts b/src/published-data/published-data.controller.ts index ec8f03dd5..364c03c29 100644 --- a/src/published-data/published-data.controller.ts +++ b/src/published-data/published-data.controller.ts @@ -439,8 +439,7 @@ export class PublishedDataController { @Param("id") id: string, @Body() data: UpdatePublishedDataDto, ): Promise { - // eslint-disable-next-line @typescript-eslint/naming-convention - const { doi, ...publishedData } = data; + const { ...publishedData } = data; const OAIServerUri = this.configService.get("oaiProviderRoute"); diff --git a/src/published-data/published-data.service.spec.ts b/src/published-data/published-data.service.spec.ts index 1774daff4..12a9937ec 100644 --- a/src/published-data/published-data.service.spec.ts +++ b/src/published-data/published-data.service.spec.ts @@ -32,6 +32,7 @@ const mockPublishedData: PublishedData = { describe("PublishedDataService", () => { let service: PublishedDataService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let model: Model; beforeEach(async () => { diff --git a/src/published-data/published-data.service.ts b/src/published-data/published-data.service.ts index 77fc76f56..97cbed44b 100644 --- a/src/published-data/published-data.service.ts +++ b/src/published-data/published-data.service.ts @@ -2,7 +2,7 @@ import { Inject, Injectable, Scope } from "@nestjs/common"; import { REQUEST } from "@nestjs/core"; import { Request } from "express"; import { InjectModel } from "@nestjs/mongoose"; -import { FilterQuery, Model, QueryOptions } from "mongoose"; +import { FilterQuery, Model } from "mongoose"; import { parseLimitFilters, addCreatedByFields, diff --git a/src/samples/samples.controller.ts b/src/samples/samples.controller.ts index 7aaf51e1b..4f49a3dac 100644 --- a/src/samples/samples.controller.ts +++ b/src/samples/samples.controller.ts @@ -63,7 +63,6 @@ import { Request } from "express"; import { JWTUser } from "src/auth/interfaces/jwt-user.interface"; import { IDatasetFields } from "src/datasets/interfaces/dataset-filters.interface"; import { CreateSubAttachmentDto } from "src/attachments/dto/create-sub-attachment.dto"; -import { User } from "src/users/schemas/user.schema"; @ApiBearerAuth() @ApiTags("samples") diff --git a/src/samples/samples.service.spec.ts b/src/samples/samples.service.spec.ts index 60f29f6c4..9425bec06 100644 --- a/src/samples/samples.service.spec.ts +++ b/src/samples/samples.service.spec.ts @@ -43,6 +43,7 @@ const mockSample: SampleClass = { describe("SamplesService", () => { let service: SamplesService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let sampleModel: Model; beforeEach(async () => { diff --git a/src/samples/samples.service.ts b/src/samples/samples.service.ts index f57326c98..fd1189102 100644 --- a/src/samples/samples.service.ts +++ b/src/samples/samples.service.ts @@ -31,6 +31,7 @@ export class SamplesService { const createdSample = new this.sampleModel( addCreatedByFields(createSampleDto, username), ); + return createdSample.save(); } diff --git a/src/users/roles.service.spec.ts b/src/users/roles.service.spec.ts index 082fa028a..75d00063b 100644 --- a/src/users/roles.service.spec.ts +++ b/src/users/roles.service.spec.ts @@ -19,7 +19,9 @@ const mockUserRole: UserRole = { describe("RolesService", () => { let service: RolesService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let roleModel: Model; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let userRoleModel: Model; beforeEach(async () => { diff --git a/src/users/user-identities.service.spec.ts b/src/users/user-identities.service.spec.ts index 597638d8c..848d25ef1 100644 --- a/src/users/user-identities.service.spec.ts +++ b/src/users/user-identities.service.spec.ts @@ -25,6 +25,7 @@ const mockUserIdentity: UserIdentity = { describe("UserIdentitiesService", () => { let service: UserIdentitiesService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let userIdentityModel: Model; beforeEach(async () => { diff --git a/src/users/users.service.spec.ts b/src/users/users.service.spec.ts index 838063b9b..24a65a86d 100644 --- a/src/users/users.service.spec.ts +++ b/src/users/users.service.spec.ts @@ -62,8 +62,11 @@ const mockUserSettings: UserSettings = { describe("UsersService", () => { let service: UsersService; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let userModel: Model; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let userIdentityModel: Model; + // eslint-disable-next-line @typescript-eslint/no-unused-vars let userSettingsModel: Model; beforeEach(async () => { diff --git a/src/users/users.service.ts b/src/users/users.service.ts index c9c4ec08f..7369730d7 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -2,7 +2,7 @@ import { Injectable, Logger, OnModuleInit } from "@nestjs/common"; import { ConfigService } from "@nestjs/config"; import { InjectModel } from "@nestjs/mongoose"; import { genSalt, hash } from "bcrypt"; -import { FilterQuery, Model, ObjectId } from "mongoose"; +import { FilterQuery, Model } from "mongoose"; import { CreateUserIdentityDto } from "./dto/create-user-identity.dto"; import { CreateUserDto } from "./dto/create-user.dto"; import { RolesService } from "./roles.service"; @@ -160,7 +160,7 @@ export class UsersService implements OnModuleInit { ); if (createUserDto.authStrategy !== "local") { - const { password, ...sanitizedCreateUserDto } = createUserDto; + const { ...sanitizedCreateUserDto } = createUserDto; const createdUser = new this.userModel(sanitizedCreateUserDto); return createdUser.save(); } else if (createUserDto.password) {