diff --git a/App/FeatureSet/ApiReference/Service/Model.ts b/App/FeatureSet/ApiReference/Service/Model.ts index a504213c75..02346161e3 100644 --- a/App/FeatureSet/ApiReference/Service/Model.ts +++ b/App/FeatureSet/ApiReference/Service/Model.ts @@ -6,7 +6,7 @@ import Permission, { PermissionHelper, PermissionProps, } from 'Common/Types/Permission'; -import { DashboardApiRoute } from 'Common/ServiceRoute'; +import { AppApiRoute } from 'Common/ServiceRoute'; import LocalCache from 'CommonServer/Infrastructure/LocalCache'; import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; import LocalFile from 'CommonServer/Utils/LocalFile'; @@ -227,7 +227,7 @@ export default class ServiceHandler { pageData.exampleObjectID = ObjectID.generate(); pageData.apiPath = - DashboardApiRoute.toString() + + AppApiRoute.toString() + currentResource.model.crudApiPath?.toString(); pageData.isMasterAdminApiDocs = diff --git a/Common/ServiceRoute.ts b/Common/ServiceRoute.ts index a4e712fd16..b3026b80e8 100644 --- a/Common/ServiceRoute.ts +++ b/Common/ServiceRoute.ts @@ -2,7 +2,7 @@ import Route from './Types/API/Route'; export const homeRoute: Route = new Route('/'); -export const DashboardApiRoute: Route = new Route('/api'); +export const AppApiRoute: Route = new Route('/api'); export const IdentityRoute: Route = new Route('/identity'); diff --git a/CommonServer/EnvironmentConfig.ts b/CommonServer/EnvironmentConfig.ts index 9d9d9ab2aa..d80efa4d73 100644 --- a/CommonServer/EnvironmentConfig.ts +++ b/CommonServer/EnvironmentConfig.ts @@ -78,7 +78,7 @@ export const WorkflowHostname: Hostname = Hostname.fromString( }` ); -export const DashboardApiHostname: Hostname = Hostname.fromString( +export const AppApiHostname: Hostname = Hostname.fromString( `${process.env['SERVER_APP_HOSTNAME'] || 'localhost'}:${ process.env['APP_PORT'] || 80 }` diff --git a/CommonServer/Services/CallService.ts b/CommonServer/Services/CallService.ts index 122e8c48b4..5f0e5e804e 100644 --- a/CommonServer/Services/CallService.ts +++ b/CommonServer/Services/CallService.ts @@ -4,7 +4,7 @@ import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; import { JSONObject } from 'Common/Types/JSON'; import API from 'Common/Utils/API'; -import { DashboardApiHostname } from '../EnvironmentConfig'; +import { AppApiHostname } from '../EnvironmentConfig'; import Protocol from 'Common/Types/API/Protocol'; import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; import ObjectID from 'Common/Types/ObjectID'; @@ -45,7 +45,7 @@ export class CallService extends BaseService { return await API.post( new URL( Protocol.HTTP, - DashboardApiHostname, + AppApiHostname, new Route('/api/notification/call/make-call') ), body, diff --git a/CommonServer/Services/MailService.ts b/CommonServer/Services/MailService.ts index 079675639d..148529bd30 100644 --- a/CommonServer/Services/MailService.ts +++ b/CommonServer/Services/MailService.ts @@ -4,7 +4,7 @@ import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; import { JSONObject } from 'Common/Types/JSON'; import API from 'Common/Utils/API'; -import { DashboardApiHostname } from '../EnvironmentConfig'; +import { AppApiHostname } from '../EnvironmentConfig'; import Email from 'Common/Types/Email/EmailMessage'; import EmailServer from 'Common/Types/Email/EmailServer'; import Protocol from 'Common/Types/API/Protocol'; @@ -49,7 +49,7 @@ export class MailService extends BaseService { return await API.post( new URL( Protocol.HTTP, - DashboardApiHostname, + AppApiHostname, new Route('/api/notification/email/send') ), body, diff --git a/CommonServer/Services/SmsService.ts b/CommonServer/Services/SmsService.ts index bd9127172f..cbca213f44 100644 --- a/CommonServer/Services/SmsService.ts +++ b/CommonServer/Services/SmsService.ts @@ -4,7 +4,7 @@ import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; import { JSONObject } from 'Common/Types/JSON'; import API from 'Common/Utils/API'; -import { DashboardApiHostname } from '../EnvironmentConfig'; +import { AppApiHostname } from '../EnvironmentConfig'; import Protocol from 'Common/Types/API/Protocol'; import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; import ObjectID from 'Common/Types/ObjectID'; @@ -46,7 +46,7 @@ export class SmsService extends BaseService { return await API.post( new URL( Protocol.HTTP, - DashboardApiHostname, + AppApiHostname, new Route('/api/notification/sms/send') ), body, diff --git a/CommonServer/Services/UserNotificationRuleService.ts b/CommonServer/Services/UserNotificationRuleService.ts index ed8ae19512..0a2478a437 100644 --- a/CommonServer/Services/UserNotificationRuleService.ts +++ b/CommonServer/Services/UserNotificationRuleService.ts @@ -22,7 +22,7 @@ import EmailMessage from 'Common/Types/Email/EmailMessage'; import SMS from 'Common/Types/SMS/SMS'; import Incident from 'Model/Models/Incident'; import URL from 'Common/Types/API/URL'; -import { DashboardApiRoute } from 'Common/ServiceRoute'; +import { AppApiRoute } from 'Common/ServiceRoute'; import DatabaseConfig from '../DatabaseConfig'; import ShortLinkService from './ShortLinkService'; import ShortLink from 'Model/Models/ShortLink'; @@ -445,7 +445,7 @@ export class Service extends DatabaseService { responseUrl: new URL( httpProtocol, host, - new Route(DashboardApiRoute.toString()) + new Route(AppApiRoute.toString()) .addRoute(new UserOnCallLogTimeline().crudApiPath!) .addRoute( '/call/gather-input/' + @@ -471,7 +471,7 @@ export class Service extends DatabaseService { new URL( httpProtocol, host, - new Route(DashboardApiRoute.toString()) + new Route(AppApiRoute.toString()) .addRoute(new UserOnCallLogTimeline().crudApiPath!) .addRoute( '/acknowledge/' + userOnCallLogTimelineId.toString() @@ -518,7 +518,7 @@ export class Service extends DatabaseService { acknowledgeIncidentLink: new URL( httpProtocol, host, - new Route(DashboardApiRoute.toString()) + new Route(AppApiRoute.toString()) .addRoute(new UserOnCallLogTimeline().crudApiPath!) .addRoute( '/acknowledge/' + userOnCallLogTimelineId.toString() diff --git a/CommonUI/src/Config.ts b/CommonUI/src/Config.ts index abe7b05c86..64412d452f 100644 --- a/CommonUI/src/Config.ts +++ b/CommonUI/src/Config.ts @@ -4,7 +4,7 @@ import { AccountsRoute, AdminDashboardRoute, ApiReferenceRoute, - DashboardApiRoute, + AppApiRoute, DashboardRoute, FileRoute, IdentityRoute, @@ -73,7 +73,7 @@ export const FILE_HOSTNAME: Hostname = Hostname.fromString(HOST); export const APP_API_URL: URL = new URL( HTTP_PROTOCOL, APP_HOSTNAME, - DashboardApiRoute + AppApiRoute ); export const REALTIME_URL: URL = new URL( diff --git a/CommonUI/src/Utils/API/DashboardAPI.ts b/CommonUI/src/Utils/API/DashboardAPI.ts index 587d47517c..6f0c2d25cc 100755 --- a/CommonUI/src/Utils/API/DashboardAPI.ts +++ b/CommonUI/src/Utils/API/DashboardAPI.ts @@ -1,10 +1,10 @@ import { APP_HOSTNAME, HTTP_PROTOCOL } from '../../Config'; -import { DashboardApiRoute } from 'Common/ServiceRoute'; +import { AppApiRoute } from 'Common/ServiceRoute'; import BaseAPI from './API'; class BackendAPI extends BaseAPI { public constructor() { - super(HTTP_PROTOCOL, APP_HOSTNAME, DashboardApiRoute); + super(HTTP_PROTOCOL, APP_HOSTNAME, AppApiRoute); } }