@boxyhq/saml-jackson 1.14.2 → 1.15.0
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +1 -1
- package/dist/controller/oauth.js +6 -1
- package/dist/controller/oauth.js.map +1 -1
- package/dist/controller/utils.d.ts +2 -0
- package/dist/controller/utils.js +6 -0
- package/dist/controller/utils.js.map +1 -1
- package/dist/db/db.d.ts +3 -3
- package/dist/db/db.js +4 -4
- package/dist/db/db.js.map +1 -1
- package/dist/db/mem.d.ts +3 -3
- package/dist/db/mem.js +4 -4
- package/dist/db/mem.js.map +1 -1
- package/dist/db/mongo.d.ts +3 -3
- package/dist/db/mongo.js +6 -5
- package/dist/db/mongo.js.map +1 -1
- package/dist/db/planetscale/entity/JacksonStore.js +3 -1
- package/dist/db/planetscale/entity/JacksonStore.js.map +1 -1
- package/dist/db/redis.d.ts +2 -2
- package/dist/db/redis.js +30 -40
- package/dist/db/redis.js.map +1 -1
- package/dist/db/sql/mariadb/entity/JacksonStore.js +3 -1
- package/dist/db/sql/mariadb/entity/JacksonStore.js.map +1 -1
- package/dist/db/sql/sql.d.ts +3 -3
- package/dist/db/sql/sql.js +10 -8
- package/dist/db/sql/sql.js.map +1 -1
- package/dist/db/store.js +4 -4
- package/dist/db/store.js.map +1 -1
- package/dist/directory-sync/batch-events/lock.d.ts +18 -0
- package/dist/directory-sync/batch-events/lock.js +79 -0
- package/dist/directory-sync/batch-events/lock.js.map +1 -0
- package/dist/directory-sync/batch-events/queue.d.ts +37 -0
- package/dist/directory-sync/batch-events/queue.js +234 -0
- package/dist/directory-sync/batch-events/queue.js.map +1 -0
- package/dist/directory-sync/index.d.ts +4 -2
- package/dist/directory-sync/index.js +39 -6
- package/dist/directory-sync/index.js.map +1 -1
- package/dist/directory-sync/non-scim/google/api.js +2 -2
- package/dist/directory-sync/non-scim/google/api.js.map +1 -1
- package/dist/directory-sync/non-scim/google/oauth.js +2 -2
- package/dist/directory-sync/non-scim/google/oauth.js.map +1 -1
- package/dist/directory-sync/scim/Base.d.ts +1 -1
- package/dist/directory-sync/scim/Base.js.map +1 -1
- package/dist/directory-sync/scim/DirectoryGroups.js +20 -7
- package/dist/directory-sync/scim/DirectoryGroups.js.map +1 -1
- package/dist/directory-sync/scim/DirectoryUsers.js +19 -6
- package/dist/directory-sync/scim/DirectoryUsers.js.map +1 -1
- package/dist/directory-sync/scim/WebhookEventsLogger.d.ts +1 -1
- package/dist/directory-sync/scim/WebhookEventsLogger.js +8 -1
- package/dist/directory-sync/scim/WebhookEventsLogger.js.map +1 -1
- package/dist/directory-sync/scim/utils.js.map +1 -1
- package/dist/directory-sync/types.d.ts +6 -1
- package/dist/directory-sync/types.js.map +1 -1
- package/dist/directory-sync/utils.d.ts +16 -0
- package/dist/directory-sync/{scim/events.js → utils.js} +22 -13
- package/dist/directory-sync/utils.js.map +1 -0
- package/dist/event/webhook.d.ts +2 -2
- package/dist/event/webhook.js.map +1 -1
- package/dist/opentelemetry/metrics.d.ts +1 -0
- package/dist/opentelemetry/metrics.js +7 -0
- package/dist/opentelemetry/metrics.js.map +1 -1
- package/dist/saml/lib.d.ts +3 -3
- package/dist/typings.d.ts +10 -5
- package/migration/mariadb/1695120700240-md_sortorder.ts +16 -0
- package/migration/mysql/1695120580071-ms_sortorder.ts +16 -0
- package/migration/planetscale/1695120599689-ms_sortorder.ts +16 -0
- package/package.json +18 -18
- package/dist/directory-sync/scim/events.d.ts +0 -9
- package/dist/directory-sync/scim/events.js.map +0 -1
|
@@ -16,16 +16,26 @@ const Users_1 = require("./scim/Users");
|
|
|
16
16
|
const Groups_1 = require("./scim/Groups");
|
|
17
17
|
const utils_1 = require("./scim/utils");
|
|
18
18
|
const request_1 = require("./request");
|
|
19
|
-
const events_1 = require("./scim/events");
|
|
20
19
|
const WebhookEventsLogger_1 = require("./scim/WebhookEventsLogger");
|
|
21
20
|
const google_1 = require("./non-scim/google");
|
|
22
21
|
const non_scim_1 = require("./non-scim");
|
|
22
|
+
const utils_2 = require("../controller/utils");
|
|
23
|
+
const utils_3 = require("./utils");
|
|
24
|
+
const queue_1 = require("./batch-events/queue");
|
|
25
|
+
const lock_1 = require("./batch-events/lock");
|
|
23
26
|
const directorySync = (params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
27
|
const { db, opts, eventController } = params;
|
|
25
28
|
const users = new Users_1.Users({ db });
|
|
26
29
|
const groups = new Groups_1.Groups({ db });
|
|
27
|
-
const
|
|
28
|
-
const directories = new DirectoryConfig_1.DirectoryConfig({
|
|
30
|
+
const webhookLogs = new WebhookEventsLogger_1.WebhookEventsLogger({ db });
|
|
31
|
+
const directories = new DirectoryConfig_1.DirectoryConfig({
|
|
32
|
+
db,
|
|
33
|
+
opts,
|
|
34
|
+
users,
|
|
35
|
+
groups,
|
|
36
|
+
logger: webhookLogs,
|
|
37
|
+
eventController,
|
|
38
|
+
});
|
|
29
39
|
const directoryUsers = new DirectoryUsers_1.DirectoryUsers({ directories, users });
|
|
30
40
|
const directoryGroups = new DirectoryGroups_1.DirectoryGroups({ directories, users, groups });
|
|
31
41
|
const requestHandler = new request_1.RequestHandler(directoryUsers, directoryGroups);
|
|
@@ -34,19 +44,42 @@ const directorySync = (params) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
34
44
|
return (0, utils_1.getDirectorySyncProviders)();
|
|
35
45
|
};
|
|
36
46
|
const googleProvider = (0, google_1.newGoogleProvider)({ directories, opts });
|
|
47
|
+
// Batch send events
|
|
48
|
+
const eventStore = db.store(utils_2.storeNamespacePrefix.dsync.events);
|
|
49
|
+
const lockStore = db.store(utils_2.storeNamespacePrefix.dsync.lock, utils_3.eventLockTTL);
|
|
50
|
+
const eventLock = new lock_1.EventLock({ lockStore });
|
|
51
|
+
const eventProcessor = new queue_1.EventProcessor({
|
|
52
|
+
opts,
|
|
53
|
+
eventStore,
|
|
54
|
+
eventLock,
|
|
55
|
+
directories,
|
|
56
|
+
webhookLogs,
|
|
57
|
+
});
|
|
37
58
|
return {
|
|
38
59
|
users,
|
|
39
60
|
groups,
|
|
40
61
|
directories,
|
|
41
|
-
webhookLogs
|
|
62
|
+
webhookLogs,
|
|
42
63
|
requests: requestHandler,
|
|
43
64
|
providers: getProviders,
|
|
44
65
|
events: {
|
|
45
|
-
callback: yield (0,
|
|
66
|
+
callback: yield (0, utils_3.handleEventCallback)({
|
|
67
|
+
opts,
|
|
68
|
+
directories,
|
|
69
|
+
webhookLogs,
|
|
70
|
+
eventProcessor,
|
|
71
|
+
}),
|
|
72
|
+
batch: eventProcessor,
|
|
46
73
|
},
|
|
47
74
|
google: googleProvider.oauth,
|
|
48
75
|
sync: (callback) => __awaiter(void 0, void 0, void 0, function* () {
|
|
49
|
-
return yield (0, non_scim_1.startSync)({
|
|
76
|
+
return yield (0, non_scim_1.startSync)({
|
|
77
|
+
userController: users,
|
|
78
|
+
groupController: groups,
|
|
79
|
+
opts,
|
|
80
|
+
directories,
|
|
81
|
+
requestHandler,
|
|
82
|
+
}, callback);
|
|
50
83
|
}),
|
|
51
84
|
};
|
|
52
85
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/directory-sync/index.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,4DAAyD;AACzD,0DAAuD;AACvD,4DAAyD;AACzD,wCAAqC;AACrC,0CAAuC;AACvC,wCAAyD;AACzD,uCAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/directory-sync/index.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,4DAAyD;AACzD,0DAAuD;AACvD,4DAAyD;AACzD,wCAAqC;AACrC,0CAAuC;AACvC,wCAAyD;AACzD,uCAA2C;AAC3C,oEAAiE;AACjE,8CAAsD;AACtD,yCAAuC;AACvC,+CAA2D;AAC3D,mCAA4D;AAC5D,gDAAsD;AACtD,8CAAgD;AAEhD,MAAM,aAAa,GAAG,CAAO,MAA0E,EAAE,EAAE;IACzG,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IAE7C,MAAM,KAAK,GAAG,IAAI,aAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,IAAI,yCAAmB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,IAAI,iCAAe,CAAC;QACtC,EAAE;QACF,IAAI;QACJ,KAAK;QACL,MAAM;QACN,MAAM,EAAE,WAAW;QACnB,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IAClE,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5E,MAAM,cAAc,GAAG,IAAI,wBAAc,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IAE3E,gCAAgC;IAChC,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,OAAO,IAAA,iCAAyB,GAAE,CAAC;IACrC,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhE,oBAAoB;IACpB,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,4BAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,4BAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,oBAAY,CAAC,CAAC;IAC1E,MAAM,SAAS,GAAG,IAAI,gBAAS,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAC/C,MAAM,cAAc,GAAG,IAAI,sBAAc,CAAC;QACxC,IAAI;QACJ,UAAU;QACV,SAAS;QACT,WAAW;QACX,WAAW;KACZ,CAAC,CAAC;IAEH,OAAO;QACL,KAAK;QACL,MAAM;QACN,WAAW;QACX,WAAW;QACX,QAAQ,EAAE,cAAc;QACxB,SAAS,EAAE,YAAY;QACvB,MAAM,EAAE;YACN,QAAQ,EAAE,MAAM,IAAA,2BAAmB,EAAC;gBAClC,IAAI;gBACJ,WAAW;gBACX,WAAW;gBACX,cAAc;aACf,CAAC;YACF,KAAK,EAAE,cAAc;SACtB;QACD,MAAM,EAAE,cAAc,CAAC,KAAK;QAC5B,IAAI,EAAE,CAAO,QAAuB,EAAE,EAAE;YACtC,OAAO,MAAM,IAAA,oBAAS,EACpB;gBACE,cAAc,EAAE,KAAK;gBACrB,eAAe,EAAE,MAAM;gBACvB,IAAI;gBACJ,WAAW;gBACX,cAAc;aACf,EACD,QAAQ,CACT,CAAC;QACJ,CAAC,CAAA;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|
|
@@ -20,8 +20,8 @@ class GoogleProvider {
|
|
|
20
20
|
this.directories = directories;
|
|
21
21
|
}
|
|
22
22
|
createOAuth2Client(directory) {
|
|
23
|
-
var _a;
|
|
24
|
-
const googleProvider = (_a = this.opts.dsync) === null || _a === void 0 ? void 0 : _a.providers.google;
|
|
23
|
+
var _a, _b;
|
|
24
|
+
const googleProvider = (_b = (_a = this.opts.dsync) === null || _a === void 0 ? void 0 : _a.providers) === null || _b === void 0 ? void 0 : _b.google;
|
|
25
25
|
const authClient = new google_auth_library_1.OAuth2Client(googleProvider === null || googleProvider === void 0 ? void 0 : googleProvider.clientId, googleProvider === null || googleProvider === void 0 ? void 0 : googleProvider.clientSecret, googleProvider === null || googleProvider === void 0 ? void 0 : googleProvider.callbackUrl);
|
|
26
26
|
authClient.setCredentials({
|
|
27
27
|
access_token: directory.google_access_token,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/directory-sync/non-scim/google/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA0C;AAC1C,6DAAmD;AAiBnD,MAAa,cAAc;IAMzB,YAAY,EAAE,WAAW,EAAE,IAAI,EAAwB;QAHvD,oCAA+B,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3C,mCAA8B,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,oBAAoB,CAAC,CAAC;QAG/E,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,kBAAkB,CAAC,SAAoB;;QACrC,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/directory-sync/non-scim/google/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA0C;AAC1C,6DAAmD;AAiBnD,MAAa,cAAc;IAMzB,YAAY,EAAE,WAAW,EAAE,IAAI,EAAwB;QAHvD,oCAA+B,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3C,mCAA8B,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,oBAAoB,CAAC,CAAC;QAG/E,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,kBAAkB,CAAC,SAAoB;;QACrC,MAAM,cAAc,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,SAAS,0CAAE,MAAM,CAAC;QAE1D,MAAM,UAAU,GAAG,IAAI,kCAAY,CACjC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,EACxB,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,YAAY,EAC5B,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,CAC5B,CAAC;QAEF,UAAU,CAAC,cAAc,CAAC;YACxB,YAAY,EAAE,SAAS,CAAC,mBAAmB;YAC3C,aAAa,EAAE,SAAS,CAAC,oBAAoB;SAC9C,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;IAEK,cAAc;;YAClB,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;gBAC5D,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;YAEH,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC5C,OAAO,EAAE,CAAC;aACX;YAED,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;gBACtC,OAAO,CACL,SAAS,CAAC,mBAAmB,IAAI,SAAS,CAAC,oBAAoB,IAAI,SAAS,CAAC,aAAa,KAAK,EAAE,CAClG,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAEK,QAAQ,CAAC,SAAoB,EAAE,OAAgC;;YACnE,MAAM,KAAK,GAAG;gBACZ,UAAU,EAAE,GAAG;gBACf,MAAM,EAAE,SAAS,CAAC,aAAa;aAChC,CAAC;YAEF,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAAE;gBACtB,KAAK,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC;aACxC;YAED,MAAM,WAAW,GAAG,IAAA,aAAK,EAAC,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAEjG,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAErD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;gBACxB,OAAO;oBACL,IAAI,EAAE,EAAE;oBACR,QAAQ,EAAE,IAAI;iBACf,CAAC;aACH;YAED,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;gBAC7C,OAAO;oBACL,EAAE,EAAE,IAAI,CAAC,EAAY;oBACrB,KAAK,EAAE,IAAI,CAAC,YAAsB;oBAClC,UAAU,EAAE,MAAA,IAAI,CAAC,IAAI,0CAAE,SAAmB;oBAC1C,SAAS,EAAE,MAAA,IAAI,CAAC,IAAI,0CAAE,UAAoB;oBAC1C,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS;oBACvB,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,OAAO;gBACL,IAAI,EAAE,KAAK;gBACX,QAAQ,EAAE;oBACR,aAAa,EAAE,QAAQ,CAAC,IAAI,CAAC,aAAa;oBAC1C,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa;iBAC3C;aACF,CAAC;QACJ,CAAC;KAAA;IAEK,SAAS,CAAC,SAAoB,EAAE,OAAgC;;YACpE,MAAM,WAAW,GAAG,IAAA,aAAK,EAAC,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAEjG,MAAM,KAAK,GAAG;gBACZ,UAAU,EAAE,GAAG;gBACf,MAAM,EAAE,SAAS,CAAC,aAAa;aAChC,CAAC;YAEF,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAAE;gBACtB,KAAK,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC;aACxC;YAED,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEtD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE;gBACzB,OAAO;oBACL,IAAI,EAAE,EAAE;oBACR,QAAQ,EAAE,IAAI;iBACf,CAAC;aACH;YAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChD,OAAO;oBACL,EAAE,EAAE,KAAK,CAAC,EAAY;oBACtB,IAAI,EAAE,KAAK,CAAC,IAAc;oBAC1B,GAAG,EAAE,KAAK;iBACX,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACR,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,aAAuB;oBAChD,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa;iBAC3C;aACF,CAAC;QACJ,CAAC;KAAA;IAEK,eAAe,CAAC,SAAoB,EAAE,KAAY;;YACtD,MAAM,WAAW,GAAG,IAAA,aAAK,EAAC,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAEjG,MAAM,UAAU,GAAkB,EAAE,CAAC;YACrC,MAAM,KAAK,GAAG;gBACZ,UAAU,EAAE,GAAG;gBACf,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAClB,MAAM,EAAE,SAAS,CAAC,aAAa;aAChC,CAAC;YAEF,IAAI,aAAa,GAA8B,IAAI,CAAC;YAEpD,GAAG;gBACD,IAAI,aAAa,EAAE;oBACjB,KAAK,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC;iBACpC;gBAED,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAEvD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE;oBAC1B,MAAM;iBACP;gBAED,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACjD,OAAO;wBACL,EAAE,EAAE,IAAI,CAAC,EAAY;wBACrB,GAAG,EAAE,IAAI;qBACV,CAAC;gBACJ,CAAC,CAAC,CAAC;gBAEH,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;gBAE5B,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC;aAC7C,QAAQ,aAAa,EAAE;YAExB,OAAO,UAAU,CAAC;QACpB,CAAC;KAAA;CACF;AAhKD,wCAgKC"}
|
|
@@ -23,8 +23,8 @@ class GoogleAuth {
|
|
|
23
23
|
this.directories = directories;
|
|
24
24
|
}
|
|
25
25
|
createOAuth2Client(directory) {
|
|
26
|
-
var _a;
|
|
27
|
-
const googleProvider = (_a = this.opts.dsync) === null || _a === void 0 ? void 0 : _a.providers.google;
|
|
26
|
+
var _a, _b;
|
|
27
|
+
const googleProvider = (_b = (_a = this.opts.dsync) === null || _a === void 0 ? void 0 : _a.providers) === null || _b === void 0 ? void 0 : _b.google;
|
|
28
28
|
const authClient = new google_auth_library_1.OAuth2Client(googleProvider === null || googleProvider === void 0 ? void 0 : googleProvider.clientId, googleProvider === null || googleProvider === void 0 ? void 0 : googleProvider.clientSecret, googleProvider === null || googleProvider === void 0 ? void 0 : googleProvider.callbackUrl);
|
|
29
29
|
authClient.setCredentials({
|
|
30
30
|
access_token: directory.google_access_token,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../src/directory-sync/non-scim/google/oauth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAgE;AAEhE,qDAAmE;AAGnE,MAAM,KAAK,GAAG;IACZ,+DAA+D;IAC/D,gEAAgE;IAChE,uEAAuE;CACxE,CAAC;AAOF,MAAa,UAAU;IAIrB,YAAY,EAAE,WAAW,EAAE,IAAI,EAAoB;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,kBAAkB,CAAC,SAAoB;;QACrC,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../src/directory-sync/non-scim/google/oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,6 @@ export declare class Base {
|
|
|
7
7
|
constructor({ db }: {
|
|
8
8
|
db: DatabaseStore;
|
|
9
9
|
});
|
|
10
|
-
store(type: 'groups' | 'members' | 'users' | 'logs'): Storable;
|
|
10
|
+
store(type: 'groups' | 'members' | 'users' | 'logs' | 'events'): Storable;
|
|
11
11
|
setTenantAndProduct(tenant: string, product: string): this;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../src/directory-sync/scim/Base.ts"],"names":[],"mappings":";;;AACA,kDAA8D;AAE9D,MAAa,IAAI;IAMf,YAAY,EAAE,EAAE,EAAyB;QAJ/B,WAAM,GAAkB,IAAI,CAAC;QAC7B,YAAO,GAAkB,IAAI,CAAC;QAC9B,wBAAmB,GAAG,GAAG,CAAC;QAGlC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAED,4BAA4B;IAC5B,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../src/directory-sync/scim/Base.ts"],"names":[],"mappings":";;;AACA,kDAA8D;AAE9D,MAAa,IAAI;IAMf,YAAY,EAAE,EAAE,EAAyB;QAJ/B,WAAM,GAAkB,IAAI,CAAC;QAC7B,YAAO,GAAkB,IAAI,CAAC;QAC9B,wBAAmB,GAAG,GAAG,CAAC;QAGlC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAED,4BAA4B;IAC5B,KAAK,CAAC,IAAwD;QAC5D,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;SAC/D;QAED,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,4BAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7F,CAAC;IAED,6BAA6B;IAC7B,mBAAmB,CAAC,MAAc,EAAE,OAAe;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA1BD,oBA0BC"}
|
|
@@ -11,7 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.DirectoryGroups = void 0;
|
|
13
13
|
const utils_1 = require("./utils");
|
|
14
|
-
const
|
|
14
|
+
const utils_2 = require("../utils");
|
|
15
|
+
const utils_3 = require("../../controller/utils");
|
|
15
16
|
class DirectoryGroups {
|
|
16
17
|
constructor({ directories, users, groups }) {
|
|
17
18
|
this.directories = directories;
|
|
@@ -27,7 +28,7 @@ class DirectoryGroups {
|
|
|
27
28
|
id: groupId,
|
|
28
29
|
raw: 'rawAttributes' in body ? body.rawAttributes : Object.assign(Object.assign({}, body), { members: [] }),
|
|
29
30
|
});
|
|
30
|
-
yield (0,
|
|
31
|
+
yield (0, utils_2.sendEvent)('group.created', { directory, group }, this.callback);
|
|
31
32
|
return {
|
|
32
33
|
status: 201,
|
|
33
34
|
data: {
|
|
@@ -128,7 +129,7 @@ class DirectoryGroups {
|
|
|
128
129
|
delete(directory, group) {
|
|
129
130
|
return __awaiter(this, void 0, void 0, function* () {
|
|
130
131
|
yield this.groups.delete(group.id);
|
|
131
|
-
yield (0,
|
|
132
|
+
yield (0, utils_2.sendEvent)('group.deleted', { directory, group }, this.callback);
|
|
132
133
|
return {
|
|
133
134
|
status: 200,
|
|
134
135
|
data: {},
|
|
@@ -145,7 +146,7 @@ class DirectoryGroups {
|
|
|
145
146
|
if (error || !updatedGroup) {
|
|
146
147
|
throw error;
|
|
147
148
|
}
|
|
148
|
-
yield (0,
|
|
149
|
+
yield (0, utils_2.sendEvent)('group.updated', { directory, group: updatedGroup }, this.callback);
|
|
149
150
|
return updatedGroup;
|
|
150
151
|
});
|
|
151
152
|
}
|
|
@@ -159,7 +160,7 @@ class DirectoryGroups {
|
|
|
159
160
|
yield this.groups.addUserToGroup(group.id, member.value);
|
|
160
161
|
}
|
|
161
162
|
const { data: user } = yield this.users.get(member.value);
|
|
162
|
-
yield (0,
|
|
163
|
+
yield (0, utils_2.sendEvent)('group.user_added', { directory, group, user }, this.callback);
|
|
163
164
|
}
|
|
164
165
|
});
|
|
165
166
|
}
|
|
@@ -173,7 +174,7 @@ class DirectoryGroups {
|
|
|
173
174
|
const { data: user } = yield this.users.get(member.value);
|
|
174
175
|
// User may not exist in the directory, so we need to check if the user exists
|
|
175
176
|
if (user) {
|
|
176
|
-
yield (0,
|
|
177
|
+
yield (0, utils_2.sendEvent)('group.user_removed', { directory, group, user }, this.callback);
|
|
177
178
|
}
|
|
178
179
|
}
|
|
179
180
|
});
|
|
@@ -191,9 +192,21 @@ class DirectoryGroups {
|
|
|
191
192
|
const method = request.method.toUpperCase();
|
|
192
193
|
// Get the directory
|
|
193
194
|
const { data: directory, error } = yield this.directories.get(directoryId);
|
|
194
|
-
if (error
|
|
195
|
+
if (error) {
|
|
195
196
|
return this.respondWithError(error);
|
|
196
197
|
}
|
|
198
|
+
if (!directory) {
|
|
199
|
+
return {
|
|
200
|
+
status: 200,
|
|
201
|
+
data: {},
|
|
202
|
+
};
|
|
203
|
+
}
|
|
204
|
+
if (!(0, utils_3.isConnectionActive)(directory)) {
|
|
205
|
+
return {
|
|
206
|
+
status: 200,
|
|
207
|
+
data: {},
|
|
208
|
+
};
|
|
209
|
+
}
|
|
197
210
|
// Validate the request
|
|
198
211
|
if (directory.scim.secret != apiSecret) {
|
|
199
212
|
return this.respondWithError({ code: 401, message: 'Unauthorized' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DirectoryGroups.js","sourceRoot":"","sources":["../../../src/directory-sync/scim/DirectoryGroups.ts"],"names":[],"mappings":";;;;;;;;;;;;AAaA,mCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"DirectoryGroups.js","sourceRoot":"","sources":["../../../src/directory-sync/scim/DirectoryGroups.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.DirectoryUsers = void 0;
|
|
13
13
|
const utils_1 = require("./utils");
|
|
14
|
-
const
|
|
14
|
+
const utils_2 = require("../utils");
|
|
15
|
+
const utils_3 = require("../../controller/utils");
|
|
15
16
|
class DirectoryUsers {
|
|
16
17
|
constructor({ directories, users }) {
|
|
17
18
|
this.directories = directories;
|
|
@@ -29,7 +30,7 @@ class DirectoryUsers {
|
|
|
29
30
|
active,
|
|
30
31
|
raw: 'rawAttributes' in body ? body.rawAttributes : body,
|
|
31
32
|
});
|
|
32
|
-
yield (0,
|
|
33
|
+
yield (0, utils_2.sendEvent)('user.created', { directory, user }, this.callback);
|
|
33
34
|
return {
|
|
34
35
|
status: 201,
|
|
35
36
|
data: user === null || user === void 0 ? void 0 : user.raw,
|
|
@@ -54,7 +55,7 @@ class DirectoryUsers {
|
|
|
54
55
|
active,
|
|
55
56
|
raw: 'rawAttributes' in body ? body.rawAttributes : body,
|
|
56
57
|
});
|
|
57
|
-
yield (0,
|
|
58
|
+
yield (0, utils_2.sendEvent)('user.updated', { directory, user: updatedUser }, this.callback);
|
|
58
59
|
return {
|
|
59
60
|
status: 200,
|
|
60
61
|
data: updatedUser === null || updatedUser === void 0 ? void 0 : updatedUser.raw,
|
|
@@ -73,7 +74,7 @@ class DirectoryUsers {
|
|
|
73
74
|
rawAttributes = Object.assign(Object.assign({}, rawAttributes), parsedAttributes.rawAttributes);
|
|
74
75
|
}
|
|
75
76
|
const { data: updatedUser } = yield this.users.update(user.id, Object.assign(Object.assign({ first_name: user.first_name, last_name: user.last_name, email: user.email, active: user.active }, attributes), { raw: (0, utils_1.updateRawUserAttributes)(user.raw, rawAttributes) }));
|
|
76
|
-
yield (0,
|
|
77
|
+
yield (0, utils_2.sendEvent)('user.updated', { directory, user: updatedUser }, this.callback);
|
|
77
78
|
return {
|
|
78
79
|
status: 200,
|
|
79
80
|
data: updatedUser === null || updatedUser === void 0 ? void 0 : updatedUser.raw,
|
|
@@ -83,7 +84,7 @@ class DirectoryUsers {
|
|
|
83
84
|
delete(directory, user) {
|
|
84
85
|
return __awaiter(this, void 0, void 0, function* () {
|
|
85
86
|
yield this.users.delete(user.id);
|
|
86
|
-
yield (0,
|
|
87
|
+
yield (0, utils_2.sendEvent)('user.deleted', { directory, user }, this.callback);
|
|
87
88
|
return {
|
|
88
89
|
status: 200,
|
|
89
90
|
data: user.raw,
|
|
@@ -135,9 +136,21 @@ class DirectoryUsers {
|
|
|
135
136
|
const method = request.method.toUpperCase();
|
|
136
137
|
// Get the directory
|
|
137
138
|
const { data: directory, error } = yield this.directories.get(directoryId);
|
|
138
|
-
if (error
|
|
139
|
+
if (error) {
|
|
139
140
|
return this.respondWithError(error);
|
|
140
141
|
}
|
|
142
|
+
if (!directory) {
|
|
143
|
+
return {
|
|
144
|
+
status: 200,
|
|
145
|
+
data: {},
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
if (!(0, utils_3.isConnectionActive)(directory)) {
|
|
149
|
+
return {
|
|
150
|
+
status: 200,
|
|
151
|
+
data: {},
|
|
152
|
+
};
|
|
153
|
+
}
|
|
141
154
|
// Validate the request
|
|
142
155
|
if (directory.scim.secret != apiSecret) {
|
|
143
156
|
return this.respondWithError({ code: 401, message: 'Unauthorized' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DirectoryUsers.js","sourceRoot":"","sources":["../../../src/directory-sync/scim/DirectoryUsers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAWA,mCAAwG;AACxG,
|
|
1
|
+
{"version":3,"file":"DirectoryUsers.js","sourceRoot":"","sources":["../../../src/directory-sync/scim/DirectoryUsers.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export declare class WebhookEventsLogger extends Base {
|
|
|
7
7
|
constructor({ db }: {
|
|
8
8
|
db: DatabaseStore;
|
|
9
9
|
});
|
|
10
|
-
log(directory: Directory, event: DirectorySyncEvent, status: number): Promise<WebhookEventLog>;
|
|
10
|
+
log(directory: Directory, event: DirectorySyncEvent | DirectorySyncEvent[], status: number): Promise<WebhookEventLog>;
|
|
11
11
|
get(id: string): Promise<WebhookEventLog>;
|
|
12
12
|
getAll(params?: GetAllParams): Promise<WebhookEventLog[]>;
|
|
13
13
|
delete(id: string): Promise<void>;
|
|
@@ -19,7 +19,14 @@ class WebhookEventsLogger extends Base_1.Base {
|
|
|
19
19
|
log(directory, event, status) {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
const id = (0, crypto_1.randomUUID)();
|
|
22
|
-
const log =
|
|
22
|
+
const log = {
|
|
23
|
+
id,
|
|
24
|
+
payload: event,
|
|
25
|
+
webhook_endpoint: directory.webhook.endpoint,
|
|
26
|
+
created_at: new Date(),
|
|
27
|
+
status_code: status,
|
|
28
|
+
delivered: status === 200,
|
|
29
|
+
};
|
|
23
30
|
yield this.store('logs').put(id, log, {
|
|
24
31
|
name: 'directoryId',
|
|
25
32
|
value: directory.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebhookEventsLogger.js","sourceRoot":"","sources":["../../../src/directory-sync/scim/WebhookEventsLogger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAoC;AASpC,iCAA8B;AAM9B,MAAa,mBAAoB,SAAQ,WAAI;IAC3C,YAAY,EAAE,EAAE,EAAyB;QACvC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAChB,CAAC;IAEY,GAAG,CAAC,SAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"WebhookEventsLogger.js","sourceRoot":"","sources":["../../../src/directory-sync/scim/WebhookEventsLogger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAoC;AASpC,iCAA8B;AAM9B,MAAa,mBAAoB,SAAQ,WAAI;IAC3C,YAAY,EAAE,EAAE,EAAyB;QACvC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAChB,CAAC;IAEY,GAAG,CAAC,SAAoB,EAAE,KAAgD,EAAE,MAAc;;YACrG,MAAM,EAAE,GAAG,IAAA,mBAAU,GAAE,CAAC;YAExB,MAAM,GAAG,GAAoB;gBAC3B,EAAE;gBACF,OAAO,EAAE,KAAK;gBACd,gBAAgB,EAAE,SAAS,CAAC,OAAO,CAAC,QAAQ;gBAC5C,UAAU,EAAE,IAAI,IAAI,EAAE;gBACtB,WAAW,EAAE,MAAM;gBACnB,SAAS,EAAE,MAAM,KAAK,GAAG;aAC1B,CAAC;YAEF,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE;gBACpC,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,SAAS,CAAC,EAAE;aACpB,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC;QACb,CAAC;KAAA;IAEY,GAAG,CAAC,EAAU;;YACzB,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1C,CAAC;KAAA;IAED,+CAA+C;IAClC,MAAM,CAAC,SAAuB,EAAE;;YAC3C,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;YAEtD,IAAI,SAAS,GAAsB,EAAE,CAAC;YAEtC,IAAI,WAAW,EAAE;gBACf,MAAM,KAAK,GAAG;oBACZ,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,WAAW;iBACnB,CAAC;gBAEF,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;aACtF;iBAAM;gBACL,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;aAC3E;YAED,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAEY,MAAM,CAAC,EAAU;;YAC5B,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC;KAAA;IAED,wCAAwC;IAClC,SAAS,CAAC,WAAmB;;YACjC,MAAM,KAAK,GAAG;gBACZ,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,WAAW;aACnB,CAAC;YAEF,iDAAiD;YACjD,OAAO,IAAI,EAAE;gBACX,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBAEjG,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;oBAClC,MAAM;iBACP;gBAED,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;aACtE;QACH,CAAC;KAAA;CACF;AAvED,kDAuEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/directory-sync/scim/utils.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/directory-sync/scim/utils.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,2CAAuD;AAGhD,MAAM,mBAAmB,GAAG,CAAC,SAA8B,EAAE,EAAE;IACpE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IAEtC,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,IAAI,EAAE,KAAK,KAAK,EAAE;YAChB,OAAO;gBACL,MAAM,EAAE,gBAAgB;gBACxB,OAAO,EAAE,KAAK;aACf,CAAC;SACH;QAED,IAAI,EAAE,KAAK,QAAQ,EAAE;YACnB,OAAO;gBACL,MAAM,EAAE,mBAAmB;gBAC3B,OAAO,EAAE,KAAK;aACf,CAAC;SACH;KACF;IAED,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;QAC/C,IAAI,EAAE,KAAK,QAAQ,EAAE;YACnB,OAAO;gBACL,MAAM,EAAE,mBAAmB;gBAC3B,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aACzC,CAAC;SACH;KACF;IAED,oBAAoB;IACpB,IAAI,EAAE,KAAK,SAAS,IAAI,aAAa,IAAI,KAAK,EAAE;QAC9C,OAAO;YACL,MAAM,EAAE,iBAAiB;YACzB,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC;KACH;IAED,OAAO;QACL,MAAM,EAAE,SAAS;KAClB,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,mBAAmB,uBAuC9B;AAEF,mCAAmC;AACnC,4BAA4B;AACrB,MAAM,yBAAyB,GAAG,GAA4B,EAAE;IACrE,OAAO,MAAM,CAAC,OAAO,CAAC,gCAAsB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACzE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACjB,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAC;AALW,QAAA,yBAAyB,6BAKpC;AAEF,yFAAyF;AAClF,MAAM,qBAAqB,GAAG,CAAC,SAA6B,EAAE,EAAE;IACrE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;IAElC,MAAM,UAAU,GAAkB,EAAE,CAAC;IACrC,MAAM,aAAa,GAAG,EAAE,CAAC;IAEzB,MAAM,aAAa,GAAG;QACpB,MAAM,EAAE,QAAQ;QAChB,gBAAgB,EAAE,YAAY;QAC9B,iBAAiB,EAAE,WAAW;QAC9B,8BAA8B,EAAE,OAAO;KACxC,CAAC;IAEF,kDAAkD;IAClD,8CAA8C;IAC9C,IAAI,IAAI,EAAE;QACR,IAAI,IAAI,IAAI,aAAa,EAAE;YACzB,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC;SACzC;QAED,aAAa,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;KAC7B;IAED,gFAAgF;IAChF,qEAAqE;SAChE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAClC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC1C,IAAI,SAAS,IAAI,aAAa,EAAE;gBAC9B,UAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;aACzD;YAED,aAAa,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;SAC7C;KACF;IAED,OAAO;QACL,UAAU;QACV,aAAa;KACd,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,qBAAqB,yBAuChC;AAEF,iDAAiD;AAC1C,MAAM,6BAA6B,GAAG,CAAC,IAAS,EAAE,EAAE;IACzD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAMlD,CAAC;IAEF,OAAO;QACL,UAAU,EAAE,IAAI,IAAI,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;QAC7D,SAAS,EAAE,IAAI,IAAI,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;QAC9D,KAAK,EAAE,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ;QAC/D,MAAM,EAAE,MAAM,IAAI,IAAI;QACtB,EAAE,EAAE,MAAM,EAAE,wDAAwD;KACrE,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,6BAA6B,iCAgBxC;AAEF,6BAA6B;AACtB,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;IACzD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAErC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,GAAG,CAAC;KACZ;IAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,gBAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;KAClC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAZW,QAAA,uBAAuB,2BAYlC;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAmB,EAAE,EAAE;IAC3D,OAAO,IAAI,KAAK,QAAQ,CAAC;AAC3B,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC"}
|
|
@@ -7,6 +7,8 @@ import { Groups } from './scim/Groups';
|
|
|
7
7
|
import { WebhookEventsLogger } from './scim/WebhookEventsLogger';
|
|
8
8
|
import { ApiError } from '../typings';
|
|
9
9
|
import { RequestHandler } from './request';
|
|
10
|
+
import { EventProcessor } from './batch-events/queue';
|
|
11
|
+
import { EventLock as Lock } from './batch-events/lock';
|
|
10
12
|
export type IDirectorySyncController = Awaited<ReturnType<typeof directorySync>>;
|
|
11
13
|
export type IDirectoryConfig = InstanceType<typeof DirectoryConfig>;
|
|
12
14
|
export type IDirectoryGroups = InstanceType<typeof DirectoryGroups>;
|
|
@@ -15,6 +17,8 @@ export type IUsers = InstanceType<typeof Users>;
|
|
|
15
17
|
export type IGroups = InstanceType<typeof Groups>;
|
|
16
18
|
export type IWebhookEventsLogger = InstanceType<typeof WebhookEventsLogger>;
|
|
17
19
|
export type IRequestHandler = InstanceType<typeof RequestHandler>;
|
|
20
|
+
export type IEventProcessor = InstanceType<typeof EventProcessor>;
|
|
21
|
+
export type EventLock = InstanceType<typeof Lock>;
|
|
18
22
|
export type DirectorySyncEventType = 'user.created' | 'user.updated' | 'user.deleted' | 'group.created' | 'group.updated' | 'group.deleted' | 'group.user_added' | 'group.user_removed';
|
|
19
23
|
export declare enum DirectorySyncProviders {
|
|
20
24
|
'azure-scim-v2' = "Azure SCIM v2.0",
|
|
@@ -78,12 +82,13 @@ export interface DirectorySyncEvent {
|
|
|
78
82
|
tenant: string;
|
|
79
83
|
product: string;
|
|
80
84
|
}
|
|
81
|
-
export interface WebhookEventLog
|
|
85
|
+
export interface WebhookEventLog {
|
|
82
86
|
id: string;
|
|
83
87
|
webhook_endpoint: string;
|
|
84
88
|
created_at: Date;
|
|
85
89
|
status_code?: number;
|
|
86
90
|
delivered?: boolean;
|
|
91
|
+
payload: DirectorySyncEvent | DirectorySyncEvent[];
|
|
87
92
|
}
|
|
88
93
|
export type User = {
|
|
89
94
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/directory-sync/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/directory-sync/types.ts"],"names":[],"mappings":";;;AAiCA,IAAY,sBAOX;AAPD,WAAY,sBAAsB;IAChC,2DAAmC,CAAA;IACnC,iEAAyC,CAAA;IACzC,yDAAiC,CAAA;IACjC,8DAAsC,CAAA;IACtC,+DAAuC,CAAA;IACvC,2CAAmB,CAAA;AACrB,CAAC,EAPW,sBAAsB,sCAAtB,sBAAsB,QAOjC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { DirectorySyncEventType, Directory, User, Group, EventCallback, DirectorySyncEvent, IWebhookEventsLogger, IDirectoryConfig, JacksonOption, IEventProcessor } from '../typings';
|
|
2
|
+
export declare const eventLockTTL = 6;
|
|
3
|
+
interface Payload {
|
|
4
|
+
directory: Directory;
|
|
5
|
+
group?: Group | null;
|
|
6
|
+
user?: User | null;
|
|
7
|
+
}
|
|
8
|
+
interface EventCallbackParams {
|
|
9
|
+
opts: JacksonOption;
|
|
10
|
+
directories: IDirectoryConfig;
|
|
11
|
+
eventProcessor: IEventProcessor;
|
|
12
|
+
webhookLogs: IWebhookEventsLogger;
|
|
13
|
+
}
|
|
14
|
+
export declare const sendEvent: (event: DirectorySyncEventType, payload: Payload, callback?: EventCallback) => Promise<void>;
|
|
15
|
+
export declare const handleEventCallback: ({ opts, directories, eventProcessor, webhookLogs, }: EventCallbackParams) => Promise<(event: DirectorySyncEvent) => Promise<void>>;
|
|
16
|
+
export {};
|
|
@@ -9,41 +9,50 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.handleEventCallback = exports.sendEvent = void 0;
|
|
13
|
-
const webhook_1 = require("
|
|
14
|
-
const transform_1 = require("./transform");
|
|
15
|
-
const
|
|
12
|
+
exports.handleEventCallback = exports.sendEvent = exports.eventLockTTL = void 0;
|
|
13
|
+
const webhook_1 = require("../event/webhook");
|
|
14
|
+
const transform_1 = require("./scim/transform");
|
|
15
|
+
const error_1 = require("../controller/error");
|
|
16
|
+
exports.eventLockTTL = 6;
|
|
16
17
|
const sendEvent = (event, payload, callback) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
-
if (!(0, utils_1.isConnectionActive)(payload.directory)) {
|
|
18
|
-
return;
|
|
19
|
-
}
|
|
20
18
|
if (!callback) {
|
|
21
19
|
return;
|
|
22
20
|
}
|
|
23
21
|
yield callback((0, transform_1.transformEventPayload)(event, payload));
|
|
24
22
|
});
|
|
25
23
|
exports.sendEvent = sendEvent;
|
|
26
|
-
const handleEventCallback = (directories,
|
|
24
|
+
const handleEventCallback = ({ opts, directories, eventProcessor, webhookLogs, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
+
// Callback that handles the events for Jackson service
|
|
27
26
|
return (event) => __awaiter(void 0, void 0, void 0, function* () {
|
|
27
|
+
var _a;
|
|
28
28
|
const { tenant, product, directory_id: directoryId } = event;
|
|
29
|
-
const { data: directory } = yield directories.get(directoryId);
|
|
30
|
-
if (
|
|
31
|
-
|
|
29
|
+
const { data: directory, error } = yield directories.get(directoryId);
|
|
30
|
+
if (error) {
|
|
31
|
+
console.error(`Error fetching directory ${directoryId}: ${error.message}`);
|
|
32
|
+
throw new error_1.JacksonError(error.message, error.code);
|
|
32
33
|
}
|
|
33
34
|
if (!directory.webhook.endpoint || !directory.webhook.secret) {
|
|
35
|
+
console.error(`Webhook not configured for directory ${directoryId}. Skipping ...`);
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
// If batch size is set, store the events in the database
|
|
39
|
+
// We will process the queue later in the background
|
|
40
|
+
if ((_a = opts.dsync) === null || _a === void 0 ? void 0 : _a.webhookBatchSize) {
|
|
41
|
+
yield eventProcessor.push(event);
|
|
34
42
|
return;
|
|
35
43
|
}
|
|
36
44
|
let status = 200;
|
|
37
45
|
try {
|
|
46
|
+
// Send the event to the webhook (synchronously)
|
|
38
47
|
yield (0, webhook_1.sendPayloadToWebhook)(directory.webhook, event);
|
|
39
48
|
}
|
|
40
49
|
catch (err) {
|
|
41
50
|
status = err.response ? err.response.status : 500;
|
|
42
51
|
}
|
|
43
52
|
if (directory.log_webhook_events) {
|
|
44
|
-
yield
|
|
53
|
+
yield webhookLogs.setTenantAndProduct(tenant, product).log(directory, event, status);
|
|
45
54
|
}
|
|
46
55
|
});
|
|
47
56
|
});
|
|
48
57
|
exports.handleEventCallback = handleEventCallback;
|
|
49
|
-
//# sourceMappingURL=
|
|
58
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/directory-sync/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAYA,8CAAwD;AACxD,gDAAyD;AACzD,+CAAmD;AAEtC,QAAA,YAAY,GAAG,CAAC,CAAC;AAevB,MAAM,SAAS,GAAG,CACvB,KAA6B,EAC7B,OAAgB,EAChB,QAAwB,EACxB,EAAE;IACF,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO;KACR;IAED,MAAM,QAAQ,CAAC,IAAA,iCAAqB,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AACxD,CAAC,CAAA,CAAC;AAVW,QAAA,SAAS,aAUpB;AAEK,MAAM,mBAAmB,GAAG,CAAO,EACxC,IAAI,EACJ,WAAW,EACX,cAAc,EACd,WAAW,GACS,EAAE,EAAE;IACxB,uDAAuD;IACvD,OAAO,CAAO,KAAyB,EAAE,EAAE;;QACzC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;QAE7D,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEtE,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,KAAK,CAAC,4BAA4B,WAAW,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3E,MAAM,IAAI,oBAAY,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;SACnD;QAED,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE;YAC5D,OAAO,CAAC,KAAK,CAAC,wCAAwC,WAAW,gBAAgB,CAAC,CAAC;YACnF,OAAO;SACR;QAED,yDAAyD;QACzD,oDAAoD;QACpD,IAAI,MAAA,IAAI,CAAC,KAAK,0CAAE,gBAAgB,EAAE;YAChC,MAAM,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjC,OAAO;SACR;QAED,IAAI,MAAM,GAAG,GAAG,CAAC;QAEjB,IAAI;YACF,gDAAgD;YAChD,MAAM,IAAA,8BAAoB,EAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SACtD;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC;SACnD;QAED,IAAI,SAAS,CAAC,kBAAkB,EAAE;YAChC,MAAM,WAAW,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACtF;IACH,CAAC,CAAA,CAAC;AACJ,CAAC,CAAA,CAAC;AA1CW,QAAA,mBAAmB,uBA0C9B"}
|
package/dist/event/webhook.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { EventPayloadSchema, Webhook } from '../typings';
|
|
2
|
-
export declare const createSignatureString: (secret: string, payload:
|
|
3
|
-
export declare const sendPayloadToWebhook: (webhook: Webhook, payload: EventPayloadSchema) => Promise<import("axios").AxiosResponse<any, any>>;
|
|
2
|
+
export declare const createSignatureString: (secret: string, payload: any) => string;
|
|
3
|
+
export declare const sendPayloadToWebhook: (webhook: Webhook, payload: EventPayloadSchema | EventPayloadSchema[]) => Promise<import("axios").AxiosResponse<any, any>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/event/webhook.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,oDAA4B;AAC5B,oDAA4B;AAErB,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/event/webhook.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,oDAA4B;AAC5B,oDAA4B;AAErB,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAE,OAAY,EAAE,EAAE;IACpE,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,EAAE,CAAC;KACX;IAED,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IAEvC,MAAM,SAAS,GAAG,gBAAM;SACrB,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC5B,MAAM,CAAC,GAAG,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;SACjD,MAAM,CAAC,KAAK,CAAC,CAAC;IAEjB,OAAO,KAAK,SAAS,MAAM,SAAS,EAAE,CAAC;AACzC,CAAC,CAAC;AAbW,QAAA,qBAAqB,yBAahC;AAEK,MAAM,oBAAoB,GAAG,CAClC,OAAgB,EAChB,OAAkD,EAClD,EAAE;IACF,OAAO,MAAM,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE;QACjD,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,kBAAkB,EAAE,IAAA,6BAAqB,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;SACnE;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAVW,QAAA,oBAAoB,wBAU/B"}
|
|
@@ -8,6 +8,7 @@ declare const counters: {
|
|
|
8
8
|
createDsyncConnection: () => void;
|
|
9
9
|
getDsyncConnections: () => void;
|
|
10
10
|
deleteDsyncConnections: () => void;
|
|
11
|
+
dsyncEventsBatchFailed: () => void;
|
|
11
12
|
};
|
|
12
13
|
declare const increment: (action: keyof typeof counters) => void;
|
|
13
14
|
export { increment };
|
|
@@ -49,6 +49,13 @@ const counters = {
|
|
|
49
49
|
name: 'jackson.dsync.connection.delete',
|
|
50
50
|
counterOptions: { description: 'Number of DSync connections delete requests' },
|
|
51
51
|
}),
|
|
52
|
+
dsyncEventsBatchFailed: () => {
|
|
53
|
+
(0, metrics_1.incrementCounter)({
|
|
54
|
+
meter: METER,
|
|
55
|
+
name: 'jackson.dsync.events_batch.failed',
|
|
56
|
+
counterOptions: { description: 'Indicate that a batch of dsync events failed' },
|
|
57
|
+
});
|
|
58
|
+
},
|
|
52
59
|
};
|
|
53
60
|
const increment = (action) => {
|
|
54
61
|
const counterIncrement = counters[action];
|