@oneuptime/common 10.4.4 → 10.4.5

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.
Files changed (10) hide show
  1. package/Server/Services/UserCallService.ts +20 -0
  2. package/Server/Services/UserIncomingCallNumberService.ts +22 -0
  3. package/Server/Services/UserSmsService.ts +20 -0
  4. package/build/dist/Server/Services/UserCallService.js +14 -2
  5. package/build/dist/Server/Services/UserCallService.js.map +1 -1
  6. package/build/dist/Server/Services/UserIncomingCallNumberService.js +15 -2
  7. package/build/dist/Server/Services/UserIncomingCallNumberService.js.map +1 -1
  8. package/build/dist/Server/Services/UserSmsService.js +14 -2
  9. package/build/dist/Server/Services/UserSmsService.js.map +1 -1
  10. package/package.json +1 -1
package/Server/Services/UserCallService.ts CHANGED
@@ -91,7 +91,17 @@ export class Service extends DatabaseService<Model> {
91
91
  );
92
92
  }
93
93
 
94
+ /*
95
+ * If the project has its own default Twilio config, OneUptime does not
96
+ * charge the project's Call/SMS balance, so the low-balance check does not apply.
97
+ */
98
+ const projectTwilioConfig: TwilioConfig | undefined =
99
+ await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(
100
+ createBy.data.projectId!,
101
+ );
102
+
94
103
  if (
104
+ !projectTwilioConfig &&
95
105
  (project.smsOrCallCurrentBalanceInUSDCents as number) <= 100 &&
96
106
  IsBillingEnabled
97
107
  ) {
@@ -161,7 +171,17 @@ export class Service extends DatabaseService<Model> {
161
171
  );
162
172
  }
163
173
 
174
+ /*
175
+ * If the project has its own default Twilio config, OneUptime does not
176
+ * charge the project's Call/SMS balance, so the low-balance check does not apply.
177
+ */
178
+ const projectTwilioConfig: TwilioConfig | undefined =
179
+ await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(
180
+ item.projectId!,
181
+ );
182
+
164
183
  if (
184
+ !projectTwilioConfig &&
165
185
  (project.smsOrCallCurrentBalanceInUSDCents as number) <= 100 &&
166
186
  IsBillingEnabled
167
187
  ) {
package/Server/Services/UserIncomingCallNumberService.ts CHANGED
@@ -3,8 +3,10 @@ import CreateBy from "../Types/Database/CreateBy";
3
3
  import { OnCreate } from "../Types/Database/Hooks";
4
4
  import logger from "../Utils/Logger";
5
5
  import DatabaseService from "./DatabaseService";
6
+ import ProjectCallSMSConfigService from "./ProjectCallSMSConfigService";
6
7
  import ProjectService from "./ProjectService";
7
8
  import SmsService from "./SmsService";
9
+ import TwilioConfig from "../../Types/CallAndSMS/TwilioConfig";
8
10
  import BadDataException from "../../Types/Exception/BadDataException";
9
11
  import ObjectID from "../../Types/ObjectID";
10
12
  import Text from "../../Types/Text";
@@ -48,7 +50,17 @@ export class Service extends DatabaseService<Model> {
48
50
  );
49
51
  }
50
52
 
53
+ /*
54
+ * If the project has its own default Twilio config, OneUptime does not
55
+ * charge the project's SMS balance, so the low-balance check does not apply.
56
+ */
57
+ const projectTwilioConfig: TwilioConfig | undefined =
58
+ await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(
59
+ createBy.data.projectId!,
60
+ );
61
+
51
62
  if (
63
+ !projectTwilioConfig &&
52
64
  (project.smsOrCallCurrentBalanceInUSDCents as number) <= 100 &&
53
65
  IsBillingEnabled
54
66
  ) {
@@ -141,7 +153,17 @@ export class Service extends DatabaseService<Model> {
141
153
  );
142
154
  }
143
155
 
156
+ /*
157
+ * If the project has its own default Twilio config, OneUptime does not
158
+ * charge the project's SMS balance, so the low-balance check does not apply.
159
+ */
160
+ const projectTwilioConfig: TwilioConfig | undefined =
161
+ await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(
162
+ item.projectId!,
163
+ );
164
+
144
165
  if (
166
+ !projectTwilioConfig &&
145
167
  (project.smsOrCallCurrentBalanceInUSDCents as number) <= 100 &&
146
168
  IsBillingEnabled
147
169
  ) {
package/Server/Services/UserSmsService.ts CHANGED
@@ -90,7 +90,17 @@ export class Service extends DatabaseService<Model> {
90
90
  );
91
91
  }
92
92
 
93
+ /*
94
+ * If the project has its own default Twilio config, OneUptime does not
95
+ * charge the project's SMS balance, so the low-balance check does not apply.
96
+ */
97
+ const projectTwilioConfig: TwilioConfig | undefined =
98
+ await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(
99
+ createBy.data.projectId!,
100
+ );
101
+
93
102
  if (
103
+ !projectTwilioConfig &&
94
104
  (project.smsOrCallCurrentBalanceInUSDCents as number) <= 100 &&
95
105
  IsBillingEnabled
96
106
  ) {
@@ -161,7 +171,17 @@ export class Service extends DatabaseService<Model> {
161
171
  );
162
172
  }
163
173
 
174
+ /*
175
+ * If the project has its own default Twilio config, OneUptime does not
176
+ * charge the project's SMS balance, so the low-balance check does not apply.
177
+ */
178
+ const projectTwilioConfig: TwilioConfig | undefined =
179
+ await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(
180
+ item.projectId!,
181
+ );
182
+
164
183
  if (
184
+ !projectTwilioConfig &&
165
185
  (project.smsOrCallCurrentBalanceInUSDCents as number) <= 100 &&
166
186
  IsBillingEnabled
167
187
  ) {
package/build/dist/Server/Services/UserCallService.js CHANGED
@@ -76,7 +76,13 @@ export class Service extends DatabaseService {
76
76
  if (!project.enableCallNotifications) {
77
77
  throw new BadDataException("Call notifications are disabled for this project. Please enable them in Project Settings > Notification Settings.");
78
78
  }
79
- if (project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
79
+ /*
80
+ * If the project has its own default Twilio config, OneUptime does not
81
+ * charge the project's Call/SMS balance, so the low-balance check does not apply.
82
+ */
83
+ const projectTwilioConfig = await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(createBy.data.projectId);
84
+ if (!projectTwilioConfig &&
85
+ project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
80
86
  IsBillingEnabled) {
81
87
  throw new BadDataException("Your SMS balance is low. Please recharge your SMS balance in Project Settings > Notification Settings.");
82
88
  }
@@ -124,7 +130,13 @@ export class Service extends DatabaseService {
124
130
  if (!project.enableCallNotifications) {
125
131
  throw new BadDataException("Call notifications are disabled for this project. Please enable them in Project Settings > Notification Settings.");
126
132
  }
127
- if (project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
133
+ /*
134
+ * If the project has its own default Twilio config, OneUptime does not
135
+ * charge the project's Call/SMS balance, so the low-balance check does not apply.
136
+ */
137
+ const projectTwilioConfig = await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(item.projectId);
138
+ if (!projectTwilioConfig &&
139
+ project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
128
140
  IsBillingEnabled) {
129
141
  throw new BadDataException("Your SMS balance is low. Please recharge your SMS balance in Project Settings > Notification Settings.");
130
142
  }
package/build/dist/Server/Services/UserCallService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UserCallService.js","sourceRoot":"","sources":["../../../../Server/Services/UserCallService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UserCallService.js","sourceRoot":"","sources":["../../../../Server/Services/UserCallService.ts"],"names":[],"mappings":"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"}
package/build/dist/Server/Services/UserIncomingCallNumberService.js CHANGED
@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
10
10
  import { IsBillingEnabled } from "../EnvironmentConfig";
11
11
  import logger from "../Utils/Logger";
12
12
  import DatabaseService from "./DatabaseService";
13
+ import ProjectCallSMSConfigService from "./ProjectCallSMSConfigService";
13
14
  import ProjectService from "./ProjectService";
14
15
  import SmsService from "./SmsService";
15
16
  import BadDataException from "../../Types/Exception/BadDataException";
@@ -43,7 +44,13 @@ export class Service extends DatabaseService {
43
44
  if (!project.enableSmsNotifications) {
44
45
  throw new BadDataException("SMS notifications are disabled for this project. Please enable them in Project Settings > Notification Settings.");
45
46
  }
46
- if (project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
47
+ /*
48
+ * If the project has its own default Twilio config, OneUptime does not
49
+ * charge the project's SMS balance, so the low-balance check does not apply.
50
+ */
51
+ const projectTwilioConfig = await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(createBy.data.projectId);
52
+ if (!projectTwilioConfig &&
53
+ project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
47
54
  IsBillingEnabled) {
48
55
  throw new BadDataException("Your SMS balance is low. Please recharge your SMS balance in Project Settings > Notification Settings.");
49
56
  }
@@ -109,7 +116,13 @@ export class Service extends DatabaseService {
109
116
  if (!project.enableSmsNotifications) {
110
117
  throw new BadDataException("SMS notifications are disabled for this project. Please enable them in Project Settings > Notification Settings.");
111
118
  }
112
- if (project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
119
+ /*
120
+ * If the project has its own default Twilio config, OneUptime does not
121
+ * charge the project's SMS balance, so the low-balance check does not apply.
122
+ */
123
+ const projectTwilioConfig = await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(item.projectId);
124
+ if (!projectTwilioConfig &&
125
+ project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
113
126
  IsBillingEnabled) {
114
127
  throw new BadDataException("Your SMS balance is low. Please recharge your SMS balance in Project Settings > Notification Settings.");
115
128
  }
package/build/dist/Server/Services/UserIncomingCallNumberService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UserIncomingCallNumberService.js","sourceRoot":"","sources":["../../../../Server/Services/UserIncomingCallNumberService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UserIncomingCallNumberService.js","sourceRoot":"","sources":["../../../../Server/Services/UserIncomingCallNumberService.ts"],"names":[],"mappings":"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"}
package/build/dist/Server/Services/UserSmsService.js CHANGED
@@ -76,7 +76,13 @@ export class Service extends DatabaseService {
76
76
  if (!project.enableSmsNotifications) {
77
77
  throw new BadDataException("SMS notifications are disabled for this project. Please enable them in Project Settings > Notification Settings.");
78
78
  }
79
- if (project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
79
+ /*
80
+ * If the project has its own default Twilio config, OneUptime does not
81
+ * charge the project's SMS balance, so the low-balance check does not apply.
82
+ */
83
+ const projectTwilioConfig = await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(createBy.data.projectId);
84
+ if (!projectTwilioConfig &&
85
+ project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
80
86
  IsBillingEnabled) {
81
87
  throw new BadDataException("Your SMS balance is low. Please recharge your SMS balance in Project Settings > Notification Settings.");
82
88
  }
@@ -124,7 +130,13 @@ export class Service extends DatabaseService {
124
130
  if (!project.enableSmsNotifications) {
125
131
  throw new BadDataException("SMS notifications are disabled for this project. Please enable them in Project Settings > Notification Settings.");
126
132
  }
127
- if (project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
133
+ /*
134
+ * If the project has its own default Twilio config, OneUptime does not
135
+ * charge the project's SMS balance, so the low-balance check does not apply.
136
+ */
137
+ const projectTwilioConfig = await ProjectCallSMSConfigService.getProjectDefaultTwilioConfig(item.projectId);
138
+ if (!projectTwilioConfig &&
139
+ project.smsOrCallCurrentBalanceInUSDCents <= 100 &&
128
140
  IsBillingEnabled) {
129
141
  throw new BadDataException("Your SMS balance is low. Please recharge your SMS balance in Project Settings > Notification Settings.");
130
142
  }
package/build/dist/Server/Services/UserSmsService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UserSmsService.js","sourceRoot":"","sources":["../../../../Server/Services/UserSmsService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UserSmsService.js","sourceRoot":"","sources":["../../../../Server/Services/UserSmsService.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oneuptime/common",
3
- "version": "10.4.4",
3
+ "version": "10.4.5",
4
4
  "description": "",
5
5
  "repository": {
6
6
  "type": "git",