@oneuptime/common 9.5.7 → 9.5.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Models/DatabaseModels/UserPush.ts +2 -1
- package/Server/API/UserPushAPI.ts +51 -4
- package/Server/Middleware/UserAuthorization.ts +14 -9
- package/Server/Services/PushNotificationService.ts +129 -27
- package/Server/Services/UserNotificationRuleService.ts +13 -3
- package/Server/Services/UserPushService.ts +2 -1
- package/Server/Utils/PushNotificationUtil.ts +56 -0
- package/Types/PushNotification/PushDeviceType.ts +7 -0
- package/Types/PushNotification/PushNotificationRequest.ts +3 -1
- package/UI/Components/ModelDelete/ModelDelete.tsx +4 -1
- package/UI/Components/ModelDetail/CardModelDetail.tsx +4 -0
- package/UI/Components/ModelDetail/ModelDetail.tsx +4 -1
- package/UI/Components/Page/ModelPage.tsx +4 -1
- package/build/dist/Models/DatabaseModels/UserPush.js +2 -1
- package/build/dist/Models/DatabaseModels/UserPush.js.map +1 -1
- package/build/dist/Server/API/UserPushAPI.js +34 -3
- package/build/dist/Server/API/UserPushAPI.js.map +1 -1
- package/build/dist/Server/Middleware/UserAuthorization.js +10 -4
- package/build/dist/Server/Middleware/UserAuthorization.js.map +1 -1
- package/build/dist/Server/Services/PushNotificationService.js +77 -21
- package/build/dist/Server/Services/PushNotificationService.js.map +1 -1
- package/build/dist/Server/Services/UserNotificationRuleService.js +12 -9
- package/build/dist/Server/Services/UserNotificationRuleService.js.map +1 -1
- package/build/dist/Server/Services/UserPushService.js +2 -1
- package/build/dist/Server/Services/UserPushService.js.map +1 -1
- package/build/dist/Server/Utils/PushNotificationUtil.js +32 -8
- package/build/dist/Server/Utils/PushNotificationUtil.js.map +1 -1
- package/build/dist/Types/PushNotification/PushDeviceType.js +8 -0
- package/build/dist/Types/PushNotification/PushDeviceType.js.map +1 -0
- package/build/dist/UI/Components/ModelDelete/ModelDelete.js +2 -1
- package/build/dist/UI/Components/ModelDelete/ModelDelete.js.map +1 -1
- package/build/dist/UI/Components/ModelDetail/CardModelDetail.js +2 -2
- package/build/dist/UI/Components/ModelDetail/CardModelDetail.js.map +1 -1
- package/build/dist/UI/Components/ModelDetail/ModelDetail.js +2 -1
- package/build/dist/UI/Components/ModelDetail/ModelDetail.js.map +1 -1
- package/build/dist/UI/Components/Page/ModelPage.js +2 -1
- package/build/dist/UI/Components/Page/ModelPage.js.map +1 -1
- package/package.json +2 -1
|
@@ -12,6 +12,7 @@ import React, { ReactElement, useState } from "react";
|
|
|
12
12
|
export interface ComponentProps<TBaseModel extends BaseModel> {
|
|
13
13
|
modelType: { new (): TBaseModel };
|
|
14
14
|
modelId: ObjectID;
|
|
15
|
+
modelAPI?: typeof ModelAPI | undefined;
|
|
15
16
|
onDeleteSuccess: () => void;
|
|
16
17
|
}
|
|
17
18
|
|
|
@@ -29,7 +30,9 @@ const ModelDelete: <TBaseModel extends BaseModel>(
|
|
|
29
30
|
const deleteItem: PromiseVoidFunction = async (): Promise<void> => {
|
|
30
31
|
setIsLoading(true);
|
|
31
32
|
try {
|
|
32
|
-
|
|
33
|
+
const modelAPI: typeof ModelAPI = props.modelAPI || ModelAPI;
|
|
34
|
+
|
|
35
|
+
await modelAPI.deleteItem<TBaseModel>({
|
|
33
36
|
modelType: props.modelType,
|
|
34
37
|
id: props.modelId,
|
|
35
38
|
});
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import ModelAPI from "../../Utils/ModelAPI/ModelAPI";
|
|
1
2
|
import PermissionUtil from "../../Utils/Permission";
|
|
2
3
|
import User from "../../Utils/User";
|
|
3
4
|
import Navigation from "../../Utils/Navigation";
|
|
@@ -33,6 +34,7 @@ export interface ComponentProps<TBaseModel extends BaseModel> {
|
|
|
33
34
|
formFields?: undefined | Fields<TBaseModel>;
|
|
34
35
|
className?: string | undefined;
|
|
35
36
|
name: string;
|
|
37
|
+
modelAPI?: typeof ModelAPI | undefined;
|
|
36
38
|
createEditModalWidth?: ModalWidth | undefined;
|
|
37
39
|
refresher?: boolean;
|
|
38
40
|
createOrUpdateApiUrl?: URL | undefined;
|
|
@@ -130,6 +132,7 @@ const CardModelDetail: <TBaseModel extends BaseModel>(
|
|
|
130
132
|
<ModelDetail
|
|
131
133
|
refresher={refresher}
|
|
132
134
|
{...props.modelDetailProps}
|
|
135
|
+
modelAPI={props.modelAPI}
|
|
133
136
|
onItemLoaded={(item: TBaseModel) => {
|
|
134
137
|
setItem(item);
|
|
135
138
|
if (props.modelDetailProps.onItemLoaded) {
|
|
@@ -144,6 +147,7 @@ const CardModelDetail: <TBaseModel extends BaseModel>(
|
|
|
144
147
|
<ModelFormModal<TBaseModel>
|
|
145
148
|
title={`Edit ${model.singularName}`}
|
|
146
149
|
modalWidth={props.createEditModalWidth}
|
|
150
|
+
modelAPI={props.modelAPI}
|
|
147
151
|
onClose={() => {
|
|
148
152
|
setShowModal(false);
|
|
149
153
|
}}
|
|
@@ -28,6 +28,7 @@ export interface ComponentProps<TBaseModel extends BaseModel> {
|
|
|
28
28
|
fields: Array<Field<TBaseModel>>;
|
|
29
29
|
onLoadingChange?: undefined | ((isLoading: boolean) => void);
|
|
30
30
|
modelId: ObjectID;
|
|
31
|
+
modelAPI?: typeof ModelAPI | undefined;
|
|
31
32
|
onError?: ((error: string) => void) | undefined;
|
|
32
33
|
onItemLoaded?: (item: TBaseModel) => void | undefined;
|
|
33
34
|
refresher?: undefined | boolean;
|
|
@@ -179,7 +180,9 @@ const ModelDetail: <TBaseModel extends BaseModel>(
|
|
|
179
180
|
setOnBeforeFetchData(model);
|
|
180
181
|
}
|
|
181
182
|
|
|
182
|
-
const
|
|
183
|
+
const modelAPI: typeof ModelAPI = props.modelAPI || ModelAPI;
|
|
184
|
+
|
|
185
|
+
const item: TBaseModel | null = await modelAPI.getItem({
|
|
183
186
|
modelType: props.modelType,
|
|
184
187
|
id: props.modelId,
|
|
185
188
|
select: {
|
|
@@ -20,6 +20,7 @@ export interface ComponentProps<TBaseModel extends BaseModel> {
|
|
|
20
20
|
modelType: { new (): TBaseModel };
|
|
21
21
|
modelId: ObjectID;
|
|
22
22
|
modelNameField: string;
|
|
23
|
+
modelAPI?: typeof ModelAPI | undefined;
|
|
23
24
|
}
|
|
24
25
|
|
|
25
26
|
const ModelPage: <TBaseModel extends BaseModel>(
|
|
@@ -54,7 +55,9 @@ const ModelPage: <TBaseModel extends BaseModel>(
|
|
|
54
55
|
} as Select<TBaseModel>;
|
|
55
56
|
}
|
|
56
57
|
|
|
57
|
-
const
|
|
58
|
+
const modelAPI: typeof ModelAPI = props.modelAPI || ModelAPI;
|
|
59
|
+
|
|
60
|
+
const item: TBaseModel | null = await modelAPI.getItem({
|
|
58
61
|
modelType: props.modelType,
|
|
59
62
|
id: props.modelId,
|
|
60
63
|
select: select as Select<TBaseModel>,
|
|
@@ -25,6 +25,7 @@ import TenantColumn from "../../Types/Database/TenantColumn";
|
|
|
25
25
|
import IconProp from "../../Types/Icon/IconProp";
|
|
26
26
|
import ObjectID from "../../Types/ObjectID";
|
|
27
27
|
import Permission from "../../Types/Permission";
|
|
28
|
+
import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
|
|
28
29
|
import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
|
|
29
30
|
let UserPush = class UserPush extends BaseModel {
|
|
30
31
|
constructor() {
|
|
@@ -32,7 +33,7 @@ let UserPush = class UserPush extends BaseModel {
|
|
|
32
33
|
this.project = undefined;
|
|
33
34
|
this.projectId = undefined;
|
|
34
35
|
this.deviceToken = undefined;
|
|
35
|
-
this.deviceType =
|
|
36
|
+
this.deviceType = undefined;
|
|
36
37
|
this.deviceName = undefined;
|
|
37
38
|
this.user = undefined;
|
|
38
39
|
this.userId = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserPush.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/UserPush.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,iCAAiC,MAAM,sEAAsE,CAAC;AACrH,OAAO,mBAAmB,MAAM,wDAAwD,CAAC;AACzF,OAAO,kBAAkB,MAAM,uDAAuD,CAAC;AACvF,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,UAAU,MAAM,iCAAiC,CAAC;AACzD,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,4BAA4B,MAAM,mDAAmD,CAAC;AAC7F,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAsBvE,IAAM,QAAQ,GAAd,MAAM,QAAS,SAAQ,SAAS;IAAhC;;QAyBS,YAAO,GAAa,SAAS,CAAC;QAoB9B,cAAS,GAAc,SAAS,CAAC;QAmBjC,gBAAW,GAAY,SAAS,CAAC;QAoBjC,eAAU,
|
|
1
|
+
{"version":3,"file":"UserPush.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/UserPush.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import Response from "../Utils/Response";
|
|
|
6
6
|
import BaseAPI from "./BaseAPI";
|
|
7
7
|
import BadDataException from "../../Types/Exception/BadDataException";
|
|
8
8
|
import ObjectID from "../../Types/ObjectID";
|
|
9
|
+
import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
|
|
9
10
|
import UserPush from "../../Models/DatabaseModels/UserPush";
|
|
10
11
|
export default class UserPushAPI extends BaseAPI {
|
|
11
12
|
constructor() {
|
|
@@ -16,8 +17,10 @@ export default class UserPushAPI extends BaseAPI {
|
|
|
16
17
|
if (!req.body.deviceToken) {
|
|
17
18
|
return Response.sendErrorResponse(req, res, new BadDataException("Device token is required"));
|
|
18
19
|
}
|
|
19
|
-
|
|
20
|
-
|
|
20
|
+
const validDeviceTypes = Object.values(PushDeviceType);
|
|
21
|
+
if (!req.body.deviceType ||
|
|
22
|
+
!validDeviceTypes.includes(req.body.deviceType)) {
|
|
23
|
+
return Response.sendErrorResponse(req, res, new BadDataException("Device type must be one of: " + validDeviceTypes.join(", ")));
|
|
21
24
|
}
|
|
22
25
|
if (!req.body.projectId) {
|
|
23
26
|
return Response.sendErrorResponse(req, res, new BadDataException("Project ID is required"));
|
|
@@ -47,7 +50,7 @@ export default class UserPushAPI extends BaseAPI {
|
|
|
47
50
|
userPush.deviceToken = req.body.deviceToken;
|
|
48
51
|
userPush.deviceType = req.body.deviceType;
|
|
49
52
|
userPush.deviceName = req.body.deviceName || "Unknown Device";
|
|
50
|
-
userPush.isVerified = true; //
|
|
53
|
+
userPush.isVerified = true; // Web, iOS, and Android devices are verified immediately
|
|
51
54
|
const savedDevice = await this.service.create({
|
|
52
55
|
data: userPush,
|
|
53
56
|
props: {
|
|
@@ -63,6 +66,34 @@ export default class UserPushAPI extends BaseAPI {
|
|
|
63
66
|
next(error);
|
|
64
67
|
}
|
|
65
68
|
});
|
|
69
|
+
this.router.post(`/user-push/unregister`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
|
|
70
|
+
try {
|
|
71
|
+
req = req;
|
|
72
|
+
if (!req.body.deviceToken) {
|
|
73
|
+
return Response.sendErrorResponse(req, res, new BadDataException("Device token is required"));
|
|
74
|
+
}
|
|
75
|
+
const userId = req.userAuthorization
|
|
76
|
+
.userId;
|
|
77
|
+
await this.service.deleteBy({
|
|
78
|
+
query: {
|
|
79
|
+
userId: userId,
|
|
80
|
+
deviceToken: req.body.deviceToken,
|
|
81
|
+
},
|
|
82
|
+
limit: 100,
|
|
83
|
+
skip: 0,
|
|
84
|
+
props: {
|
|
85
|
+
isRoot: true,
|
|
86
|
+
},
|
|
87
|
+
});
|
|
88
|
+
return Response.sendJsonObjectResponse(req, res, {
|
|
89
|
+
success: true,
|
|
90
|
+
message: "Device unregistered successfully",
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
catch (error) {
|
|
94
|
+
return next(error);
|
|
95
|
+
}
|
|
96
|
+
});
|
|
66
97
|
this.router.post(`/user-push/:deviceId/test-notification`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
|
|
67
98
|
var _a;
|
|
68
99
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserPushAPI.js","sourceRoot":"","sources":["../../../../Server/API/UserPushAPI.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,eAEN,MAAM,6BAA6B,CAAC;AACrC,OAAO,uBAAuB,MAAM,qCAAqC,CAAC;AAC1E,OAAO,oBAAoB,MAAM,+BAA+B,CAAC;AAOjE,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,QAAQ,MAAM,sCAAsC,CAAC;AAG5D,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAGxC;IACC;QACE,KAAK,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,qBAAqB,EACrB,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI,CAAC;gBACH,GAAG,GAAG,GAAuB,CAAC;gBAE9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC1B,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,0BAA0B,CAAC,CACjD,CAAC;gBACJ,CAAC;gBAED,
|
|
1
|
+
{"version":3,"file":"UserPushAPI.js","sourceRoot":"","sources":["../../../../Server/API/UserPushAPI.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,eAEN,MAAM,6BAA6B,CAAC;AACrC,OAAO,uBAAuB,MAAM,qCAAqC,CAAC;AAC1E,OAAO,oBAAoB,MAAM,+BAA+B,CAAC;AAOjE,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,cAAc,MAAM,6CAA6C,CAAC;AACzE,OAAO,QAAQ,MAAM,sCAAsC,CAAC;AAG5D,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAGxC;IACC;QACE,KAAK,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,qBAAqB,EACrB,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI,CAAC;gBACH,GAAG,GAAG,GAAuB,CAAC;gBAE9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC1B,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,0BAA0B,CAAC,CACjD,CAAC;gBACJ,CAAC;gBAED,MAAM,gBAAgB,GAAa,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBACjE,IACE,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU;oBACpB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,EAC/C,CAAC;oBACD,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAClB,8BAA8B,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAC7D,CACF,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oBACxB,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,wBAAwB,CAAC,CAC/C,CAAC;gBACJ,CAAC;gBAED,wCAAwC;gBACxC,MAAM,cAAc,GAAoB,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;oBACnE,KAAK,EAAE;wBACL,MAAM,EAAG,GAAwB,CAAC,iBAAkB,CAAC,MAAO;wBAC5D,SAAS,EAAE,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;wBAC3C,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW;qBAClC;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;oBACD,MAAM,EAAE;wBACN,GAAG,EAAE,IAAI;qBACV;iBACF,CAAC,CAAC;gBAEH,IAAI,cAAc,EAAE,CAAC;oBACnB,uFAAuF;oBACvF,MAAM,IAAI,gBAAgB,CACxB,0DAA0D,CAC3D,CAAC;gBACJ,CAAC;gBAED,iCAAiC;gBACjC,MAAM,QAAQ,GAAa,IAAI,QAAQ,EAAE,CAAC;gBAC1C,QAAQ,CAAC,MAAM,GACb,GACD,CAAC,iBAAkB,CAAC,MAAO,CAAC;gBAC7B,QAAQ,CAAC,SAAS,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACtD,QAAQ,CAAC,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC;gBAC5C,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC;gBAC1C,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,gBAAgB,CAAC;gBAC9D,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,yDAAyD;gBAErF,MAAM,WAAW,GAAa,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;oBACtD,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;gBAEH,OAAO,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE;oBAC/C,OAAO,EAAE,IAAI;oBACb,QAAQ,EAAE,WAAW,CAAC,GAAI,CAAC,QAAQ,EAAE;iBACtC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,KAAK,CAAC,CAAC;YACd,CAAC;QACH,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,uBAAuB,EACvB,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI,CAAC;gBACH,GAAG,GAAG,GAAuB,CAAC;gBAE9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC1B,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,0BAA0B,CAAC,CACjD,CAAC;gBACJ,CAAC;gBAED,MAAM,MAAM,GAAc,GAAwB,CAAC,iBAAkB;qBAClE,MAAO,CAAC;gBAEX,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;oBAC1B,KAAK,EAAE;wBACL,MAAM,EAAE,MAAM;wBACd,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW;qBAClC;oBACD,KAAK,EAAE,GAAG;oBACV,IAAI,EAAE,CAAC;oBACP,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;gBAEH,OAAO,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE;oBAC/C,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,kCAAkC;iBAC5C,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;QACH,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,wCAAwC,EACxC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;;YACtE,IAAI,CAAC;gBACH,GAAG,GAAG,GAAuB,CAAC;gBAE9B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC5B,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,CAC9C,CAAC;gBACJ,CAAC;gBAED,iBAAiB;gBACjB,MAAM,MAAM,GAAoB,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;oBAC7D,EAAE,EAAE,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBACxC,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;oBACD,MAAM,EAAE;wBACN,MAAM,EAAE,IAAI;wBACZ,UAAU,EAAE,IAAI;wBAChB,WAAW,EAAE,IAAI;wBACjB,UAAU,EAAE,IAAI;wBAChB,UAAU,EAAE,IAAI;wBAChB,SAAS,EAAE,IAAI;qBAChB;iBACF,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,kBAAkB,CAAC,CACzC,CAAC;gBACJ,CAAC;gBAED,kDAAkD;gBAClD,IACE,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,QAAQ,EAAE;oBACxB,GAAwB,CAAC,iBAAkB,CAAC,MAAO,CAAC,QAAQ,EAAE,EAC/D,CAAC;oBACD,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,+BAA+B,CAAC,CACtD,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;oBACvB,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,wBAAwB,CAAC,CAC/C,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC;oBACH,yBAAyB;oBACzB,MAAM,WAAW,GACf,oBAAoB,CAAC,yBAAyB,CAAC;wBAC7C,KAAK,EAAE,kCAAkC;wBACzC,IAAI,EAAE,yEAAyE;wBAC/E,WAAW,EAAE,YAAY;wBACzB,GAAG,EAAE,mBAAmB;wBACxB,kBAAkB,EAAE,KAAK;qBAC1B,CAAC,CAAC;oBAEL,MAAM,uBAAuB,CAAC,oBAAoB,CAChD;wBACE,OAAO,EAAE;4CAEL,KAAK,EAAE,MAAM,CAAC,WAAY,IACvB,CAAC,MAAM,CAAC,UAAU,IAAI;gCACvB,IAAI,EAAE,MAAM,CAAC,UAAU;6BACxB,CAAC;yBAEL;wBACD,OAAO,EAAE,WAAW;wBACpB,UAAU,EAAE,MAAM,CAAC,UAA6B;qBACjD,EACD;wBACE,WAAW,EAAE,KAAK;wBAClB,SAAS,EAAE,MAAM,CAAC,SAAU;wBAC5B,MAAM,EAAE,MAAM,CAAC,MAAO;qBACvB,CACF,CAAC;gBACJ,CAAC;gBAAC,OAAO,KAAU,EAAE,CAAC;oBACpB,MAAM,IAAI,gBAAgB,CACxB,qCAAqC,KAAK,CAAC,OAAO,EAAE,CACrD,CAAC;gBACJ,CAAC;gBAED,OAAO,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE;oBAC/C,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,qCAAqC;iBAC/C,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;QACH,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,6BAA6B,EAC7B,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;;YACtE,IAAI,CAAC;gBACH,GAAG,GAAG,GAAuB,CAAC;gBAE9B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC5B,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,CAC9C,CAAC;gBACJ,CAAC;gBAED,MAAM,MAAM,GAAoB,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;oBAC7D,EAAE,EAAE,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBACxC,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;oBACD,MAAM,EAAE;wBACN,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,kBAAkB,CAAC,CACzC,CAAC;gBACJ,CAAC;gBAED,kDAAkD;gBAClD,IACE,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,QAAQ,EAAE;oBACxB,GAAwB,CAAC,iBAAkB,CAAC,MAAO,CAAC,QAAQ,EAAE,EAC/D,CAAC;oBACD,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,+BAA+B,CAAC,CACtD,CAAC;gBACJ,CAAC;gBAED,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,GAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAExD,OAAO,QAAQ,CAAC,wBAAwB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;QACH,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,+BAA+B,EAC/B,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;;YACtE,IAAI,CAAC;gBACH,GAAG,GAAG,GAAuB,CAAC;gBAE9B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC5B,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,CAC9C,CAAC;gBACJ,CAAC;gBAED,MAAM,MAAM,GAAoB,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;oBAC7D,EAAE,EAAE,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBACxC,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;oBACD,MAAM,EAAE;wBACN,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,kBAAkB,CAAC,CACzC,CAAC;gBACJ,CAAC;gBAED,kDAAkD;gBAClD,IACE,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,QAAQ,EAAE;oBACxB,GAAwB,CAAC,iBAAkB,CAAC,MAAO,CAAC,QAAQ,EAAE,EAC/D,CAAC;oBACD,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,+BAA+B,CAAC,CACtD,CAAC;gBACJ,CAAC;gBAED,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,GAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAE1D,OAAO,QAAQ,CAAC,wBAAwB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -42,11 +42,17 @@ export default class UserMiddleware {
|
|
|
42
42
|
return accessToken;
|
|
43
43
|
}
|
|
44
44
|
static getAccessTokenFromExpressRequest(req) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
// 1. Try cookie (existing web dashboard flow)
|
|
46
|
+
const cookieToken = CookieUtil.getCookieFromExpressRequest(req, CookieUtil.getUserTokenKey());
|
|
47
|
+
if (cookieToken) {
|
|
48
|
+
return cookieToken;
|
|
48
49
|
}
|
|
49
|
-
|
|
50
|
+
// 2. Fallback: Check Authorization: Bearer <token> header (mobile app flow)
|
|
51
|
+
const authHeader = req.headers["authorization"];
|
|
52
|
+
if (authHeader && authHeader.startsWith("Bearer ")) {
|
|
53
|
+
return authHeader.substring(7);
|
|
54
|
+
}
|
|
55
|
+
return undefined;
|
|
50
56
|
}
|
|
51
57
|
static getSsoTokens(req) {
|
|
52
58
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserAuthorization.js","sourceRoot":"","sources":["../../../../Server/Middleware/UserAuthorization.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,gCAAgC,CAAC;AAChE,OAAO,cAAc,MAAM,4BAA4B,CAAC;AACxD,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,WAAW,MAAM,+BAA+B,CAAC;AACxD,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAOzC,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,YAAY,MAAM,uBAAuB,CAAC;AACjD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAG7C,OAAO,yBAAyB,MAAM,iDAAiD,CAAC;AACxF,OAAO,yBAAyB,MAAM,iDAAiD,CAAC;AACxF,OAAO,uBAAuB,MAAM,+CAA+C,CAAC;AACpF,OAAO,YAAY,MAAM,0BAA0B,CAAC;AAEpD,OAAO,aAAa,MAAM,2BAA2B,CAAC;AAEtD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAK5C,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAE5C,OAAO,kBAAkB,MAAM,wCAAwC,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC;;;;;OAKG;IAGW,AAAP,MAAM,CAAC,wBAAwB,CACpC,GAAmB;QAEnB,IAAI,WAAW,GAAuB,SAAS,CAAC;QAEhD,IACE,UAAU,CAAC,2BAA2B,CAAC,GAAG,EAAE,UAAU,CAAC,eAAe,EAAE,CAAC,EACzE,CAAC;YACD,WAAW,GAAG,UAAU,CAAC,2BAA2B,CAClD,GAAG,EACH,UAAU,CAAC,eAAe,EAAE,CAC7B,CAAC;QACJ,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAGa,AAAP,MAAM,CAAC,gCAAgC,CAC5C,GAAmB;QAEnB,
|
|
1
|
+
{"version":3,"file":"UserAuthorization.js","sourceRoot":"","sources":["../../../../Server/Middleware/UserAuthorization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
|
|
1
2
|
import logger from "../Utils/Logger";
|
|
2
3
|
import UserPushService from "./UserPushService";
|
|
3
4
|
import UserOnCallLogTimelineService from "./UserOnCallLogTimelineService";
|
|
4
5
|
import UserNotificationStatus from "../../Types/UserNotification/UserNotificationStatus";
|
|
5
6
|
import { VapidPublicKey, VapidPrivateKey, VapidSubject, } from "../EnvironmentConfig";
|
|
6
7
|
import webpush from "web-push";
|
|
8
|
+
import { Expo } from "expo-server-sdk";
|
|
7
9
|
import PushNotificationUtil from "../Utils/PushNotificationUtil";
|
|
8
10
|
import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
|
|
9
11
|
import PushNotificationLog from "../../Models/DatabaseModels/PushNotificationLog";
|
|
@@ -33,11 +35,7 @@ class PushNotificationService {
|
|
|
33
35
|
logger.error("No devices provided for push notification");
|
|
34
36
|
throw new Error("No devices provided");
|
|
35
37
|
}
|
|
36
|
-
|
|
37
|
-
logger.error(`Unsupported device type: ${request.deviceType}`);
|
|
38
|
-
throw new Error("Only web push notifications are supported");
|
|
39
|
-
}
|
|
40
|
-
logger.info(`Sending web push notifications to ${request.devices.length} devices`);
|
|
38
|
+
logger.info(`Sending ${request.deviceType} push notifications to ${request.devices.length} devices`);
|
|
41
39
|
logger.info(`Notification message: ${JSON.stringify(request.message)}`);
|
|
42
40
|
const deviceNames = request.devices
|
|
43
41
|
.map((device) => {
|
|
@@ -49,7 +47,16 @@ class PushNotificationService {
|
|
|
49
47
|
}
|
|
50
48
|
const promises = [];
|
|
51
49
|
for (const device of request.devices) {
|
|
52
|
-
|
|
50
|
+
if (request.deviceType === PushDeviceType.Web) {
|
|
51
|
+
promises.push(this.sendWebPushNotification(device.token, request.message, options));
|
|
52
|
+
}
|
|
53
|
+
else if (request.deviceType === PushDeviceType.iOS ||
|
|
54
|
+
request.deviceType === PushDeviceType.Android) {
|
|
55
|
+
promises.push(this.sendExpoPushNotification(device.token, request.message, request.deviceType, options));
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
logger.error(`Unsupported device type: ${request.deviceType}`);
|
|
59
|
+
}
|
|
53
60
|
}
|
|
54
61
|
const results = await Promise.allSettled(promises);
|
|
55
62
|
let successCount = 0;
|
|
@@ -211,6 +218,48 @@ class PushNotificationService {
|
|
|
211
218
|
throw error;
|
|
212
219
|
}
|
|
213
220
|
}
|
|
221
|
+
static async sendExpoPushNotification(expoPushToken, message, deviceType, _options) {
|
|
222
|
+
var _a;
|
|
223
|
+
if (!Expo.isExpoPushToken(expoPushToken)) {
|
|
224
|
+
throw new Error(`Invalid Expo push token for ${deviceType} device: ${expoPushToken}`);
|
|
225
|
+
}
|
|
226
|
+
try {
|
|
227
|
+
const dataPayload = {};
|
|
228
|
+
if (message.data) {
|
|
229
|
+
for (const key of Object.keys(message.data)) {
|
|
230
|
+
dataPayload[key] = String(message.data[key]);
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
if (message.url || message.clickAction) {
|
|
234
|
+
dataPayload["url"] = message.url || message.clickAction || "";
|
|
235
|
+
}
|
|
236
|
+
const channelId = deviceType === PushDeviceType.Android ? "oncall_high" : "default";
|
|
237
|
+
const expoPushMessage = {
|
|
238
|
+
to: expoPushToken,
|
|
239
|
+
title: message.title,
|
|
240
|
+
body: message.body,
|
|
241
|
+
data: dataPayload,
|
|
242
|
+
sound: "default",
|
|
243
|
+
priority: "high",
|
|
244
|
+
channelId: channelId,
|
|
245
|
+
};
|
|
246
|
+
const tickets = await this.expoClient.sendPushNotificationsAsync([expoPushMessage]);
|
|
247
|
+
const ticket = tickets[0];
|
|
248
|
+
if (ticket && ticket.status === "error") {
|
|
249
|
+
const errorTicket = ticket;
|
|
250
|
+
logger.error(`Expo push notification error for ${deviceType} device: ${errorTicket.message}`);
|
|
251
|
+
if (((_a = errorTicket.details) === null || _a === void 0 ? void 0 : _a.error) === "DeviceNotRegistered") {
|
|
252
|
+
logger.info("Expo push token is no longer valid (DeviceNotRegistered)");
|
|
253
|
+
}
|
|
254
|
+
throw new Error(`Expo push notification failed: ${errorTicket.message}`);
|
|
255
|
+
}
|
|
256
|
+
logger.info(`Expo push notification sent successfully to ${deviceType} device`);
|
|
257
|
+
}
|
|
258
|
+
catch (error) {
|
|
259
|
+
logger.error(`Failed to send Expo push notification to ${deviceType} device: ${error.message}`);
|
|
260
|
+
throw error;
|
|
261
|
+
}
|
|
262
|
+
}
|
|
214
263
|
static async sendPushNotificationToUser(userId, projectId, message, options = {}) {
|
|
215
264
|
// Get all verified push devices for the user
|
|
216
265
|
const userPushDevices = await UserPushService.findBy({
|
|
@@ -232,29 +281,36 @@ class PushNotificationService {
|
|
|
232
281
|
},
|
|
233
282
|
});
|
|
234
283
|
if (userPushDevices.length === 0) {
|
|
235
|
-
logger.info(`No verified
|
|
284
|
+
logger.info(`No verified push devices found for user ${userId.toString()}`);
|
|
236
285
|
return;
|
|
237
286
|
}
|
|
238
|
-
//
|
|
239
|
-
const
|
|
287
|
+
// Group devices by type
|
|
288
|
+
const devicesByType = new Map();
|
|
240
289
|
for (const device of userPushDevices) {
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
name: device.deviceName || "Unknown Device",
|
|
245
|
-
});
|
|
290
|
+
const type = device.deviceType || PushDeviceType.Web;
|
|
291
|
+
if (!devicesByType.has(type)) {
|
|
292
|
+
devicesByType.set(type, []);
|
|
246
293
|
}
|
|
294
|
+
devicesByType.get(type).push({
|
|
295
|
+
token: device.deviceToken,
|
|
296
|
+
name: device.deviceName || "Unknown Device",
|
|
297
|
+
});
|
|
247
298
|
}
|
|
248
|
-
// Send notifications to
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
299
|
+
// Send notifications to each device type group
|
|
300
|
+
const sendPromises = [];
|
|
301
|
+
for (const [deviceType, devices] of devicesByType.entries()) {
|
|
302
|
+
if (devices.length > 0) {
|
|
303
|
+
sendPromises.push(this.sendPushNotification({
|
|
304
|
+
devices: devices,
|
|
305
|
+
message: message,
|
|
306
|
+
deviceType: deviceType,
|
|
307
|
+
}, options));
|
|
308
|
+
}
|
|
255
309
|
}
|
|
310
|
+
await Promise.allSettled(sendPromises);
|
|
256
311
|
}
|
|
257
312
|
}
|
|
258
313
|
PushNotificationService.isWebPushInitialized = false;
|
|
314
|
+
PushNotificationService.expoClient = new Expo();
|
|
259
315
|
export default PushNotificationService;
|
|
260
316
|
//# sourceMappingURL=PushNotificationService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PushNotificationService.js","sourceRoot":"","sources":["../../../../Server/Services/PushNotificationService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"PushNotificationService.js","sourceRoot":"","sources":["../../../../Server/Services/PushNotificationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -819,9 +819,9 @@ export class Service extends DatabaseService {
|
|
|
819
819
|
isRoot: true,
|
|
820
820
|
},
|
|
821
821
|
});
|
|
822
|
-
const pushMessage = PushNotificationUtil.createAlertCreatedNotification(Object.assign({ alertTitle: alert.title, projectName: ((_16 = alert.project) === null || _16 === void 0 ? void 0 : _16.name) || "OneUptime", alertViewLink: (await AlertService.getAlertLinkInDashboard(alert.projectId, alert.id)).toString() }, (alert.alertNumber !== undefined && {
|
|
822
|
+
const pushMessage = PushNotificationUtil.createAlertCreatedNotification(Object.assign(Object.assign({ alertTitle: alert.title, projectName: ((_16 = alert.project) === null || _16 === void 0 ? void 0 : _16.name) || "OneUptime", alertViewLink: (await AlertService.getAlertLinkInDashboard(alert.projectId, alert.id)).toString() }, (alert.alertNumber !== undefined && {
|
|
823
823
|
alertNumber: alert.alertNumber,
|
|
824
|
-
})));
|
|
824
|
+
})), { alertId: alert.id.toString(), projectId: alert.projectId.toString() }));
|
|
825
825
|
// send push notification.
|
|
826
826
|
PushNotificationService.sendPushNotification({
|
|
827
827
|
devices: [
|
|
@@ -830,7 +830,8 @@ export class Service extends DatabaseService {
|
|
|
830
830
|
})),
|
|
831
831
|
],
|
|
832
832
|
message: pushMessage,
|
|
833
|
-
deviceType: notificationRuleItem.userPush
|
|
833
|
+
deviceType: notificationRuleItem.userPush
|
|
834
|
+
.deviceType,
|
|
834
835
|
}, {
|
|
835
836
|
projectId: options.projectId,
|
|
836
837
|
userOnCallLogTimelineId: updatedLog.id,
|
|
@@ -868,9 +869,9 @@ export class Service extends DatabaseService {
|
|
|
868
869
|
isRoot: true,
|
|
869
870
|
},
|
|
870
871
|
});
|
|
871
|
-
const pushMessage = PushNotificationUtil.createIncidentCreatedNotification(Object.assign({ incidentTitle: incident.title, projectName: ((_17 = incident.project) === null || _17 === void 0 ? void 0 : _17.name) || "OneUptime", incidentViewLink: (await IncidentService.getIncidentLinkInDashboard(incident.projectId, incident.id)).toString() }, (incident.incidentNumber !== undefined && {
|
|
872
|
+
const pushMessage = PushNotificationUtil.createIncidentCreatedNotification(Object.assign(Object.assign({ incidentTitle: incident.title, projectName: ((_17 = incident.project) === null || _17 === void 0 ? void 0 : _17.name) || "OneUptime", incidentViewLink: (await IncidentService.getIncidentLinkInDashboard(incident.projectId, incident.id)).toString() }, (incident.incidentNumber !== undefined && {
|
|
872
873
|
incidentNumber: incident.incidentNumber,
|
|
873
|
-
})));
|
|
874
|
+
})), { incidentId: incident.id.toString(), projectId: incident.projectId.toString() }));
|
|
874
875
|
// send push notification.
|
|
875
876
|
PushNotificationService.sendPushNotification({
|
|
876
877
|
devices: [
|
|
@@ -879,7 +880,8 @@ export class Service extends DatabaseService {
|
|
|
879
880
|
})),
|
|
880
881
|
],
|
|
881
882
|
message: pushMessage,
|
|
882
|
-
deviceType: notificationRuleItem.userPush
|
|
883
|
+
deviceType: notificationRuleItem.userPush
|
|
884
|
+
.deviceType,
|
|
883
885
|
}, {
|
|
884
886
|
projectId: options.projectId,
|
|
885
887
|
userOnCallLogTimelineId: updatedLog.id,
|
|
@@ -916,11 +918,11 @@ export class Service extends DatabaseService {
|
|
|
916
918
|
isRoot: true,
|
|
917
919
|
},
|
|
918
920
|
});
|
|
919
|
-
const pushMessage = PushNotificationUtil.createAlertEpisodeCreatedNotification(Object.assign(Object.assign({ alertEpisodeTitle: alertEpisode.title, projectName: ((_18 = alertEpisode.project) === null || _18 === void 0 ? void 0 : _18.name) || "OneUptime", alertEpisodeViewLink: (await AlertEpisodeService.getEpisodeLinkInDashboard(alertEpisode.projectId, alertEpisode.id)).toString() }, (alertEpisode.episodeNumber !== undefined && {
|
|
921
|
+
const pushMessage = PushNotificationUtil.createAlertEpisodeCreatedNotification(Object.assign(Object.assign(Object.assign({ alertEpisodeTitle: alertEpisode.title, projectName: ((_18 = alertEpisode.project) === null || _18 === void 0 ? void 0 : _18.name) || "OneUptime", alertEpisodeViewLink: (await AlertEpisodeService.getEpisodeLinkInDashboard(alertEpisode.projectId, alertEpisode.id)).toString() }, (alertEpisode.episodeNumber !== undefined && {
|
|
920
922
|
episodeNumber: alertEpisode.episodeNumber,
|
|
921
923
|
})), (alertEpisode.episodeNumberWithPrefix && {
|
|
922
924
|
episodeNumberWithPrefix: alertEpisode.episodeNumberWithPrefix,
|
|
923
|
-
})));
|
|
925
|
+
})), { alertEpisodeId: alertEpisode.id.toString(), projectId: alertEpisode.projectId.toString() }));
|
|
924
926
|
PushNotificationService.sendPushNotification({
|
|
925
927
|
devices: [
|
|
926
928
|
Object.assign({ token: notificationRuleItem.userPush.deviceToken }, (notificationRuleItem.userPush.deviceName && {
|
|
@@ -928,7 +930,8 @@ export class Service extends DatabaseService {
|
|
|
928
930
|
})),
|
|
929
931
|
],
|
|
930
932
|
message: pushMessage,
|
|
931
|
-
deviceType: notificationRuleItem.userPush
|
|
933
|
+
deviceType: notificationRuleItem.userPush
|
|
934
|
+
.deviceType,
|
|
932
935
|
}, {
|
|
933
936
|
projectId: options.projectId,
|
|
934
937
|
userOnCallLogTimelineId: updatedLog.id,
|