From 41d03ec596aad2e395cd6db822c997dc18db3527 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Thu, 15 Dec 2022 12:07:15 +0530 Subject: [PATCH] fix lint. --- Common/Utils/Analytics.ts | 13 +- CommonServer/API/StatusPageAPI.ts | 7 +- CommonServer/API/StatusPageSubscriberAPI.ts | 18 +-- CommonServer/Config.ts | 2 +- .../Infrastructure/PostgresDatabase.ts | 1 + .../Services/StatusPageSubscriberService.ts | 55 ++++--- CommonServer/Utils/Response.ts | 3 +- CommonUI/src/Components/Footer/Footer.tsx | 2 - CommonUI/src/Config.ts | 41 ++--- .../src/Components/Header/ProjectPicker.tsx | 37 ++--- .../StatusPages/View/EmailSubscribers.tsx | 21 +-- DashboardAPI/Index.ts | 2 - Model/Models/StatusPageSubscriber.ts | 13 +- StatusPage/src/Components/Header/Header.tsx | 3 +- .../src/Components/MasterPage/MasterPage.tsx | 29 ++-- StatusPage/src/Pages/Overview/Overview.tsx | 148 ++++++++++-------- StatusPage/src/Pages/Subscribe/Subscribe.tsx | 11 +- .../Jobs/StatusPageCerts/StausPageCerts.ts | 27 ++-- 18 files changed, 206 insertions(+), 227 deletions(-) diff --git a/Common/Utils/Analytics.ts b/Common/Utils/Analytics.ts index 5027df90a7..1154e83514 100644 --- a/Common/Utils/Analytics.ts +++ b/Common/Utils/Analytics.ts @@ -1,18 +1,17 @@ import Email from '../Types/Email'; -import { JSONObject } from '../Types/JSON' -import posthog from 'posthog-js' - -export default class Analytics { +import { JSONObject } from '../Types/JSON'; +import posthog from 'posthog-js'; +export default class Analytics { public constructor(apiHost: string, apiKey: string) { - posthog.init(apiKey, { api_host: apiHost}) + posthog.init(apiKey, { api_host: apiHost }); } - public userAuth(email: Email): void { + public userAuth(email: Email): void { posthog.identify(email.toString()); } public capture(eventName: string, data: JSONObject): void { posthog.capture(eventName, data); } -} \ No newline at end of file +} diff --git a/CommonServer/API/StatusPageAPI.ts b/CommonServer/API/StatusPageAPI.ts index 7703dbfcc6..e8d440a7e4 100644 --- a/CommonServer/API/StatusPageAPI.ts +++ b/CommonServer/API/StatusPageAPI.ts @@ -120,8 +120,6 @@ export default class StatusPageAPI extends BaseAPI< } ); - - this.router.post( `/${new this.entityType() .getCrudApiPath() @@ -404,7 +402,6 @@ export default class StatusPageAPI extends BaseAPI< return monitor.monitorId!; }); - const startDate: Date = OneUptimeDate.getSomeDaysAgo(90); const endDate: Date = OneUptimeDate.getCurrentDate(); @@ -445,8 +442,6 @@ export default class StatusPageAPI extends BaseAPI< }); } - - // check if status page has active incident. let activeIncidents: Array = []; if (monitorsOnStatusPage.length > 0) { @@ -520,7 +515,7 @@ export default class StatusPageAPI extends BaseAPI< let incidentStateTimelines: Array = []; - console.log("HERE"); + console.log('HERE'); if (incidentsOnStausPage.length > 0) { incidentStateTimelines = await IncidentStateTimelineService.findBy({ diff --git a/CommonServer/API/StatusPageSubscriberAPI.ts b/CommonServer/API/StatusPageSubscriberAPI.ts index 20dd3f2120..e3f2ba24b6 100644 --- a/CommonServer/API/StatusPageSubscriberAPI.ts +++ b/CommonServer/API/StatusPageSubscriberAPI.ts @@ -1,4 +1,3 @@ - import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; import StatusPageSubscriberService, { Service as StatusPageSubscriberServiceType, @@ -19,14 +18,15 @@ export default class StatusPageSubscriberAPI extends BaseAPI< super(StatusPageSubscriber, StatusPageSubscriberService); this.router.get( - `/${new this.entityType().getCrudApiPath()?.toString()}/unsubscribe/:id`, + `/${new this.entityType() + .getCrudApiPath() + ?.toString()}/unsubscribe/:id`, async ( req: ExpressRequest, res: ExpressResponse, next: NextFunction ) => { try { - await this.service.updateOneBy({ query: { _id: req.params['id'] as string, @@ -37,18 +37,18 @@ export default class StatusPageSubscriberAPI extends BaseAPI< props: { isRoot: true, ignoreHooks: true, - } + }, }); - return Response.sendHtmlResponse(req, res, '

You have been unsubscribed.

'); + return Response.sendHtmlResponse( + req, + res, + '

You have been unsubscribed.

' + ); } catch (err) { next(err); } } ); - - - - } } diff --git a/CommonServer/Config.ts b/CommonServer/Config.ts index eddf667eba..a359430a73 100644 --- a/CommonServer/Config.ts +++ b/CommonServer/Config.ts @@ -147,4 +147,4 @@ export const SubscriptionPlans: Array = SubscriptionPlan.getSubscriptionPlans(); export const AnalyticsKey: string = process.env['ANALYTICS_KEY'] || ''; -export const AnalyticsHost: string = process.env['ANALYTICS_HOST'] || ''; \ No newline at end of file +export const AnalyticsHost: string = process.env['ANALYTICS_HOST'] || ''; diff --git a/CommonServer/Infrastructure/PostgresDatabase.ts b/CommonServer/Infrastructure/PostgresDatabase.ts index 6163f55d06..3f0f05bbb2 100644 --- a/CommonServer/Infrastructure/PostgresDatabase.ts +++ b/CommonServer/Infrastructure/PostgresDatabase.ts @@ -25,6 +25,7 @@ export default class Database { username: DatabaseUsername, password: DatabasePassword, database: DatabaseName, + migrationsTableName: 'migrations', entities: Entities, //logging: 'all', synchronize: diff --git a/CommonServer/Services/StatusPageSubscriberService.ts b/CommonServer/Services/StatusPageSubscriberService.ts index 3c866f37e0..534f5c6716 100644 --- a/CommonServer/Services/StatusPageSubscriberService.ts +++ b/CommonServer/Services/StatusPageSubscriberService.ts @@ -20,9 +20,8 @@ export class Service extends DatabaseService { protected override async onBeforeCreate( data: CreateBy ): Promise> { - if (!data.data.statusPageId) { - throw new BadDataException("Status Page ID is required.") + throw new BadDataException('Status Page ID is required.'); } const statuspage = await StatusPageService.findOneById({ @@ -31,33 +30,33 @@ export class Service extends DatabaseService { projectId: true, pageTitle: true, name: true, - isPublicStatusPage: true + isPublicStatusPage: true, }, props: { isRoot: true, ignoreHooks: true, - } + }, }); if (!statuspage || !statuspage.projectId) { - throw new BadDataException("Status Page not found"); + throw new BadDataException('Status Page not found'); } data.data.projectId = statuspage.projectId; return { createBy: data, carryForward: statuspage }; - } - protected override async onCreateSuccess( onCreate: OnCreate, createdItem: Model ): Promise { - - if (createdItem.statusPageId && createdItem.subscriberEmail && createdItem._id) { - // Call mail service and send an email. - + if ( + createdItem.statusPageId && + createdItem.subscriberEmail && + createdItem._id + ) { + // Call mail service and send an email. // get status page domain for this status page. // if the domain is not found, use the internal sttaus page preview link. @@ -65,28 +64,38 @@ export class Service extends DatabaseService { const domains = await StatusPageDomainService.findBy({ query: { statusPageId: createdItem.statusPageId, - isSslProvisioned: true + isSslProvisioned: true, }, select: { - fullDomain: true + fullDomain: true, }, skip: 0, limit: LIMIT_PER_PROJECT, props: { isRoot: true, ignoreHooks: true, - } + }, }); - - let statusPageURL: string = domains.map((d) => d.fullDomain).join(", "); + let statusPageURL: string = domains + .map((d) => { + return d.fullDomain; + }) + .join(', '); if (domains.length === 0) { // 'https://local.oneuptime.com/status-page/40092fb5-cc33-4995-b532-b4e49c441c98' - statusPageURL = new URL(HttpProtocol, Domain).addRoute("/status-page/" + createdItem.statusPageId.toString()).toString(); + statusPageURL = new URL(HttpProtocol, Domain) + .addRoute( + '/status-page/' + createdItem.statusPageId.toString() + ) + .toString(); } - const statusPageName: string = onCreate.carryForward.pageTitle || onCreate.carryForward.name || 'Status Page'; + const statusPageName: string = + onCreate.carryForward.pageTitle || + onCreate.carryForward.name || + 'Status Page'; MailService.sendMail({ toEmail: createdItem.subscriberEmail, @@ -94,8 +103,14 @@ export class Service extends DatabaseService { vars: { statusPageName: statusPageName, statusPageUrl: statusPageURL, - isPublicStatusPage: onCreate.carryForward.isPublicStatusPage, - unsubscribeUrl: new URL(HttpProtocol, Domain).addRoute("/api/status-page-subscriber/unsubscribe/" + createdItem._id.toString()).toString() + isPublicStatusPage: + onCreate.carryForward.isPublicStatusPage, + unsubscribeUrl: new URL(HttpProtocol, Domain) + .addRoute( + '/api/status-page-subscriber/unsubscribe/' + + createdItem._id.toString() + ) + .toString(), }, subject: 'You have been subscribed to ' + statusPageName, }).catch((err: Error) => { diff --git a/CommonServer/Utils/Response.ts b/CommonServer/Utils/Response.ts index 439c8a4221..f8c9f611fb 100644 --- a/CommonServer/Utils/Response.ts +++ b/CommonServer/Utils/Response.ts @@ -264,7 +264,6 @@ export default class Response { this.logResponse(req, res, { text: text as string }); } - public static sendHtmlResponse( req: ExpressRequest, res: ExpressResponse, @@ -281,7 +280,7 @@ export default class Response { oneUptimeResponse.set('Pod-Id', process.env['POD_NAME']); oneUptimeResponse.logBody = { html: html as string }; - oneUptimeResponse.writeHead(200, { 'Content-Type':'text/html'}); + oneUptimeResponse.writeHead(200, { 'Content-Type': 'text/html' }); oneUptimeResponse.end(html); this.logResponse(req, res, { html: html as string }); } diff --git a/CommonUI/src/Components/Footer/Footer.tsx b/CommonUI/src/Components/Footer/Footer.tsx index 58aaa9d6b0..b184afc51e 100644 --- a/CommonUI/src/Components/Footer/Footer.tsx +++ b/CommonUI/src/Components/Footer/Footer.tsx @@ -66,7 +66,6 @@ const Footer: FunctionComponent = ( props.links.filter((link: FooterLink) => { return !link.showOnRightIfNoCopyright; }).length > 0 && ( -

{props.links && props.links @@ -101,7 +100,6 @@ const Footer: FunctionComponent = ( } )}

- )} {props.links && diff --git a/CommonUI/src/Config.ts b/CommonUI/src/Config.ts index 21da9cef67..ed4f90bf58 100644 --- a/CommonUI/src/Config.ts +++ b/CommonUI/src/Config.ts @@ -9,7 +9,8 @@ export const env: Function = (key: string): string => { return process.env[key] || ''; }; -export const HTTP_PROTOCOL: Protocol = env('HTTP_PROTOCOL') === "http" ? Protocol.HTTP : Protocol.HTTPS; +export const HTTP_PROTOCOL: Protocol = + env('HTTP_PROTOCOL') === 'http' ? Protocol.HTTP : Protocol.HTTPS; export const DOMAIN: string = env('DOMAIN') || ''; @@ -41,46 +42,32 @@ export const ACCOUNTS_ROUTE: Route = new Route(env('ACCOUNTS_ROUTE')); export const HOME_ROUTE: Route = new Route(env('HOME_ROUTE')); export const DASHBOARD_API_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') + env('DOMAIN') ); -export const IDENTITY_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') -); +export const IDENTITY_HOSTNAME: Hostname = Hostname.fromString(env('DOMAIN')); -export const DASHBOARD_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') -); +export const DASHBOARD_HOSTNAME: Hostname = Hostname.fromString(env('DOMAIN')); export const INTEGRATION_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') + env('DOMAIN') ); export const STATUS_PAGE_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') + env('DOMAIN') ); -export const HELM_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') -); +export const HELM_HOSTNAME: Hostname = Hostname.fromString(env('DOMAIN')); -export const API_DOCS_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') -); +export const API_DOCS_HOSTNAME: Hostname = Hostname.fromString(env('DOMAIN')); export const ADMIN_DASHBOARD_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') -); -export const ACCOUNTS_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') -); -export const HOME_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') + env('DOMAIN') ); +export const ACCOUNTS_HOSTNAME: Hostname = Hostname.fromString(env('DOMAIN')); +export const HOME_HOSTNAME: Hostname = Hostname.fromString(env('DOMAIN')); -export const FILE_HOSTNAME: Hostname = Hostname.fromString( - env('DOMAIN') -); +export const FILE_HOSTNAME: Hostname = Hostname.fromString(env('DOMAIN')); export const DASHBOARD_API_URL: URL = new URL( HTTP_PROTOCOL, @@ -141,4 +128,4 @@ export const StatusPageCNameRecord: string = env('STATUS_PAGE_CNAME_RECORD') || ''; export const AnalyticsKey: string = env('ANALYTICS_KEY') || ''; -export const AnalyticsHost: string = env('ANALYTICS_HOST'); \ No newline at end of file +export const AnalyticsHost: string = env('ANALYTICS_HOST'); diff --git a/Dashboard/src/Components/Header/ProjectPicker.tsx b/Dashboard/src/Components/Header/ProjectPicker.tsx index a3ef42a22c..782cb3cba0 100644 --- a/Dashboard/src/Components/Header/ProjectPicker.tsx +++ b/Dashboard/src/Components/Header/ProjectPicker.tsx @@ -32,27 +32,26 @@ const DashboardProjectPicker: FunctionComponent = ( ); const getFooter = (): ReactElement => { - if (!BILLING_ENABLED) { return <>; } - return (
{ - setIsSubscriptionPlanYearly( - !isSubsriptionPlanYearly - ); - refreshFields(); - }} - > - {isSubsriptionPlanYearly ? ( - Switch to monthly pricing? - ) : ( - Switch to yearly pricing? - )} -
); - } + return ( +
{ + setIsSubscriptionPlanYearly(!isSubsriptionPlanYearly); + refreshFields(); + }} + > + {isSubsriptionPlanYearly ? ( + Switch to monthly pricing? + ) : ( + Switch to yearly pricing? + )} +
+ ); + }; const [isSubsriptionPlanYearly, setIsSubscriptionPlanYearly] = useState(true); @@ -238,9 +237,7 @@ const DashboardProjectPicker: FunctionComponent = ( fields: [...fields], formType: FormType.Create, }} - footer={ - getFooter() - } + footer={getFooter()} /> ) : ( <> diff --git a/Dashboard/src/Pages/StatusPages/View/EmailSubscribers.tsx b/Dashboard/src/Pages/StatusPages/View/EmailSubscribers.tsx index 17739ead32..ba8a3f7658 100644 --- a/Dashboard/src/Pages/StatusPages/View/EmailSubscribers.tsx +++ b/Dashboard/src/Pages/StatusPages/View/EmailSubscribers.tsx @@ -131,27 +131,10 @@ const StatusPageDelete: FunctionComponent = ( getElement: (item: JSONObject): ReactElement => { if (item['isUnsubscribed']) { return ( - - ); - } else { - return ( - + ); } + return ; }, }, { diff --git a/DashboardAPI/Index.ts b/DashboardAPI/Index.ts index 7bea40d30c..6e24787914 100755 --- a/DashboardAPI/Index.ts +++ b/DashboardAPI/Index.ts @@ -30,7 +30,6 @@ import StatusPagePrivateUserService, { Service as StatusPagePrivateUserServiceType, } from 'CommonServer/Services/StatusPagePrivateUserService'; - import StatusPageFooterLink from 'Model/Models/StatusPageFooterLink'; import StatusPageFooterLinkService, { Service as StatusPageFooterLinkServiceType, @@ -287,7 +286,6 @@ app.use( ).getRouter() ); - app.use( new BaseAPI( StatusPagePrivateUser, diff --git a/Model/Models/StatusPageSubscriber.ts b/Model/Models/StatusPageSubscriber.ts index a02af3200c..4a34b893bb 100644 --- a/Model/Models/StatusPageSubscriber.ts +++ b/Model/Models/StatusPageSubscriber.ts @@ -24,7 +24,11 @@ import CanAccessIfCanReadOn from 'Common/Types/Database/CanAccessIfCanReadOn'; @CanAccessIfCanReadOn('statusPage') @TenantColumn('projectId') @TableAccessControl({ - create: [Permission.ProjectOwner, Permission.CanCreateStatusPageSubscriber, Permission.Public], + create: [ + Permission.ProjectOwner, + Permission.CanCreateStatusPageSubscriber, + Permission.Public, + ], read: [Permission.ProjectOwner, Permission.CanReadStatusPageSubscriber], delete: [Permission.ProjectOwner, Permission.CanDeleteStatusPageSubscriber], update: [Permission.ProjectOwner, Permission.CanEditStatusPageSubscriber], @@ -132,7 +136,7 @@ export default class StatusPageSubscriber extends BaseModel { create: [ Permission.ProjectOwner, Permission.CanCreateStatusPageSubscriber, - Permission.Public + Permission.Public, ], read: [Permission.ProjectOwner, Permission.CanReadStatusPageSubscriber], update: [ @@ -153,7 +157,7 @@ export default class StatusPageSubscriber extends BaseModel { create: [ Permission.ProjectOwner, Permission.CanCreateStatusPageSubscriber, - Permission.Public + Permission.Public, ], read: [Permission.ProjectOwner, Permission.CanReadStatusPageSubscriber], update: [ @@ -174,7 +178,7 @@ export default class StatusPageSubscriber extends BaseModel { create: [ Permission.ProjectOwner, Permission.CanCreateStatusPageSubscriber, - Permission.Public + Permission.Public, ], read: [Permission.ProjectOwner, Permission.CanReadStatusPageSubscriber], update: [ @@ -257,7 +261,6 @@ export default class StatusPageSubscriber extends BaseModel { @JoinColumn({ name: 'deletedByUserId' }) public deletedByUser?: User = undefined; - @ColumnAccessControl({ create: [], read: [Permission.CurrentUser], diff --git a/StatusPage/src/Components/Header/Header.tsx b/StatusPage/src/Components/Header/Header.tsx index d0d83b56a9..0fe5919789 100644 --- a/StatusPage/src/Components/Header/Header.tsx +++ b/StatusPage/src/Components/Header/Header.tsx @@ -14,9 +14,8 @@ export interface ComponentProps { const StatusPageHeader: FunctionComponent = ( props: ComponentProps ): ReactElement => { - if (!props.banner && !props.logo && props.links.length === 0) { - return <> + return <>; } return ( diff --git a/StatusPage/src/Components/MasterPage/MasterPage.tsx b/StatusPage/src/Components/MasterPage/MasterPage.tsx index 4959a053fa..d953c55132 100644 --- a/StatusPage/src/Components/MasterPage/MasterPage.tsx +++ b/StatusPage/src/Components/MasterPage/MasterPage.tsx @@ -49,22 +49,21 @@ const DashboardMasterPage: FunctionComponent = ( ); if (id) { return new ObjectID(id); - } else { - // get status page id by hostname. - const response: HTTPResponse = - await BaseAPI.post( - URL.fromString(DASHBOARD_API_URL.toString()).addRoute( - `/status-page/domain` - ), - { - domain: Navigation.getHostname().toString() - }, - {} - ); + } + // get status page id by hostname. + const response: HTTPResponse = + await BaseAPI.post( + URL.fromString(DASHBOARD_API_URL.toString()).addRoute( + `/status-page/domain` + ), + { + domain: Navigation.getHostname().toString(), + }, + {} + ); - if (response.data && response.data['statusPageId']) { - return new ObjectID(response.data['statusPageId'] as string); - } + if (response.data && response.data['statusPageId']) { + return new ObjectID(response.data['statusPageId'] as string); } throw new BadDataException('Status Page ID not found'); diff --git a/StatusPage/src/Pages/Overview/Overview.tsx b/StatusPage/src/Pages/Overview/Overview.tsx index 6c5f865ec2..57ea46790f 100644 --- a/StatusPage/src/Pages/Overview/Overview.tsx +++ b/StatusPage/src/Pages/Overview/Overview.tsx @@ -575,12 +575,12 @@ const Overview: FunctionComponent = ( eventViewRoute={RouteUtil.populateRouteParams( props.isPreviewPage ? (RouteMap[ - PageMap - .PREVIEW_INCIDENT_DETAIL - ] as Route) + PageMap + .PREVIEW_INCIDENT_DETAIL + ] as Route) : (RouteMap[ - PageMap.INCIDENT_DETAIL - ] as Route), + PageMap.INCIDENT_DETAIL + ] as Route), incidentGroup.incident.id! )} /> @@ -621,12 +621,12 @@ const Overview: FunctionComponent = ( eventViewRoute={RouteUtil.populateRouteParams( props.isPreviewPage ? (RouteMap[ - PageMap - .PREVIEW_SCHEDULED_EVENT_DETAIL - ] as Route) + PageMap + .PREVIEW_SCHEDULED_EVENT_DETAIL + ] as Route) : (RouteMap[ - PageMap.SCHEDULED_EVENT_DETAIL - ] as Route), + PageMap.SCHEDULED_EVENT_DETAIL + ] as Route), scheduledEventGroup.scheduledMaintenance .id! )} @@ -638,10 +638,11 @@ const Overview: FunctionComponent = (
{currentStatus && statusPageResources.length > 0 && ( = ( )}
- {statusPageResources.length > 0 &&
- - {statusPageResources.filter( - (resources: StatusPageResource) => { - return !resources.statusPageGroupId; - } - ).length > 0 ? ( - - {getMonitorOverviewListInGroup(null)} - - ) : ( - <> - )} -
- {resourceGroups.length > 0 && - resourceGroups.map( - ( - resourceGroup: StatusPageGroup, - i: number - ) => { - return ( - - {getMonitorOverviewListInGroup( - resourceGroup - )} - - ); + {statusPageResources.length > 0 && ( +
+ + {statusPageResources.filter( + (resources: StatusPageResource) => { + return !resources.statusPageGroupId; + } + ).length > 0 ? ( + - -
} - - {statusPageResources.length === 0 &&

No resources added to this Status Page, please add some resources from OneUptime dashboard.

} + > + {getMonitorOverviewListInGroup(null)} + + ) : ( + <> + )} +
+ {resourceGroups.length > 0 && + resourceGroups.map( + ( + resourceGroup: StatusPageGroup, + i: number + ) => { + return ( + + {getMonitorOverviewListInGroup( + resourceGroup + )} + + ); + } + )} +
+ +
+ )} + {statusPageResources.length === 0 && ( +

+ {' '} + No resources added to this Status Page, please add + some resources from OneUptime dashboard. +

+ )}
) : ( <> diff --git a/StatusPage/src/Pages/Subscribe/Subscribe.tsx b/StatusPage/src/Pages/Subscribe/Subscribe.tsx index 6311beea0a..2554252c28 100644 --- a/StatusPage/src/Pages/Subscribe/Subscribe.tsx +++ b/StatusPage/src/Pages/Subscribe/Subscribe.tsx @@ -16,10 +16,7 @@ const PageNotFound: FunctionComponent = ( return ( - -
+

Subscribe.

@@ -30,8 +27,6 @@ const PageNotFound: FunctionComponent = ( }} /> */} - - {currentTab === 'Email' ? ( modelType={StatusPageSubscriber} @@ -51,7 +46,9 @@ const PageNotFound: FunctionComponent = ( ]} formType={FormType.Create} submitButtonText={'Subscribe'} - onBeforeCreate={async (item: StatusPageSubscriber) => { + onBeforeCreate={async ( + item: StatusPageSubscriber + ) => { const id: ObjectID = LocalStorage.getItem( 'statusPageId' ) as ObjectID; diff --git a/Workers/Jobs/StatusPageCerts/StausPageCerts.ts b/Workers/Jobs/StatusPageCerts/StausPageCerts.ts index 08196f058d..2007b1db92 100644 --- a/Workers/Jobs/StatusPageCerts/StausPageCerts.ts +++ b/Workers/Jobs/StatusPageCerts/StausPageCerts.ts @@ -365,25 +365,23 @@ RunCron( const key: string = JSON.parse(cert.blob || '{}').privateKeyPem; let crt: string = JSON.parse(certBlob.blob || '{}').cert; - // Add chain to crt. - console.log("Lookign for chain"); + // Add chain to crt. + console.log('Lookign for chain'); console.log(JSON.parse(certBlob.blob || '{}')); if (JSON.parse(certBlob.blob || '{}').chain) { - console.log("Chain found"); - crt += '\n' + - '\n' + - JSON.parse(certBlob.blob || '{}').chain; + console.log('Chain found'); + crt += '\n' + '\n' + JSON.parse(certBlob.blob || '{}').chain; } // Write to disk. fs.writeFileSync( `/usr/src/Certs/StatusPageCerts/${cert.key}.crt`, - crt, + crt ); fs.writeFileSync( `/usr/src/Certs/StatusPageCerts/${cert.key}.key`, - key, + key ); } } @@ -452,7 +450,6 @@ const checkCnameValidation: Function = async ( fulldomain: string, token: string ): Promise => { - try { const agent: https.Agent = new https.Agent({ rejectUnauthorized: false, @@ -460,9 +457,9 @@ const checkCnameValidation: Function = async ( const result: AxiosResponse = await axios.get( 'https://' + - fulldomain + - '/status-page-api/cname-verification/' + - token, + fulldomain + + '/status-page-api/cname-verification/' + + token, { httpsAgent: agent } ); @@ -482,9 +479,9 @@ const isSslProvisioned: Function = async ( try { const result: AxiosResponse = await axios.get( 'https://' + - fulldomain + - '/status-page-api/cname-verification/' + - token + fulldomain + + '/status-page-api/cname-verification/' + + token ); if (result.status === 200) {