@ampsec/platform-client 47.8.0 → 48.1.0
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/build/src/dto/enums/ampSettingKeys.enum.d.ts +1 -1
- package/build/src/dto/enums/ampSettingKeys.enum.js +1 -1
- package/build/src/dto/enums/ampSettingKeys.enum.js.map +1 -1
- package/build/src/services/lookup.service.d.ts +6 -0
- package/build/src/services/lookup.service.js +15 -0
- package/build/src/services/lookup.service.js.map +1 -1
- package/build/src/services/settings.service.js +2 -2
- package/build/src/services/settings.service.js.map +1 -1
- package/package.json +1 -1
- package/src/dto/enums/ampSettingKeys.enum.ts +1 -1
- package/src/services/lookup.service.ts +18 -0
- package/src/services/settings.service.ts +2 -2
|
@@ -5,6 +5,6 @@ exports.AmpSettingKeys = void 0;
|
|
|
5
5
|
var AmpSettingKeys;
|
|
6
6
|
(function (AmpSettingKeys) {
|
|
7
7
|
AmpSettingKeys["DEFAULT_NOTIFICATION_CONNECTOR"] = "DEFAULT_NOTIFICATION_CONNECTOR";
|
|
8
|
-
AmpSettingKeys["
|
|
8
|
+
AmpSettingKeys["GHOST_MODE"] = "GHOST_MODE";
|
|
9
9
|
})(AmpSettingKeys || (exports.AmpSettingKeys = AmpSettingKeys = {}));
|
|
10
10
|
//# sourceMappingURL=ampSettingKeys.enum.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ampSettingKeys.enum.js","sourceRoot":"","sources":["../../../../src/dto/enums/ampSettingKeys.enum.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,mFAAiE,CAAA;IACjE,
|
|
1
|
+
{"version":3,"file":"ampSettingKeys.enum.js","sourceRoot":"","sources":["../../../../src/dto/enums/ampSettingKeys.enum.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,mFAAiE,CAAA;IACjE,2CAAyB,CAAA;AAC3B,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { AssetIdDto, AssetKeys, RawUserIds, SaasComponentIdDto, UserIdDto } from '../dto';
|
|
2
2
|
export declare class UserLookupService {
|
|
3
|
+
private readonly ids;
|
|
3
4
|
private readonly emailLookupMap;
|
|
4
5
|
private readonly extIdLookupMap;
|
|
5
6
|
private lastUpdated;
|
|
6
7
|
getLastUpdated(): string;
|
|
8
|
+
getIds(): UserIdDto[];
|
|
7
9
|
/**
|
|
8
10
|
* Emails are normalized to lower case but external IDs are case sensitive
|
|
9
11
|
*/
|
|
@@ -26,11 +28,13 @@ export declare class UserLookupService {
|
|
|
26
28
|
byExtId(extId: string): UserIdDto | undefined;
|
|
27
29
|
}
|
|
28
30
|
export declare class AssetLookupService {
|
|
31
|
+
private readonly ids;
|
|
29
32
|
private readonly macsLookupMap;
|
|
30
33
|
private readonly snLookupMap;
|
|
31
34
|
private readonly extIdLookupMap;
|
|
32
35
|
private lastUpdated;
|
|
33
36
|
getLastUpdated(): string;
|
|
37
|
+
getIds(): AssetIdDto[];
|
|
34
38
|
/**
|
|
35
39
|
* Macs are normalized to standard format using `formatMacAddress` but serial numbers and external IDs are case sensitive
|
|
36
40
|
*/
|
|
@@ -47,9 +51,11 @@ export declare class AssetLookupService {
|
|
|
47
51
|
byExtId(extId: string): AssetIdDto | undefined;
|
|
48
52
|
}
|
|
49
53
|
export declare class SaasComponentLookupService {
|
|
54
|
+
private readonly ids;
|
|
50
55
|
private readonly extIdLookupMap;
|
|
51
56
|
private lastUpdated;
|
|
52
57
|
getLastUpdated(): string;
|
|
58
|
+
getIds(): SaasComponentIdDto[];
|
|
53
59
|
add(sc: SaasComponentIdDto): void;
|
|
54
60
|
byExtId(extId: string): SaasComponentIdDto | undefined;
|
|
55
61
|
}
|
|
@@ -8,6 +8,7 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
8
8
|
const utils_1 = require("./utils");
|
|
9
9
|
class UserLookupService {
|
|
10
10
|
constructor() {
|
|
11
|
+
this.ids = [];
|
|
11
12
|
this.emailLookupMap = new Map();
|
|
12
13
|
this.extIdLookupMap = new Map();
|
|
13
14
|
this.lastUpdated = new Date('2023-04-17T13:00:00.000Z');
|
|
@@ -15,11 +16,15 @@ class UserLookupService {
|
|
|
15
16
|
getLastUpdated() {
|
|
16
17
|
return this.lastUpdated.toISOString();
|
|
17
18
|
}
|
|
19
|
+
getIds() {
|
|
20
|
+
return this.ids; // TODO make this immutable?
|
|
21
|
+
}
|
|
18
22
|
// TODO throw errors if conflicts are found
|
|
19
23
|
/**
|
|
20
24
|
* Emails are normalized to lower case but external IDs are case sensitive
|
|
21
25
|
*/
|
|
22
26
|
add(user) {
|
|
27
|
+
this.ids.push(user);
|
|
23
28
|
user.emails.forEach(email => this.emailLookupMap.set(email.toLowerCase(), user));
|
|
24
29
|
if (user.extId) {
|
|
25
30
|
this.extIdLookupMap.set(user.extId, user);
|
|
@@ -84,6 +89,7 @@ class UserLookupService {
|
|
|
84
89
|
exports.UserLookupService = UserLookupService;
|
|
85
90
|
class AssetLookupService {
|
|
86
91
|
constructor() {
|
|
92
|
+
this.ids = [];
|
|
87
93
|
this.macsLookupMap = new Map();
|
|
88
94
|
this.snLookupMap = new Map();
|
|
89
95
|
this.extIdLookupMap = new Map();
|
|
@@ -92,12 +98,16 @@ class AssetLookupService {
|
|
|
92
98
|
getLastUpdated() {
|
|
93
99
|
return this.lastUpdated.toISOString();
|
|
94
100
|
}
|
|
101
|
+
getIds() {
|
|
102
|
+
return this.ids; // TODO make this immutable?
|
|
103
|
+
}
|
|
95
104
|
// TODO throw errors if conflicts are found
|
|
96
105
|
/**
|
|
97
106
|
* Macs are normalized to standard format using `formatMacAddress` but serial numbers and external IDs are case sensitive
|
|
98
107
|
*/
|
|
99
108
|
add(asset) {
|
|
100
109
|
var _a;
|
|
110
|
+
this.ids.push(asset);
|
|
101
111
|
(_a = asset.macs) === null || _a === void 0 ? void 0 : _a.forEach(mac => this.macsLookupMap.set((0, utils_1.formatMacAddress)(mac), asset));
|
|
102
112
|
if (asset.sn) {
|
|
103
113
|
this.snLookupMap.set(asset.sn, asset);
|
|
@@ -154,14 +164,19 @@ class AssetLookupService {
|
|
|
154
164
|
exports.AssetLookupService = AssetLookupService;
|
|
155
165
|
class SaasComponentLookupService {
|
|
156
166
|
constructor() {
|
|
167
|
+
this.ids = [];
|
|
157
168
|
this.extIdLookupMap = new Map();
|
|
158
169
|
this.lastUpdated = new Date('2023-04-17T13:00:00.000Z');
|
|
159
170
|
}
|
|
160
171
|
getLastUpdated() {
|
|
161
172
|
return this.lastUpdated.toISOString();
|
|
162
173
|
}
|
|
174
|
+
getIds() {
|
|
175
|
+
return this.ids; // TODO make this immutable?
|
|
176
|
+
}
|
|
163
177
|
// TODO throw errors if conflicts are found
|
|
164
178
|
add(sc) {
|
|
179
|
+
this.ids.push(sc);
|
|
165
180
|
this.extIdLookupMap.set(sc.extId, sc);
|
|
166
181
|
this.lastUpdated = new Date();
|
|
167
182
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookup.service.js","sourceRoot":"","sources":["../../../src/services/lookup.service.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,mCAAyC;AAEzC,MAAa,iBAAiB;IAA9B;QACmB,mBAAc,GAAG,IAAI,GAAG,EAAqB,CAAC;QAC9C,mBAAc,GAAG,IAAI,GAAG,EAAqB,CAAC;QACvD,gBAAW,GAAG,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"lookup.service.js","sourceRoot":"","sources":["../../../src/services/lookup.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,7 +94,7 @@ class AmpSettingsMap {
|
|
|
94
94
|
this.rawSettingsList = new Array();
|
|
95
95
|
this.getGlobalSetting = (key) => {
|
|
96
96
|
const tenantVal = this.settings.tenantSettings[key.id];
|
|
97
|
-
if (tenantVal) {
|
|
97
|
+
if (!lodash_1.default.isNil(tenantVal)) {
|
|
98
98
|
return tenantVal;
|
|
99
99
|
}
|
|
100
100
|
return key.defaultValue;
|
|
@@ -104,7 +104,7 @@ class AmpSettingsMap {
|
|
|
104
104
|
const connectorMap = this.settings.connectorSettings[cid];
|
|
105
105
|
if (connectorMap) {
|
|
106
106
|
const connectorVal = connectorMap[key.id];
|
|
107
|
-
if (connectorVal) {
|
|
107
|
+
if (!lodash_1.default.isNil(connectorVal)) {
|
|
108
108
|
return connectorVal;
|
|
109
109
|
}
|
|
110
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.service.js","sourceRoot":"","sources":["../../../src/services/settings.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"settings.service.js","sourceRoot":"","sources":["../../../src/services/settings.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,6 +3,7 @@ import {AssetIdDto, AssetKeys, RawUserIds, SaasComponentIdDto, UserIdDto} from '
|
|
|
3
3
|
import {formatMacAddress} from './utils';
|
|
4
4
|
|
|
5
5
|
export class UserLookupService {
|
|
6
|
+
private readonly ids: UserIdDto[] = [];
|
|
6
7
|
private readonly emailLookupMap = new Map<string, UserIdDto>();
|
|
7
8
|
private readonly extIdLookupMap = new Map<string, UserIdDto>();
|
|
8
9
|
private lastUpdated = new Date('2023-04-17T13:00:00.000Z');
|
|
@@ -11,11 +12,16 @@ export class UserLookupService {
|
|
|
11
12
|
return this.lastUpdated.toISOString();
|
|
12
13
|
}
|
|
13
14
|
|
|
15
|
+
getIds(): UserIdDto[] {
|
|
16
|
+
return this.ids; // TODO make this immutable?
|
|
17
|
+
}
|
|
18
|
+
|
|
14
19
|
// TODO throw errors if conflicts are found
|
|
15
20
|
/**
|
|
16
21
|
* Emails are normalized to lower case but external IDs are case sensitive
|
|
17
22
|
*/
|
|
18
23
|
add(user: UserIdDto) {
|
|
24
|
+
this.ids.push(user);
|
|
19
25
|
user.emails.forEach(email => this.emailLookupMap.set(email.toLowerCase(), user));
|
|
20
26
|
if (user.extId) {
|
|
21
27
|
this.extIdLookupMap.set(user.extId, user);
|
|
@@ -84,6 +90,7 @@ export class UserLookupService {
|
|
|
84
90
|
}
|
|
85
91
|
|
|
86
92
|
export class AssetLookupService {
|
|
93
|
+
private readonly ids: AssetIdDto[] = [];
|
|
87
94
|
private readonly macsLookupMap = new Map<string, AssetIdDto>();
|
|
88
95
|
private readonly snLookupMap = new Map<string, AssetIdDto>();
|
|
89
96
|
private readonly extIdLookupMap = new Map<string, AssetIdDto>();
|
|
@@ -93,11 +100,16 @@ export class AssetLookupService {
|
|
|
93
100
|
return this.lastUpdated.toISOString();
|
|
94
101
|
}
|
|
95
102
|
|
|
103
|
+
getIds(): AssetIdDto[] {
|
|
104
|
+
return this.ids; // TODO make this immutable?
|
|
105
|
+
}
|
|
106
|
+
|
|
96
107
|
// TODO throw errors if conflicts are found
|
|
97
108
|
/**
|
|
98
109
|
* Macs are normalized to standard format using `formatMacAddress` but serial numbers and external IDs are case sensitive
|
|
99
110
|
*/
|
|
100
111
|
add(asset: AssetIdDto) {
|
|
112
|
+
this.ids.push(asset);
|
|
101
113
|
asset.macs?.forEach(mac => this.macsLookupMap.set(formatMacAddress(mac), asset));
|
|
102
114
|
if (asset.sn) {
|
|
103
115
|
this.snLookupMap.set(asset.sn, asset);
|
|
@@ -157,6 +169,7 @@ export class AssetLookupService {
|
|
|
157
169
|
}
|
|
158
170
|
|
|
159
171
|
export class SaasComponentLookupService {
|
|
172
|
+
private readonly ids: SaasComponentIdDto[] = [];
|
|
160
173
|
private readonly extIdLookupMap = new Map<string, SaasComponentIdDto>();
|
|
161
174
|
private lastUpdated = new Date('2023-04-17T13:00:00.000Z');
|
|
162
175
|
|
|
@@ -164,8 +177,13 @@ export class SaasComponentLookupService {
|
|
|
164
177
|
return this.lastUpdated.toISOString();
|
|
165
178
|
}
|
|
166
179
|
|
|
180
|
+
getIds(): SaasComponentIdDto[] {
|
|
181
|
+
return this.ids; // TODO make this immutable?
|
|
182
|
+
}
|
|
183
|
+
|
|
167
184
|
// TODO throw errors if conflicts are found
|
|
168
185
|
add(sc: SaasComponentIdDto) {
|
|
186
|
+
this.ids.push(sc);
|
|
169
187
|
this.extIdLookupMap.set(sc.extId, sc);
|
|
170
188
|
this.lastUpdated = new Date();
|
|
171
189
|
}
|
|
@@ -120,7 +120,7 @@ export class AmpSettingsMap {
|
|
|
120
120
|
|
|
121
121
|
getGlobalSetting = <T>(key: TypedAmpSettingsKey<T>): T => {
|
|
122
122
|
const tenantVal = this.settings.tenantSettings[key.id];
|
|
123
|
-
if (tenantVal) {
|
|
123
|
+
if (!_.isNil(tenantVal)) {
|
|
124
124
|
return tenantVal as T;
|
|
125
125
|
}
|
|
126
126
|
return key.defaultValue;
|
|
@@ -131,7 +131,7 @@ export class AmpSettingsMap {
|
|
|
131
131
|
const connectorMap = this.settings.connectorSettings[cid];
|
|
132
132
|
if (connectorMap) {
|
|
133
133
|
const connectorVal = connectorMap[key.id];
|
|
134
|
-
if (connectorVal) {
|
|
134
|
+
if (!_.isNil(connectorVal)) {
|
|
135
135
|
return connectorVal as T;
|
|
136
136
|
}
|
|
137
137
|
}
|