akeyless-server-commons 1.0.8 → 1.0.9
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/dist/cjs/helpers/global_helpers.d.ts +1 -1
- package/dist/cjs/helpers/global_helpers.js +6 -3
- package/dist/cjs/helpers/global_helpers.js.map +1 -1
- package/dist/cjs/helpers/notification_helpers.d.ts +2 -2
- package/dist/cjs/helpers/notification_helpers.js +14 -11
- package/dist/cjs/helpers/notification_helpers.js.map +1 -1
- package/dist/esm/helpers/global_helpers.d.ts +1 -1
- package/dist/esm/helpers/global_helpers.js +6 -3
- package/dist/esm/helpers/global_helpers.js.map +1 -1
- package/dist/esm/helpers/notification_helpers.d.ts +2 -2
- package/dist/esm/helpers/notification_helpers.js +14 -11
- package/dist/esm/helpers/notification_helpers.js.map +1 -1
- package/package.json +1 -1
|
@@ -8,4 +8,4 @@ export declare const get_version: (packageJsonPath: string) => string;
|
|
|
8
8
|
export declare const sleep: (ms?: number) => Promise<unknown>;
|
|
9
9
|
export declare const add_audit_record: AddAuditRecord;
|
|
10
10
|
export declare const get_nx_service_urls: (env_name?: string) => TObject<string>;
|
|
11
|
-
export declare const get_address_by_geo: ({ lat, lng }: Geo, currentLanguage: LanguageOptions) => Promise<string>;
|
|
11
|
+
export declare const get_address_by_geo: ({ lat, lng }: Geo, currentLanguage: LanguageOptions) => Promise<string | Error>;
|
|
@@ -112,7 +112,10 @@ exports.get_nx_service_urls = get_nx_service_urls;
|
|
|
112
112
|
const get_address_by_geo = (_a, currentLanguage_1) => __awaiter(void 0, [_a, currentLanguage_1], void 0, function* ({ lat, lng }, currentLanguage) {
|
|
113
113
|
var _b;
|
|
114
114
|
const language = currentLanguage === akeyless_types_commons_1.LanguageOptions.He ? "iw" : "en";
|
|
115
|
-
const apiKey = process.env.google_api_key
|
|
115
|
+
const apiKey = process.env.google_api_key;
|
|
116
|
+
if (!apiKey) {
|
|
117
|
+
throw new Error("missing env google api key");
|
|
118
|
+
}
|
|
116
119
|
const url = `https://maps.googleapis.com/maps/api/geocode/json?latlng=${lat},${lng}&key=${apiKey}&language=${language}`;
|
|
117
120
|
try {
|
|
118
121
|
const response = yield axios_1.default.get(url);
|
|
@@ -120,11 +123,11 @@ const get_address_by_geo = (_a, currentLanguage_1) => __awaiter(void 0, [_a, cur
|
|
|
120
123
|
return response.data.results[0].formatted_address.slice(0, 35);
|
|
121
124
|
}
|
|
122
125
|
else {
|
|
123
|
-
return "address not found";
|
|
126
|
+
return new Error("address not found");
|
|
124
127
|
}
|
|
125
128
|
}
|
|
126
129
|
catch (error) {
|
|
127
|
-
console.error("getAddressByGeo error:", error);
|
|
130
|
+
console.error("getAddressByGeo error:", error.message || error);
|
|
128
131
|
return "address not found";
|
|
129
132
|
}
|
|
130
133
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global_helpers.js","sourceRoot":"","sources":["../../../src/helpers/global_helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"global_helpers.js","sourceRoot":"","sources":["../../../src/helpers/global_helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { EventFromDevice } from "akeyless-types-commons";
|
|
2
|
-
export declare const send_sms: (recepient: string, text: string, entity_for_audit: string) => Promise<void>;
|
|
1
|
+
import { EventFromDevice, TObject } from "akeyless-types-commons";
|
|
2
|
+
export declare const send_sms: (recepient: string, text: string, entity_for_audit: string, details?: TObject<any>) => Promise<void>;
|
|
3
3
|
export declare const push_event_to_mobile_users: (event: EventFromDevice) => Promise<void>;
|
|
4
4
|
type FuncSendFcmMessage = (title: string, body: string, fcm_tokens: string[], custom_sound?: string) => Promise<{
|
|
5
5
|
success: boolean;
|
|
@@ -22,7 +22,7 @@ const twilio_1 = require("twilio");
|
|
|
22
22
|
const firestore_1 = require("firebase-admin/firestore");
|
|
23
23
|
const uuid_1 = require("uuid");
|
|
24
24
|
const form_data_1 = __importDefault(require("form-data"));
|
|
25
|
-
const send_local_sms = (recepient, text) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
+
const send_local_sms = (recepient, text, details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
26
|
const { sms_provider: { multisend }, } = managers_1.cache_manager.getObjectData("nx-settings");
|
|
27
27
|
const msgId = (0, uuid_1.v4)();
|
|
28
28
|
let data = new form_data_1.default();
|
|
@@ -45,11 +45,11 @@ const send_local_sms = (recepient, text) => __awaiter(void 0, void 0, void 0, fu
|
|
|
45
45
|
if (!response.data.success) {
|
|
46
46
|
throw `http request to multisend error ${JSON.stringify(response.data.error)}`;
|
|
47
47
|
}
|
|
48
|
-
yield keep_outgoing_sms(recepient, text, "multisend", msgId);
|
|
48
|
+
yield keep_outgoing_sms(recepient, text, "multisend", msgId, details);
|
|
49
49
|
managers_1.logger.log("send_local_sms. message sent successfully", { number: recepient, text, response: response.data });
|
|
50
50
|
return "multisend";
|
|
51
51
|
});
|
|
52
|
-
const send_international_sms = (recepient, text) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
|
+
const send_international_sms = (recepient, text, details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
53
53
|
const { sms_provider: { twilio }, } = managers_1.cache_manager.getObjectData("nx-settings");
|
|
54
54
|
const twilioClient = new twilio_1.Twilio(twilio.account_sid, twilio.token);
|
|
55
55
|
const message = yield twilioClient.messages.create({
|
|
@@ -60,7 +60,7 @@ const send_international_sms = (recepient, text) => __awaiter(void 0, void 0, vo
|
|
|
60
60
|
if (message.errorMessage) {
|
|
61
61
|
throw `twilioClient.messages.create failed: ${message.errorMessage} `;
|
|
62
62
|
}
|
|
63
|
-
yield keep_outgoing_sms(recepient, text, "twilio", message.sid);
|
|
63
|
+
yield keep_outgoing_sms(recepient, text, "twilio", message.sid, details);
|
|
64
64
|
managers_1.logger.log("send_international_sms. message sent successfully", { number: recepient, text, response: message });
|
|
65
65
|
return "twilio";
|
|
66
66
|
});
|
|
@@ -79,7 +79,7 @@ const login_to_monogoto = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
79
79
|
throw `login_to_monogoto failed: ` + error;
|
|
80
80
|
}
|
|
81
81
|
});
|
|
82
|
-
const send_iccid_sms = (recepient, text) => __awaiter(void 0, void 0, void 0, function* () {
|
|
82
|
+
const send_iccid_sms = (recepient, text, details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
83
83
|
const { sms_provider: { monogoto }, } = managers_1.cache_manager.getObjectData("nx-settings");
|
|
84
84
|
const monogoto_auth = yield login_to_monogoto();
|
|
85
85
|
const data = { Message: text, From: monogoto.from };
|
|
@@ -95,20 +95,20 @@ const send_iccid_sms = (recepient, text) => __awaiter(void 0, void 0, void 0, fu
|
|
|
95
95
|
if (response.status !== 200) {
|
|
96
96
|
throw `monogoto request failed , status: ${response.status} , data: ${JSON.stringify(response.data)}`;
|
|
97
97
|
}
|
|
98
|
-
yield keep_outgoing_sms(recepient, text, "monogoto", response.data);
|
|
98
|
+
yield keep_outgoing_sms(recepient, text, "monogoto", response.data, details);
|
|
99
99
|
managers_1.logger.log("send_iccid_sms. message sent successfully", { number: recepient, text, response: response.data });
|
|
100
100
|
return "monogoto";
|
|
101
101
|
});
|
|
102
|
-
const send_sms = (recepient, text, entity_for_audit) => __awaiter(void 0, void 0, void 0, function* () {
|
|
102
|
+
const send_sms = (recepient, text, entity_for_audit, details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
103
103
|
try {
|
|
104
104
|
const send = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
105
105
|
if ((0, phone_number_helpers_1.is_iccid)(recepient)) {
|
|
106
|
-
return yield send_iccid_sms(recepient, text);
|
|
106
|
+
return yield send_iccid_sms(recepient, text, details);
|
|
107
107
|
}
|
|
108
108
|
if ((0, phone_number_helpers_1.is_international_phone_number)(recepient)) {
|
|
109
|
-
return send_international_sms(recepient, text);
|
|
109
|
+
return send_international_sms(recepient, text, details);
|
|
110
110
|
}
|
|
111
|
-
return yield send_local_sms(recepient, text);
|
|
111
|
+
return yield send_local_sms(recepient, text, details);
|
|
112
112
|
});
|
|
113
113
|
const service = yield send();
|
|
114
114
|
yield (0, global_helpers_1.add_audit_record)("send_sms", entity_for_audit || "general", {
|
|
@@ -123,7 +123,7 @@ const send_sms = (recepient, text, entity_for_audit) => __awaiter(void 0, void 0
|
|
|
123
123
|
}
|
|
124
124
|
});
|
|
125
125
|
exports.send_sms = send_sms;
|
|
126
|
-
const keep_outgoing_sms = (recepient, content, service, external_id) => __awaiter(void 0, void 0, void 0, function* () {
|
|
126
|
+
const keep_outgoing_sms = (recepient, content, service, external_id, details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
127
127
|
const timestamp = firestore_1.Timestamp.now();
|
|
128
128
|
const data = {
|
|
129
129
|
external_id,
|
|
@@ -133,6 +133,9 @@ const keep_outgoing_sms = (recepient, content, service, external_id) => __awaite
|
|
|
133
133
|
timestamp,
|
|
134
134
|
status: "new",
|
|
135
135
|
};
|
|
136
|
+
if (details) {
|
|
137
|
+
data.details = details;
|
|
138
|
+
}
|
|
136
139
|
yield (0, firebase_helpers_1.add_document)("nx-sms-out", data);
|
|
137
140
|
});
|
|
138
141
|
const push_event_to_mobile_users = (event) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification_helpers.js","sourceRoot":"","sources":["../../../src/helpers/notification_helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,0CAAyE;AACzE,qDAAoD;AACpD,yDAA6D;AAG7D,iEAAiF;AACjF,mCAAgC;AAChC,wDAAqD;AACrD,+BAAoC;AACpC,0DAAiC;AAIjC,MAAM,cAAc,GAAgB,CAAO,SAAS,EAAE,IAAI,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"notification_helpers.js","sourceRoot":"","sources":["../../../src/helpers/notification_helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,4 +8,4 @@ export declare const get_version: (packageJsonPath: string) => string;
|
|
|
8
8
|
export declare const sleep: (ms?: number) => Promise<unknown>;
|
|
9
9
|
export declare const add_audit_record: AddAuditRecord;
|
|
10
10
|
export declare const get_nx_service_urls: (env_name?: string) => TObject<string>;
|
|
11
|
-
export declare const get_address_by_geo: ({ lat, lng }: Geo, currentLanguage: LanguageOptions) => Promise<string>;
|
|
11
|
+
export declare const get_address_by_geo: ({ lat, lng }: Geo, currentLanguage: LanguageOptions) => Promise<string | Error>;
|
|
@@ -98,7 +98,10 @@ export const get_nx_service_urls = (env_name = "mode") => {
|
|
|
98
98
|
export const get_address_by_geo = (_a, currentLanguage_1) => __awaiter(void 0, [_a, currentLanguage_1], void 0, function* ({ lat, lng }, currentLanguage) {
|
|
99
99
|
var _b;
|
|
100
100
|
const language = currentLanguage === LanguageOptions.He ? "iw" : "en";
|
|
101
|
-
const apiKey = process.env.google_api_key
|
|
101
|
+
const apiKey = process.env.google_api_key;
|
|
102
|
+
if (!apiKey) {
|
|
103
|
+
throw new Error("missing env google api key");
|
|
104
|
+
}
|
|
102
105
|
const url = `https://maps.googleapis.com/maps/api/geocode/json?latlng=${lat},${lng}&key=${apiKey}&language=${language}`;
|
|
103
106
|
try {
|
|
104
107
|
const response = yield axios.get(url);
|
|
@@ -106,11 +109,11 @@ export const get_address_by_geo = (_a, currentLanguage_1) => __awaiter(void 0, [
|
|
|
106
109
|
return response.data.results[0].formatted_address.slice(0, 35);
|
|
107
110
|
}
|
|
108
111
|
else {
|
|
109
|
-
return "address not found";
|
|
112
|
+
return new Error("address not found");
|
|
110
113
|
}
|
|
111
114
|
}
|
|
112
115
|
catch (error) {
|
|
113
|
-
console.error("getAddressByGeo error:", error);
|
|
116
|
+
console.error("getAddressByGeo error:", error.message || error);
|
|
114
117
|
return "address not found";
|
|
115
118
|
}
|
|
116
119
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global_helpers.js","sourceRoot":"","sources":["../../../src/helpers/global_helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"global_helpers.js","sourceRoot":"","sources":["../../../src/helpers/global_helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { EventFromDevice } from "akeyless-types-commons";
|
|
2
|
-
export declare const send_sms: (recepient: string, text: string, entity_for_audit: string) => Promise<void>;
|
|
1
|
+
import { EventFromDevice, TObject } from "akeyless-types-commons";
|
|
2
|
+
export declare const send_sms: (recepient: string, text: string, entity_for_audit: string, details?: TObject<any>) => Promise<void>;
|
|
3
3
|
export declare const push_event_to_mobile_users: (event: EventFromDevice) => Promise<void>;
|
|
4
4
|
type FuncSendFcmMessage = (title: string, body: string, fcm_tokens: string[], custom_sound?: string) => Promise<{
|
|
5
5
|
success: boolean;
|
|
@@ -16,7 +16,7 @@ import { Twilio } from "twilio";
|
|
|
16
16
|
import { Timestamp } from "firebase-admin/firestore";
|
|
17
17
|
import { v4 as uniqId } from "uuid";
|
|
18
18
|
import FormData from "form-data";
|
|
19
|
-
const send_local_sms = (recepient, text) => __awaiter(void 0, void 0, void 0, function* () {
|
|
19
|
+
const send_local_sms = (recepient, text, details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
20
|
const { sms_provider: { multisend }, } = cache_manager.getObjectData("nx-settings");
|
|
21
21
|
const msgId = uniqId();
|
|
22
22
|
let data = new FormData();
|
|
@@ -39,11 +39,11 @@ const send_local_sms = (recepient, text) => __awaiter(void 0, void 0, void 0, fu
|
|
|
39
39
|
if (!response.data.success) {
|
|
40
40
|
throw `http request to multisend error ${JSON.stringify(response.data.error)}`;
|
|
41
41
|
}
|
|
42
|
-
yield keep_outgoing_sms(recepient, text, "multisend", msgId);
|
|
42
|
+
yield keep_outgoing_sms(recepient, text, "multisend", msgId, details);
|
|
43
43
|
logger.log("send_local_sms. message sent successfully", { number: recepient, text, response: response.data });
|
|
44
44
|
return "multisend";
|
|
45
45
|
});
|
|
46
|
-
const send_international_sms = (recepient, text) => __awaiter(void 0, void 0, void 0, function* () {
|
|
46
|
+
const send_international_sms = (recepient, text, details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
47
47
|
const { sms_provider: { twilio }, } = cache_manager.getObjectData("nx-settings");
|
|
48
48
|
const twilioClient = new Twilio(twilio.account_sid, twilio.token);
|
|
49
49
|
const message = yield twilioClient.messages.create({
|
|
@@ -54,7 +54,7 @@ const send_international_sms = (recepient, text) => __awaiter(void 0, void 0, vo
|
|
|
54
54
|
if (message.errorMessage) {
|
|
55
55
|
throw `twilioClient.messages.create failed: ${message.errorMessage} `;
|
|
56
56
|
}
|
|
57
|
-
yield keep_outgoing_sms(recepient, text, "twilio", message.sid);
|
|
57
|
+
yield keep_outgoing_sms(recepient, text, "twilio", message.sid, details);
|
|
58
58
|
logger.log("send_international_sms. message sent successfully", { number: recepient, text, response: message });
|
|
59
59
|
return "twilio";
|
|
60
60
|
});
|
|
@@ -73,7 +73,7 @@ const login_to_monogoto = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
73
73
|
throw `login_to_monogoto failed: ` + error;
|
|
74
74
|
}
|
|
75
75
|
});
|
|
76
|
-
const send_iccid_sms = (recepient, text) => __awaiter(void 0, void 0, void 0, function* () {
|
|
76
|
+
const send_iccid_sms = (recepient, text, details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
77
77
|
const { sms_provider: { monogoto }, } = cache_manager.getObjectData("nx-settings");
|
|
78
78
|
const monogoto_auth = yield login_to_monogoto();
|
|
79
79
|
const data = { Message: text, From: monogoto.from };
|
|
@@ -89,20 +89,20 @@ const send_iccid_sms = (recepient, text) => __awaiter(void 0, void 0, void 0, fu
|
|
|
89
89
|
if (response.status !== 200) {
|
|
90
90
|
throw `monogoto request failed , status: ${response.status} , data: ${JSON.stringify(response.data)}`;
|
|
91
91
|
}
|
|
92
|
-
yield keep_outgoing_sms(recepient, text, "monogoto", response.data);
|
|
92
|
+
yield keep_outgoing_sms(recepient, text, "monogoto", response.data, details);
|
|
93
93
|
logger.log("send_iccid_sms. message sent successfully", { number: recepient, text, response: response.data });
|
|
94
94
|
return "monogoto";
|
|
95
95
|
});
|
|
96
|
-
export const send_sms = (recepient, text, entity_for_audit) => __awaiter(void 0, void 0, void 0, function* () {
|
|
96
|
+
export const send_sms = (recepient, text, entity_for_audit, details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
97
97
|
try {
|
|
98
98
|
const send = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
99
99
|
if (is_iccid(recepient)) {
|
|
100
|
-
return yield send_iccid_sms(recepient, text);
|
|
100
|
+
return yield send_iccid_sms(recepient, text, details);
|
|
101
101
|
}
|
|
102
102
|
if (is_international_phone_number(recepient)) {
|
|
103
|
-
return send_international_sms(recepient, text);
|
|
103
|
+
return send_international_sms(recepient, text, details);
|
|
104
104
|
}
|
|
105
|
-
return yield send_local_sms(recepient, text);
|
|
105
|
+
return yield send_local_sms(recepient, text, details);
|
|
106
106
|
});
|
|
107
107
|
const service = yield send();
|
|
108
108
|
yield add_audit_record("send_sms", entity_for_audit || "general", {
|
|
@@ -116,7 +116,7 @@ export const send_sms = (recepient, text, entity_for_audit) => __awaiter(void 0,
|
|
|
116
116
|
throw `${entity_for_audit}, send_sms failed: ` + error;
|
|
117
117
|
}
|
|
118
118
|
});
|
|
119
|
-
const keep_outgoing_sms = (recepient, content, service, external_id) => __awaiter(void 0, void 0, void 0, function* () {
|
|
119
|
+
const keep_outgoing_sms = (recepient, content, service, external_id, details) => __awaiter(void 0, void 0, void 0, function* () {
|
|
120
120
|
const timestamp = Timestamp.now();
|
|
121
121
|
const data = {
|
|
122
122
|
external_id,
|
|
@@ -126,6 +126,9 @@ const keep_outgoing_sms = (recepient, content, service, external_id) => __awaite
|
|
|
126
126
|
timestamp,
|
|
127
127
|
status: "new",
|
|
128
128
|
};
|
|
129
|
+
if (details) {
|
|
130
|
+
data.details = details;
|
|
131
|
+
}
|
|
129
132
|
yield add_document("nx-sms-out", data);
|
|
130
133
|
});
|
|
131
134
|
export const push_event_to_mobile_users = (event) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification_helpers.js","sourceRoot":"","sources":["../../../src/helpers/notification_helpers.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,EAAE,QAAQ,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,QAAQ,MAAM,WAAW,CAAC;AAIjC,MAAM,cAAc,GAAgB,CAAO,SAAS,EAAE,IAAI,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"notification_helpers.js","sourceRoot":"","sources":["../../../src/helpers/notification_helpers.ts"],"names":[],"mappings":"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"}
|