Merge branch 'main' into BC-8106-teacher-discoverability

apps/server/src/apps/server.app.ts

@@ -4,8 +4,7 @@ import { Mail, MailService } from '@infra/mail';
 /* eslint-disable no-console */
 import { MikroORM } from '@mikro-orm/core';
 import { AccountService } from '@modules/account';
-import { SystemRule } from '@modules/authorization/domain/rules';
-
+import { SystemRule } from '@modules/authorization-rules';
 import { ColumnBoardService } from '@modules/board';
 import { ContextExternalToolService } from '@src/modules/tool/context-external-tool';
 import { CollaborativeStorageUc } from '@modules/collaborative-storage/uc/collaborative-storage.uc';

apps/server/src/modules/authorization/api/authorization-reference.uc.ts → apps/server/src/modules/authorization-reference/api/authorization-reference.uc.ts

@@ -1,8 +1,9 @@
 import { EntityId } from '@shared/domain/types';
 import { Injectable } from '@nestjs/common';
-import { AuthorizableReferenceType, AuthorizationContext, AuthorizationReferenceService } from '../domain';
+import { AuthorizationContext, AuthorizableReferenceType } from '@modules/authorization';
 import { AuthorizedReponse } from './dto';
 import { AuthorizationReponseMapper } from './mapper';
+import { AuthorizationReferenceService } from '../domain';
 
 @Injectable()
 export class AuthorizationReferenceUc {

apps/server/src/modules/authorization/api/dto/authorization-body.params.ts → apps/server/src/modules/authorization-reference/api/dto/authorization-body.params.ts

@@ -1,8 +1,8 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Permission } from '@shared/domain/interface';
+import { Action, AuthorizableReferenceType, AuthorizationContext } from '@modules/authorization';
 import { Type } from 'class-transformer';
 import { IsArray, IsEnum, IsMongoId, ValidateNested } from 'class-validator';
-import { Action, AuthorizableReferenceType, AuthorizationContext } from '../../domain';
 
 class AuthorizationContextParams implements AuthorizationContext {
 	@IsEnum(Action)

apps/server/src/modules/authorization/api/test/authorization.api.spec.ts → apps/server/src/modules/authorization-reference/api/test/authorization.api.spec.ts

@@ -4,7 +4,12 @@ import { HttpStatus, INestApplication } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { TestApiClient, UserAndAccountTestFactory } from '@shared/testing';
 import { Permission } from '@shared/domain/interface';
-import { Action, AuthorizableReferenceType, AuthorizationContext, AuthorizationContextBuilder } from '../../domain';
+import {
+	Action,
+	AuthorizationContext,
+	AuthorizationContextBuilder,
+	AuthorizableReferenceType,
+} from '@modules/authorization';
 import { AuthorizationReponseMapper } from '../mapper';
 import { AuthorizationBodyParams } from '../dto';
 

apps/server/src/modules/authorization-reference/authorization-reference.config.ts

@@ -0,0 +1,3 @@
+import { LoggerConfig } from '@src/core/logger';
+
+export interface AuthorizationReferenceConfig extends LoggerConfig {}

apps/server/src/modules/authorization/authorization-reference.module.ts → apps/server/src/modules/authorization-reference/authorization-reference.module.ts

@@ -1,39 +1,25 @@
 import { InstanceModule } from '@modules/instance';
-import { LessonModule } from '@modules/lesson';
-import { ToolModule } from '@modules/tool';
-import { forwardRef, Module } from '@nestjs/common';
-import {
-	CourseGroupRepo,
-	CourseRepo,
-	LegacySchoolRepo,
-	SchoolExternalToolRepo,
-	SubmissionRepo,
-	TaskRepo,
-	UserRepo,
-} from '@shared/repo';
+import { Module } from '@nestjs/common';
+import { CourseGroupRepo, CourseRepo, LegacySchoolRepo, SubmissionRepo, TaskRepo, UserRepo } from '@shared/repo';
 import { LoggerModule } from '@src/core/logger';
-import { AuthorizationModule } from './authorization.module';
-import { AuthorizationHelper, AuthorizationReferenceService, ReferenceLoader } from './domain';
-import { TeamsModule } from '../teams';
+import { AuthorizationModule } from '@modules/authorization';
+import { AuthorizationReferenceService, ReferenceLoader } from './domain';
 
 /**
  * This module is part of an intermediate state. In the future it should be replaced by an AuthorizationApiModule.
  * For now it is used where the authorization itself needs to load data from the database.
  * Avoid using this module and load the needed data in your use cases and then use the normal AuthorizationModule!
  */
 @Module({
-	// TODO: remove forwardRef
-	imports: [AuthorizationModule, LessonModule, TeamsModule, forwardRef(() => ToolModule), LoggerModule, InstanceModule],
+	imports: [AuthorizationModule, LoggerModule, InstanceModule],
 	providers: [
-		AuthorizationHelper,
 		ReferenceLoader,
 		UserRepo,
 		CourseRepo,
 		CourseGroupRepo,
 		TaskRepo,
 		LegacySchoolRepo,
 		SubmissionRepo,
-		SchoolExternalToolRepo,
 		AuthorizationReferenceService,
 	],
 	exports: [AuthorizationReferenceService],

apps/server/src/modules/authorization/domain/service/authorization-reference.service.spec.ts → apps/server/src/modules/authorization-reference/domain/authorization-reference.service.spec.ts

@@ -3,11 +3,13 @@ import { NotFoundException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { courseFactory, setupEntities, userFactory } from '@shared/testing';
 import { ObjectId } from '@mikro-orm/mongodb';
-import { AuthorizationService } from '@modules/authorization';
-import { AuthorizableReferenceType } from '../type';
+import {
+	AuthorizableReferenceType,
+	AuthorizationContextBuilder,
+	AuthorizationService,
+	ForbiddenLoggableException,
+} from '@modules/authorization';
 import { ReferenceLoader } from './reference.loader';
-import { AuthorizationContextBuilder } from '../mapper';
-import { ForbiddenLoggableException } from '../error';
 import { AuthorizationReferenceService } from './authorization-reference.service';
 
 describe('AuthorizationReferenceService', () => {

apps/server/src/modules/authorization/domain/service/authorization-reference.service.ts → apps/server/src/modules/authorization-reference/domain/authorization-reference.service.ts

@@ -1,8 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { EntityId } from '@shared/domain/types';
-import { ForbiddenLoggableException } from '../error';
-import { AuthorizableReferenceType, AuthorizationContext } from '../type';
-import { AuthorizationService } from './authorization.service';
+import {
+	AuthorizationContext,
+	AuthorizationService,
+	ForbiddenLoggableException,
+	AuthorizableReferenceType,
+} from '@modules/authorization';
 import { ReferenceLoader } from './reference.loader';
 
 /**

apps/server/src/modules/authorization-reference/domain/index.ts

@@ -0,0 +1,2 @@
+export * from './authorization-reference.service';
+export * from './reference.loader';

apps/server/src/modules/authorization/domain/service/reference.loader.spec.ts → apps/server/src/modules/authorization-reference/domain/reference.loader.spec.ts

@@ -1,25 +1,13 @@
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { ObjectId } from '@mikro-orm/mongodb';
+import { AuthorizableReferenceType, AuthorizationInjectionService } from '@modules/authorization';
 import { InstanceService } from '@modules/instance';
-import { LessonService } from '@modules/lesson';
-import { ContextExternalToolAuthorizableService, ExternalToolAuthorizableService } from '@modules/tool';
 import { NotImplementedException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { EntityId } from '@shared/domain/types';
-import {
-	CourseGroupRepo,
-	CourseRepo,
-	LegacySchoolRepo,
-	SchoolExternalToolRepo,
-	SubmissionRepo,
-	TaskRepo,
-	UserRepo,
-} from '@shared/repo';
+import { CourseGroupRepo, CourseRepo, LegacySchoolRepo, SubmissionRepo, TaskRepo, UserRepo } from '@shared/repo';
 import { setupEntities, userFactory } from '@shared/testing';
-import { TeamAuthorisableService } from '@src/modules/teams';
-import { AuthorizableReferenceType } from '../type';
 import { ReferenceLoader } from './reference.loader';
-import { AuthorizationInjectionService } from './authorization-injection.service';
 
 describe('reference.loader', () => {
 	let service: ReferenceLoader;
@@ -29,12 +17,7 @@ describe('reference.loader', () => {
 	let courseGroupRepo: DeepMocked<CourseGroupRepo>;
 	let taskRepo: DeepMocked<TaskRepo>;
 	let schoolRepo: DeepMocked<LegacySchoolRepo>;
-	let lessonService: DeepMocked<LessonService>;
-	let teamsAuthorisableService: DeepMocked<TeamAuthorisableService>;
 	let submissionRepo: DeepMocked<SubmissionRepo>;
-	let schoolExternalToolRepo: DeepMocked<SchoolExternalToolRepo>;
-	let contextExternalToolAuthorizableService: DeepMocked<ContextExternalToolAuthorizableService>;
-	let externalToolAuthorizableService: DeepMocked<ExternalToolAuthorizableService>;
 	let instanceService: DeepMocked<InstanceService>;
 	const entityId: EntityId = new ObjectId().toHexString();
 
@@ -68,30 +51,10 @@ describe('reference.loader', () => {
 					provide: LegacySchoolRepo,
 					useValue: createMock<LegacySchoolRepo>(),
 				},
-				{
-					provide: LessonService,
-					useValue: createMock<LessonService>(),
-				},
-				{
-					provide: TeamAuthorisableService,
-					useValue: createMock<TeamAuthorisableService>(),
-				},
 				{
 					provide: SubmissionRepo,
 					useValue: createMock<SubmissionRepo>(),
 				},
-				{
-					provide: SchoolExternalToolRepo,
-					useValue: createMock<SchoolExternalToolRepo>(),
-				},
-				{
-					provide: ContextExternalToolAuthorizableService,
-					useValue: createMock<ContextExternalToolAuthorizableService>(),
-				},
-				{
-					provide: ExternalToolAuthorizableService,
-					useValue: createMock<ExternalToolAuthorizableService>(),
-				},
 				{
 					provide: InstanceService,
 					useValue: createMock<InstanceService>(),
@@ -106,12 +69,7 @@ describe('reference.loader', () => {
 		courseGroupRepo = await module.get(CourseGroupRepo);
 		taskRepo = await module.get(TaskRepo);
 		schoolRepo = await module.get(LegacySchoolRepo);
-		lessonService = await module.get(LessonService);
-		teamsAuthorisableService = await module.get(TeamAuthorisableService);
 		submissionRepo = await module.get(SubmissionRepo);
-		schoolExternalToolRepo = await module.get(SchoolExternalToolRepo);
-		contextExternalToolAuthorizableService = await module.get(ContextExternalToolAuthorizableService);
-		externalToolAuthorizableService = await module.get(ExternalToolAuthorizableService);
 		instanceService = await module.get(InstanceService);
 	});
 
@@ -184,45 +142,13 @@ describe('reference.loader', () => {
 			expect(injectionService.injectReferenceLoader).toBeCalledWith(AuthorizableReferenceType.School, schoolRepo);
 		});
 
-		it('should inject lesson service', () => {
-			expect(injectionService.injectReferenceLoader).toBeCalledWith(AuthorizableReferenceType.Lesson, lessonService);
-		});
-
-		it('should inject teams repo', () => {
-			expect(injectionService.injectReferenceLoader).toBeCalledWith(
-				AuthorizableReferenceType.Team,
-				teamsAuthorisableService
-			);
-		});
-
 		it('should inject submission repo', () => {
 			expect(injectionService.injectReferenceLoader).toBeCalledWith(
 				AuthorizableReferenceType.Submission,
 				submissionRepo
 			);
 		});
 
-		it('should inject school external tool repo', () => {
-			expect(injectionService.injectReferenceLoader).toBeCalledWith(
-				AuthorizableReferenceType.SchoolExternalToolEntity,
-				schoolExternalToolRepo
-			);
-		});
-
-		it('should inject context external tool authorizable service', () => {
-			expect(injectionService.injectReferenceLoader).toBeCalledWith(
-				AuthorizableReferenceType.ContextExternalToolEntity,
-				contextExternalToolAuthorizableService
-			);
-		});
-
-		it('should inject external tool authorizable service', () => {
-			expect(injectionService.injectReferenceLoader).toBeCalledWith(
-				AuthorizableReferenceType.ExternalTool,
-				externalToolAuthorizableService
-			);
-		});
-
 		it('should inject instance service', () => {
 			expect(injectionService.injectReferenceLoader).toBeCalledWith(
 				AuthorizableReferenceType.Instance,

apps/server/src/modules/authorization/domain/service/reference.loader.ts → apps/server/src/modules/authorization-reference/domain/reference.loader.ts

@@ -1,26 +1,15 @@
 // TODO fix modules circular dependency
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { ContextExternalToolAuthorizableService } from '@modules/tool/context-external-tool/service';
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { TeamAuthorisableService } from '@src/modules/teams/service/team-authorisable.service';
-import { ExternalToolAuthorizableService } from '@modules/tool/external-tool/service';
-import { LessonService } from '@modules/lesson';
+import {
+	AuthorizableReferenceType,
+	AuthorizationInjectionService,
+	AuthorizationLoaderService,
+} from '@modules/authorization';
+import { InstanceService } from '@modules/instance';
 import { Injectable, NotImplementedException } from '@nestjs/common';
 import { AuthorizableObject } from '@shared/domain/domain-object';
 import { BaseDO } from '@shared/domain/domainobject';
 import { EntityId } from '@shared/domain/types';
-import {
-	CourseGroupRepo,
-	CourseRepo,
-	LegacySchoolRepo,
-	SchoolExternalToolRepo,
-	SubmissionRepo,
-	TaskRepo,
-	UserRepo,
-} from '@shared/repo';
-import { InstanceService } from '../../../instance';
-import { AuthorizableReferenceType, AuthorizationLoaderService } from '../type';
-import { AuthorizationInjectionService } from './authorization-injection.service';
+import { CourseGroupRepo, CourseRepo, LegacySchoolRepo, SubmissionRepo, TaskRepo, UserRepo } from '@shared/repo';
 
 @Injectable()
 export class ReferenceLoader {
@@ -30,12 +19,7 @@ export class ReferenceLoader {
 		private readonly courseGroupRepo: CourseGroupRepo,
 		private readonly taskRepo: TaskRepo,
 		private readonly schoolRepo: LegacySchoolRepo,
-		private readonly lessonService: LessonService,
-		private readonly teamAuthorisableService: TeamAuthorisableService,
 		private readonly submissionRepo: SubmissionRepo,
-		private readonly schoolExternalToolRepo: SchoolExternalToolRepo,
-		private readonly contextExternalToolAuthorizableService: ContextExternalToolAuthorizableService,
-		private readonly externalToolAuthorizableService: ExternalToolAuthorizableService,
 		private readonly instanceService: InstanceService,
 		private readonly authorizationInjectionService: AuthorizationInjectionService
 	) {
@@ -45,15 +29,7 @@ export class ReferenceLoader {
 		service.injectReferenceLoader(AuthorizableReferenceType.CourseGroup, this.courseGroupRepo);
 		service.injectReferenceLoader(AuthorizableReferenceType.User, this.userRepo);
 		service.injectReferenceLoader(AuthorizableReferenceType.School, this.schoolRepo);
-		service.injectReferenceLoader(AuthorizableReferenceType.Lesson, this.lessonService);
-		service.injectReferenceLoader(AuthorizableReferenceType.Team, this.teamAuthorisableService);
 		service.injectReferenceLoader(AuthorizableReferenceType.Submission, this.submissionRepo);
-		service.injectReferenceLoader(AuthorizableReferenceType.SchoolExternalToolEntity, this.schoolExternalToolRepo);
-		service.injectReferenceLoader(
-			AuthorizableReferenceType.ContextExternalToolEntity,
-			this.contextExternalToolAuthorizableService
-		);
-		service.injectReferenceLoader(AuthorizableReferenceType.ExternalTool, this.externalToolAuthorizableService);
 		service.injectReferenceLoader(AuthorizableReferenceType.Instance, this.instanceService);
 	}
 

apps/server/src/modules/authorization-reference/index.ts

@@ -0,0 +1,3 @@
+export { AuthorizationReferenceModule } from './authorization-reference.module';
+export { AuthorizationReferenceApiModule } from './authorization-reference.api.module';
+export { AuthorizationReferenceService } from './domain/authorization-reference.service';

apps/server/src/modules/authorization-rules/authorization-rules.config.ts

@@ -0,0 +1,2 @@
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface AuthorizationRulesConfig {}

apps/server/src/modules/authorization-rules/authorization-rules.module.ts

@@ -0,0 +1,43 @@
+import { Module } from '@nestjs/common';
+import { AuthorizationModule } from '@modules/authorization';
+import {
+	CourseGroupRule,
+	CourseRule,
+	GroupRule,
+	InstanceRule,
+	LegacySchoolRule,
+	LessonRule,
+	SchoolRule,
+	SchoolSystemOptionsRule,
+	SubmissionRule,
+	TaskRule,
+	TeamRule,
+	UserLoginMigrationRule,
+	UserRule,
+	SystemRule,
+} from './rules';
+
+@Module({
+	imports: [AuthorizationModule],
+	providers: [
+		// rules
+		CourseGroupRule,
+		CourseRule,
+		GroupRule,
+		LessonRule,
+		SchoolRule,
+		SubmissionRule,
+		TaskRule,
+		TeamRule,
+		UserRule,
+		UserLoginMigrationRule,
+		LegacySchoolRule,
+		SystemRule,
+		SchoolSystemOptionsRule,
+		InstanceRule,
+	],
+	exports: [
+		SystemRule, // Why export? This is a no go!
+	],
+})
+export class AuthorizationRulesModule {}

apps/server/src/modules/authorization-rules/index.ts

@@ -0,0 +1,2 @@
+export { AuthorizationRulesModule } from './authorization-rules.module';
+export { SystemRule } from './rules/system.rule';