diff --git a/Accounts/package-lock.json b/Accounts/package-lock.json index cf7e619677..257d87af50 100644 --- a/Accounts/package-lock.json +++ b/Accounts/package-lock.json @@ -3560,7 +3560,7 @@ }, "../common": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "axios": "^0.26.1", @@ -14141,7 +14141,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/json2csv": "^5.0.3", "jsonwebtoken": "^8.5.1", @@ -16397,7 +16397,7 @@ }, "../CommonUI": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/free-regular-svg-icons": "^6.1.0", diff --git a/AdminDashboard/package-lock.json b/AdminDashboard/package-lock.json index 2acd74d9f5..16eb93cba4 100644 --- a/AdminDashboard/package-lock.json +++ b/AdminDashboard/package-lock.json @@ -3375,7 +3375,7 @@ }, "../common": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "devDependencies": { "@types/node": "^17.0.22" } @@ -13192,7 +13192,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/json2csv": "^5.0.3", @@ -15362,7 +15362,7 @@ }, "../CommonUI": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/free-regular-svg-icons": "^6.1.0", diff --git a/ApiDocs/package-lock.json b/ApiDocs/package-lock.json index aa2bd22ab2..83f3d2802b 100644 --- a/ApiDocs/package-lock.json +++ b/ApiDocs/package-lock.json @@ -8,7 +8,7 @@ "name": "oneuptime-ApiDocs", "version": "3.0.0", "hasInstallScript": true, - "license": "ISC", + "license": "MIT", "dependencies": { "chai": "^4.3.6", "chai-http": "^4.3.0", @@ -39,7 +39,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -591,7 +591,7 @@ "../common": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -1256,7 +1256,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/json2csv": "^5.0.3", "Common": "file:../Common", diff --git a/ApiDocs/package.json b/ApiDocs/package.json index 107c292770..4d228cbdcb 100755 --- a/ApiDocs/package.json +++ b/ApiDocs/package.json @@ -8,7 +8,7 @@ "url": "git+https://github.com/OneUptime/ApiDocs.git" }, "author": "HackerBay, Inc.", - "license": "ISC", + "license": "MIT", "bugs": { "url": "https://github.com/oneuptime/ApiDocs/issues" }, diff --git a/ApplicationScanner/package-lock.json b/ApplicationScanner/package-lock.json index f09cfcd052..b02fec2b24 100644 --- a/ApplicationScanner/package-lock.json +++ b/ApplicationScanner/package-lock.json @@ -33,7 +33,7 @@ }, "../common": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "axios": "^0.26.1" }, @@ -43,7 +43,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/json2csv": "^5.0.3", diff --git a/Common/Models/AlertCharge.ts b/Common/Models/AlertCharge.ts index 42b26f171c..e446dec155 100644 --- a/Common/Models/AlertCharge.ts +++ b/Common/Models/AlertCharge.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Incident from './Incident'; import SubscriberAlert from './SubscriberAlert'; import Monitor from './Monitor'; @@ -10,6 +13,15 @@ import Project from './Project'; name: 'AlertCharge', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } + @Column() public project!: Project; diff --git a/Common/Models/Announcement.ts b/Common/Models/Announcement.ts index c14fba9a32..af94987ea2 100644 --- a/Common/Models/Announcement.ts +++ b/Common/Models/Announcement.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import StatusPage from './StatusPage'; @@ -8,6 +11,14 @@ import StatusPage from './StatusPage'; name: 'Announcement', }) export default class Announcement extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public statusPage!: StatusPage; diff --git a/Common/Models/AnnouncementLog.ts b/Common/Models/AnnouncementLog.ts index 70ed982192..ee31b65d73 100644 --- a/Common/Models/AnnouncementLog.ts +++ b/Common/Models/AnnouncementLog.ts @@ -1,5 +1,8 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Announcement from './Announcement'; import StatusPage from './StatusPage'; @@ -9,6 +12,14 @@ import Project from './Project'; name: 'AnnouncementLog', }) export default class AnnouncementLog extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public announcement!: Announcement; diff --git a/Common/Models/ApplicationLog.ts b/Common/Models/ApplicationLog.ts index 02ceecaf43..278e4cfdb3 100644 --- a/Common/Models/ApplicationLog.ts +++ b/Common/Models/ApplicationLog.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import ApplicationLogContainer from './ApplicationLogContainer'; import ApplicationLogType from '../Types/ApplicationLog/ApplicationLogType'; @@ -8,6 +11,14 @@ import Tags from '../Types/Tags'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public applicationLogContainer!: ApplicationLogContainer; diff --git a/Common/Models/ApplicationLogContainer.ts b/Common/Models/ApplicationLogContainer.ts index db2191da79..6891d82180 100644 --- a/Common/Models/ApplicationLogContainer.ts +++ b/Common/Models/ApplicationLogContainer.ts @@ -1,5 +1,8 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import ResourceLabel from './ResourceLabel'; @@ -9,6 +12,14 @@ import Component from './Component'; name: 'ApplicationLogContainer', }) export default class ApplicationLogContainer extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Index() @Column() public project!: Project; diff --git a/Common/Models/ApplicationSecurity.ts b/Common/Models/ApplicationSecurity.ts index 6399f9b687..c2c50e10c7 100644 --- a/Common/Models/ApplicationSecurity.ts +++ b/Common/Models/ApplicationSecurity.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Component from './Component'; import ResourceLabel from './ResourceLabel'; import GitCredential from './GitCredential'; @@ -7,6 +10,14 @@ import GitCredential from './GitCredential'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/ApplicationSecurityRunInstance.ts b/Common/Models/ApplicationSecurityRunInstance.ts index c28283a650..511b882f13 100644 --- a/Common/Models/ApplicationSecurityRunInstance.ts +++ b/Common/Models/ApplicationSecurityRunInstance.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Component from './Component'; import ApplicationSecurity from './ApplicationSecurity'; @@ -7,6 +10,14 @@ import ApplicationSecurity from './ApplicationSecurity'; name: 'ApplicationSecurityRunInstance', }) export default class ApplicationSecurityRunInstance extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public security!: ApplicationSecurity; diff --git a/Common/Models/ApplicationSecurityRunInstanceLog.ts b/Common/Models/ApplicationSecurityRunInstanceLog.ts index ac318b1adf..a130f72654 100644 --- a/Common/Models/ApplicationSecurityRunInstanceLog.ts +++ b/Common/Models/ApplicationSecurityRunInstanceLog.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import ApplicationSecurityRunInstance from './ApplicationSecurityRunInstance'; import SecuritySeverity from '../Types/SecuritySeverity'; @@ -7,6 +10,14 @@ import SecuritySeverity from '../Types/SecuritySeverity'; name: 'ApplicationSecurityRunInstanceLog', }) export default class ApplicationSecurityRunInstanceLog extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public applicationSeurityRunInstance!: ApplicationSecurityRunInstance; diff --git a/Common/Models/AutomatedScript.ts b/Common/Models/AutomatedScript.ts index 540e932c2c..bc7d9d8a57 100644 --- a/Common/Models/AutomatedScript.ts +++ b/Common/Models/AutomatedScript.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -12,6 +15,14 @@ export enum ScriptType { name: 'AutomatedScripts', }) export default class AutomatedScript extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/AutomatedScriptOnEvent.ts b/Common/Models/AutomatedScriptOnEvent.ts index 3e88d1d694..4af0fb2f93 100644 --- a/Common/Models/AutomatedScriptOnEvent.ts +++ b/Common/Models/AutomatedScriptOnEvent.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import OperationResult from '../Types/Operation/OperationResult'; import AutomatedScript from './AutomatedScript'; @@ -7,6 +10,14 @@ import AutomatedScript from './AutomatedScript'; name: 'AutomatedScriptOnEvent', }) export default class AutomatedScriptOnEvent extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public automatedScript!: AutomatedScript; @Column() diff --git a/Common/Models/AutomatedScriptRunInstance.ts b/Common/Models/AutomatedScriptRunInstance.ts index 53cc6a46ec..ed28c6c6c6 100644 --- a/Common/Models/AutomatedScriptRunInstance.ts +++ b/Common/Models/AutomatedScriptRunInstance.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import AutomatedScript from './AutomatedScript'; @@ -10,6 +13,14 @@ import OperationStatus from '../Types/Operation/OperationStatus'; name: 'AutomationScriptRunInstance', }) export default class AutomationScriptRunInstance extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public automationScript!: AutomatedScript; diff --git a/Common/Models/AutomatedScriptsLog.ts b/Common/Models/AutomatedScriptsLog.ts index 31fff708bd..887849bc85 100644 --- a/Common/Models/AutomatedScriptsLog.ts +++ b/Common/Models/AutomatedScriptsLog.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import AutomatedScriptRunInstance from './AutomatedScriptRunInstance'; @Entity({ name: 'ApplicationSecurityRunInstanceLog', }) export default class ApplicationSecurityRunInstanceLog extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public automatedScriptRunInstance!: AutomatedScriptRunInstance; diff --git a/Common/Models/BaseModel.ts b/Common/Models/BaseModel.ts index 9485ce91a3..97e229a659 100644 --- a/Common/Models/BaseModel.ts +++ b/Common/Models/BaseModel.ts @@ -6,10 +6,48 @@ import { PrimaryGeneratedColumn, BaseEntity, } from 'typeorm'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import ObjectID from '../Types/ObjectID'; export default class BaseModel extends BaseEntity { + private encryptedColumns!: EncryptedColumns; + private uniqueColumns!: UniqueColumns; + private slugifyColumn: string | null; + private requiredColumns!: RequiredColumns; + + public constructor( + encryptedColumns: EncryptedColumns, + requiredColumns: RequiredColumns, + uniqueColumns: UniqueColumns, + slugifyColumn: string | null + ) { + super(); + this.encryptedColumns = encryptedColumns; + this.slugifyColumn = slugifyColumn; + this.requiredColumns = requiredColumns; + this.uniqueColumns = uniqueColumns; + } + + public getEncryptedColumns(): EncryptedColumns { + return this.encryptedColumns; + } + + public getUniqueColumns(): UniqueColumns { + return this.uniqueColumns; + } + + public getRequiredColumns(): RequiredColumns { + return this.requiredColumns; + } + + public getSlugifyColumn(): string | null { + return this.slugifyColumn; + } + @PrimaryGeneratedColumn('uuid') - public id!: string; + public id!: ObjectID; @CreateDateColumn() public createdAt!: Date; diff --git a/Common/Models/Component.ts b/Common/Models/Component.ts index c213e2c3e7..f2a37b34a6 100755 --- a/Common/Models/Component.ts +++ b/Common/Models/Component.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'UserAlerts', }) export default class ComponentModel extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/ContainerSecurity.ts b/Common/Models/ContainerSecurity.ts index c6e8a10a22..aeca7ef2a4 100644 --- a/Common/Models/ContainerSecurity.ts +++ b/Common/Models/ContainerSecurity.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import DockerCredential from './DockerCredential'; import Component from './Component'; import ResourceLabel from './ResourceLabel'; @@ -8,6 +11,14 @@ import ResourceLabel from './ResourceLabel'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/ContainerSecurityLog.ts b/Common/Models/ContainerSecurityLog.ts index 081d8b3fb7..e220b82d3b 100644 --- a/Common/Models/ContainerSecurityLog.ts +++ b/Common/Models/ContainerSecurityLog.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import ContainerSecurity from './ContainerSecurity'; import Component from './Component'; @@ -7,6 +10,14 @@ import Component from './Component'; name: 'ContainerSecurityLog', }) export default class ContainerSecurityLog extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public security!: ContainerSecurity; diff --git a/Common/Models/CustomField.ts b/Common/Models/CustomField.ts index 89f5bc0155..07efa31b1f 100644 --- a/Common/Models/CustomField.ts +++ b/Common/Models/CustomField.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; export enum CustomFieldType { @@ -11,6 +14,14 @@ export enum CustomFieldType { name: 'CustomField', }) export default class CustomField extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public fieldName!: string; diff --git a/Common/Models/DockerCredential.ts b/Common/Models/DockerCredential.ts index 6786848c91..6ffa53538a 100644 --- a/Common/Models/DockerCredential.ts +++ b/Common/Models/DockerCredential.ts @@ -1,5 +1,8 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'DockerCredential', }) export default class DockerCredential extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public dockerRegistryUrl!: URL; diff --git a/Common/Models/DomainVerificationToken.ts b/Common/Models/DomainVerificationToken.ts index b9e0116425..e92572d4cc 100644 --- a/Common/Models/DomainVerificationToken.ts +++ b/Common/Models/DomainVerificationToken.ts @@ -1,11 +1,22 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; @Entity({ name: 'DomainVerificationToken', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Index() @Column() public domain!: string; // The main or base domain eg oneuptime.com diff --git a/Common/Models/EmailLog.ts b/Common/Models/EmailLog.ts index 87e550c70a..b287bb9f0f 100644 --- a/Common/Models/EmailLog.ts +++ b/Common/Models/EmailLog.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'EmailLog', }) export default class EmailLog extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public fromEmail!: string; diff --git a/Common/Models/EmailTemplate.ts b/Common/Models/EmailTemplate.ts index 46c6c57c21..c274d6ecdb 100755 --- a/Common/Models/EmailTemplate.ts +++ b/Common/Models/EmailTemplate.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import EmailTemplateType from '../Types/Email/EmailTemplateType'; @@ -8,6 +11,14 @@ import EmailTemplateType from '../Types/Email/EmailTemplateType'; name: 'EmailTemplate', }) export default class EmailTemplate extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/ErrorEvent.ts b/Common/Models/ErrorEvent.ts index 70e120c429..22d107f5fe 100644 --- a/Common/Models/ErrorEvent.ts +++ b/Common/Models/ErrorEvent.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import ErrorTrackerContainer from './ErrorTrackerContainer'; import Issue from './Issue'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public errorTracker!: ErrorTrackerContainer; @Column() diff --git a/Common/Models/ErrorTrackerContainer.ts b/Common/Models/ErrorTrackerContainer.ts index 812dc6b2ef..9b9f491cf2 100644 --- a/Common/Models/ErrorTrackerContainer.ts +++ b/Common/Models/ErrorTrackerContainer.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Component from './Component'; import ResourceLabel from './ResourceLabel'; @@ -8,6 +11,14 @@ import ResourceLabel from './ResourceLabel'; name: 'ErrorTrackerContainer', }) export default class ErrorTrackerContainer extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public component!: Component; diff --git a/Common/Models/Escalation.ts b/Common/Models/Escalation.ts index 2d2803203a..162745a407 100755 --- a/Common/Models/Escalation.ts +++ b/Common/Models/Escalation.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import OnCallDutySchedule from './OnCallDutySchedule'; @@ -8,6 +11,14 @@ import OnCallDutySchedule from './OnCallDutySchedule'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/EscalationTeamMember.ts b/Common/Models/EscalationTeamMember.ts index a89cb53757..cfcca9897b 100644 --- a/Common/Models/EscalationTeamMember.ts +++ b/Common/Models/EscalationTeamMember.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Team from './Team'; import User from './User'; @@ -7,6 +10,14 @@ import User from './User'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public startTime!: Date; diff --git a/Common/Models/ExternalStatusPage.ts b/Common/Models/ExternalStatusPage.ts index 17a59e2d90..3786e887d6 100644 --- a/Common/Models/ExternalStatusPage.ts +++ b/Common/Models/ExternalStatusPage.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import StatusPage from './StatusPage'; @@ -8,6 +11,14 @@ import StatusPage from './StatusPage'; name: 'ExternalStatusPage', }) export default class ExternalStatusPage extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/Feedback.ts b/Common/Models/Feedback.ts index 68cf88aeb5..e2e140c24d 100755 --- a/Common/Models/Feedback.ts +++ b/Common/Models/Feedback.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'Feedback', }) export default class Feedback extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/File.ts b/Common/Models/File.ts new file mode 100644 index 0000000000..471eb620f5 --- /dev/null +++ b/Common/Models/File.ts @@ -0,0 +1,28 @@ +import { Column, Entity } from 'typeorm'; +import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; +import Project from './Project'; + +@Entity({ + name: 'UserAlerts', +}) +export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } + @Column() + public name!: Project; + + @Column() + public fileExtention!: string; + + @Column() + public base64Content!: string; +} diff --git a/Common/Models/GitCredential.ts b/Common/Models/GitCredential.ts index 0a4a4899e1..2624892f60 100644 --- a/Common/Models/GitCredential.ts +++ b/Common/Models/GitCredential.ts @@ -1,5 +1,8 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'GitCredential', }) export default class GitCredential extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public gitUsername!: string; diff --git a/Common/Models/GlobalConfig.ts b/Common/Models/GlobalConfig.ts index faa9b867c5..5dafd0cb68 100755 --- a/Common/Models/GlobalConfig.ts +++ b/Common/Models/GlobalConfig.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; @Entity({ name: 'GlobalConfig', }) export default class GlobalConfig extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/Incident.ts b/Common/Models/Incident.ts index 3eaefb0d38..e887de3e8a 100755 --- a/Common/Models/Incident.ts +++ b/Common/Models/Incident.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import IncomingRequest from './IncomingRequest'; @@ -17,6 +20,14 @@ export enum IncidentState { name: 'Incident', }) export default class Incident extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public idNumber!: number; diff --git a/Common/Models/IncidentCommunicationSla.ts b/Common/Models/IncidentCommunicationSla.ts index 878199d826..f72287321a 100644 --- a/Common/Models/IncidentCommunicationSla.ts +++ b/Common/Models/IncidentCommunicationSla.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/IncidentNote.ts b/Common/Models/IncidentNote.ts index 9eba827bad..9ccce55236 100644 --- a/Common/Models/IncidentNote.ts +++ b/Common/Models/IncidentNote.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Incident, { IncidentState } from './Incident'; @@ -12,6 +15,14 @@ export enum IncidentMessageType { name: 'IncidentNote', }) export default class IncidentNote extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public incident!: Incident; diff --git a/Common/Models/IncidentNoteTemplate.ts b/Common/Models/IncidentNoteTemplate.ts index e50ad5fca0..75bb116dd5 100644 --- a/Common/Models/IncidentNoteTemplate.ts +++ b/Common/Models/IncidentNoteTemplate.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; import { IncidentState } from './Incident'; @Entity({ name: 'IncidentNoteTemplate', }) export default class IncidentNoteTemplate extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/IncidentPriority.ts b/Common/Models/IncidentPriority.ts index b6e3e35dcc..9506730b91 100644 --- a/Common/Models/IncidentPriority.ts +++ b/Common/Models/IncidentPriority.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'IncidentPriority', }) export default class IncidentPriority extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/IncidentResource.ts b/Common/Models/IncidentResource.ts index 2cefb3d8e8..62baf4757c 100644 --- a/Common/Models/IncidentResource.ts +++ b/Common/Models/IncidentResource.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Monitor from './Monitor'; import Incident from './Incident'; @@ -7,6 +10,14 @@ import Incident from './Incident'; name: 'IncidentResource', }) export default class IncidentResource extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public incident!: Incident; diff --git a/Common/Models/IncidentSMSAction.ts b/Common/Models/IncidentSMSAction.ts index 4ce206f479..c971555a1f 100755 --- a/Common/Models/IncidentSMSAction.ts +++ b/Common/Models/IncidentSMSAction.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Incident from './Incident'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public incident!: Incident; diff --git a/Common/Models/IncidentSetting.ts b/Common/Models/IncidentSetting.ts index 0f8b346836..6285771139 100644 --- a/Common/Models/IncidentSetting.ts +++ b/Common/Models/IncidentSetting.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import IncidentPriority from './IncidentPriority'; @@ -8,6 +11,14 @@ import IncidentPriority from './IncidentPriority'; name: 'IncidentSetting', }) export default class IncidentSetting extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/IncidentTimeline.ts b/Common/Models/IncidentTimeline.ts index cc17664e19..bc3b8e6862 100644 --- a/Common/Models/IncidentTimeline.ts +++ b/Common/Models/IncidentTimeline.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Incident from './Incident'; import Probe from './Probe'; import User from './User'; @@ -8,6 +11,14 @@ import User from './User'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public incident!: Incident; diff --git a/Common/Models/IncomingCallRouting.ts b/Common/Models/IncomingCallRouting.ts index 8a9da6cbb7..bd7989ff66 100644 --- a/Common/Models/IncomingCallRouting.ts +++ b/Common/Models/IncomingCallRouting.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/IncomingCallRoutingLog.ts b/Common/Models/IncomingCallRoutingLog.ts index 6aa0e3f140..8afd88e162 100644 --- a/Common/Models/IncomingCallRoutingLog.ts +++ b/Common/Models/IncomingCallRoutingLog.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import IncomingCallRouting from './IncomingCallRouting'; @@ -9,6 +12,14 @@ import OperationStatus from '../Types/Operation/OperationStatus'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/IncomingCallRoutingSchema.ts b/Common/Models/IncomingCallRoutingSchema.ts index d74cd3df84..2ade8a2bf6 100644 --- a/Common/Models/IncomingCallRoutingSchema.ts +++ b/Common/Models/IncomingCallRoutingSchema.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import IncomingCallRouting from './IncomingCallRouting'; import OnCallDutySchedule from './OnCallDutySchedule'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public incomingCallRouting!: IncomingCallRouting; @Column() diff --git a/Common/Models/IncomingRequest.ts b/Common/Models/IncomingRequest.ts index b5d4aed9fb..4fbe5e6c31 100644 --- a/Common/Models/IncomingRequest.ts +++ b/Common/Models/IncomingRequest.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; import IncidentPriority from './IncidentPriority'; import IncomingRequestCustomFields from '../Types/IncomingRequest/IncomingRequestCustomFields'; @@ -8,6 +11,14 @@ import Filter from '../Types/Filter/Filter'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/IncomingRequestResource.ts b/Common/Models/IncomingRequestResource.ts index 4249844656..67c675758c 100644 --- a/Common/Models/IncomingRequestResource.ts +++ b/Common/Models/IncomingRequestResource.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Monitor from './Monitor'; import IncomingRequest from './IncomingRequest'; @@ -7,6 +10,14 @@ import IncomingRequest from './IncomingRequest'; name: 'StatusPageChartType', }) export default class StatusPageChartType extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public incomingRequest!: IncomingRequest; diff --git a/Common/Models/Integration.ts b/Common/Models/Integration.ts index be94ef7605..52a9cf2e7c 100755 --- a/Common/Models/Integration.ts +++ b/Common/Models/Integration.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -13,6 +16,14 @@ export enum IntegrationType { name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public webHookName!: string; diff --git a/Common/Models/IntegrationResource.ts b/Common/Models/IntegrationResource.ts index c829747c25..8f00ab1a7f 100644 --- a/Common/Models/IntegrationResource.ts +++ b/Common/Models/IntegrationResource.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Monitor from './Monitor'; import Integration from './Integration'; @@ -7,6 +10,14 @@ import Integration from './Integration'; name: 'StatusPageChartType', }) export default class StatusPageChartType extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public integration!: Integration; diff --git a/Common/Models/Issue.ts b/Common/Models/Issue.ts index c5ed0a7819..ca7fcd35ad 100644 --- a/Common/Models/Issue.ts +++ b/Common/Models/Issue.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import ErrorTrackerContainer from './ErrorTrackerContainer'; @@ -13,6 +16,14 @@ export enum IssueType { name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/IssueMember.ts b/Common/Models/IssueMember.ts index f0c3b23c33..1ced82df19 100644 --- a/Common/Models/IssueMember.ts +++ b/Common/Models/IssueMember.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Issue from './Issue'; @@ -7,6 +10,14 @@ import Issue from './Issue'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public issue!: Issue; diff --git a/Common/Models/IssueTimeline.ts b/Common/Models/IssueTimeline.ts index 7b0916a2d3..43825d99af 100644 --- a/Common/Models/IssueTimeline.ts +++ b/Common/Models/IssueTimeline.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Issue from './Issue'; @@ -14,6 +17,14 @@ export enum IssueStatus { name: 'IssueTimeline', }) export default class IssueTimeline extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public issue!: Issue; diff --git a/Common/Models/Lead.ts b/Common/Models/Lead.ts index 46c0a404d9..41126ec8e6 100755 --- a/Common/Models/Lead.ts +++ b/Common/Models/Lead.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; @Entity({ name: 'Lead', }) export default class Lead extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/LetsEncryptCertificateStore.ts b/Common/Models/LetsEncryptCertificateStore.ts index 5a418901be..5c029bb056 100644 --- a/Common/Models/LetsEncryptCertificateStore.ts +++ b/Common/Models/LetsEncryptCertificateStore.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public certificateId!: string; diff --git a/Common/Models/LetsEncryptManager.ts b/Common/Models/LetsEncryptManager.ts index 30b4f53fcc..49364396fc 100644 --- a/Common/Models/LetsEncryptManager.ts +++ b/Common/Models/LetsEncryptManager.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public store!: Object; diff --git a/Common/Models/LighthouseLog.ts b/Common/Models/LighthouseLog.ts index 108acc69c8..6834e46e40 100644 --- a/Common/Models/LighthouseLog.ts +++ b/Common/Models/LighthouseLog.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Monitor from './Monitor'; @Entity({ name: 'LighthouseLog', }) export default class LighthouseLog extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public monitor!: Monitor; diff --git a/Common/Models/LoginHistory.ts b/Common/Models/LoginHistory.ts index d9fda88d82..de5bb65d7d 100755 --- a/Common/Models/LoginHistory.ts +++ b/Common/Models/LoginHistory.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; @Entity({ name: 'LoginHistory', }) export default class LoginHistory extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public user!: User; diff --git a/Common/Models/Monitor.ts b/Common/Models/Monitor.ts index 211846635e..44c16a9a61 100755 --- a/Common/Models/Monitor.ts +++ b/Common/Models/Monitor.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import IncidentCommunicationSla from './IncidentCommunicationSla'; @@ -17,6 +20,14 @@ import MonitorType from '../Types/Monitor/MonitorType'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; //Which project this monitor belongs to. diff --git a/Common/Models/MonitorCustomField.ts b/Common/Models/MonitorCustomField.ts index 33a8f3b486..addc7e7402 100644 --- a/Common/Models/MonitorCustomField.ts +++ b/Common/Models/MonitorCustomField.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; import { CustomFieldType } from './CustomField'; @@ -7,6 +10,14 @@ import { CustomFieldType } from './CustomField'; name: 'MonitorCustomField', }) export default class MonitorCustomField extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public fieldName!: string; diff --git a/Common/Models/MonitorLog.ts b/Common/Models/MonitorLog.ts index bd581684f3..29dee5fa5e 100755 --- a/Common/Models/MonitorLog.ts +++ b/Common/Models/MonitorLog.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Monitor from './Monitor'; import Probe from './Probe'; import Incident from './Incident'; @@ -7,6 +10,14 @@ import Incident from './Incident'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public monitor!: Monitor; diff --git a/Common/Models/MonitorSla.ts b/Common/Models/MonitorSla.ts index 29fe55b292..5582899d11 100644 --- a/Common/Models/MonitorSla.ts +++ b/Common/Models/MonitorSla.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/MonitorStatus.ts b/Common/Models/MonitorStatus.ts index 7900997390..67689932de 100755 --- a/Common/Models/MonitorStatus.ts +++ b/Common/Models/MonitorStatus.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import ResourceStatus from './ResourceStatus'; import Incident from './Incident'; @@ -9,6 +12,14 @@ import Monitor from './Monitor'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public monitor!: Monitor; diff --git a/Common/Models/Notification.ts b/Common/Models/Notification.ts index 08aff18156..ecc8208226 100755 --- a/Common/Models/Notification.ts +++ b/Common/Models/Notification.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/NotificationUserStatus.ts b/Common/Models/NotificationUserStatus.ts index 8e2c0d4a8b..a120409318 100644 --- a/Common/Models/NotificationUserStatus.ts +++ b/Common/Models/NotificationUserStatus.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; @Entity({ name: 'UserAlerts', }) export default class NotificationUserStatus extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public notification!: Notification; diff --git a/Common/Models/OnCallDutyEscalation.ts b/Common/Models/OnCallDutyEscalation.ts index bf85238c8d..5715c6f877 100644 --- a/Common/Models/OnCallDutyEscalation.ts +++ b/Common/Models/OnCallDutyEscalation.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import OnCallDutySchedule from './OnCallDutySchedule'; @@ -8,6 +11,14 @@ import OnCallDutySchedule from './OnCallDutySchedule'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/OnCallDutyEscalationTeam.ts b/Common/Models/OnCallDutyEscalationTeam.ts index 67f4fa1599..7472ddaa26 100644 --- a/Common/Models/OnCallDutyEscalationTeam.ts +++ b/Common/Models/OnCallDutyEscalationTeam.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import OnCallDutyEscalation from './OnCallDutyEscalation'; import Team from './Team'; @@ -11,6 +14,14 @@ import Team from './Team'; name: 'ResourceStatus', }) export default class ResourceStatus extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public onCallDutyEscalation!: OnCallDutyEscalation; diff --git a/Common/Models/OnCallDutySchedule.ts b/Common/Models/OnCallDutySchedule.ts index 4a9a73874e..ad81e63428 100755 --- a/Common/Models/OnCallDutySchedule.ts +++ b/Common/Models/OnCallDutySchedule.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/OnCallDutyScheduleEscalationStatus.ts b/Common/Models/OnCallDutyScheduleEscalationStatus.ts index 6845e6c28e..8a94365a25 100644 --- a/Common/Models/OnCallDutyScheduleEscalationStatus.ts +++ b/Common/Models/OnCallDutyScheduleEscalationStatus.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Escalation from './Escalation'; import OnCallDutyScheduleStatus from './OnCallDutyScheduleStatus'; @@ -7,6 +10,14 @@ import OnCallDutyScheduleStatus from './OnCallDutyScheduleStatus'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public escalation!: Escalation; diff --git a/Common/Models/OnCallDutyScheduleResource.ts b/Common/Models/OnCallDutyScheduleResource.ts index 1fd2a6a3ff..750b4f5418 100644 --- a/Common/Models/OnCallDutyScheduleResource.ts +++ b/Common/Models/OnCallDutyScheduleResource.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Monitor from './Monitor'; import OnCallDutySchedule from './OnCallDutySchedule'; @@ -7,6 +10,14 @@ import OnCallDutySchedule from './OnCallDutySchedule'; name: 'OnCallDutyScheduleResource', }) export default class OnCallDutyScheduleResource extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public onCallDutySchedule!: OnCallDutySchedule; diff --git a/Common/Models/OnCallDutyScheduleStatus.ts b/Common/Models/OnCallDutyScheduleStatus.ts index 1f9f2868f5..b98ff7a3de 100644 --- a/Common/Models/OnCallDutyScheduleStatus.ts +++ b/Common/Models/OnCallDutyScheduleStatus.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import Incident from './Incident'; @@ -9,6 +12,14 @@ import OnCallDutySchedule from './OnCallDutySchedule'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/PerformanceTracker.ts b/Common/Models/PerformanceTracker.ts index ca1ec193e5..195d817a87 100644 --- a/Common/Models/PerformanceTracker.ts +++ b/Common/Models/PerformanceTracker.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Component from './Component'; @@ -7,6 +10,14 @@ import Component from './Component'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public component!: Component; diff --git a/Common/Models/PerformanceTrackerMetric.ts b/Common/Models/PerformanceTrackerMetric.ts index d7b159af52..674d55978c 100644 --- a/Common/Models/PerformanceTrackerMetric.ts +++ b/Common/Models/PerformanceTrackerMetric.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import PerformanceTracker from './PerformanceTracker'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public type!: string; diff --git a/Common/Models/Probe.ts b/Common/Models/Probe.ts index b287449d1a..b185321217 100755 --- a/Common/Models/Probe.ts +++ b/Common/Models/Probe.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'Probe', }) export default class Probe extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column({ nullable: false }) public key!: string; diff --git a/Common/Models/Project.ts b/Common/Models/Project.ts index 8cb38c0c1c..f589fa6a1e 100644 --- a/Common/Models/Project.ts +++ b/Common/Models/Project.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public name!: string; diff --git a/Common/Models/ProjectAdminNotes.ts b/Common/Models/ProjectAdminNotes.ts index b61d676b26..7f67cf213a 100644 --- a/Common/Models/ProjectAdminNotes.ts +++ b/Common/Models/ProjectAdminNotes.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; import User from './User'; @@ -7,6 +10,14 @@ import User from './User'; name: 'ProjectAdminNote', }) export default class ProjectAdminNote extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column({ nullable: false }) public project!: Project; diff --git a/Common/Models/ProjectAlertBalance.ts b/Common/Models/ProjectAlertBalance.ts index 68f7b272df..bf79db9a2b 100644 --- a/Common/Models/ProjectAlertBalance.ts +++ b/Common/Models/ProjectAlertBalance.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; @Entity({ name: 'ProjectAlertBalance', }) export default class ProjectAlertBalance extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column({ nullable: false }) public minimumBalance!: number; diff --git a/Common/Models/ProjectSmtpConfig.ts b/Common/Models/ProjectSmtpConfig.ts index 892f65d6d4..5e0bf56569 100755 --- a/Common/Models/ProjectSmtpConfig.ts +++ b/Common/Models/ProjectSmtpConfig.ts @@ -1,5 +1,8 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'ProjectSmtpConfig', }) export default class ProjectSmtpConfig extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column({ nullable: false, }) diff --git a/Common/Models/ProjectUser.ts b/Common/Models/ProjectUser.ts index 1e82853d46..397ebe7001 100644 --- a/Common/Models/ProjectUser.ts +++ b/Common/Models/ProjectUser.ts @@ -1,6 +1,9 @@ import { Column, Entity } from 'typeorm'; import Role from '../Types/Role'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; import User from './User'; @@ -8,6 +11,14 @@ import User from './User'; name: 'ProjectAdminNote', }) export default class ProjectAdminNote extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column({ nullable: false }) public project!: Project; diff --git a/Common/Models/ResourceLabel.ts b/Common/Models/ResourceLabel.ts index 4cd470134f..c33dce65cc 100755 --- a/Common/Models/ResourceLabel.ts +++ b/Common/Models/ResourceLabel.ts @@ -1,5 +1,8 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'ResourceLabel', }) export default class ResourceLabel extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() @Index() public project!: Project; diff --git a/Common/Models/ResourceStatus.ts b/Common/Models/ResourceStatus.ts index 039bb71eb7..264944b9ce 100644 --- a/Common/Models/ResourceStatus.ts +++ b/Common/Models/ResourceStatus.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -11,6 +14,14 @@ import Project from './Project'; name: 'ResourceStatus', }) export default class ResourceStatus extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/ScheduledEvent.ts b/Common/Models/ScheduledEvent.ts index fbe71a4715..dc5f22c99f 100755 --- a/Common/Models/ScheduledEvent.ts +++ b/Common/Models/ScheduledEvent.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/ScheduledEventNote.ts b/Common/Models/ScheduledEventNote.ts index 67c90a8d5f..2d156be81c 100644 --- a/Common/Models/ScheduledEventNote.ts +++ b/Common/Models/ScheduledEventNote.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import ScheduledEvent from './ScheduledEvent'; import ScheduledEventState from '../Types/ScheduledEvent/ScheduledEventState'; @@ -13,6 +16,14 @@ export enum ScheduledEventNote { name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public scheduledEvent!: ScheduledEvent; diff --git a/Common/Models/ScheduledEventResource.ts b/Common/Models/ScheduledEventResource.ts index 4135609fb8..059e6f00d1 100644 --- a/Common/Models/ScheduledEventResource.ts +++ b/Common/Models/ScheduledEventResource.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Monitor from './Monitor'; import ScheduledEvent from './ScheduledEvent'; @@ -7,6 +10,14 @@ import ScheduledEvent from './ScheduledEvent'; name: 'StatusPageChartType', }) export default class StatusPageChartType extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public scheduledEvent!: ScheduledEvent; diff --git a/Common/Models/SmsCount.ts b/Common/Models/SmsCount.ts index 017c1f729f..45d0042d66 100644 --- a/Common/Models/SmsCount.ts +++ b/Common/Models/SmsCount.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public user!: User; diff --git a/Common/Models/SmsProvider.ts b/Common/Models/SmsProvider.ts index 26c56d54ca..b94d8ebbe2 100755 --- a/Common/Models/SmsProvider.ts +++ b/Common/Models/SmsProvider.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import { JSONObject } from '../Types/JSON'; @@ -12,6 +15,14 @@ export enum SMSProviderType { name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/SmsTemplate.ts b/Common/Models/SmsTemplate.ts index 5b1a60c8d5..183e02a279 100755 --- a/Common/Models/SmsTemplate.ts +++ b/Common/Models/SmsTemplate.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import SmsTemplateType from '../Types/SMS/SmsTemplateType'; @@ -8,6 +11,14 @@ import SmsTemplateType from '../Types/SMS/SmsTemplateType'; name: 'SmsTemplate', }) export default class SmsTemplate extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/SslCertificate.ts b/Common/Models/SslCertificate.ts index 334842b95b..ca873dbd71 100644 --- a/Common/Models/SslCertificate.ts +++ b/Common/Models/SslCertificate.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; @Entity({ name: 'SslCertificate', }) export default class SslCertificate extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public certificateId!: string; diff --git a/Common/Models/SslCertificateManager.ts b/Common/Models/SslCertificateManager.ts index ed296458d3..9e9e8927d8 100644 --- a/Common/Models/SslCertificateManager.ts +++ b/Common/Models/SslCertificateManager.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; @Entity({ name: 'SslCertificateManager', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public subject!: string; diff --git a/Common/Models/SslVerificationCahllenge.ts b/Common/Models/SslVerificationCahllenge.ts index b23376dbe4..2fe3c15342 100644 --- a/Common/Models/SslVerificationCahllenge.ts +++ b/Common/Models/SslVerificationCahllenge.ts @@ -1,10 +1,21 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; @Entity({ name: 'SslVerificationChallenge', }) export default class SslVerificationChallenge extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public token!: string; diff --git a/Common/Models/SsoConfig.ts b/Common/Models/SsoConfig.ts index 11b1f015d2..22e6b456ee 100644 --- a/Common/Models/SsoConfig.ts +++ b/Common/Models/SsoConfig.ts @@ -1,5 +1,8 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'SsoConfig', }) export default class SsoConfig extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column({ nullable: false }) public enabled!: boolean; diff --git a/Common/Models/SsoDefaultRole.ts b/Common/Models/SsoDefaultRole.ts index 21f9924264..482803e149 100644 --- a/Common/Models/SsoDefaultRole.ts +++ b/Common/Models/SsoDefaultRole.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import Role from '../Types/Role'; @@ -8,6 +11,14 @@ import Role from '../Types/Role'; name: 'SsoDefaultRole', }) export default class SsoDefaultRole extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public domain!: string; diff --git a/Common/Models/StatusPage.ts b/Common/Models/StatusPage.ts index 49b9a80adf..788cbbb020 100755 --- a/Common/Models/StatusPage.ts +++ b/Common/Models/StatusPage.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @Entity({ name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/StatusPageCategory.ts b/Common/Models/StatusPageCategory.ts index d3e4b10a04..254d7897c9 100644 --- a/Common/Models/StatusPageCategory.ts +++ b/Common/Models/StatusPageCategory.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import StatusPage from './StatusPage'; @@ -7,6 +10,14 @@ import StatusPage from './StatusPage'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public statusPage!: StatusPage; diff --git a/Common/Models/StatusPageDomains.ts b/Common/Models/StatusPageDomains.ts index f130a0bb0b..c31f34e864 100644 --- a/Common/Models/StatusPageDomains.ts +++ b/Common/Models/StatusPageDomains.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import StatusPage from './StatusPage'; import DomainVerificationToken from './DomainVerificationToken'; @@ -8,6 +11,14 @@ import DomainVerificationToken from './DomainVerificationToken'; name: 'StatusPageDomains', }) export default class StatusPageDomains extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public statusPage!: StatusPage; diff --git a/Common/Models/StatusPageFooterLink.ts b/Common/Models/StatusPageFooterLink.ts index 175b0dd43b..25b5751d3d 100644 --- a/Common/Models/StatusPageFooterLink.ts +++ b/Common/Models/StatusPageFooterLink.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import StatusPage from './StatusPage'; @@ -7,6 +10,14 @@ import StatusPage from './StatusPage'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public statusPage!: StatusPage; diff --git a/Common/Models/StatusPageIpWhiteList.ts b/Common/Models/StatusPageIpWhiteList.ts index d51187ae01..43d5388761 100644 --- a/Common/Models/StatusPageIpWhiteList.ts +++ b/Common/Models/StatusPageIpWhiteList.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import StatusPage from './StatusPage'; @@ -7,6 +10,14 @@ import StatusPage from './StatusPage'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public statusPage!: StatusPage; diff --git a/Common/Models/StatusPageLanguages.ts b/Common/Models/StatusPageLanguages.ts index 7c4aa7a42f..a255b1e935 100644 --- a/Common/Models/StatusPageLanguages.ts +++ b/Common/Models/StatusPageLanguages.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import StatusPage from './StatusPage'; @@ -7,6 +10,14 @@ import StatusPage from './StatusPage'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public statusPage!: StatusPage; diff --git a/Common/Models/StatusPageResource.ts b/Common/Models/StatusPageResource.ts index 7a919754e6..839ebc189a 100644 --- a/Common/Models/StatusPageResource.ts +++ b/Common/Models/StatusPageResource.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import StatusPage from './StatusPage'; import StatusPageCategory from './StatusPageCategory'; import Monitor from './Monitor'; @@ -8,6 +11,14 @@ import Monitor from './Monitor'; name: 'StatusPageChartType', }) export default class StatusPageChartType extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public statusPage!: StatusPage; diff --git a/Common/Models/Subscriber.ts b/Common/Models/Subscriber.ts index 1dc8372465..6a6247f453 100755 --- a/Common/Models/Subscriber.ts +++ b/Common/Models/Subscriber.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import StatusPage from './StatusPage'; @@ -11,6 +14,14 @@ import HTTPMethod from '../Types/API/HTTPMethod'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public monitor!: Monitor; diff --git a/Common/Models/SubscriberAlert.ts b/Common/Models/SubscriberAlert.ts index 9bbd3d7f66..9ba6521842 100755 --- a/Common/Models/SubscriberAlert.ts +++ b/Common/Models/SubscriberAlert.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import Subscriber from './Subscriber'; @@ -12,6 +15,14 @@ import OperationResult from '../Types/Operation/OperationResult'; name: 'UserAlerts', }) export default class Model extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Models/Team.ts b/Common/Models/Team.ts index af2bd9311c..6ce0df19e5 100644 --- a/Common/Models/Team.ts +++ b/Common/Models/Team.ts @@ -1,5 +1,8 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; @@ -7,6 +10,14 @@ import Project from './Project'; name: 'Team', }) export default class Team extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() @Index() public project!: Project; diff --git a/Common/Models/TeamMember.ts b/Common/Models/TeamMember.ts index 5900b6a50d..5bf6ff6bbe 100644 --- a/Common/Models/TeamMember.ts +++ b/Common/Models/TeamMember.ts @@ -1,5 +1,8 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Team from './Team'; import User from './User'; @@ -7,6 +10,14 @@ import User from './User'; name: 'TeamMember', }) export default class TeamMember extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() @Index() public team!: Team; diff --git a/Common/Models/User.ts b/Common/Models/User.ts index 4f3ea229bf..188105c3c6 100644 --- a/Common/Models/User.ts +++ b/Common/Models/User.ts @@ -1,12 +1,23 @@ import { Column, Entity } from 'typeorm'; import Role from '../Types/Role'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import SSO from './SsoConfig'; @Entity({ name: 'User', }) export default class User extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column({ type: 'text', length: 100 }) public name!: string; diff --git a/Common/Models/UserAdminNote.ts b/Common/Models/UserAdminNote.ts index c2f6071e0a..fab4c69d08 100644 --- a/Common/Models/UserAdminNote.ts +++ b/Common/Models/UserAdminNote.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; @Entity({ name: 'UserAdminNote', }) export default class UserAdminNotes extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column({ nullable: false }) public forUser!: User; diff --git a/Common/Models/UserAlert.ts b/Common/Models/UserAlert.ts index b9aff3cd6d..b9f798f1d0 100755 --- a/Common/Models/UserAlert.ts +++ b/Common/Models/UserAlert.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import Incident, { IncidentState } from './Incident'; @@ -10,6 +13,14 @@ import OnCallDutySchedule from './OnCallDutySchedule'; name: 'UserAlerts', }) export default class UserAlerts extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column({ nullable: false, }) diff --git a/Common/Models/UserAlertCallLogs.ts b/Common/Models/UserAlertCallLogs.ts index 30d84602c7..70468cbcc8 100644 --- a/Common/Models/UserAlertCallLogs.ts +++ b/Common/Models/UserAlertCallLogs.ts @@ -1,5 +1,8 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; import Project from './Project'; import OperationStatus from '../Types/Operation/OperationStatus'; @@ -8,6 +11,14 @@ import OperationStatus from '../Types/Operation/OperationStatus'; name: 'CallLog', }) export default class CallLog extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public fromNumber!: string; diff --git a/Common/Models/UserVerificationToken.ts b/Common/Models/UserVerificationToken.ts index 128f93cbe4..26e33398d7 100755 --- a/Common/Models/UserVerificationToken.ts +++ b/Common/Models/UserVerificationToken.ts @@ -1,11 +1,22 @@ import { Column, Entity, Index } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import User from './User'; @Entity({ name: 'UserVerificationToken', }) export default class UserVerificationToken extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column({ nullable: false }) public user!: User; diff --git a/Common/Models/Zapier.ts b/Common/Models/Zapier.ts index 6b39156e84..73a7ef6035 100755 --- a/Common/Models/Zapier.ts +++ b/Common/Models/Zapier.ts @@ -1,11 +1,22 @@ import { Column, Entity } from 'typeorm'; import BaseModel from './BaseModel'; +import EncryptedColumns from '../Types/Database/EncryptedColumns'; +import UniqueColumns from '../Types/Database/UniqueColumns'; +import RequiredColumns from '../Types/Database/RequiredColumns'; import Project from './Project'; @Entity({ name: 'Zapier', }) export default class Zapier extends BaseModel { + public constructor() { + super( + new EncryptedColumns([]), + new UniqueColumns([]), + new RequiredColumns([]), + null + ); + } @Column() public project!: Project; diff --git a/Common/Types/Database/Columns.ts b/Common/Types/Database/Columns.ts new file mode 100644 index 0000000000..729a815c74 --- /dev/null +++ b/Common/Types/Database/Columns.ts @@ -0,0 +1,13 @@ +export default class Columns { + private _columns!: Array; + public get columns(): Array { + return this._columns; + } + public set columns(v: Array) { + this._columns = v; + } + + public constructor(columns: Array) { + this.columns = columns; + } +} diff --git a/Common/Types/Database/EncryptedColumns.ts b/Common/Types/Database/EncryptedColumns.ts new file mode 100644 index 0000000000..c89fad4537 --- /dev/null +++ b/Common/Types/Database/EncryptedColumns.ts @@ -0,0 +1,3 @@ +import Columns from './Columns'; + +export default class EncryptedColumns extends Columns {} diff --git a/Common/Types/Database/RequiredColumns.ts b/Common/Types/Database/RequiredColumns.ts new file mode 100644 index 0000000000..c2077c5751 --- /dev/null +++ b/Common/Types/Database/RequiredColumns.ts @@ -0,0 +1,3 @@ +import Columns from './Columns'; + +export default class RequiredColumns extends Columns {} diff --git a/Common/Types/Database/UniqueColumns.ts b/Common/Types/Database/UniqueColumns.ts new file mode 100644 index 0000000000..b284e9bd4d --- /dev/null +++ b/Common/Types/Database/UniqueColumns.ts @@ -0,0 +1,3 @@ +import Columns from './Columns'; + +export default class UniqueColumns extends Columns {} diff --git a/Common/package-lock.json b/Common/package-lock.json index 22a7ab1f4e..b09ad86123 100644 --- a/Common/package-lock.json +++ b/Common/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", diff --git a/Common/package.json b/Common/package.json index 97d4c5d4a3..e658c347aa 100644 --- a/Common/package.json +++ b/Common/package.json @@ -8,7 +8,7 @@ "compile": "tsc" }, "author": "", - "license": "ISC", + "license": "MIT", "devDependencies": { "@types/jest": "^27.4.1", "@types/node": "^17.0.22", diff --git a/CommonServer/Infrastructure/Database.ts b/CommonServer/Infrastructure/Database.ts deleted file mode 100644 index 0ebb4f5036..0000000000 --- a/CommonServer/Infrastructure/Database.ts +++ /dev/null @@ -1,47 +0,0 @@ -import MongoDB from 'mongodb'; -import { DatabaseUrl, DatabaseName } from '../Config'; -import Grid from 'gridfs-stream'; - -export type Collection = MongoDB.Collection; -export type Document = MongoDB.Document; - -export default class Database { - private static databaseClient: MongoDB.MongoClient; - private static databaseConnected: boolean = false; - private static fileClient: MongoDB.Collection; - - public static getClient(): MongoDB.MongoClient { - this.databaseClient = new MongoDB.MongoClient(DatabaseUrl); - return this.databaseClient; - } - - public static async getFileClient(): Promise { - if (this.fileClient) { - return this.fileClient; - } - - const database: MongoDB.Db = await this.getDatabase(); - const mongoClient: MongoDB.MongoClient = await this.getClient(); - this.fileClient = await Grid(database, mongoClient).collection( - 'uploads' - ); - - return this.fileClient; - } - - public static async connect(): Promise { - if (!this.databaseClient) { - await this.getClient(); - } - await this.databaseClient.connect(); - return this.databaseClient; - } - - public static async getDatabase(): Promise { - if (!this.databaseConnected) { - await this.connect(); - this.databaseConnected = true; - } - return this.databaseClient.db(DatabaseName); - } -} diff --git a/CommonServer/Infrastructure/ORM.ts b/CommonServer/Infrastructure/ORM.ts deleted file mode 100644 index 8d07c559d0..0000000000 --- a/CommonServer/Infrastructure/ORM.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { - DatabaseHost, - DatabaseName, - DatabasePassword, - DatabasePort, - DatabaseUsername, -} from '../Config'; - -import { DataSource, BaseEntity } from 'typeorm'; - -const AppDataSource: DataSource = new DataSource({ - type: 'postgres', - host: DatabaseHost.toString(), - port: DatabasePort.toNumber(), - username: DatabaseUsername, - password: DatabasePassword, - database: DatabaseName, -}); - -export default AppDataSource; - -export interface Document extends BaseEntity {} - -export interface RequiredFields extends Array {} - -export interface UniqueFields extends Array {} - -export interface EncryptedFields extends Array {} diff --git a/CommonServer/Infrastructure/PostgresDatabase.ts b/CommonServer/Infrastructure/PostgresDatabase.ts new file mode 100644 index 0000000000..5c2a27cf79 --- /dev/null +++ b/CommonServer/Infrastructure/PostgresDatabase.ts @@ -0,0 +1,33 @@ +import { DataSource } from 'typeorm'; +import { + DatabaseHost, + DatabaseName, + DatabasePassword, + DatabasePort, + DatabaseUsername, +} from '../Config'; + +export const PostgresDataSource: DataSource = new DataSource({ + type: 'postgres', + host: DatabaseHost.toString(), + port: DatabasePort.toNumber(), + username: DatabaseUsername, + password: DatabasePassword, + database: DatabaseName, +}); + +export default class Database { + private static dataSource: DataSource; + + public static getClient(): DataSource { + return this.dataSource; + } + + public static async connect(): Promise { + if (!this.dataSource) { + await this.getClient(); + } + this.dataSource = await PostgresDataSource.initialize(); + return this.dataSource; + } +} diff --git a/CommonServer/Services/AlertChargeService.ts b/CommonServer/Services/AlertChargeService.ts index 3b9ed9f584..05dd768722 100644 --- a/CommonServer/Services/AlertChargeService.ts +++ b/CommonServer/Services/AlertChargeService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/AlertCharge'; +import Model from 'Common/Models/AlertCharge'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Alert Charge', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/AlertService.ts b/CommonServer/Services/AlertService.ts index 5b5567b81f..6bbcc2bbd0 100644 --- a/CommonServer/Services/AlertService.ts +++ b/CommonServer/Services/AlertService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Alert'; +import Model from 'Common/Models/Alert'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Alert', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ApiStatusService.ts b/CommonServer/Services/ApiStatusService.ts index fe8513204d..b26ac08a04 100644 --- a/CommonServer/Services/ApiStatusService.ts +++ b/CommonServer/Services/ApiStatusService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ApiStatus'; +import Model from 'Common/Models/ApiStatus'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'API Status', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ApplicationLogService.ts b/CommonServer/Services/ApplicationLogService.ts index 9dce42a859..652b8816dc 100644 --- a/CommonServer/Services/ApplicationLogService.ts +++ b/CommonServer/Services/ApplicationLogService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ApplicationLog'; +import Model from 'Common/Models/ApplicationLog'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'ApplicationLog', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ApplicationScannerService.ts b/CommonServer/Services/ApplicationScannerService.ts index 7c8542c730..f74bf5bd51 100644 --- a/CommonServer/Services/ApplicationScannerService.ts +++ b/CommonServer/Services/ApplicationScannerService.ts @@ -1,9 +1,4 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ApplicationScanner'; +import Model from 'Common/Models/ApplicationScanner'; import DatabaseService from './DatabaseService'; import CreateBy from '../Types/DB/CreateBy'; import { Document } from '../Infrastructure/ORM'; @@ -15,8 +10,7 @@ class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Application Scanner', publicListProps: { populate: [], @@ -58,9 +52,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: true, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } diff --git a/CommonServer/Services/ApplicationSecurityLogService.ts b/CommonServer/Services/ApplicationSecurityLogService.ts index 986727957b..374d429e46 100644 --- a/CommonServer/Services/ApplicationSecurityLogService.ts +++ b/CommonServer/Services/ApplicationSecurityLogService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ApplicationSecurityLog'; +import Model from 'Common/Models/ApplicationSecurityLog'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Application Security Log', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ApplicationSecurityService.ts b/CommonServer/Services/ApplicationSecurityService.ts index 2c7006aa66..d9c06c2deb 100644 --- a/CommonServer/Services/ApplicationSecurityService.ts +++ b/CommonServer/Services/ApplicationSecurityService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ApplicationSecurity'; +import Model from 'Common/Models/ApplicationSecurity'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Application Security', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/AuditLogsService.ts b/CommonServer/Services/AuditLogsService.ts index 440578640d..10784a5158 100644 --- a/CommonServer/Services/AuditLogsService.ts +++ b/CommonServer/Services/AuditLogsService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/AuditLogs'; +import Model from 'Common/Models/AuditLogs'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Audit Log', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/AutomatedScriptLogService.ts b/CommonServer/Services/AutomatedScriptLogService.ts index 830b682abe..6d1de264b7 100644 --- a/CommonServer/Services/AutomatedScriptLogService.ts +++ b/CommonServer/Services/AutomatedScriptLogService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/AutomationScriptsLog'; +import Model from 'Common/Models/AutomationScriptsLog'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Automated Script Log', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/AutomatedScriptService.ts b/CommonServer/Services/AutomatedScriptService.ts index 086b3262c4..bc9c68c309 100644 --- a/CommonServer/Services/AutomatedScriptService.ts +++ b/CommonServer/Services/AutomatedScriptService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/AutomatedScripts'; +import Model from 'Common/Models/AutomatedScripts'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Automated Scripts', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/CallLogsService.ts b/CommonServer/Services/CallLogsService.ts index 350261f14b..405d20b87b 100644 --- a/CommonServer/Services/CallLogsService.ts +++ b/CommonServer/Services/CallLogsService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/CallLogs'; +import Model from 'Common/Models/CallLogs'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Call Logs', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/CallRoutingLogService.ts b/CommonServer/Services/CallRoutingLogService.ts index fe64f5686a..ceacefd5ab 100644 --- a/CommonServer/Services/CallRoutingLogService.ts +++ b/CommonServer/Services/CallRoutingLogService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/CallRoutingLog'; +import Model from 'Common/Models/CallRoutingLog'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Call Routing Log', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: true, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/CallRoutingService.ts b/CommonServer/Services/CallRoutingService.ts index 40d8fe53f6..dec5eaaa3c 100644 --- a/CommonServer/Services/CallRoutingService.ts +++ b/CommonServer/Services/CallRoutingService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/CallRouting'; +import Model from 'Common/Models/CallRouting'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Call Routing', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/CertificateService.ts b/CommonServer/Services/CertificateService.ts index c130b33d08..3a93190fbc 100644 --- a/CommonServer/Services/CertificateService.ts +++ b/CommonServer/Services/CertificateService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Certificate'; +import Model from 'Common/Models/Certificate'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Certificate', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/CertificateStoreService.ts b/CommonServer/Services/CertificateStoreService.ts index 2d35bd3dd6..a7faffa7c1 100644 --- a/CommonServer/Services/CertificateStoreService.ts +++ b/CommonServer/Services/CertificateStoreService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/CertificateStore'; +import Model from 'Common/Models/CertificateStore'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Certificate Store', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ComponentService.ts b/CommonServer/Services/ComponentService.ts index cbcabbd65d..e527daf9e9 100644 --- a/CommonServer/Services/ComponentService.ts +++ b/CommonServer/Services/ComponentService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Component'; +import Model from 'Common/Models/Component'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Component', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ContainerScannerService.ts b/CommonServer/Services/ContainerScannerService.ts index d9e5321173..b6a4f24bd9 100644 --- a/CommonServer/Services/ContainerScannerService.ts +++ b/CommonServer/Services/ContainerScannerService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ContainerScanner'; +import Model from 'Common/Models/ContainerScanner'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Container Scanner', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ContainerSecurityLogService.ts b/CommonServer/Services/ContainerSecurityLogService.ts index c8ce0def0c..bbfab369fa 100644 --- a/CommonServer/Services/ContainerSecurityLogService.ts +++ b/CommonServer/Services/ContainerSecurityLogService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ContainerSecurityLog'; +import Model from 'Common/Models/ContainerSecurityLog'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Container Security Log', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ContainerSecurityService.ts b/CommonServer/Services/ContainerSecurityService.ts index 9e8d54e5ca..1036b0c410 100644 --- a/CommonServer/Services/ContainerSecurityService.ts +++ b/CommonServer/Services/ContainerSecurityService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ContainerSecurity'; +import Model from 'Common/Models/ContainerSecurity'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Container Security', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/CustomFieldService.ts b/CommonServer/Services/CustomFieldService.ts index 66b8409037..50e760fd20 100644 --- a/CommonServer/Services/CustomFieldService.ts +++ b/CommonServer/Services/CustomFieldService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/CustomField'; +import Model from 'Common/Models/CustomField'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Custom Field', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/DatabaseService.ts b/CommonServer/Services/DatabaseService.ts index 3cf8ce2426..ab8140f482 100644 --- a/CommonServer/Services/DatabaseService.ts +++ b/CommonServer/Services/DatabaseService.ts @@ -1,13 +1,7 @@ import Slug from 'Common/Utils/Slug'; import Populate from '../Types/DB/Populate'; import Select from '../Types/DB/Select'; -import { - EncryptedFields, - RequiredFields, - UniqueFields, - Document, - Query as DbQuery, -} from '../Infrastructure/ORM'; +import { Document, Query as DbQuery } from '../Infrastructure/ORM'; import FindOneBy from '../Types/DB/FindOneBy'; import UpdateOneBy from '../Types/DB/UpdateOneBy'; import CountBy from '../Types/DB/CountBy'; @@ -27,6 +21,7 @@ import Encryption from '../Utils/Encryption'; import { JSONObject } from 'Common/Types/JSON'; import SortOrder from '../Types/DB/SortOrder'; import DbFunctions from '../Utils/DBFunctions'; +import BaseModel from 'Common/Models/BaseModel'; export interface ListProps { populate: Populate; @@ -50,7 +45,7 @@ interface InternalUpdateBy extends UpdateBy { multiple: boolean; } -class DatabaseService { +class DatabaseService { public adminItemProps: ItemProps; public adminListProps: ListProps; public ownerItemProps: ItemProps; @@ -61,18 +56,11 @@ class DatabaseService { public model: BaseModel; public publicItemProps: ItemProps; public publicListProps: ListProps; - public requiredFields: RequiredFields; - public uniqueFields: UniqueFields; - public encryptedFields: EncryptedFields; public viewerItemProps: ItemProps; public viewerListProps: ListProps; - public isResourceByProject: boolean; - public slugifyField: string; public constructor({ model, - requiredFields, - uniqueFields, friendlyName = '', publicListProps, adminListProps, @@ -84,11 +72,7 @@ class DatabaseService { ownerListProps, memberItemProps, viewerItemProps, - isResourceByProject = true, - slugifyField = '', - encryptedFields, }: { - uniqueFields: UniqueFields; adminItemProps: ItemProps; adminListProps: ListProps; friendlyName: string; @@ -97,18 +81,14 @@ class DatabaseService { model: BaseModel; publicItemProps: ItemProps; publicListProps: ListProps; - requiredFields: RequiredFields; viewerItemProps: ItemProps; viewerListProps: ListProps; ownerItemProps: ItemProps; ownerListProps: ListProps; isResourceByProject: boolean; - slugifyField: string; - encryptedFields: EncryptedFields; }) { this.model = model; this.friendlyName = friendlyName; - this.requiredFields = requiredFields; this.publicListProps = publicListProps; this.adminListProps = adminListProps; this.memberItemProps = memberItemProps; @@ -117,12 +97,8 @@ class DatabaseService { this.viewerListProps = viewerListProps; this.publicItemProps = publicItemProps; this.viewerItemProps = viewerItemProps; - this.isResourceByProject = isResourceByProject; - this.uniqueFields = uniqueFields; - this.slugifyField = slugifyField; this.ownerItemProps = ownerItemProps; this.ownerListProps = ownerListProps; - this.encryptedFields = encryptedFields; } protected isValid(data: JSONObject): boolean { @@ -135,7 +111,7 @@ class DatabaseService { protected checkRequiredFields(data: JSONObject): void { // Check required fields. - for (const requiredField of this.requiredFields) { + for (const requiredField of this.model.getRequiredColumns().columns) { if (!data[requiredField]) { throw new BadDataException(`${requiredField} is required`); } @@ -151,7 +127,7 @@ class DatabaseService { const iv: Buffer = Encryption.getIV(); data['iv'] = iv; - for (const key of this.encryptedFields) { + for (const key of this.model.getEncryptedColumns().columns) { // If data is an object. if (typeof data[key] === 'object') { const dataObj: JSONObject = data[key] as JSONObject; @@ -176,7 +152,7 @@ class DatabaseService { protected decrypt(data: Document): Document { const iv: Buffer = data.get('iv'); - for (const key of this.encryptedFields) { + for (const key of this.model.getEncryptedColumns().columns) { // If data is an object. if (typeof data.get(key) === 'object') { const dataObj: JSONObject = data.get(key); @@ -335,10 +311,12 @@ class DatabaseService { item.set(key, data[key]); } - if (this.slugifyField) { + if (this.model.getSlugifyColumn()) { item.set( 'slug', - Slug.getSlug(data[this.slugifyField] as string) + Slug.getSlug( + data[this.model.getSlugifyColumn() as string] as string + ) ); } @@ -687,7 +665,8 @@ class DatabaseService { }); // Check required fields. - for (const requiredField of this.requiredFields) { + for (const requiredField of this.model.getRequiredColumns() + .columns) { if (beforeUpdateBy.data.get(requiredField) === null) { throw new BadDataException(`${requiredField} is required.`); } diff --git a/CommonServer/Services/DefaultManagerService.ts b/CommonServer/Services/DefaultManagerService.ts index 66634cacd5..d8562c2edf 100644 --- a/CommonServer/Services/DefaultManagerService.ts +++ b/CommonServer/Services/DefaultManagerService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/DefaultManager'; +import Model from 'Common/Models/DefaultManager'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Default Manager', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/DockerCredentialService.ts b/CommonServer/Services/DockerCredentialService.ts index f8163d5714..069748cfd0 100644 --- a/CommonServer/Services/DockerCredentialService.ts +++ b/CommonServer/Services/DockerCredentialService.ts @@ -1,9 +1,4 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/DockerCredential'; +import Model from 'Common/Models/DockerCredential'; import BadDataException from 'Common/Types/Exception/BadDataException'; import DatabaseService from './DatabaseService'; import API from 'Common/Utils/API'; @@ -16,8 +11,7 @@ class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Docker Credential', publicListProps: { populate: [], @@ -59,9 +53,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } diff --git a/CommonServer/Services/DomainVerificationTokenService.ts b/CommonServer/Services/DomainVerificationTokenService.ts index b675886dc4..248a04b8a5 100644 --- a/CommonServer/Services/DomainVerificationTokenService.ts +++ b/CommonServer/Services/DomainVerificationTokenService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/DomainVerificationToken'; +import Model from 'Common/Models/DomainVerificationToken'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Domain Verification Token', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/EmailStatusService.ts b/CommonServer/Services/EmailStatusService.ts index 63133d04a6..14738554ce 100644 --- a/CommonServer/Services/EmailStatusService.ts +++ b/CommonServer/Services/EmailStatusService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/EmailStatus'; +import Model from 'Common/Models/EmailStatus'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Email Status', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/EmailTemplateService.ts b/CommonServer/Services/EmailTemplateService.ts index 85d4922c92..79efd74117 100755 --- a/CommonServer/Services/EmailTemplateService.ts +++ b/CommonServer/Services/EmailTemplateService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/EmailTemplate'; +import Model from 'Common/Models/EmailTemplate'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Email Template', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ErrorEventService.ts b/CommonServer/Services/ErrorEventService.ts index 1f337e4e4d..0ca222b31e 100644 --- a/CommonServer/Services/ErrorEventService.ts +++ b/CommonServer/Services/ErrorEventService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ErrorEvent'; +import Model from 'Common/Models/ErrorEvent'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Error Event', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ErrorTrackerService.ts b/CommonServer/Services/ErrorTrackerService.ts index b8a1ff6f9c..9c3ee1df96 100644 --- a/CommonServer/Services/ErrorTrackerService.ts +++ b/CommonServer/Services/ErrorTrackerService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ErrorTracker'; +import Model from 'Common/Models/ErrorTracker'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Error Tracker', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/EscalationService.ts b/CommonServer/Services/EscalationService.ts index b3e52bc31d..62e6c9754b 100755 --- a/CommonServer/Services/EscalationService.ts +++ b/CommonServer/Services/EscalationService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Escalation'; +import Model from 'Common/Models/Escalation'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Escalation', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/FeedbackService.ts b/CommonServer/Services/FeedbackService.ts index c44c92c679..1003f1be79 100755 --- a/CommonServer/Services/FeedbackService.ts +++ b/CommonServer/Services/FeedbackService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Feedback'; +import Model from 'Common/Models/Feedback'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Feedback', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/FileService.ts b/CommonServer/Services/FileService.ts index 022fba8bc1..0d1208fd3c 100755 --- a/CommonServer/Services/FileService.ts +++ b/CommonServer/Services/FileService.ts @@ -1,5 +1,8 @@ import BadDataException from 'Common/Types/Exception/BadDataException'; -import Database, { Collection, Document } from '../Infrastructure/Database'; +import Database, { + Collection, + Document, +} from '../Infrastructure/PostgresDatabase'; import ObjectID from 'Common/Types/ObjectID'; class FileService { public async getFileById(fileId: ObjectID): Promise { diff --git a/CommonServer/Services/GitCredentialService.ts b/CommonServer/Services/GitCredentialService.ts index 0bd7a7581e..e74e8e4be9 100644 --- a/CommonServer/Services/GitCredentialService.ts +++ b/CommonServer/Services/GitCredentialService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/GitCredential'; +import Model from 'Common/Models/GitCredential'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Git Credentials Service', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/GlobalConfigService.ts b/CommonServer/Services/GlobalConfigService.ts index 2454e5bac4..a94a4e2dd1 100644 --- a/CommonServer/Services/GlobalConfigService.ts +++ b/CommonServer/Services/GlobalConfigService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/GlobalConfig'; +import Model from 'Common/Models/GlobalConfig'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Global Config', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/GroupService.ts b/CommonServer/Services/GroupService.ts index 5645ef3591..d0d4ee0edf 100644 --- a/CommonServer/Services/GroupService.ts +++ b/CommonServer/Services/GroupService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Groups'; +import Model from 'Common/Models/Groups'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Group Service', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IncidentCommunicationSlaService.ts b/CommonServer/Services/IncidentCommunicationSlaService.ts index c2aa933bdd..34a2214f27 100644 --- a/CommonServer/Services/IncidentCommunicationSlaService.ts +++ b/CommonServer/Services/IncidentCommunicationSlaService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/IncidentCommunicationSla'; +import Model from 'Common/Models/IncidentCommunicationSla'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Incident Communication SLA', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IncidentMessageService.ts b/CommonServer/Services/IncidentMessageService.ts index c1b6e36ad0..6e5bd80c95 100644 --- a/CommonServer/Services/IncidentMessageService.ts +++ b/CommonServer/Services/IncidentMessageService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/IncidentMessage'; +import Model from 'Common/Models/IncidentMessage'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Incident Message', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IncidentNoteTemplateService.ts b/CommonServer/Services/IncidentNoteTemplateService.ts index 22f14dbee8..54bd44acdb 100644 --- a/CommonServer/Services/IncidentNoteTemplateService.ts +++ b/CommonServer/Services/IncidentNoteTemplateService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/IncidentNoteTemplate'; +import Model from 'Common/Models/IncidentNoteTemplate'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Incident Note Template', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IncidentPrioritiesService.ts b/CommonServer/Services/IncidentPrioritiesService.ts index 1384c986e6..7151b4a5ea 100644 --- a/CommonServer/Services/IncidentPrioritiesService.ts +++ b/CommonServer/Services/IncidentPrioritiesService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/IncidentPriority'; +import Model from 'Common/Models/IncidentPriority'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Incident Priority', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IncidentSMSActionService.ts b/CommonServer/Services/IncidentSMSActionService.ts index d086ecb836..3096a596ba 100755 --- a/CommonServer/Services/IncidentSMSActionService.ts +++ b/CommonServer/Services/IncidentSMSActionService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/IncidentSMSAction'; +import Model from 'Common/Models/IncidentSMSAction'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Incident SMS Action', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IncidentService.ts b/CommonServer/Services/IncidentService.ts index 80ee6b43fb..dfe2051c2d 100755 --- a/CommonServer/Services/IncidentService.ts +++ b/CommonServer/Services/IncidentService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Incident'; +import Model from 'Common/Models/Incident'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Incident', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IncidentSettingsService.ts b/CommonServer/Services/IncidentSettingsService.ts index 493c215a73..1487b9a9c2 100644 --- a/CommonServer/Services/IncidentSettingsService.ts +++ b/CommonServer/Services/IncidentSettingsService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/IncidentSettings'; +import Model from 'Common/Models/IncidentSettings'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Incident Setting', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IncidentTimelineService.ts b/CommonServer/Services/IncidentTimelineService.ts index 8ce749c2fd..68b2915d2c 100644 --- a/CommonServer/Services/IncidentTimelineService.ts +++ b/CommonServer/Services/IncidentTimelineService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/IncidentTimeline'; +import Model from 'Common/Models/IncidentTimeline'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Incident Timeline', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IncomingRequestService.ts b/CommonServer/Services/IncomingRequestService.ts index 53d62c4e3c..c60105f624 100644 --- a/CommonServer/Services/IncomingRequestService.ts +++ b/CommonServer/Services/IncomingRequestService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/IncomingRequest'; +import Model from 'Common/Models/IncomingRequest'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Incoming Request', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IntegrationService.ts b/CommonServer/Services/IntegrationService.ts index 3912aeacd2..3f15600cc7 100755 --- a/CommonServer/Services/IntegrationService.ts +++ b/CommonServer/Services/IntegrationService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Integration'; +import Model from 'Common/Models/Integration'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Integration', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IssueMemberService.ts b/CommonServer/Services/IssueMemberService.ts index 300cfe56a7..9d5e70b5a9 100644 --- a/CommonServer/Services/IssueMemberService.ts +++ b/CommonServer/Services/IssueMemberService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/IssueMember'; +import Model from 'Common/Models/IssueMember'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Issue Member', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IssueService.ts b/CommonServer/Services/IssueService.ts index 272917e1f7..7de5b79cd7 100644 --- a/CommonServer/Services/IssueService.ts +++ b/CommonServer/Services/IssueService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Issue'; +import Model from 'Common/Models/Issue'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Issue', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/IssueTimelineService.ts b/CommonServer/Services/IssueTimelineService.ts index a973724641..bac7c7bc17 100644 --- a/CommonServer/Services/IssueTimelineService.ts +++ b/CommonServer/Services/IssueTimelineService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/IssueTimeline'; +import Model from 'Common/Models/IssueTimeline'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Issue Timeline', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/LeadService.ts b/CommonServer/Services/LeadService.ts index d468e47741..b2fcb6025d 100755 --- a/CommonServer/Services/LeadService.ts +++ b/CommonServer/Services/LeadService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Lead'; +import Model from 'Common/Models/Lead'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Lead', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/LighthouseLogService.ts b/CommonServer/Services/LighthouseLogService.ts index 4a5354e90a..d2be46086a 100644 --- a/CommonServer/Services/LighthouseLogService.ts +++ b/CommonServer/Services/LighthouseLogService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/LighthouseLog'; +import Model from 'Common/Models/LighthouseLog'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Lighthouse Log', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/LogService.ts b/CommonServer/Services/LogService.ts index 7af654edd7..7496f25ea0 100644 --- a/CommonServer/Services/LogService.ts +++ b/CommonServer/Services/LogService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Log'; +import Model from 'Common/Models/Log'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Log', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/LoginHistoryService.ts b/CommonServer/Services/LoginHistoryService.ts index 40dbacb49f..e9b3dc1309 100644 --- a/CommonServer/Services/LoginHistoryService.ts +++ b/CommonServer/Services/LoginHistoryService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/LoginHistory'; +import Model from 'Common/Models/LoginHistory'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Login History', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/MonitorCustomField.ts b/CommonServer/Services/MonitorCustomField.ts index 0c5db4eba5..b5bedca989 100644 --- a/CommonServer/Services/MonitorCustomField.ts +++ b/CommonServer/Services/MonitorCustomField.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/MonitorCustomField'; +import Model from 'Common/Models/MonitorCustomField'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Monitor Custom Field', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/MonitorLogByDayService.ts b/CommonServer/Services/MonitorLogByDayService.ts index 7f46155c64..8c70f57750 100644 --- a/CommonServer/Services/MonitorLogByDayService.ts +++ b/CommonServer/Services/MonitorLogByDayService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/MonitorLogByDay'; +import Model from 'Common/Models/MonitorLogByDay'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Monitor Log by Day', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/MonitorLogByHourService.ts b/CommonServer/Services/MonitorLogByHourService.ts index 435aea39aa..24ffcb6d4b 100644 --- a/CommonServer/Services/MonitorLogByHourService.ts +++ b/CommonServer/Services/MonitorLogByHourService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/MonitorLogByHour'; +import Model from 'Common/Models/MonitorLogByHour'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Monitor Log by Hour', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/MonitorLogByWeekService.ts b/CommonServer/Services/MonitorLogByWeekService.ts index eac281211a..b0585c1a56 100644 --- a/CommonServer/Services/MonitorLogByWeekService.ts +++ b/CommonServer/Services/MonitorLogByWeekService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/MonitorLogByWeek'; +import Model from 'Common/Models/MonitorLogByWeek'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Monitor Log by Week', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/MonitorLogService.ts b/CommonServer/Services/MonitorLogService.ts index 15ca119dd4..15aa663bec 100644 --- a/CommonServer/Services/MonitorLogService.ts +++ b/CommonServer/Services/MonitorLogService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/MonitorLog'; +import Model from 'Common/Models/MonitorLog'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Monitor Log', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/MonitorService.ts b/CommonServer/Services/MonitorService.ts index 95d14bc86e..efbacfea7d 100644 --- a/CommonServer/Services/MonitorService.ts +++ b/CommonServer/Services/MonitorService.ts @@ -2,12 +2,7 @@ import OneUptimeDate from 'Common/Types/Date'; import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; import { Document } from '../Infrastructure/ORM'; -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Monitor'; +import Model from 'Common/Models/Monitor'; import Query from '../Types/DB/Query'; import DatabaseService from './DatabaseService'; @@ -15,8 +10,7 @@ class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Monitor', publicListProps: { populate: [], @@ -58,9 +52,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } diff --git a/CommonServer/Services/MonitorSlaService.ts b/CommonServer/Services/MonitorSlaService.ts index 9105514a57..79755aca15 100644 --- a/CommonServer/Services/MonitorSlaService.ts +++ b/CommonServer/Services/MonitorSlaService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/MonitorSla'; +import Model from 'Common/Models/MonitorSla'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Monitor SLA', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/MonitorStatusService.ts b/CommonServer/Services/MonitorStatusService.ts index 530513cdfb..8821c716eb 100644 --- a/CommonServer/Services/MonitorStatusService.ts +++ b/CommonServer/Services/MonitorStatusService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/MonitorStatus'; +import Model from 'Common/Models/MonitorStatus'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Monitor Status', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/NotificationService.ts b/CommonServer/Services/NotificationService.ts index 2a3d050e62..a67b685c05 100755 --- a/CommonServer/Services/NotificationService.ts +++ b/CommonServer/Services/NotificationService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Notification'; +import Model from 'Common/Models/Notification'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Notification', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/OnCallScheduleStatusService.ts b/CommonServer/Services/OnCallScheduleStatusService.ts index e9009f957a..bf5359d7d6 100644 --- a/CommonServer/Services/OnCallScheduleStatusService.ts +++ b/CommonServer/Services/OnCallScheduleStatusService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/OnCallScheduleStatus'; +import Model from 'Common/Models/OnCallScheduleStatus'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'OnCall Schedule Status', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/PerformanceTrackerMetricService.ts b/CommonServer/Services/PerformanceTrackerMetricService.ts index 7b6272d35c..40ce0eff8c 100644 --- a/CommonServer/Services/PerformanceTrackerMetricService.ts +++ b/CommonServer/Services/PerformanceTrackerMetricService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/PerformanceTrackerMetric'; +import Model from 'Common/Models/PerformanceTrackerMetric'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Performance Tracker Metric', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/PerformanceTrackerService.ts b/CommonServer/Services/PerformanceTrackerService.ts index 6d0b29e3f8..e1110bdd55 100644 --- a/CommonServer/Services/PerformanceTrackerService.ts +++ b/CommonServer/Services/PerformanceTrackerService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/PerformanceTracker'; +import Model from 'Common/Models/PerformanceTracker'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Performance Tracker', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ProbeService.ts b/CommonServer/Services/ProbeService.ts index 30bc061f56..0261d389e7 100644 --- a/CommonServer/Services/ProbeService.ts +++ b/CommonServer/Services/ProbeService.ts @@ -1,9 +1,4 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Probe'; +import Model from 'Common/Models/Probe'; import { Document } from '../Infrastructure/ORM'; @@ -17,8 +12,7 @@ class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Probe', publicListProps: { populate: [], @@ -60,9 +54,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } diff --git a/CommonServer/Services/ProjectService.ts b/CommonServer/Services/ProjectService.ts index 1a291f4312..2a8b6ebf06 100755 --- a/CommonServer/Services/ProjectService.ts +++ b/CommonServer/Services/ProjectService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Project'; +import Model from 'Common/Models/Project'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Project', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ResourceCategoryService.ts b/CommonServer/Services/ResourceCategoryService.ts index 451ec99c86..e0f11093e7 100755 --- a/CommonServer/Services/ResourceCategoryService.ts +++ b/CommonServer/Services/ResourceCategoryService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ResourceCategory'; +import Model from 'Common/Models/ResourceCategory'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Resource Category', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ScheduleService.ts b/CommonServer/Services/ScheduleService.ts index baf5970088..8fcc7fc1e6 100755 --- a/CommonServer/Services/ScheduleService.ts +++ b/CommonServer/Services/ScheduleService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Schedule'; +import Model from 'Common/Models/Schedule'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Schedule', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ScheduledEventNoteService.ts b/CommonServer/Services/ScheduledEventNoteService.ts index ad1d9326f3..99200b629c 100644 --- a/CommonServer/Services/ScheduledEventNoteService.ts +++ b/CommonServer/Services/ScheduledEventNoteService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ScheduledEvent'; +import Model from 'Common/Models/ScheduledEvent'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Scheduled Event', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/ScheduledEventService.ts b/CommonServer/Services/ScheduledEventService.ts index ad1d9326f3..99200b629c 100755 --- a/CommonServer/Services/ScheduledEventService.ts +++ b/CommonServer/Services/ScheduledEventService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/ScheduledEvent'; +import Model from 'Common/Models/ScheduledEvent'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Scheduled Event', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/SiteManagerService.ts b/CommonServer/Services/SiteManagerService.ts index 6caa81c3ee..8c8b23ee9e 100644 --- a/CommonServer/Services/SiteManagerService.ts +++ b/CommonServer/Services/SiteManagerService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/SiteManager'; +import Model from 'Common/Models/SiteManager'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Site Manager Service', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/SmsCountService.ts b/CommonServer/Services/SmsCountService.ts index 5d540f22b2..5fb3ddfb0a 100644 --- a/CommonServer/Services/SmsCountService.ts +++ b/CommonServer/Services/SmsCountService.ts @@ -1,11 +1,6 @@ import OneUptimeDate from 'Common/Types/Date'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/SmsCount'; +import Model from 'Common/Models/SmsCount'; import DatabaseService from './DatabaseService'; import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; @@ -15,8 +10,7 @@ class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'SMS Count', publicListProps: { populate: [], @@ -58,9 +52,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } diff --git a/CommonServer/Services/SmsProviderService.ts b/CommonServer/Services/SmsProviderService.ts index b4b43be330..4c724b22cd 100755 --- a/CommonServer/Services/SmsProviderService.ts +++ b/CommonServer/Services/SmsProviderService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/SmsProvider'; +import Model from 'Common/Models/SmsProvider'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'SMS Provider', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/SmsTemplateService.ts b/CommonServer/Services/SmsTemplateService.ts index d3565a14d9..e0e5ff4e92 100755 --- a/CommonServer/Services/SmsTemplateService.ts +++ b/CommonServer/Services/SmsTemplateService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/SmsTemplate'; +import Model from 'Common/Models/SmsTemplate'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'SMS Template', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/SmtpService.ts b/CommonServer/Services/SmtpService.ts index 50638417b5..dd8ba10481 100755 --- a/CommonServer/Services/SmtpService.ts +++ b/CommonServer/Services/SmtpService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Smtp'; +import Model from 'Common/Models/Smtp'; import DatabaseService from './DatabaseService'; class EmailSmtpService extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'SMTP', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class EmailSmtpService extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/SslService.ts b/CommonServer/Services/SslService.ts index eea72d1f9d..38324f2ecd 100644 --- a/CommonServer/Services/SslService.ts +++ b/CommonServer/Services/SslService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/SSL'; +import Model from 'Common/Models/SSL'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'SSL', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/SsoDefaultRolesService.ts b/CommonServer/Services/SsoDefaultRolesService.ts index 196543d15b..86763be0aa 100644 --- a/CommonServer/Services/SsoDefaultRolesService.ts +++ b/CommonServer/Services/SsoDefaultRolesService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/SsoDefaultRole'; +import Model from 'Common/Models/SsoDefaultRole'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'SSO Default Role', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: true, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/SsoService.ts b/CommonServer/Services/SsoService.ts index 644963fac9..c7b5a91338 100644 --- a/CommonServer/Services/SsoService.ts +++ b/CommonServer/Services/SsoService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/SSO'; +import Model from 'Common/Models/SSO'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'SSO', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/StatusPageCategoryService.ts b/CommonServer/Services/StatusPageCategoryService.ts index cbd986f062..be284e6fad 100644 --- a/CommonServer/Services/StatusPageCategoryService.ts +++ b/CommonServer/Services/StatusPageCategoryService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/StatusPageCategory'; +import Model from 'Common/Models/StatusPageCategory'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Status Page Category', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/StatusPageService.ts b/CommonServer/Services/StatusPageService.ts index 042a703c37..cbc944f8b4 100755 --- a/CommonServer/Services/StatusPageService.ts +++ b/CommonServer/Services/StatusPageService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/StatusPage'; +import Model from 'Common/Models/StatusPage'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Status Page', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/SubscriberAlertService.ts b/CommonServer/Services/SubscriberAlertService.ts index 61ae5dbd44..a344154c87 100755 --- a/CommonServer/Services/SubscriberAlertService.ts +++ b/CommonServer/Services/SubscriberAlertService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/SubscriberAlert'; +import Model from 'Common/Models/SubscriberAlert'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Subscriber Alert', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/SubscriberService.ts b/CommonServer/Services/SubscriberService.ts index cb33978916..570e292cc1 100755 --- a/CommonServer/Services/SubscriberService.ts +++ b/CommonServer/Services/SubscriberService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/Subscriber'; +import Model from 'Common/Models/Subscriber'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'Subscriber', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Services/UserService.ts b/CommonServer/Services/UserService.ts index 5de07c5aae..31197bbfe4 100755 --- a/CommonServer/Services/UserService.ts +++ b/CommonServer/Services/UserService.ts @@ -1,17 +1,11 @@ -import Model, { - requiredFields, - uniqueFields, - slugifyField, - encryptedFields, -} from 'Common/Models/User'; +import Model from 'Common/Models/User'; import DatabaseService from './DatabaseService'; class Service extends DatabaseService { public constructor() { super({ model: Model, - requiredFields: requiredFields, - uniqueFields: uniqueFields, + friendlyName: 'User', publicListProps: { populate: [], @@ -53,9 +47,6 @@ class Service extends DatabaseService { populate: [], select: [], }, - isResourceByProject: false, - slugifyField: slugifyField, - encryptedFields: encryptedFields, }); } } diff --git a/CommonServer/Utils/Response.ts b/CommonServer/Utils/Response.ts index 5d923f7c48..39bc8f27ba 100644 --- a/CommonServer/Utils/Response.ts +++ b/CommonServer/Utils/Response.ts @@ -11,7 +11,7 @@ import { JSONObject, JSONArray, JSONObjectOrArray } from 'Common/Types/JSON'; import { File } from 'Common/Types/File'; import Exception from 'Common/Types/Exception/Exception'; import ListData from 'Common/Types/ListData'; -import Database from '../Infrastructure/Database'; +import Database from '../Infrastructure/PostgresDatabase'; import PositiveNumber from 'Common/Types/PositiveNumber'; import URL from 'Common/Types/API/URL'; diff --git a/CommonServer/package-lock.json b/CommonServer/package-lock.json index aea8b37eb6..14bc87ca16 100644 --- a/CommonServer/package-lock.json +++ b/CommonServer/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "CommonServer", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/gridfs-stream": "^0.5.35", @@ -37,7 +37,7 @@ "../common": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -55,7 +55,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", diff --git a/CommonServer/package.json b/CommonServer/package.json index cf77aa3d67..cfcbf6de26 100644 --- a/CommonServer/package.json +++ b/CommonServer/package.json @@ -8,7 +8,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "@elastic/elasticsearch": "^8.1.0", diff --git a/CommonUI/package-lock.json b/CommonUI/package-lock.json index 91adb7bd00..34d72ef565 100644 --- a/CommonUI/package-lock.json +++ b/CommonUI/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "CommonUI", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/free-regular-svg-icons": "^6.1.0", @@ -27,7 +27,7 @@ "../common": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -45,7 +45,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", diff --git a/CommonUI/package.json b/CommonUI/package.json index 67987c33a2..3df2349c26 100644 --- a/CommonUI/package.json +++ b/CommonUI/package.json @@ -8,7 +8,7 @@ "compile": "tsc" }, "author": "", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.0", diff --git a/ContainerScanner/package-lock.json b/ContainerScanner/package-lock.json index b92ea75cf0..67bbb2e4ba 100644 --- a/ContainerScanner/package-lock.json +++ b/ContainerScanner/package-lock.json @@ -28,7 +28,7 @@ }, "../common": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "axios": "^0.26.1" }, @@ -38,7 +38,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/json2csv": "^5.0.3", diff --git a/Dashboard/package-lock.json b/Dashboard/package-lock.json index 38261a210d..fe42e071ef 100644 --- a/Dashboard/package-lock.json +++ b/Dashboard/package-lock.json @@ -4000,7 +4000,7 @@ }, "../common": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "devDependencies": { "@types/node": "^17.0.22" } @@ -15311,7 +15311,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/json2csv": "^5.0.3", @@ -17717,7 +17717,7 @@ }, "../CommonUI": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/free-regular-svg-icons": "^6.1.0", diff --git a/DashboardAPI/package-lock.json b/DashboardAPI/package-lock.json index b67cbd6296..09423dce42 100644 --- a/DashboardAPI/package-lock.json +++ b/DashboardAPI/package-lock.json @@ -99,7 +99,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -119,7 +119,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/gridfs-stream": "^0.5.35", diff --git a/DataIngestor/package-lock.json b/DataIngestor/package-lock.json index 8452e63b55..fc89a2b318 100644 --- a/DataIngestor/package-lock.json +++ b/DataIngestor/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "data-ingestor", "version": "3.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "axios": "^0.26.1", "Common": "file:../Common", @@ -30,14 +30,14 @@ }, "../common": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "devDependencies": { "@types/node": "^17.0.22" } }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/json2csv": "^5.0.3", diff --git a/DataIngestor/package.json b/DataIngestor/package.json index 2acdcc28fe..fa89b1102a 100644 --- a/DataIngestor/package.json +++ b/DataIngestor/package.json @@ -12,7 +12,7 @@ }, "keywords": [], "author": "", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "axios": "^0.26.1", diff --git a/File/Dockerfile b/File/Dockerfile new file mode 100644 index 0000000000..e69de29bb2 diff --git a/File/Dockerfile.dev b/File/Dockerfile.dev new file mode 100644 index 0000000000..e69de29bb2 diff --git a/File/package.json b/File/package.json new file mode 100644 index 0000000000..43fedcec36 --- /dev/null +++ b/File/package.json @@ -0,0 +1,11 @@ +{ + "name": "file", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "MIT" +} diff --git a/HelmChart/package-lock.json b/HelmChart/package-lock.json index 7c82c51f20..98f54f3839 100644 --- a/HelmChart/package-lock.json +++ b/HelmChart/package-lock.json @@ -8,7 +8,7 @@ "name": "HelmChart", "version": "3.0.0", "hasInstallScript": true, - "license": "ISC", + "license": "MIT", "dependencies": { "chai": "^4.3.6", "chai-http": "^4.3.0", @@ -36,7 +36,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -583,7 +583,7 @@ "../common": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -1249,7 +1249,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/json2csv": "^5.0.3", "Common": "file:../Common", diff --git a/HelmChart/package.json b/HelmChart/package.json index 1800c44b3f..77dc7421d8 100644 --- a/HelmChart/package.json +++ b/HelmChart/package.json @@ -13,7 +13,7 @@ "dep-check": "depcheck ./ --skip-missing=true --ignores='ejs'" }, "author": "", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "CommonServer": "file:../CommonServer", diff --git a/Home/package-lock.json b/Home/package-lock.json index c1ad0ddacd..6c1e7307cf 100644 --- a/Home/package-lock.json +++ b/Home/package-lock.json @@ -109,7 +109,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "axios": "^0.26.1", @@ -1683,7 +1683,7 @@ "../common": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "axios": "^0.26.1", @@ -3623,7 +3623,7 @@ "../CommonServer": { "name": "CommonServer", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/json2csv": "^5.0.3", "Common": "file:../Common", @@ -7074,7 +7074,7 @@ "../CommonServer": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/gridfs-stream": "^0.5.35", diff --git a/HttpTestServer/package-lock.json b/HttpTestServer/package-lock.json index 6c20a43491..1962ef48cb 100644 --- a/HttpTestServer/package-lock.json +++ b/HttpTestServer/package-lock.json @@ -8,7 +8,7 @@ "name": "HttpTestServer", "version": "1.0.0", "hasInstallScript": true, - "license": "ISC", + "license": "MIT", "dependencies": { "body-parser": "^1.19.2", "Common": "file:../Common", @@ -84,7 +84,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -1191,7 +1191,7 @@ "../common": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -2480,7 +2480,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/json2csv": "^5.0.3", "Common": "file:../Common", diff --git a/HttpTestServer/package.json b/HttpTestServer/package.json index ed5c1ca98f..615f6f005c 100644 --- a/HttpTestServer/package.json +++ b/HttpTestServer/package.json @@ -14,7 +14,7 @@ }, "keywords": [], "author": "", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "CommonServer": "file:../CommonServer", diff --git a/Identity/Dockerfile b/Identity/Dockerfile new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Identity/Dockerfile.dev b/Identity/Dockerfile.dev new file mode 100644 index 0000000000..e69de29bb2 diff --git a/JavaScriptSDK/package-lock.json b/JavaScriptSDK/package-lock.json index d809ed82cd..c4d5a6718e 100644 --- a/JavaScriptSDK/package-lock.json +++ b/JavaScriptSDK/package-lock.json @@ -8,7 +8,7 @@ "name": "oneuptime", "version": "3.0.0", "hasInstallScript": true, - "license": "ISC", + "license": "MIT", "dependencies": { "lru_map": "^0.4.1", "systeminformation": "^5.11.9", diff --git a/JavaScriptSDK/package.json b/JavaScriptSDK/package.json index df19c2426e..e6008674ee 100644 --- a/JavaScriptSDK/package.json +++ b/JavaScriptSDK/package.json @@ -25,7 +25,7 @@ "tracker" ], "author": "HackerBay, Inc.", - "license": "ISC", + "license": "MIT", "devDependencies": { "@babel/cli": "^7.17.6", "@babel/core": "^7.17.8", diff --git a/Licensing/package-lock.json b/Licensing/package-lock.json index 37a6f5b322..55508691eb 100644 --- a/Licensing/package-lock.json +++ b/Licensing/package-lock.json @@ -71,7 +71,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -739,7 +739,7 @@ "../common": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -1527,7 +1527,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/json2csv": "^5.0.3", "Common": "file:../Common", diff --git a/LighthouseRunner/package-lock.json b/LighthouseRunner/package-lock.json index d82f1ed564..8774865dc0 100644 --- a/LighthouseRunner/package-lock.json +++ b/LighthouseRunner/package-lock.json @@ -32,14 +32,14 @@ }, "../common": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "devDependencies": { "@types/node": "^17.0.22" } }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/json2csv": "^5.0.3", diff --git a/Mail/package-lock.json b/Mail/package-lock.json index 984a2c01f1..ee766f7e79 100644 --- a/Mail/package-lock.json +++ b/Mail/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "mail", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/node": "^17.0.27", "@types/nodemailer": "^6.4.4", @@ -23,7 +23,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -550,7 +550,7 @@ "../Common/node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "camelcase": "^5.3.1", "find-up": "^4.1.0", @@ -1050,7 +1050,7 @@ "../Common/node_modules/anymatch": { "version": "3.1.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -1315,7 +1315,7 @@ "../Common/node_modules/cliui": { "version": "7.0.4", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -1508,7 +1508,7 @@ "../Common/node_modules/electron-to-chromium": { "version": "1.4.118", "dev": true, - "license": "ISC" + "license": "MIT" }, "../Common/node_modules/emittery": { "version": "0.8.1", @@ -1717,7 +1717,7 @@ "../Common/node_modules/fs.realpath": { "version": "1.0.0", "dev": true, - "license": "ISC" + "license": "MIT" }, "../Common/node_modules/fsevents": { "version": "2.3.2", @@ -1747,7 +1747,7 @@ "../Common/node_modules/get-caller-file": { "version": "2.0.5", "dev": true, - "license": "ISC", + "license": "MIT", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -1774,7 +1774,7 @@ "../Common/node_modules/glob": { "version": "7.2.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -1801,7 +1801,7 @@ "../Common/node_modules/graceful-fs": { "version": "4.2.10", "dev": true, - "license": "ISC" + "license": "MIT" }, "../Common/node_modules/has": { "version": "1.0.3", @@ -1911,7 +1911,7 @@ "../Common/node_modules/inflight": { "version": "1.0.6", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -1920,7 +1920,7 @@ "../Common/node_modules/inherits": { "version": "2.0.4", "dev": true, - "license": "ISC" + "license": "MIT" }, "../Common/node_modules/is-arrayish": { "version": "0.2.1", @@ -1986,7 +1986,7 @@ "../Common/node_modules/isexe": { "version": "2.0.0", "dev": true, - "license": "ISC" + "license": "MIT" }, "../Common/node_modules/istanbul-lib-coverage": { "version": "3.2.0", @@ -2547,7 +2547,7 @@ "../Common/node_modules/jest-snapshot/node_modules/semver": { "version": "7.3.7", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "lru-cache": "^6.0.0" }, @@ -2791,7 +2791,7 @@ "../Common/node_modules/lru-cache": { "version": "6.0.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "yallist": "^4.0.0" }, @@ -2816,7 +2816,7 @@ "../Common/node_modules/make-error": { "version": "1.3.6", "dev": true, - "license": "ISC" + "license": "MIT" }, "../Common/node_modules/makeerror": { "version": "1.0.12", @@ -2873,7 +2873,7 @@ "../Common/node_modules/minimatch": { "version": "3.1.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -2949,7 +2949,7 @@ "../Common/node_modules/once": { "version": "1.4.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "wrappy": "1" } @@ -3071,7 +3071,7 @@ "../Common/node_modules/picocolors": { "version": "1.0.0", "dev": true, - "license": "ISC" + "license": "MIT" }, "../Common/node_modules/picomatch": { "version": "2.3.1", @@ -3218,7 +3218,7 @@ "../Common/node_modules/rimraf": { "version": "3.0.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "glob": "^7.1.3" }, @@ -3242,7 +3242,7 @@ "../Common/node_modules/saxes": { "version": "5.0.1", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "xmlchars": "^2.2.0" }, @@ -3253,7 +3253,7 @@ "../Common/node_modules/semver": { "version": "6.3.0", "dev": true, - "license": "ISC", + "license": "MIT", "bin": { "semver": "bin/semver.js" } @@ -3280,7 +3280,7 @@ "../Common/node_modules/signal-exit": { "version": "3.0.7", "dev": true, - "license": "ISC" + "license": "MIT" }, "../Common/node_modules/sisteransi": { "version": "1.0.5", @@ -3455,7 +3455,7 @@ "../Common/node_modules/test-exclude": { "version": "6.0.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", @@ -3563,7 +3563,7 @@ "../Common/node_modules/ts-jest/node_modules/semver": { "version": "7.3.7", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "lru-cache": "^6.0.0" }, @@ -3643,7 +3643,7 @@ "../Common/node_modules/v8-to-istanbul": { "version": "8.1.1", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.1", "convert-source-map": "^1.6.0", @@ -3725,7 +3725,7 @@ "../Common/node_modules/which": { "version": "2.0.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "isexe": "^2.0.0" }, @@ -3763,12 +3763,12 @@ "../Common/node_modules/wrappy": { "version": "1.0.2", "dev": true, - "license": "ISC" + "license": "MIT" }, "../Common/node_modules/write-file-atomic": { "version": "3.0.3", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "imurmurhash": "^0.1.4", "is-typedarray": "^1.0.0", @@ -3809,7 +3809,7 @@ "../Common/node_modules/y18n": { "version": "5.0.8", "dev": true, - "license": "ISC", + "license": "MIT", "engines": { "node": ">=10" } @@ -3817,7 +3817,7 @@ "../Common/node_modules/yallist": { "version": "4.0.0", "dev": true, - "license": "ISC" + "license": "MIT" }, "../Common/node_modules/yargs": { "version": "16.2.0", @@ -3839,14 +3839,14 @@ "../Common/node_modules/yargs-parser": { "version": "20.2.9", "dev": true, - "license": "ISC", + "license": "MIT", "engines": { "node": ">=10" } }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/gridfs-stream": "^0.5.35", @@ -4529,11 +4529,11 @@ }, "../CommonServer/node_modules/fs.realpath": { "version": "1.0.0", - "license": "ISC" + "license": "MIT" }, "../CommonServer/node_modules/glob": { "version": "7.2.0", - "license": "ISC", + "license": "MIT", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -4551,7 +4551,7 @@ }, "../CommonServer/node_modules/graceful-fs": { "version": "4.2.10", - "license": "ISC" + "license": "MIT" }, "../CommonServer/node_modules/gridfs-stream": { "version": "1.1.1", @@ -4629,7 +4629,7 @@ }, "../CommonServer/node_modules/inflight": { "version": "1.0.6", - "license": "ISC", + "license": "MIT", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -4637,7 +4637,7 @@ }, "../CommonServer/node_modules/inherits": { "version": "2.0.4", - "license": "ISC" + "license": "MIT" }, "../CommonServer/node_modules/ip": { "version": "1.1.5", @@ -4814,7 +4814,7 @@ }, "../CommonServer/node_modules/minimatch": { "version": "3.1.2", - "license": "ISC", + "license": "MIT", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5015,7 +5015,7 @@ }, "../CommonServer/node_modules/once": { "version": "1.4.0", - "license": "ISC", + "license": "MIT", "dependencies": { "wrappy": "1" } @@ -5151,7 +5151,7 @@ }, "../CommonServer/node_modules/semver": { "version": "5.7.1", - "license": "ISC", + "license": "MIT", "bin": { "semver": "bin/semver" } @@ -5193,7 +5193,7 @@ }, "../CommonServer/node_modules/setprototypeof": { "version": "1.2.0", - "license": "ISC" + "license": "MIT" }, "../CommonServer/node_modules/sift": { "version": "16.0.0", @@ -5469,7 +5469,7 @@ }, "../CommonServer/node_modules/wrappy": { "version": "1.0.2", - "license": "ISC" + "license": "MIT" }, "../CommonServer/node_modules/ws": { "version": "8.2.3", @@ -5551,11 +5551,11 @@ }, "node_modules/fs.realpath": { "version": "1.0.0", - "license": "ISC" + "license": "MIT" }, "node_modules/glob": { "version": "7.2.0", - "license": "ISC", + "license": "MIT", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5573,7 +5573,7 @@ }, "node_modules/graceful-fs": { "version": "4.2.10", - "license": "ISC" + "license": "MIT" }, "node_modules/handlebars": { "version": "4.7.7", @@ -5596,7 +5596,7 @@ }, "node_modules/inflight": { "version": "1.0.6", - "license": "ISC", + "license": "MIT", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -5604,11 +5604,11 @@ }, "node_modules/inherits": { "version": "2.0.4", - "license": "ISC" + "license": "MIT" }, "node_modules/minimatch": { "version": "3.1.2", - "license": "ISC", + "license": "MIT", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5640,7 +5640,7 @@ }, "node_modules/once": { "version": "1.4.0", - "license": "ISC", + "license": "MIT", "dependencies": { "wrappy": "1" } @@ -5676,7 +5676,7 @@ }, "node_modules/wrappy": { "version": "1.0.2", - "license": "ISC" + "license": "MIT" } }, "dependencies": { diff --git a/Mail/package.json b/Mail/package.json index 0e2001bd3b..40fd349462 100644 --- a/Mail/package.json +++ b/Mail/package.json @@ -10,7 +10,7 @@ "test": "echo 'no tests'" }, "author": "", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/node": "^17.0.27", "@types/nodemailer": "^6.4.4", diff --git a/Probe/package-lock.json b/Probe/package-lock.json index 42a0b185cb..0a726c1afc 100644 --- a/Probe/package-lock.json +++ b/Probe/package-lock.json @@ -8,7 +8,7 @@ "name": "probe", "version": "3.0.0", "hasInstallScript": true, - "license": "ISC", + "license": "MIT", "dependencies": { "await-sleep": "^0.0.1", "axios": "^0.26.1", @@ -37,7 +37,7 @@ "../common": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -55,7 +55,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -75,7 +75,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/gridfs-stream": "^0.5.35", diff --git a/Probe/package.json b/Probe/package.json index e2b563fd42..ab138243b5 100755 --- a/Probe/package.json +++ b/Probe/package.json @@ -17,7 +17,7 @@ "url": "git+https://gitlab.com/oneuptime/probe.git" }, "author": "Nilanshu", - "license": "ISC", + "license": "MIT", "bugs": { "url": "https://gitlab.com/oneuptime/probe/issues" }, diff --git a/ProbeAPI/package-lock.json b/ProbeAPI/package-lock.json index 84b05ab211..1599ccca49 100644 --- a/ProbeAPI/package-lock.json +++ b/ProbeAPI/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "ProbeAPI", "version": "3.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "axios": "^0.26.1", "Common": "file:../Common", @@ -33,7 +33,7 @@ "../common": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -51,7 +51,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -68,7 +68,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/gridfs-stream": "^0.5.35", diff --git a/ProbeAPI/package.json b/ProbeAPI/package.json index e17c6883c9..7e41a1bd39 100644 --- a/ProbeAPI/package.json +++ b/ProbeAPI/package.json @@ -12,7 +12,7 @@ }, "keywords": [], "author": "HackerBay, Inc. ", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "axios": "^0.26.1", diff --git a/Realtime/package-lock.json b/Realtime/package-lock.json index a9c6bc894b..ae3e138a2b 100644 --- a/Realtime/package-lock.json +++ b/Realtime/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "realtime", "version": "3.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "axios": "^0.26.1", "Common": "file:../Common", @@ -29,7 +29,7 @@ "../common": { "version": "1.0.0", "extraneous": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -47,7 +47,7 @@ "../Common": { "name": "common", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/nanoid-dictionary": "^4.2.0", "@types/uuid": "^8.3.4", @@ -64,7 +64,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/gridfs-stream": "^0.5.35", diff --git a/Realtime/package.json b/Realtime/package.json index c4702922f2..6872d163b7 100644 --- a/Realtime/package.json +++ b/Realtime/package.json @@ -12,7 +12,7 @@ }, "keywords": [], "author": "", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "axios": "^0.26.1", diff --git a/ScriptRunner/package-lock.json b/ScriptRunner/package-lock.json index fb30d8ad2b..73960558f4 100644 --- a/ScriptRunner/package-lock.json +++ b/ScriptRunner/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "ScriptRunner", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@types/node-cron": "^3.0.1", "axios": "^0.26.1", @@ -29,7 +29,7 @@ }, "../common": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "axios": "^0.26.1" }, @@ -39,7 +39,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/json2csv": "^5.0.3", diff --git a/ScriptRunner/package.json b/ScriptRunner/package.json index a191802e31..4a08b62c20 100644 --- a/ScriptRunner/package.json +++ b/ScriptRunner/package.json @@ -11,7 +11,7 @@ "audit": "npm audit --audit-level=low" }, "author": "Augustine", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "@types/node-cron": "^3.0.1", diff --git a/Scripts/package-lock.json b/Scripts/package-lock.json index 936988608e..5ffccda757 100644 --- a/Scripts/package-lock.json +++ b/Scripts/package-lock.json @@ -8,7 +8,7 @@ "name": "scripts", "version": "1.0.0", "hasInstallScript": true, - "license": "ISC", + "license": "MIT", "dependencies": { "ts-node": "^10.7.0", "typescript": "^4.6.3", diff --git a/Scripts/package.json b/Scripts/package.json index be8058d8d3..aa38e71734 100644 --- a/Scripts/package.json +++ b/Scripts/package.json @@ -15,7 +15,7 @@ "npm-force-resolutions": "0.0.10" }, "author": "", - "license": "ISC", + "license": "MIT", "dependencies": { "ts-node": "^10.7.0", "typescript": "^4.6.3", diff --git a/StatusPage/package-lock.json b/StatusPage/package-lock.json index e9f33cb48b..ea6591d49f 100644 --- a/StatusPage/package-lock.json +++ b/StatusPage/package-lock.json @@ -3749,7 +3749,7 @@ }, "../common": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "axios": "^0.26.1" }, @@ -14719,7 +14719,7 @@ }, "../CommonServer": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.1.0", "@types/json2csv": "^5.0.3", @@ -17084,7 +17084,7 @@ }, "../CommonUI": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/free-regular-svg-icons": "^6.1.0", diff --git a/Tests/package-lock.json b/Tests/package-lock.json index 56fc04da0e..413d8b33c0 100644 --- a/Tests/package-lock.json +++ b/Tests/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "tests", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "axios": "^0.26.1", "speakeasy": "^2.0.0" diff --git a/Tests/package.json b/Tests/package.json index e63b1eaf4d..d6a4ca2ca5 100644 --- a/Tests/package.json +++ b/Tests/package.json @@ -12,7 +12,7 @@ }, "keywords": [], "author": "", - "license": "ISC", + "license": "MIT", "devDependencies": { "chai": "^4.3.6", "chai-http": "^4.3.0", diff --git a/Workers/package-lock.json b/Workers/package-lock.json index 33d3a7c666..4fd0fb8642 100644 --- a/Workers/package-lock.json +++ b/Workers/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "workers", "version": "1.0.0", - "license": "ISC" + "license": "MIT" } } } diff --git a/Workers/package.json b/Workers/package.json index 317a739769..91d839c4b7 100644 --- a/Workers/package.json +++ b/Workers/package.json @@ -7,5 +7,5 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", - "license": "ISC" + "license": "MIT" } diff --git a/Zapier/package-lock.json b/Zapier/package-lock.json index 40b060ca6a..7544b62d92 100644 --- a/Zapier/package-lock.json +++ b/Zapier/package-lock.json @@ -843,7 +843,7 @@ "node_modules/isexe": { "version": "2.0.0", "dev": true, - "license": "ISC" + "license": "MIT" }, "node_modules/babel-preset-flow": { "version": "6.23.0", @@ -1282,7 +1282,7 @@ "node_modules/minimatch": { "version": "3.0.4", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1970,7 +1970,7 @@ "node_modules/browser-stdout": { "version": "1.3.1", "dev": true, - "license": "ISC" + "license": "MIT" }, "node_modules/minimist": { "version": "1.2.5", @@ -2438,7 +2438,7 @@ "node_modules/which": { "version": "2.0.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "isexe": "^2.0.0" }, diff --git a/_test/error-tracker-js/package-lock.json b/_test/error-tracker-js/package-lock.json index 4a2373d601..dc62768002 100644 --- a/_test/error-tracker-js/package-lock.json +++ b/_test/error-tracker-js/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "error-tracker", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "oneuptime-staging": "^3.0.9531" } diff --git a/_test/error-tracker-js/package.json b/_test/error-tracker-js/package.json index 816cdf9bd4..fcff534917 100644 --- a/_test/error-tracker-js/package.json +++ b/_test/error-tracker-js/package.json @@ -8,7 +8,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "oneuptime-staging": "^3.0.9531" diff --git a/_test/logger-js/package-lock.json b/_test/logger-js/package-lock.json index c8e66fe83c..a991148e75 100644 --- a/_test/logger-js/package-lock.json +++ b/_test/logger-js/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "logger", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "oneuptime-staging": "^3.0.9421" } @@ -1043,7 +1043,7 @@ "resolved": "https://registry.npmjs.org/oneuptime-staging/-/oneuptime-staging-3.0.9421.tgz", "integrity": "sha512-PFDfzkvA9R7ExRLSCI1zMCiIe+jVPirIbXXOpXaQWp86lnuOSIjktYshxJWWqf2eSMVA5r0uhJ5GI4AecdYjRQ==", "hasInstallScript": true, - "license": "ISC", + "license": "MIT", "dependencies": { "@babel/polyfill": "^7.10.1", "axios": "^0.21.1", diff --git a/_test/logger-js/package.json b/_test/logger-js/package.json index cc6c32d231..2378db2be5 100644 --- a/_test/logger-js/package.json +++ b/_test/logger-js/package.json @@ -8,7 +8,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "oneuptime-staging": "^3.0.9421" diff --git a/_test/package-lock.json b/_test/package-lock.json index 8ca891b60f..b6169a7b7b 100644 --- a/_test/package-lock.json +++ b/_test/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "test", "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "oneuptime-staging": "^4.0.34" } diff --git a/_test/package.json b/_test/package.json index 4cdf18a2fc..cb488ea050 100644 --- a/_test/package.json +++ b/_test/package.json @@ -7,7 +7,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "oneuptime-staging": "^4.0.34" diff --git a/_test/performance-tracker/package-lock.json b/_test/performance-tracker/package-lock.json index c44dbced12..da99423373 100644 --- a/_test/performance-tracker/package-lock.json +++ b/_test/performance-tracker/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "version": "1.0.0", - "license": "ISC", + "license": "MIT", "dependencies": { "express": "^4.17.1", "oneuptime-staging": "^3.0.10585" diff --git a/_test/performance-tracker/package.json b/_test/performance-tracker/package.json index c5175b818e..d7b24fc159 100644 --- a/_test/performance-tracker/package.json +++ b/_test/performance-tracker/package.json @@ -7,7 +7,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", - "license": "ISC", + "license": "MIT", "type": "module", "dependencies": { "express": "^4.17.1", diff --git a/_test/script-monitor/package.json b/_test/script-monitor/package.json index 33320f507c..2097c4fd19 100644 --- a/_test/script-monitor/package.json +++ b/_test/script-monitor/package.json @@ -7,7 +7,7 @@ "test": "mocha ." }, "author": "Dave", - "license": "ISC", + "license": "MIT", "devDependencies": { "chai": "^4.3.4", "mocha": "^8.4.0", diff --git a/package-lock.json b/package-lock.json index ddf5b1e5be..52a52f202b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "app", "version": "3.0.2", - "license": "ISC", + "license": "MIT", "dependencies": { "eslint-plugin-progress": "^0.0.1" }, diff --git a/package.json b/package.json index d8bcfe60d8..3089ef8f75 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "prettier": "^2.6.0" }, "scripts": { + "typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js", "count-total-lines-of-code": "git grep ^ | wc -l", "uninstall": "docker stop $(docker ps -a -q) && docker rm $(docker ps -a -q)", "delete-all-local-branches": "git branch | grep -v 'master' | xargs git branch -D", @@ -63,7 +64,7 @@ }, "keywords": [], "author": "", - "license": "ISC", + "license": "MIT", "bugs": { "url": "https://gitlab.com/oneuptime/app/issues" },