@boxyhq/saml-jackson 1.5.0 → 1.6.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/setup-link.d.ts +1 -1
- package/dist/controller/setup-link.js +13 -5
- package/dist/controller/setup-link.js.map +1 -1
- package/dist/db/db.d.ts +1 -1
- package/dist/db/db.js +2 -2
- package/dist/db/db.js.map +1 -1
- package/dist/db/mem.d.ts +2 -2
- package/dist/db/mem.js +21 -4
- package/dist/db/mem.js.map +1 -1
- package/dist/db/mongo.d.ts +2 -2
- package/dist/db/mongo.js +14 -8
- package/dist/db/mongo.js.map +1 -1
- package/dist/db/redis.d.ts +2 -2
- package/dist/db/redis.js +57 -5
- package/dist/db/redis.js.map +1 -1
- package/dist/db/sql/sql.d.ts +2 -2
- package/dist/db/sql/sql.js +19 -9
- package/dist/db/sql/sql.js.map +1 -1
- package/dist/db/store.js +2 -2
- package/dist/db/store.js.map +1 -1
- package/dist/typings.d.ts +11 -3
- package/dist/typings.js +1 -1
- package/dist/typings.js.map +1 -1
- package/package.json +5 -10
@@ -6,7 +6,7 @@ export declare class SetupLinkController {
|
|
6
6
|
});
|
7
7
|
create(body: SetupLinkCreatePayload): Promise<SetupLink>;
|
8
8
|
getByToken(token: string): Promise<SetupLink>;
|
9
|
-
getByService(service: string): Promise<SetupLink[]>;
|
9
|
+
getByService(service: string, pageOffset?: number, pageLimit?: number): Promise<SetupLink[]>;
|
10
10
|
remove(key: string): Promise<boolean>;
|
11
11
|
isExpired(setupLink: SetupLink): boolean;
|
12
12
|
}
|
@@ -47,8 +47,12 @@ class SetupLinkController {
|
|
47
47
|
// Create a new setup link
|
48
48
|
create(body) {
|
49
49
|
return __awaiter(this, void 0, void 0, function* () {
|
50
|
-
const { tenant, product, service, regenerate } = body;
|
50
|
+
const { tenant, product, service, name, description, defaultRedirectUrl, regenerate, redirectUrl } = body;
|
51
51
|
(0, utils_1.validateTenantAndProduct)(tenant, product);
|
52
|
+
if (defaultRedirectUrl || redirectUrl) {
|
53
|
+
const redirectUrlList = (0, utils_1.extractRedirectUrls)(redirectUrl || '');
|
54
|
+
(0, utils_1.validateRedirectUrl)({ defaultRedirectUrl, redirectUrlList });
|
55
|
+
}
|
52
56
|
const setupID = dbutils.keyDigest(dbutils.keyFromParts(tenant, product, service));
|
53
57
|
const token = crypto_1.default.randomBytes(24).toString('hex');
|
54
58
|
const existing = yield this.setupLinkStore.getByIndex({
|
@@ -67,6 +71,10 @@ class SetupLinkController {
|
|
67
71
|
tenant,
|
68
72
|
product,
|
69
73
|
service,
|
74
|
+
name,
|
75
|
+
description,
|
76
|
+
redirectUrl,
|
77
|
+
defaultRedirectUrl,
|
70
78
|
validTill: +new Date(new Date().setDate(new Date().getDate() + 3)),
|
71
79
|
url: `${process.env.NEXTAUTH_URL}/setup/${token}`,
|
72
80
|
};
|
@@ -103,16 +111,16 @@ class SetupLinkController {
|
|
103
111
|
});
|
104
112
|
}
|
105
113
|
// Get setup links by service
|
106
|
-
getByService(service) {
|
114
|
+
getByService(service, pageOffset, pageLimit) {
|
107
115
|
return __awaiter(this, void 0, void 0, function* () {
|
108
116
|
if (!service) {
|
109
117
|
throw new error_1.JacksonError('Missing service name', 400);
|
110
118
|
}
|
111
|
-
const
|
119
|
+
const setupLinks = yield this.setupLinkStore.getByIndex({
|
112
120
|
name: utils_1.IndexNames.Service,
|
113
121
|
value: service,
|
114
|
-
});
|
115
|
-
return
|
122
|
+
}, pageOffset, pageLimit);
|
123
|
+
return setupLinks;
|
116
124
|
});
|
117
125
|
}
|
118
126
|
// Remove a setup link
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"setup-link.js","sourceRoot":"","sources":["../../src/controller/setup-link.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qDAAuC;AACvC,
|
1
|
+
{"version":3,"file":"setup-link.js","sourceRoot":"","sources":["../../src/controller/setup-link.ts"],"names":[],"mappings":"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"}
|
package/dist/db/db.d.ts
CHANGED
@@ -5,7 +5,7 @@ declare class DB implements DatabaseDriver {
|
|
5
5
|
constructor(db: DatabaseDriver, encryptionKey: EncryptionKey);
|
6
6
|
get(namespace: string, key: string): Promise<unknown>;
|
7
7
|
getAll(namespace: any, pageOffset: any, pageLimit: any): Promise<unknown[]>;
|
8
|
-
getByIndex(namespace: string, idx: Index): Promise<unknown[]>;
|
8
|
+
getByIndex(namespace: string, idx: Index, pageOffset?: number, pageLimit?: number): Promise<unknown[]>;
|
9
9
|
put(namespace: string, key: string, val: unknown, ttl?: number, ...indexes: Index[]): Promise<unknown>;
|
10
10
|
delete(namespace: string, key: string): Promise<unknown>;
|
11
11
|
store(namespace: string, ttl?: number): Storable;
|
package/dist/db/db.js
CHANGED
@@ -79,9 +79,9 @@ class DB {
|
|
79
79
|
});
|
80
80
|
});
|
81
81
|
}
|
82
|
-
getByIndex(namespace, idx) {
|
82
|
+
getByIndex(namespace, idx, pageOffset, pageLimit) {
|
83
83
|
return __awaiter(this, void 0, void 0, function* () {
|
84
|
-
const res = yield this.db.getByIndex(namespace, idx);
|
84
|
+
const res = yield this.db.getByIndex(namespace, idx, pageOffset, pageLimit);
|
85
85
|
const encryptionKey = this.encryptionKey;
|
86
86
|
return res.map((r) => {
|
87
87
|
return decrypt(r, encryptionKey);
|
package/dist/db/db.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/db/db.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uDAAyC;AACzC,gDAAwB;AACxB,oDAA4B;AAC5B,oDAA4B;AAC5B,oDAA4B;AAC5B,oDAA4B;AAE5B,4DAAyD;AACzD,4DAAyD;AACzD,wDAAqD;AAErD,oEAA4F;AAC5F,oEAA4F;AAC5F,gEAAsF;AAEtF,kEAAoF;AACpF,kEAAoF;AACpF,8DAA8E;AAE9E,MAAM,OAAO,GAAG,CAAC,GAAc,EAAE,aAA4B,EAAW,EAAE;IACxE,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC;KACjF;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,EAAE;IAGN,YAAY,EAAkB,EAAE,aAA4B;QAC1D,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAEK,GAAG,CAAC,SAAiB,EAAE,GAAW;;YACtC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YAE9C,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO,IAAI,CAAC;aACb;YAED,OAAO,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1C,CAAC;KAAA;IAEK,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS;;YAC3C,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAgB,CAAC;YACpF,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;YACzC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACnB,OAAO,OAAO,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAEK,UAAU,
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/db/db.ts"],"names":[],"mappings":"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"}
|
package/dist/db/mem.d.ts
CHANGED
@@ -10,8 +10,8 @@ declare class Mem implements DatabaseDriver {
|
|
10
10
|
constructor(options: DatabaseOption);
|
11
11
|
init(): Promise<Mem>;
|
12
12
|
get(namespace: string, key: string): Promise<any>;
|
13
|
-
getAll(namespace: string, pageOffset
|
14
|
-
getByIndex(namespace: string, idx: Index): Promise<any>;
|
13
|
+
getAll(namespace: string, pageOffset?: number, pageLimit?: number): Promise<unknown[]>;
|
14
|
+
getByIndex(namespace: string, idx: Index, pageOffset?: number, pageLimit?: number): Promise<any>;
|
15
15
|
put(namespace: string, key: string, val: Encrypted, ttl?: number, ...indexes: any[]): Promise<any>;
|
16
16
|
delete(namespace: string, key: string): Promise<any>;
|
17
17
|
}
|
package/dist/db/mem.js
CHANGED
@@ -98,12 +98,29 @@ class Mem {
|
|
98
98
|
return returnValue || [];
|
99
99
|
});
|
100
100
|
}
|
101
|
-
getByIndex(namespace, idx) {
|
101
|
+
getByIndex(namespace, idx, pageOffset, pageLimit) {
|
102
102
|
return __awaiter(this, void 0, void 0, function* () {
|
103
|
-
const
|
103
|
+
const offsetAndLimitValueCheck = !dbutils.isNumeric(pageOffset) && !dbutils.isNumeric(pageLimit);
|
104
|
+
const skip = Number(offsetAndLimitValueCheck ? 0 : pageOffset);
|
105
|
+
let take = Number(offsetAndLimitValueCheck ? this.options.pageLimit : pageLimit);
|
106
|
+
let count = 0;
|
107
|
+
take += skip;
|
108
|
+
const dbKeys = Array.from((yield this.indexes[dbutils.keyForIndex(namespace, idx)]) || []);
|
109
|
+
const iterator = dbKeys.reverse().values();
|
104
110
|
const ret = [];
|
105
|
-
for (const dbKey of
|
106
|
-
|
111
|
+
for (const dbKey of iterator || []) {
|
112
|
+
if (offsetAndLimitValueCheck) {
|
113
|
+
ret.push(yield this.get(namespace, dbKey));
|
114
|
+
}
|
115
|
+
else {
|
116
|
+
if (count >= take) {
|
117
|
+
break;
|
118
|
+
}
|
119
|
+
if (count >= skip) {
|
120
|
+
ret.push(yield this.get(namespace, dbKey));
|
121
|
+
}
|
122
|
+
count++;
|
123
|
+
}
|
107
124
|
}
|
108
125
|
return ret;
|
109
126
|
});
|
package/dist/db/mem.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mem.js","sourceRoot":"","sources":["../../src/db/mem.ts"],"names":[],"mappings":";AAAA,mFAAmF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGnF,iDAAmC;AAEnC,MAAM,GAAG;IASP,YAAY,OAAuB;QACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEK,IAAI;;YACR,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,oBAAoB;YACrC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,kBAAkB;YACrC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,uDAAuD;YAC1E,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,oBAAoB;YAExC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;gBACpB,IAAI,CAAC,UAAU,GAAG,GAAS,EAAE;oBAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBACvB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;wBAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,EAAE;4BACpC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;yBACrE;qBACF;oBAED,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;wBACpB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;qBACrE;gBACH,CAAC,CAAA,CAAC;gBAEF,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;aACrE;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEK,GAAG,CAAC,SAAiB,EAAE,GAAW;;YACtC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;YACpD,IAAI,GAAG,EAAE;gBACP,OAAO,GAAG,CAAC;aACZ;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEK,MAAM,CAAC,SAAiB,EAAE,
|
1
|
+
{"version":3,"file":"mem.js","sourceRoot":"","sources":["../../src/db/mem.ts"],"names":[],"mappings":"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"}
|
package/dist/db/mongo.d.ts
CHANGED
@@ -7,8 +7,8 @@ declare class Mongo implements DatabaseDriver {
|
|
7
7
|
constructor(options: DatabaseOption);
|
8
8
|
init(): Promise<Mongo>;
|
9
9
|
get(namespace: string, key: string): Promise<any>;
|
10
|
-
getAll(namespace: string,
|
11
|
-
getByIndex(namespace: string, idx: Index): Promise<any>;
|
10
|
+
getAll(namespace: string, pageOffset?: number, pageLimit?: number): Promise<unknown[]>;
|
11
|
+
getByIndex(namespace: string, idx: Index, offset?: number, limit?: number): Promise<any>;
|
12
12
|
put(namespace: string, key: string, val: Encrypted, ttl?: number, ...indexes: any[]): Promise<void>;
|
13
13
|
delete(namespace: string, key: string): Promise<any>;
|
14
14
|
}
|
package/dist/db/mongo.js
CHANGED
@@ -61,11 +61,11 @@ class Mongo {
|
|
61
61
|
return null;
|
62
62
|
});
|
63
63
|
}
|
64
|
-
getAll(namespace,
|
64
|
+
getAll(namespace, pageOffset, pageLimit) {
|
65
65
|
return __awaiter(this, void 0, void 0, function* () {
|
66
66
|
const _namespaceMatch = new RegExp(`^${namespace}:.*`);
|
67
67
|
const docs = yield this.collection
|
68
|
-
.find({ _id: _namespaceMatch }, { sort: { createdAt: -1 }, skip:
|
68
|
+
.find({ _id: _namespaceMatch }, { sort: { createdAt: -1 }, skip: pageOffset, limit: pageLimit })
|
69
69
|
.toArray();
|
70
70
|
if (docs) {
|
71
71
|
return docs.map(({ value }) => value);
|
@@ -73,13 +73,19 @@ class Mongo {
|
|
73
73
|
return [];
|
74
74
|
});
|
75
75
|
}
|
76
|
-
getByIndex(namespace, idx) {
|
76
|
+
getByIndex(namespace, idx, offset, limit) {
|
77
77
|
return __awaiter(this, void 0, void 0, function* () {
|
78
|
-
const docs =
|
79
|
-
.
|
80
|
-
|
81
|
-
|
82
|
-
|
78
|
+
const docs = dbutils.isNumeric(offset) && dbutils.isNumeric(limit)
|
79
|
+
? yield this.collection
|
80
|
+
.find({
|
81
|
+
indexes: dbutils.keyForIndex(namespace, idx),
|
82
|
+
}, { sort: { createdAt: -1 }, skip: offset, limit: limit })
|
83
|
+
.toArray()
|
84
|
+
: yield this.collection
|
85
|
+
.find({
|
86
|
+
indexes: dbutils.keyForIndex(namespace, idx),
|
87
|
+
})
|
88
|
+
.toArray();
|
83
89
|
const ret = [];
|
84
90
|
for (const doc of docs || []) {
|
85
91
|
ret.push(doc.value);
|
package/dist/db/mongo.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mongo.js","sourceRoot":"","sources":["../../src/db/mongo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAqE;AAErE,iDAAmC;AASnC,MAAM,KAAK;IAMT,YAAY,OAAuB;QACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEK,IAAI;;YACR,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAa,CAAC;YACzC,IAAI,CAAC,MAAM,GAAG,IAAI,qBAAW,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAE5B,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YAC3B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAErD,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;YAClD,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC;YAE/E,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEK,GAAG,CAAC,SAAiB,EAAE,GAAW;;YACtC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBACxC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC;aACjC,CAAC,CAAC;YACH,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE;gBACpB,OAAO,GAAG,CAAC,KAAK,CAAC;aAClB;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEK,MAAM,CAAC,SAAiB,EAAE,
|
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
@@ -5,8 +5,8 @@ declare class Redis implements DatabaseDriver {
|
|
5
5
|
constructor(options: DatabaseOption);
|
6
6
|
init(): Promise<Redis>;
|
7
7
|
get(namespace: string, key: string): Promise<any>;
|
8
|
-
getAll(namespace: string, pageOffset
|
9
|
-
getByIndex(namespace: string, idx: Index): Promise<any>;
|
8
|
+
getAll(namespace: string, pageOffset?: number, pageLimit?: number): Promise<unknown[]>;
|
9
|
+
getByIndex(namespace: string, idx: Index, pageOffset?: number, pageLimit?: number): Promise<any>;
|
10
10
|
put(namespace: string, key: string, val: Encrypted, ttl?: number, ...indexes: any[]): Promise<void>;
|
11
11
|
delete(namespace: string, key: string): Promise<any>;
|
12
12
|
}
|
package/dist/db/redis.js
CHANGED
@@ -116,15 +116,67 @@ class Redis {
|
|
116
116
|
return returnValue || [];
|
117
117
|
});
|
118
118
|
}
|
119
|
-
getByIndex(namespace, idx) {
|
119
|
+
getByIndex(namespace, idx, pageOffset, pageLimit) {
|
120
|
+
var _a, e_2, _b, _c;
|
120
121
|
return __awaiter(this, void 0, void 0, function* () {
|
122
|
+
const offsetAndLimitValueCheck = !dbutils.isNumeric(pageOffset) && !dbutils.isNumeric(pageLimit);
|
123
|
+
let take = Number(offsetAndLimitValueCheck ? this.options.pageLimit : pageLimit);
|
124
|
+
const skip = Number(offsetAndLimitValueCheck ? 0 : pageOffset);
|
125
|
+
let count = 0;
|
126
|
+
take += skip;
|
127
|
+
const returnValue = [];
|
128
|
+
const keyArray = [];
|
121
129
|
const idxKey = dbutils.keyForIndex(namespace, idx);
|
122
130
|
const dbKeys = yield this.client.sMembers(dbutils.keyFromParts(dbutils.indexPrefix, idxKey));
|
123
|
-
|
124
|
-
|
125
|
-
|
131
|
+
if (!offsetAndLimitValueCheck) {
|
132
|
+
try {
|
133
|
+
for (var _d = true, _e = __asyncValues(this.client.zScanIterator(dbutils.keyFromParts(dbutils.createdAtPrefix, namespace), count + 1)), _f; _f = yield _e.next(), _a = _f.done, !_a;) {
|
134
|
+
_c = _f.value;
|
135
|
+
_d = false;
|
136
|
+
try {
|
137
|
+
const { _, value } = _c;
|
138
|
+
if (dbKeys.indexOf(value) !== -1) {
|
139
|
+
if (count >= take) {
|
140
|
+
break;
|
141
|
+
}
|
142
|
+
if (count >= skip) {
|
143
|
+
keyArray.push(dbutils.keyFromParts(namespace, value));
|
144
|
+
}
|
145
|
+
count++;
|
146
|
+
}
|
147
|
+
}
|
148
|
+
finally {
|
149
|
+
_d = true;
|
150
|
+
}
|
151
|
+
}
|
152
|
+
}
|
153
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
154
|
+
finally {
|
155
|
+
try {
|
156
|
+
if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
|
157
|
+
}
|
158
|
+
finally { if (e_2) throw e_2.error; }
|
159
|
+
}
|
160
|
+
if (keyArray.length > 0) {
|
161
|
+
const value = yield this.client.MGET(keyArray);
|
162
|
+
for (let i = 0; i < value.length; i++) {
|
163
|
+
const valueObject = JSON.parse(value[i].toString());
|
164
|
+
if (valueObject !== null && valueObject !== '') {
|
165
|
+
returnValue.push(valueObject);
|
166
|
+
}
|
167
|
+
}
|
168
|
+
}
|
169
|
+
return returnValue || [];
|
170
|
+
}
|
171
|
+
else {
|
172
|
+
const ret = [];
|
173
|
+
for (const dbKey of dbKeys || []) {
|
174
|
+
if (offsetAndLimitValueCheck) {
|
175
|
+
ret.push(yield this.get(namespace, dbKey));
|
176
|
+
}
|
177
|
+
}
|
178
|
+
return ret;
|
126
179
|
}
|
127
|
-
return ret;
|
128
180
|
});
|
129
181
|
}
|
130
182
|
put(namespace, key, val, ttl = 0, ...indexes) {
|
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;AAE/B,iDAAmC;AAEnC,MAAM,KAAK;IAIT,YAAY,OAAuB;QACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEK,IAAI;;YACR,MAAM,IAAI,GAAG,EAAE,CAAC;YAEhB,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;gBACpC,IAAI,CAAC,QAAQ,CAAC,GAAG;oBACf,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;iBACtB,CAAC;aACH;YAED,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC,CAAC;YAE/E,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAE5B,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEK,GAAG,CAAC,SAAiB,EAAE,GAAW;;YACtC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;YAC/D,IAAI,GAAG,EAAE;gBACP,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACxB;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEK,MAAM,CAAC,SAAiB,EAAE,
|
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
@@ -17,8 +17,8 @@ declare class Sql implements DatabaseDriver {
|
|
17
17
|
JacksonTTL: any;
|
18
18
|
}): Promise<Sql>;
|
19
19
|
get(namespace: string, key: string): Promise<any>;
|
20
|
-
getAll(namespace: string, pageOffset
|
21
|
-
getByIndex(namespace: string, idx: Index): Promise<any>;
|
20
|
+
getAll(namespace: string, pageOffset?: number, pageLimit?: number): Promise<unknown[]>;
|
21
|
+
getByIndex(namespace: string, idx: Index, pageOffset?: number, pageLimit?: number): Promise<any>;
|
22
22
|
put(namespace: string, key: string, val: Encrypted, ttl?: number, ...indexes: any[]): Promise<void>;
|
23
23
|
delete(namespace: string, key: string): Promise<any>;
|
24
24
|
}
|
package/dist/db/sql/sql.js
CHANGED
@@ -122,24 +122,34 @@ class Sql {
|
|
122
122
|
}
|
123
123
|
getAll(namespace, pageOffset, pageLimit) {
|
124
124
|
return __awaiter(this, void 0, void 0, function* () {
|
125
|
-
const
|
126
|
-
const
|
125
|
+
const skipOffsetAndLimitValue = !dbutils.isNumeric(pageOffset) && !dbutils.isNumeric(pageLimit);
|
126
|
+
const res = yield this.storeRepository.find({
|
127
127
|
where: { key: (0, typeorm_1.Like)(`%${namespace}%`) },
|
128
128
|
select: ['value', 'iv', 'tag'],
|
129
129
|
order: {
|
130
130
|
['createdAt']: 'DESC',
|
131
131
|
},
|
132
|
-
take:
|
133
|
-
skip:
|
132
|
+
take: skipOffsetAndLimitValue ? this.options.pageLimit : pageLimit,
|
133
|
+
skip: skipOffsetAndLimitValue ? 0 : pageOffset,
|
134
134
|
});
|
135
|
-
return JSON.parse(JSON.stringify(
|
135
|
+
return JSON.parse(JSON.stringify(res)) || [];
|
136
136
|
});
|
137
137
|
}
|
138
|
-
getByIndex(namespace, idx) {
|
138
|
+
getByIndex(namespace, idx, pageOffset, pageLimit) {
|
139
139
|
return __awaiter(this, void 0, void 0, function* () {
|
140
|
-
const
|
141
|
-
|
142
|
-
|
140
|
+
const skipOffsetAndLimitValue = !dbutils.isNumeric(pageOffset) && !dbutils.isNumeric(pageLimit);
|
141
|
+
const res = skipOffsetAndLimitValue
|
142
|
+
? yield this.indexRepository.findBy({
|
143
|
+
key: dbutils.keyForIndex(namespace, idx),
|
144
|
+
})
|
145
|
+
: yield this.indexRepository.find({
|
146
|
+
where: { key: dbutils.keyForIndex(namespace, idx) },
|
147
|
+
take: skipOffsetAndLimitValue ? this.options.pageLimit : pageLimit,
|
148
|
+
skip: skipOffsetAndLimitValue ? 0 : pageOffset,
|
149
|
+
order: {
|
150
|
+
['id']: 'DESC',
|
151
|
+
},
|
152
|
+
});
|
143
153
|
const ret = [];
|
144
154
|
if (res) {
|
145
155
|
for (const r of res) {
|
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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"}
|
package/dist/db/store.js
CHANGED
@@ -49,10 +49,10 @@ class Store {
|
|
49
49
|
return yield this.db.getAll(this.namespace, pageOffset, pageLimit);
|
50
50
|
});
|
51
51
|
}
|
52
|
-
getByIndex(idx) {
|
52
|
+
getByIndex(idx, pageOffset, pageLimit) {
|
53
53
|
return __awaiter(this, void 0, void 0, function* () {
|
54
54
|
idx.value = dbutils.keyDigest(idx.value);
|
55
|
-
return yield this.db.getByIndex(this.namespace, idx);
|
55
|
+
return yield this.db.getByIndex(this.namespace, idx, pageOffset, pageLimit);
|
56
56
|
});
|
57
57
|
}
|
58
58
|
put(key, val, ...indexes) {
|
package/dist/db/store.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/db/store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iDAAmC;AAEnC,MAAM,KAAK;IAKT,YAAY,SAAiB,EAAE,EAAO,EAAE,GAAG,GAAG,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAEK,GAAG,CAAC,GAAW;;YACnB,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,CAAC;KAAA;IAEK,MAAM,CAAC,UAAmB,EAAE,SAAkB;;YAClD,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QACrE,CAAC;KAAA;IAEK,UAAU,CAAC,GAAU;;
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/db/store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iDAAmC;AAEnC,MAAM,KAAK;IAKT,YAAY,SAAiB,EAAE,EAAO,EAAE,GAAG,GAAG,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAEK,GAAG,CAAC,GAAW;;YACnB,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,CAAC;KAAA;IAEK,MAAM,CAAC,UAAmB,EAAE,SAAkB;;YAClD,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QACrE,CAAC;KAAA;IAEK,UAAU,CAAC,GAAU,EAAE,UAAmB,EAAE,SAAkB;;YAClE,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEzC,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAC9E,CAAC;KAAA;IAEK,GAAG,CAAC,GAAW,EAAE,GAAQ,EAAE,GAAG,OAAgB;;YAClD,OAAO,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACpC,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACzC,OAAO,GAAG,CAAC;YACb,CAAC,CAAC,CAAC;YAEH,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC;QAC9F,CAAC;KAAA;IAEK,MAAM,CAAC,GAAW;;YACtB,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,CAAC;KAAA;CACF;AAED,kBAAe;IACb,GAAG,EAAE,CAAC,SAAiB,EAAE,EAAO,EAAE,GAAG,GAAG,CAAC,EAAY,EAAE;QACrD,OAAO,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;CACF,CAAC"}
|
package/dist/typings.d.ts
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import { type JWK } from 'jose';
|
2
|
-
export * from '
|
2
|
+
export * from './ee/federated-saml/types';
|
3
3
|
interface SSOConnection {
|
4
4
|
defaultRedirectUrl: string;
|
5
5
|
redirectUrl: string[] | string;
|
@@ -252,14 +252,14 @@ export interface DatabaseDriver {
|
|
252
252
|
get(namespace: string, key: string): Promise<any>;
|
253
253
|
put(namespace: string, key: string, val: any, ttl: number, ...indexes: Index[]): Promise<any>;
|
254
254
|
delete(namespace: string, key: string): Promise<any>;
|
255
|
-
getByIndex(namespace: string, idx: Index): Promise<any>;
|
255
|
+
getByIndex(namespace: string, idx: Index, pageOffset?: number, pageLimit?: number): Promise<any>;
|
256
256
|
}
|
257
257
|
export interface Storable {
|
258
258
|
getAll(pageOffset?: number, pageLimit?: number): Promise<any[]>;
|
259
259
|
get(key: string): Promise<any>;
|
260
260
|
put(key: string, val: any, ...indexes: Index[]): Promise<any>;
|
261
261
|
delete(key: string): Promise<any>;
|
262
|
-
getByIndex(idx: Index): Promise<any>;
|
262
|
+
getByIndex(idx: Index, pageOffset?: number, pageLimit?: number): Promise<any>;
|
263
263
|
}
|
264
264
|
export interface DatabaseStore {
|
265
265
|
store(namespace: string): Storable;
|
@@ -627,12 +627,20 @@ export interface WebhookEventLog extends DirectorySyncEvent {
|
|
627
627
|
export type SetupLinkCreatePayload = {
|
628
628
|
tenant: string;
|
629
629
|
product: string;
|
630
|
+
name?: string;
|
631
|
+
description?: string;
|
632
|
+
defaultRedirectUrl?: string;
|
633
|
+
redirectUrl?: string;
|
630
634
|
service: SetupLinkService;
|
631
635
|
regenerate?: boolean;
|
632
636
|
};
|
633
637
|
export type SetupLink = {
|
634
638
|
setupID: string;
|
635
639
|
tenant: string;
|
640
|
+
name?: string;
|
641
|
+
description?: string;
|
642
|
+
defaultRedirectUrl?: string;
|
643
|
+
redirectUrl?: string;
|
636
644
|
product: string;
|
637
645
|
url: string;
|
638
646
|
service: SetupLinkService;
|
package/dist/typings.js
CHANGED
@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
15
15
|
};
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
17
17
|
exports.DirectorySyncProviders = void 0;
|
18
|
-
__exportStar(require("
|
18
|
+
__exportStar(require("./ee/federated-saml/types"), exports);
|
19
19
|
var DirectorySyncProviders;
|
20
20
|
(function (DirectorySyncProviders) {
|
21
21
|
DirectorySyncProviders["azure-scim-v2"] = "Azure SCIM v2.0";
|
package/dist/typings.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"typings.js","sourceRoot":"","sources":["../src/typings.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,
|
1
|
+
{"version":3,"file":"typings.js","sourceRoot":"","sources":["../src/typings.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,4DAA0C;AA0f1C,IAAY,sBAMX;AAND,WAAY,sBAAsB;IAChC,2DAAmC,CAAA;IACnC,iEAAyC,CAAA;IACzC,yDAAiC,CAAA;IACjC,8DAAsC,CAAA;IACtC,+DAAuC,CAAA;AACzC,CAAC,EANW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAMjC"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@boxyhq/saml-jackson",
|
3
|
-
"version": "1.
|
3
|
+
"version": "1.6.0",
|
4
4
|
"description": "SAML Jackson library",
|
5
5
|
"keywords": [
|
6
6
|
"SAML 2.0"
|
@@ -29,7 +29,7 @@
|
|
29
29
|
"db:migration:run:mariadb": "cross-env DB_TYPE=mariadb DB_URL=mariadb://root@localhost:3306/mysql ts-node --transpile-only ./node_modules/typeorm/cli.js migration:run -d typeorm.ts",
|
30
30
|
"db:migration:run:mssql": "cross-env DB_TYPE=mssql DB_URL='sqlserver://localhost:1433;database=master;username=sa;password=123ABabc!' ts-node --transpile-only ./node_modules/typeorm/cli.js migration:run -d typeorm.ts",
|
31
31
|
"prepublishOnly": "npm run build",
|
32
|
-
"test": "tap --ts --timeout=100 --coverage-map=map.js test/**/*.test.ts",
|
32
|
+
"test": "cross-env BOXYHQ_NO_ANALYTICS=1 tap --ts --timeout=100 --coverage-map=map.js test/**/*.test.ts",
|
33
33
|
"sort": "npx sort-package-json"
|
34
34
|
},
|
35
35
|
"tap": {
|
@@ -41,14 +41,14 @@
|
|
41
41
|
},
|
42
42
|
"dependencies": {
|
43
43
|
"@boxyhq/saml20": "1.1.0",
|
44
|
-
"@opentelemetry/api": "1.
|
44
|
+
"@opentelemetry/api": "1.4.0",
|
45
45
|
"axios": "1.2.2",
|
46
46
|
"jose": "4.11.2",
|
47
47
|
"marked": "4.2.5",
|
48
48
|
"mixpanel": "0.17.0",
|
49
49
|
"mongodb": "4.13.0",
|
50
50
|
"mssql": "9.0.1",
|
51
|
-
"mysql2": "
|
51
|
+
"mysql2": "3.0.0",
|
52
52
|
"node-forge": "1.3.1",
|
53
53
|
"openid-client": "5.3.1",
|
54
54
|
"pg": "8.8.0",
|
@@ -64,14 +64,9 @@
|
|
64
64
|
"@types/node": "18.11.18",
|
65
65
|
"@types/sinon": "10.0.13",
|
66
66
|
"@types/tap": "15.0.7",
|
67
|
-
"@typescript-eslint/eslint-plugin": "5.47.1",
|
68
|
-
"@typescript-eslint/parser": "5.47.1",
|
69
67
|
"cross-env": "7.0.3",
|
70
|
-
"eslint": "8.31.0",
|
71
|
-
"eslint-config-prettier": "8.5.0",
|
72
|
-
"prettier": "2.8.1",
|
73
68
|
"sinon": "15.0.1",
|
74
|
-
"tap": "16.3.
|
69
|
+
"tap": "16.3.3",
|
75
70
|
"ts-node": "10.9.1",
|
76
71
|
"tsconfig-paths": "4.1.2",
|
77
72
|
"typescript": "4.9.4"
|