@boxyhq/saml-jackson 1.35.1 → 1.37.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/dist/controller/analytics.d.ts +3 -1
- package/dist/controller/analytics.js +3 -2
- package/dist/controller/analytics.js.map +1 -1
- package/dist/controller/api.d.ts +3 -1
- package/dist/controller/api.js +6 -5
- package/dist/controller/api.js.map +1 -1
- package/dist/controller/connection/oidc.d.ts +3 -2
- package/dist/controller/connection/oidc.js +26 -2
- package/dist/controller/connection/oidc.js.map +1 -1
- package/dist/controller/connection/saml.d.ts +3 -2
- package/dist/controller/connection/saml.js +26 -2
- package/dist/controller/connection/saml.js.map +1 -1
- package/dist/controller/error.d.ts +2 -1
- package/dist/controller/error.js +4 -1
- package/dist/controller/error.js.map +1 -1
- package/dist/controller/oauth/oidc-client.js +1 -1
- package/dist/controller/oauth/oidc-client.js.map +1 -1
- package/dist/controller/oauth.js +69 -24
- package/dist/controller/oauth.js.map +1 -1
- package/dist/controller/sso-handler.d.ts +2 -2
- package/dist/controller/sso-handler.js +73 -65
- package/dist/controller/sso-handler.js.map +1 -1
- package/dist/controller/utils.d.ts +1 -0
- package/dist/controller/utils.js +6 -1
- package/dist/controller/utils.js.map +1 -1
- package/dist/cron/lock.d.ts +4 -2
- package/dist/cron/lock.js +4 -3
- package/dist/cron/lock.js.map +1 -1
- package/dist/db/db.d.ts +5 -2
- package/dist/db/db.js +10 -9
- package/dist/db/db.js.map +1 -1
- package/dist/db/dynamoDb.d.ts +3 -1
- package/dist/db/dynamoDb.js +1 -1
- package/dist/db/dynamoDb.js.map +1 -1
- package/dist/db/mem.d.ts +3 -1
- package/dist/db/mem.js +1 -1
- package/dist/db/mem.js.map +1 -1
- package/dist/db/mongo.d.ts +7 -3
- package/dist/db/mongo.js +5 -4
- package/dist/db/mongo.js.map +1 -1
- package/dist/db/redis.d.ts +7 -3
- package/dist/db/redis.js +4 -3
- package/dist/db/redis.js.map +1 -1
- package/dist/db/sql/sql.d.ts +7 -3
- package/dist/db/sql/sql.js +7 -6
- package/dist/db/sql/sql.js.map +1 -1
- package/dist/directory-sync/batch-events/queue.d.ts +2 -2
- package/dist/directory-sync/batch-events/queue.js +10 -10
- package/dist/directory-sync/batch-events/queue.js.map +1 -1
- package/dist/directory-sync/index.d.ts +2 -2
- package/dist/directory-sync/index.js +2 -2
- package/dist/directory-sync/index.js.map +1 -1
- package/dist/directory-sync/non-scim/index.d.ts +2 -2
- package/dist/directory-sync/non-scim/index.js +4 -4
- package/dist/directory-sync/non-scim/index.js.map +1 -1
- package/dist/directory-sync/scim/DirectoryConfig.js +1 -1
- package/dist/directory-sync/types.d.ts +1 -1
- package/dist/directory-sync/types.js +1 -1
- package/dist/directory-sync/types.js.map +1 -1
- package/dist/directory-sync/utils.d.ts +2 -2
- package/dist/directory-sync/utils.js +3 -3
- package/dist/directory-sync/utils.js.map +1 -1
- package/dist/ee/identity-federation/app.js +2 -2
- package/dist/ee/identity-federation/app.js.map +1 -1
- package/dist/ee/identity-federation/idp-login.js +3 -3
- package/dist/ee/identity-federation/idp-login.js.map +1 -1
- package/dist/ee/identity-federation/index.d.ts +2 -2
- package/dist/ee/identity-federation/sso.d.ts +2 -2
- package/dist/ee/identity-federation/sso.js +4 -4
- package/dist/ee/identity-federation/sso.js.map +1 -1
- package/dist/ee/ory/ory.d.ts +18 -0
- package/dist/ee/ory/ory.js +202 -0
- package/dist/ee/ory/ory.js.map +1 -0
- package/dist/ee/product/index.d.ts +2 -2
- package/dist/ee/product/index.js +1 -1
- package/dist/ee/product/index.js.map +1 -1
- package/dist/event/axios.d.ts +2 -2
- package/dist/event/axios.js +26 -22
- package/dist/event/axios.js.map +1 -1
- package/dist/event/index.d.ts +3 -2
- package/dist/event/index.js +2 -1
- package/dist/event/index.js.map +1 -1
- package/dist/event/webhook.d.ts +2 -2
- package/dist/event/webhook.js +5 -4
- package/dist/event/webhook.js.map +1 -1
- package/dist/index.js +31 -9
- package/dist/index.js.map +1 -1
- package/dist/sso-traces/index.d.ts +2 -2
- package/dist/sso-traces/index.js +1 -1
- package/dist/sso-traces/index.js.map +1 -1
- package/dist/typings.d.ts +20 -0
- package/package.json +10 -10
package/dist/db/mongo.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { DatabaseDriver, DatabaseOption, Encrypted, Index, Records, SortOrder } from '../typings';
|
|
1
|
+
import { DatabaseDriver, DatabaseOption, Encrypted, Index, Records, RequiredLogger, SortOrder } from '../typings';
|
|
2
2
|
declare class Mongo implements DatabaseDriver {
|
|
3
3
|
private options;
|
|
4
4
|
private client;
|
|
5
5
|
private collection;
|
|
6
6
|
private db;
|
|
7
|
-
|
|
7
|
+
private logger;
|
|
8
|
+
constructor(options: DatabaseOption, logger: RequiredLogger);
|
|
8
9
|
init(): Promise<Mongo>;
|
|
9
10
|
indexNamespace(): Promise<void>;
|
|
10
11
|
get(namespace: string, key: string): Promise<any>;
|
|
@@ -17,6 +18,9 @@ declare class Mongo implements DatabaseDriver {
|
|
|
17
18
|
close(): Promise<void>;
|
|
18
19
|
}
|
|
19
20
|
declare const _default: {
|
|
20
|
-
new: (options:
|
|
21
|
+
new: (options: {
|
|
22
|
+
db: DatabaseOption;
|
|
23
|
+
logger: RequiredLogger;
|
|
24
|
+
}) => Promise<Mongo>;
|
|
21
25
|
};
|
|
22
26
|
export default _default;
|
package/dist/db/mongo.js
CHANGED
|
@@ -45,8 +45,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
45
45
|
const mongodb_1 = require("mongodb");
|
|
46
46
|
const dbutils = __importStar(require("./utils"));
|
|
47
47
|
class Mongo {
|
|
48
|
-
constructor(options) {
|
|
48
|
+
constructor(options, logger) {
|
|
49
49
|
this.options = options;
|
|
50
|
+
this.logger = logger;
|
|
50
51
|
}
|
|
51
52
|
init() {
|
|
52
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -56,7 +57,7 @@ class Mongo {
|
|
|
56
57
|
yield this.client.connect();
|
|
57
58
|
}
|
|
58
59
|
catch (err) {
|
|
59
|
-
|
|
60
|
+
this.logger.error(`error connecting to engine: ${this.options.engine}, db: ${err}`);
|
|
60
61
|
throw err;
|
|
61
62
|
}
|
|
62
63
|
this.db = this.client.db();
|
|
@@ -72,7 +73,7 @@ class Mongo {
|
|
|
72
73
|
break;
|
|
73
74
|
}
|
|
74
75
|
catch (err) {
|
|
75
|
-
|
|
76
|
+
this.logger.error(`error in index namespace execution for db engine: ${this.options.engine}, err: ${err}`);
|
|
76
77
|
yield dbutils.sleep(1000);
|
|
77
78
|
continue;
|
|
78
79
|
}
|
|
@@ -206,7 +207,7 @@ class Mongo {
|
|
|
206
207
|
}
|
|
207
208
|
exports.default = {
|
|
208
209
|
new: (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
209
|
-
return yield new Mongo(options).init();
|
|
210
|
+
return yield new Mongo(options.db, options.logger).init();
|
|
210
211
|
}),
|
|
211
212
|
};
|
|
212
213
|
//# sourceMappingURL=mongo.js.map
|
package/dist/db/mongo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongo.js","sourceRoot":"","sources":["../../src/db/mongo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAA2E;
|
|
1
|
+
{"version":3,"file":"mongo.js","sourceRoot":"","sources":["../../src/db/mongo.ts"],"names":[],"mappings":"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"}
|
package/dist/db/redis.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { DatabaseDriver, DatabaseOption, Encrypted, Index, Records, SortOrder } from '../typings';
|
|
1
|
+
import { DatabaseDriver, DatabaseOption, Encrypted, Index, Records, RequiredLogger, SortOrder } from '../typings';
|
|
2
2
|
declare class Redis implements DatabaseDriver {
|
|
3
3
|
private options;
|
|
4
4
|
private client;
|
|
5
|
-
|
|
5
|
+
private logger;
|
|
6
|
+
constructor(options: DatabaseOption, logger: RequiredLogger);
|
|
6
7
|
init(): Promise<Redis>;
|
|
7
8
|
get(namespace: string, key: string): Promise<any>;
|
|
8
9
|
getAll(namespace: string, pageOffset?: number, pageLimit?: number, _?: string, sortOrder?: SortOrder): Promise<Records>;
|
|
@@ -13,6 +14,9 @@ declare class Redis implements DatabaseDriver {
|
|
|
13
14
|
close(): Promise<void>;
|
|
14
15
|
}
|
|
15
16
|
declare const _default: {
|
|
16
|
-
new: (options:
|
|
17
|
+
new: (options: {
|
|
18
|
+
db: DatabaseOption;
|
|
19
|
+
logger: RequiredLogger;
|
|
20
|
+
}) => Promise<Redis>;
|
|
17
21
|
};
|
|
18
22
|
export default _default;
|
package/dist/db/redis.js
CHANGED
|
@@ -52,8 +52,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
52
52
|
const redis = __importStar(require("redis"));
|
|
53
53
|
const dbutils = __importStar(require("./utils"));
|
|
54
54
|
class Redis {
|
|
55
|
-
constructor(options) {
|
|
55
|
+
constructor(options, logger) {
|
|
56
56
|
this.options = options;
|
|
57
|
+
this.logger = logger;
|
|
57
58
|
}
|
|
58
59
|
init() {
|
|
59
60
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -62,7 +63,7 @@ class Redis {
|
|
|
62
63
|
opts['url'] = this.options.url;
|
|
63
64
|
}
|
|
64
65
|
this.client = redis.createClient(opts);
|
|
65
|
-
this.client.on('error', (err) =>
|
|
66
|
+
this.client.on('error', (err) => this.logger.info('Redis Client Error', err));
|
|
66
67
|
yield this.client.connect();
|
|
67
68
|
return this;
|
|
68
69
|
});
|
|
@@ -243,7 +244,7 @@ class Redis {
|
|
|
243
244
|
}
|
|
244
245
|
exports.default = {
|
|
245
246
|
new: (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
246
|
-
return yield new Redis(options).init();
|
|
247
|
+
return yield new Redis(options.db, options.logger).init();
|
|
247
248
|
}),
|
|
248
249
|
};
|
|
249
250
|
//# sourceMappingURL=redis.js.map
|
package/dist/db/redis.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/db/redis.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/db/redis.ts"],"names":[],"mappings":"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"}
|
package/dist/db/sql/sql.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DatabaseDriver, DatabaseOption, Index, Encrypted, Records, SortOrder } from '../../typings';
|
|
1
|
+
import { DatabaseDriver, DatabaseOption, Index, Encrypted, Records, SortOrder, RequiredLogger } from '../../typings';
|
|
2
2
|
declare class Sql implements DatabaseDriver {
|
|
3
3
|
private options;
|
|
4
4
|
private dataSource;
|
|
@@ -10,7 +10,8 @@ declare class Sql implements DatabaseDriver {
|
|
|
10
10
|
private JacksonStore;
|
|
11
11
|
private JacksonIndex;
|
|
12
12
|
private JacksonTTL;
|
|
13
|
-
|
|
13
|
+
private logger;
|
|
14
|
+
constructor(options: DatabaseOption, logger: RequiredLogger);
|
|
14
15
|
init({ JacksonStore, JacksonIndex, JacksonTTL }: {
|
|
15
16
|
JacksonStore: any;
|
|
16
17
|
JacksonIndex: any;
|
|
@@ -27,6 +28,9 @@ declare class Sql implements DatabaseDriver {
|
|
|
27
28
|
close(): Promise<void>;
|
|
28
29
|
}
|
|
29
30
|
declare const _default: {
|
|
30
|
-
new: (options:
|
|
31
|
+
new: (options: {
|
|
32
|
+
db: DatabaseOption;
|
|
33
|
+
logger: RequiredLogger;
|
|
34
|
+
}, entities: any) => Promise<Sql>;
|
|
31
35
|
};
|
|
32
36
|
export default _default;
|
package/dist/db/sql/sql.js
CHANGED
|
@@ -48,8 +48,9 @@ const typeorm_1 = require("typeorm");
|
|
|
48
48
|
const dbutils = __importStar(require("../utils"));
|
|
49
49
|
const mssql = __importStar(require("./mssql"));
|
|
50
50
|
class Sql {
|
|
51
|
-
constructor(options) {
|
|
51
|
+
constructor(options, logger) {
|
|
52
52
|
this.options = options;
|
|
53
|
+
this.logger = logger;
|
|
53
54
|
}
|
|
54
55
|
init(_a) {
|
|
55
56
|
return __awaiter(this, arguments, void 0, function* ({ JacksonStore, JacksonIndex, JacksonTTL }) {
|
|
@@ -86,7 +87,7 @@ class Sql {
|
|
|
86
87
|
break;
|
|
87
88
|
}
|
|
88
89
|
catch (err) {
|
|
89
|
-
|
|
90
|
+
this.logger.error(`error connecting to engine: ${this.options.engine}, type: ${sqlType} db: ${err}`);
|
|
90
91
|
yield dbutils.sleep(1000);
|
|
91
92
|
continue;
|
|
92
93
|
}
|
|
@@ -105,7 +106,7 @@ class Sql {
|
|
|
105
106
|
break;
|
|
106
107
|
}
|
|
107
108
|
catch (err) {
|
|
108
|
-
|
|
109
|
+
this.logger.error(`error in index namespace execution for engine: ${this.options.engine}, type: ${sqlType} err: ${err}`);
|
|
109
110
|
yield dbutils.sleep(1000);
|
|
110
111
|
continue;
|
|
111
112
|
}
|
|
@@ -135,7 +136,7 @@ class Sql {
|
|
|
135
136
|
this.timerId = setTimeout(this.ttlCleanup, this.options.ttl * 1000);
|
|
136
137
|
}
|
|
137
138
|
else {
|
|
138
|
-
|
|
139
|
+
this.logger.warn(`Warning: ttl cleanup not enabled in ${sqlType} with engine ${this.options.engine}, set both "ttl" and "cleanupLimit" options to enable it!`);
|
|
139
140
|
}
|
|
140
141
|
return this;
|
|
141
142
|
});
|
|
@@ -164,7 +165,7 @@ class Sql {
|
|
|
164
165
|
}
|
|
165
166
|
}
|
|
166
167
|
catch (err) {
|
|
167
|
-
|
|
168
|
+
this.logger.error('Error running indexNamespace:', err);
|
|
168
169
|
}
|
|
169
170
|
});
|
|
170
171
|
}
|
|
@@ -347,7 +348,7 @@ class Sql {
|
|
|
347
348
|
}
|
|
348
349
|
exports.default = {
|
|
349
350
|
new: (options, entities) => __awaiter(void 0, void 0, void 0, function* () {
|
|
350
|
-
return yield new Sql(options).init(entities);
|
|
351
|
+
return yield new Sql(options.db, options.logger).init(entities);
|
|
351
352
|
}),
|
|
352
353
|
};
|
|
353
354
|
//# sourceMappingURL=sql.js.map
|
package/dist/db/sql/sql.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../../src/db/sql/sql.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../../src/db/sql/sql.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { DirectorySyncEvent, IDirectoryConfig, Storable,
|
|
1
|
+
import type { DirectorySyncEvent, IDirectoryConfig, Storable, CronLock, IWebhookEventsLogger, JacksonOptionWithRequiredLogger } from '../../typings';
|
|
2
2
|
declare enum EventStatus {
|
|
3
3
|
PENDING = "PENDING",
|
|
4
4
|
FAILED = "FAILED",
|
|
@@ -12,7 +12,7 @@ interface QueuedEvent {
|
|
|
12
12
|
created_at: string;
|
|
13
13
|
}
|
|
14
14
|
interface DirectoryEventsParams {
|
|
15
|
-
opts:
|
|
15
|
+
opts: JacksonOptionWithRequiredLogger;
|
|
16
16
|
eventStore: Storable;
|
|
17
17
|
eventLock: CronLock;
|
|
18
18
|
directories: IDirectoryConfig;
|
|
@@ -126,17 +126,17 @@ class EventProcessor {
|
|
|
126
126
|
}
|
|
127
127
|
const directory = directoryResult.value.data;
|
|
128
128
|
if (!directory) {
|
|
129
|
-
|
|
129
|
+
this.opts.logger.error(`Directory ${directoryId} not found. Deleting the dsync events.`);
|
|
130
130
|
yield this.delete(events);
|
|
131
131
|
continue;
|
|
132
132
|
}
|
|
133
133
|
if (!(0, utils_1.isConnectionActive)(directory)) {
|
|
134
|
-
|
|
134
|
+
this.opts.logger.error(`Directory ${directoryId} is not active. Deleting the dsync events.`);
|
|
135
135
|
yield this.delete(events);
|
|
136
136
|
continue;
|
|
137
137
|
}
|
|
138
138
|
if (!directory.webhook.endpoint || !directory.webhook.secret) {
|
|
139
|
-
|
|
139
|
+
this.opts.logger.error(`Webhook not configured for directory ${directoryId}. Deleting the dsync events.`);
|
|
140
140
|
yield this.delete(events);
|
|
141
141
|
continue;
|
|
142
142
|
}
|
|
@@ -146,7 +146,7 @@ class EventProcessor {
|
|
|
146
146
|
yield this.delete(events);
|
|
147
147
|
}
|
|
148
148
|
else {
|
|
149
|
-
|
|
149
|
+
this.opts.logger.error(`Webhook returned status ${status}. Marking the events as failed.`);
|
|
150
150
|
yield this.markAsFailed(events);
|
|
151
151
|
}
|
|
152
152
|
yield this.logWebhookEvent(directory, events, status);
|
|
@@ -154,7 +154,7 @@ class EventProcessor {
|
|
|
154
154
|
catch (err) {
|
|
155
155
|
const message = `Error sending payload to webhook ${directory.webhook.endpoint}. Marking the events as failed. ${err.message}`;
|
|
156
156
|
const status = ((_b = err.response) === null || _b === void 0 ? void 0 : _b.status) || 500;
|
|
157
|
-
|
|
157
|
+
this.opts.logger.error(message, err);
|
|
158
158
|
yield this.markAsFailed(events);
|
|
159
159
|
yield this.logWebhookEvent(directory, events, status);
|
|
160
160
|
throw new error_1.JacksonError(message, status);
|
|
@@ -167,7 +167,7 @@ class EventProcessor {
|
|
|
167
167
|
process() {
|
|
168
168
|
return __awaiter(this, void 0, void 0, function* () {
|
|
169
169
|
if (isJobRunning) {
|
|
170
|
-
|
|
170
|
+
this.opts.logger.info('A batch process is already running, skipping.');
|
|
171
171
|
return;
|
|
172
172
|
}
|
|
173
173
|
if (!(yield this.eventLock.acquire())) {
|
|
@@ -178,7 +178,7 @@ class EventProcessor {
|
|
|
178
178
|
this._process();
|
|
179
179
|
}
|
|
180
180
|
catch (e) {
|
|
181
|
-
|
|
181
|
+
this.opts.logger.error(' Error processing webhooks batch:', e);
|
|
182
182
|
}
|
|
183
183
|
isJobRunning = false;
|
|
184
184
|
if (this.cronInterval) {
|
|
@@ -209,10 +209,10 @@ class EventProcessor {
|
|
|
209
209
|
var _a, _b;
|
|
210
210
|
const payload = events.map(({ event }) => event);
|
|
211
211
|
try {
|
|
212
|
-
return yield (0, webhook_1.sendPayloadToWebhook)(webhook, payload, (_b = (_a = this.opts) === null || _a === void 0 ? void 0 : _a.dsync) === null || _b === void 0 ? void 0 : _b.debugWebhooks);
|
|
212
|
+
return yield (0, webhook_1.sendPayloadToWebhook)(webhook, payload, (_b = (_a = this.opts) === null || _a === void 0 ? void 0 : _a.dsync) === null || _b === void 0 ? void 0 : _b.debugWebhooks, this.opts.logger);
|
|
213
213
|
}
|
|
214
214
|
catch (err) {
|
|
215
|
-
|
|
215
|
+
this.opts.logger.error(`Error sending payload to webhook: ${err.message}`);
|
|
216
216
|
throw err;
|
|
217
217
|
}
|
|
218
218
|
});
|
|
@@ -246,7 +246,7 @@ class EventProcessor {
|
|
|
246
246
|
notifyAllEventsFailed() {
|
|
247
247
|
return __awaiter(this, void 0, void 0, function* () {
|
|
248
248
|
metrics.increment('dsyncEventsBatchFailed');
|
|
249
|
-
|
|
249
|
+
this.opts.logger.error('All events in the batch have failed. Please check the system.');
|
|
250
250
|
});
|
|
251
251
|
}
|
|
252
252
|
scheduleWorker() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/directory-sync/batch-events/queue.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/directory-sync/batch-events/queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { IEventController, DB, JacksonOptionWithRequiredLogger } from '../typings';
|
|
2
2
|
import { DirectoryConfig } from './scim/DirectoryConfig';
|
|
3
3
|
import { Users } from './scim/Users';
|
|
4
4
|
import { Groups } from './scim/Groups';
|
|
@@ -7,7 +7,7 @@ import { WebhookEventsLogger } from './scim/WebhookEventsLogger';
|
|
|
7
7
|
import { EventProcessor } from './batch-events/queue';
|
|
8
8
|
declare const directorySync: (params: {
|
|
9
9
|
db: DB;
|
|
10
|
-
opts:
|
|
10
|
+
opts: JacksonOptionWithRequiredLogger;
|
|
11
11
|
eventController: IEventController;
|
|
12
12
|
}) => Promise<{
|
|
13
13
|
users: Users;
|
|
@@ -47,8 +47,8 @@ const directorySync = (params) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
47
47
|
// Batch send events
|
|
48
48
|
const eventStore = db.store(utils_2.storeNamespacePrefix.dsync.events);
|
|
49
49
|
const lockStore = db.store(utils_2.storeNamespacePrefix.dsync.lock, utils_3.eventLockTTL);
|
|
50
|
-
const eventLock = new lock_1.CronLock({ key: utils_3.eventLockKey, lockStore });
|
|
51
|
-
const googleLock = new lock_1.CronLock({ key: utils_3.googleLockKey, lockStore });
|
|
50
|
+
const eventLock = new lock_1.CronLock({ key: utils_3.eventLockKey, lockStore, opts });
|
|
51
|
+
const googleLock = new lock_1.CronLock({ key: utils_3.googleLockKey, lockStore, opts });
|
|
52
52
|
const eventProcessor = new queue_1.EventProcessor({
|
|
53
53
|
opts,
|
|
54
54
|
eventStore,
|
|
@@ -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,oEAAiE;AACjE,8CAAsD;AACtD,yCAA2C;AAC3C,+CAA2D;AAC3D,mCAAyF;AACzF,gDAAsD;AACtD,uCAAwC;AAExC,MAAM,aAAa,GAAG,CAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/directory-sync/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type { IDirectoryConfig, IUsers, IGroups, IRequestHandler,
|
|
1
|
+
import type { IDirectoryConfig, IUsers, IGroups, IRequestHandler, EventCallback, CronLock, JacksonOptionWithRequiredLogger } from '../../typings';
|
|
2
2
|
interface SyncParams {
|
|
3
3
|
userController: IUsers;
|
|
4
4
|
groupController: IGroups;
|
|
5
|
-
opts:
|
|
5
|
+
opts: JacksonOptionWithRequiredLogger;
|
|
6
6
|
directories: IDirectoryConfig;
|
|
7
7
|
requestHandler: IRequestHandler;
|
|
8
8
|
eventCallback: EventCallback;
|
|
@@ -36,7 +36,7 @@ class SyncProviders {
|
|
|
36
36
|
startSync() {
|
|
37
37
|
return __awaiter(this, void 0, void 0, function* () {
|
|
38
38
|
if (isJobRunning) {
|
|
39
|
-
|
|
39
|
+
this.opts.logger.info('A sync process is already running, skipping.');
|
|
40
40
|
return;
|
|
41
41
|
}
|
|
42
42
|
if (!(yield this.eventLock.acquire())) {
|
|
@@ -47,7 +47,7 @@ class SyncProviders {
|
|
|
47
47
|
const startTime = Date.now();
|
|
48
48
|
try {
|
|
49
49
|
const allDirectories = yield provider.getDirectories();
|
|
50
|
-
|
|
50
|
+
this.opts.logger.info(`Starting the sync process for ${allDirectories.length} directories`);
|
|
51
51
|
for (const directory of allDirectories) {
|
|
52
52
|
const params = {
|
|
53
53
|
directory,
|
|
@@ -63,11 +63,11 @@ class SyncProviders {
|
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
catch (e) {
|
|
66
|
-
|
|
66
|
+
this.opts.logger.error(' Error processing Google sync:', e);
|
|
67
67
|
}
|
|
68
68
|
yield this.eventLock.release();
|
|
69
69
|
const endTime = Date.now();
|
|
70
|
-
|
|
70
|
+
this.opts.logger.info(`Sync process completed in ${(endTime - startTime) / 1000} seconds`);
|
|
71
71
|
isJobRunning = false;
|
|
72
72
|
if (this.cronInterval) {
|
|
73
73
|
this.scheduleSync();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/directory-sync/non-scim/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA6C;AAU7C,2CAAwC;AACxC,6CAA0C;AAC1C,yDAAsD;AAYtD,IAAI,YAAY,GAAG,KAAK,CAAC;AACzB,IAAI,UAA0B,CAAC;AAE/B,MAAa,aAAa;IAUxB,YAAY,EACV,cAAc,EACd,eAAe,EACf,IAAI,EACJ,WAAW,EACX,cAAc,EACd,aAAa,EACb,SAAS,GACE;;QACX,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,YAAY,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,SAAS,0CAAE,MAAM,CAAC,YAAY,CAAC;QACpE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;IAED,yBAAyB;IACZ,SAAS;;YACpB,IAAI,YAAY,EAAE,CAAC;gBACjB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/directory-sync/non-scim/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -527,7 +527,7 @@ class DirectoryConfig {
|
|
|
527
527
|
transform(directory) {
|
|
528
528
|
var _a, _b;
|
|
529
529
|
if (directory.scim.path) {
|
|
530
|
-
// Add the flag to ensure SCIM compliance when using
|
|
530
|
+
// Add the flag to ensure SCIM compliance when using Entra ID
|
|
531
531
|
if (directory.type === 'azure-scim-v2') {
|
|
532
532
|
directory.scim.path = `${directory.scim.path}/?aadOptscim062020`;
|
|
533
533
|
}
|
|
@@ -21,7 +21,7 @@ export type IEventProcessor = InstanceType<typeof EventProcessor>;
|
|
|
21
21
|
export type CronLock = InstanceType<typeof Lock>;
|
|
22
22
|
export type DirectorySyncEventType = 'user.created' | 'user.updated' | 'user.deleted' | 'group.created' | 'group.updated' | 'group.deleted' | 'group.user_added' | 'group.user_removed';
|
|
23
23
|
export declare enum DirectorySyncProviders {
|
|
24
|
-
'azure-scim-v2' = "
|
|
24
|
+
'azure-scim-v2' = "Entra ID SCIM v2.0",
|
|
25
25
|
'onelogin-scim-v2' = "OneLogin SCIM v2.0",
|
|
26
26
|
'okta-scim-v2' = "Okta SCIM v2.0",
|
|
27
27
|
'jumpcloud-scim-v2' = "JumpCloud v2.0",
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DirectorySyncProviders = void 0;
|
|
4
4
|
var DirectorySyncProviders;
|
|
5
5
|
(function (DirectorySyncProviders) {
|
|
6
|
-
DirectorySyncProviders["azure-scim-v2"] = "
|
|
6
|
+
DirectorySyncProviders["azure-scim-v2"] = "Entra ID SCIM v2.0";
|
|
7
7
|
DirectorySyncProviders["onelogin-scim-v2"] = "OneLogin SCIM v2.0";
|
|
8
8
|
DirectorySyncProviders["okta-scim-v2"] = "Okta SCIM v2.0";
|
|
9
9
|
DirectorySyncProviders["jumpcloud-scim-v2"] = "JumpCloud v2.0";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/directory-sync/types.ts"],"names":[],"mappings":";;;AAiCA,IAAY,sBAOX;AAPD,WAAY,sBAAsB;IAChC,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/directory-sync/types.ts"],"names":[],"mappings":";;;AAiCA,IAAY,sBAOX;AAPD,WAAY,sBAAsB;IAChC,8DAAsC,CAAA;IACtC,iEAAyC,CAAA;IACzC,yDAAiC,CAAA;IACjC,8DAAsC,CAAA;IACtC,+DAAuC,CAAA;IACvC,2CAAmB,CAAA;AACrB,CAAC,EAPW,sBAAsB,sCAAtB,sBAAsB,QAOjC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { DirectorySyncEventType, Directory, User, Group, EventCallback, DirectorySyncEvent, IWebhookEventsLogger, IDirectoryConfig,
|
|
1
|
+
import type { DirectorySyncEventType, Directory, User, Group, EventCallback, DirectorySyncEvent, IWebhookEventsLogger, IDirectoryConfig, IEventProcessor, JacksonOptionWithRequiredLogger } from '../typings';
|
|
2
2
|
export declare const eventLockTTL = 30;
|
|
3
3
|
export declare const webhookLogsTTL: number;
|
|
4
4
|
export declare const eventLockKey = "dsync-event-lock";
|
|
@@ -9,7 +9,7 @@ interface Payload {
|
|
|
9
9
|
user?: User | null;
|
|
10
10
|
}
|
|
11
11
|
interface EventCallbackParams {
|
|
12
|
-
opts:
|
|
12
|
+
opts: JacksonOptionWithRequiredLogger;
|
|
13
13
|
directories: IDirectoryConfig;
|
|
14
14
|
eventProcessor: IEventProcessor;
|
|
15
15
|
webhookLogs: IWebhookEventsLogger;
|