@boxyhq/saml-jackson 1.35.0 → 1.36.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.
Files changed (89) hide show
  1. package/dist/controller/analytics.d.ts +3 -1
  2. package/dist/controller/analytics.js +3 -2
  3. package/dist/controller/analytics.js.map +1 -1
  4. package/dist/controller/api.d.ts +1 -3
  5. package/dist/controller/api.js +5 -6
  6. package/dist/controller/api.js.map +1 -1
  7. package/dist/controller/connection/oidc.d.ts +2 -3
  8. package/dist/controller/connection/oidc.js +2 -26
  9. package/dist/controller/connection/oidc.js.map +1 -1
  10. package/dist/controller/connection/saml.d.ts +2 -3
  11. package/dist/controller/connection/saml.js +4 -28
  12. package/dist/controller/connection/saml.js.map +1 -1
  13. package/dist/controller/error.d.ts +2 -1
  14. package/dist/controller/error.js +4 -1
  15. package/dist/controller/error.js.map +1 -1
  16. package/dist/controller/oauth/oidc-client.js +1 -1
  17. package/dist/controller/oauth/oidc-client.js.map +1 -1
  18. package/dist/controller/oauth.d.ts +3 -0
  19. package/dist/controller/oauth.js +212 -110
  20. package/dist/controller/oauth.js.map +1 -1
  21. package/dist/controller/sso-handler.d.ts +2 -2
  22. package/dist/controller/sso-handler.js +73 -65
  23. package/dist/controller/sso-handler.js.map +1 -1
  24. package/dist/controller/utils.d.ts +1 -0
  25. package/dist/controller/utils.js +6 -1
  26. package/dist/controller/utils.js.map +1 -1
  27. package/dist/cron/lock.d.ts +4 -2
  28. package/dist/cron/lock.js +4 -3
  29. package/dist/cron/lock.js.map +1 -1
  30. package/dist/db/db.d.ts +5 -2
  31. package/dist/db/db.js +10 -9
  32. package/dist/db/db.js.map +1 -1
  33. package/dist/db/dynamoDb.d.ts +3 -1
  34. package/dist/db/dynamoDb.js +9 -9
  35. package/dist/db/dynamoDb.js.map +1 -1
  36. package/dist/db/mem.d.ts +3 -1
  37. package/dist/db/mem.js +1 -1
  38. package/dist/db/mem.js.map +1 -1
  39. package/dist/db/mongo.d.ts +7 -3
  40. package/dist/db/mongo.js +5 -4
  41. package/dist/db/mongo.js.map +1 -1
  42. package/dist/db/redis.d.ts +7 -3
  43. package/dist/db/redis.js +4 -3
  44. package/dist/db/redis.js.map +1 -1
  45. package/dist/db/sql/sql.d.ts +7 -3
  46. package/dist/db/sql/sql.js +4 -3
  47. package/dist/db/sql/sql.js.map +1 -1
  48. package/dist/directory-sync/batch-events/queue.d.ts +2 -2
  49. package/dist/directory-sync/batch-events/queue.js +13 -13
  50. package/dist/directory-sync/batch-events/queue.js.map +1 -1
  51. package/dist/directory-sync/index.d.ts +2 -2
  52. package/dist/directory-sync/index.js +2 -2
  53. package/dist/directory-sync/index.js.map +1 -1
  54. package/dist/directory-sync/non-scim/google/oauth.js +6 -6
  55. package/dist/directory-sync/non-scim/google/oauth.js.map +1 -1
  56. package/dist/directory-sync/non-scim/index.d.ts +2 -2
  57. package/dist/directory-sync/non-scim/index.js +4 -4
  58. package/dist/directory-sync/non-scim/index.js.map +1 -1
  59. package/dist/directory-sync/utils.d.ts +2 -2
  60. package/dist/directory-sync/utils.js +3 -3
  61. package/dist/directory-sync/utils.js.map +1 -1
  62. package/dist/ee/identity-federation/idp-login.js +3 -3
  63. package/dist/ee/identity-federation/idp-login.js.map +1 -1
  64. package/dist/ee/identity-federation/index.d.ts +2 -2
  65. package/dist/ee/identity-federation/sso.d.ts +2 -2
  66. package/dist/ee/identity-federation/sso.js +4 -4
  67. package/dist/ee/identity-federation/sso.js.map +1 -1
  68. package/dist/event/axios.d.ts +2 -2
  69. package/dist/event/axios.js +26 -22
  70. package/dist/event/axios.js.map +1 -1
  71. package/dist/event/index.d.ts +3 -2
  72. package/dist/event/index.js +2 -1
  73. package/dist/event/index.js.map +1 -1
  74. package/dist/event/webhook.d.ts +2 -2
  75. package/dist/event/webhook.js +5 -4
  76. package/dist/event/webhook.js.map +1 -1
  77. package/dist/index.js +24 -11
  78. package/dist/index.js.map +1 -1
  79. package/dist/opentelemetry/metrics.d.ts +6 -1
  80. package/dist/opentelemetry/metrics.js +26 -2
  81. package/dist/opentelemetry/metrics.js.map +1 -1
  82. package/dist/sso-traces/index.d.ts +2 -2
  83. package/dist/sso-traces/index.js +1 -1
  84. package/dist/sso-traces/index.js.map +1 -1
  85. package/dist/typings.d.ts +16 -7
  86. package/package.json +8 -8
  87. package/dist/ee/ory/ory.d.ts +0 -18
  88. package/dist/ee/ory/ory.js +0 -202
  89. package/dist/ee/ory/ory.js.map +0 -1
package/dist/index.js CHANGED
@@ -69,7 +69,6 @@ const branding_1 = require("./ee/branding");
69
69
  const sso_traces_1 = __importDefault(require("./sso-traces"));
70
70
  const event_1 = __importDefault(require("./event"));
71
71
  const product_1 = require("./ee/product");
72
- const ory_1 = require("./ee/ory/ory");
73
72
  const TRACES_TTL_DEFAULT = 7 * 24 * 60 * 60;
74
73
  const defaultOpts = (opts) => {
75
74
  var _a, _b, _c, _d, _e;
@@ -95,12 +94,19 @@ const defaultOpts = (opts) => {
95
94
  newOpts.boxyhqLicenseKey = newOpts.boxyhqLicenseKey || undefined;
96
95
  newOpts.ssoTraces = newOpts.ssoTraces || {};
97
96
  newOpts.ssoTraces.ttl = ((_e = newOpts.ssoTraces) === null || _e === void 0 ? void 0 : _e.ttl) || TRACES_TTL_DEFAULT;
97
+ const defaultLogger = {
98
+ info: console.info.bind(console),
99
+ error: console.error.bind(console),
100
+ warn: console.warn.bind(console),
101
+ };
102
+ newOpts.logger = Object.assign(Object.assign({}, defaultLogger), newOpts.logger);
98
103
  return newOpts;
99
104
  };
100
105
  const controllers = (opts) => __awaiter(void 0, void 0, void 0, function* () {
101
106
  var _a;
102
107
  opts = defaultOpts(opts);
103
- const db = yield db_1.default.new(opts.db);
108
+ const logger = opts.logger;
109
+ const db = yield db_1.default.new({ db: opts.db, logger });
104
110
  const connectionStore = db.store('saml:config');
105
111
  const sessionStore = db.store('oauth:session', opts.db.ttl);
106
112
  const codeStore = db.store('oauth:code', opts.db.ttl);
@@ -112,14 +118,12 @@ const controllers = (opts) => __awaiter(void 0, void 0, void 0, function* () {
112
118
  const productStore = db.store('product:config');
113
119
  const tracesStore = db.store('saml:tracer', (_a = opts.ssoTraces) === null || _a === void 0 ? void 0 : _a.ttl);
114
120
  const ssoTraces = new sso_traces_1.default({ tracesStore, opts });
115
- const eventController = new event_1.default({ opts });
121
+ const eventController = new event_1.default({ opts: opts });
116
122
  const productController = new product_1.ProductController({ productStore, opts });
117
- const oryController = new ory_1.OryController({ opts, productController });
118
123
  const connectionAPIController = new api_1.ConnectionAPIController({
119
124
  connectionStore,
120
125
  opts,
121
126
  eventController,
122
- oryController,
123
127
  });
124
128
  const adminController = new admin_1.AdminController({ connectionStore, ssoTraces });
125
129
  const healthCheckController = new health_check_1.HealthCheckController({ healthCheckStore });
@@ -128,7 +132,11 @@ const controllers = (opts) => __awaiter(void 0, void 0, void 0, function* () {
128
132
  // Create default certificate if it doesn't exist.
129
133
  yield x509.init(certificateStore, opts);
130
134
  // Enterprise Features
131
- const identityFederationController = yield (0, identity_federation_1.default)({ db, opts, ssoTraces });
135
+ const identityFederationController = yield (0, identity_federation_1.default)({
136
+ db,
137
+ opts: opts,
138
+ ssoTraces,
139
+ });
132
140
  const brandingController = new branding_1.BrandingController({ store: settingsStore, opts });
133
141
  const oauthController = new oauth_1.OAuthController({
134
142
  connectionStore,
@@ -146,7 +154,11 @@ const controllers = (opts) => __awaiter(void 0, void 0, void 0, function* () {
146
154
  });
147
155
  const oidcDiscoveryController = new oidc_discovery_1.OidcDiscoveryController({ opts });
148
156
  const spConfig = new sp_config_1.SPSSOConfig(opts);
149
- const directorySyncController = yield (0, directory_sync_1.default)({ db, opts, eventController });
157
+ const directorySyncController = yield (0, directory_sync_1.default)({
158
+ db,
159
+ opts: opts,
160
+ eventController,
161
+ });
150
162
  // write pre-loaded connections if present
151
163
  const preLoadedConnection = opts.preLoadedConnection;
152
164
  if (preLoadedConnection && preLoadedConnection.length > 0) {
@@ -158,13 +170,14 @@ const controllers = (opts) => __awaiter(void 0, void 0, void 0, function* () {
158
170
  else {
159
171
  yield connectionAPIController.createSAMLConnection(connection);
160
172
  }
161
- console.info(`loaded connection for tenant "${connection.tenant}" and product "${connection.product}"`);
173
+ logger.info(`loaded connection for tenant "${connection.tenant}" and product "${connection.product}"`);
162
174
  }
163
175
  }
164
176
  if (!opts.noAnalytics) {
165
- console.info('Anonymous analytics enabled. You can disable this by setting the DO_NOT_TRACK=1 or BOXYHQ_NO_ANALYTICS=1 environment variables');
177
+ logger.info('Anonymous analytics enabled. You can disable this by setting the DO_NOT_TRACK=1 or BOXYHQ_NO_ANALYTICS=1 environment variables');
166
178
  const analyticsStore = db.store('_analytics:events');
167
179
  const analyticsController = new analytics_1.AnalyticsController({
180
+ opts,
168
181
  analyticsStore,
169
182
  connectionAPIController,
170
183
  directorySyncController,
@@ -172,11 +185,11 @@ const controllers = (opts) => __awaiter(void 0, void 0, void 0, function* () {
172
185
  yield analyticsController.init();
173
186
  }
174
187
  if ('driver' in opts.db) {
175
- console.info(`Using external database driver`);
188
+ logger.info(`Using external database driver`);
176
189
  }
177
190
  else {
178
191
  const type = opts.db.engine === 'sql' && opts.db.type ? ' Type: ' + opts.db.type : '';
179
- console.info(`Using engine: ${opts.db.engine}.${type}`);
192
+ logger.info(`Using engine: ${opts.db.engine}.${type}`);
180
193
  }
181
194
  return {
182
195
  spConfig,
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,19 @@
1
+ import { type CounterOperationParams } from '@boxyhq/metrics';
1
2
  declare const counters: {
2
3
  createConnection: () => void;
3
4
  getConnections: () => void;
4
5
  deleteConnections: () => void;
5
6
  oauthAuthorize: () => void;
7
+ oauthAuthorizeError: (counterAttributes: CounterOperationParams["counterAttributes"]) => void;
8
+ oAuthResponseError: (counterAttributes: CounterOperationParams["counterAttributes"]) => void;
6
9
  oauthToken: () => void;
10
+ oauthTokenError: (counterAttributes: CounterOperationParams["counterAttributes"]) => void;
7
11
  oauthUserInfo: () => void;
12
+ oauthUserInfoError: (counterAttributes: CounterOperationParams["counterAttributes"]) => void;
8
13
  createDsyncConnection: () => void;
9
14
  getDsyncConnections: () => void;
10
15
  deleteDsyncConnections: () => void;
11
16
  dsyncEventsBatchFailed: () => void;
12
17
  };
13
- declare const increment: (action: keyof typeof counters) => void;
18
+ declare const increment: (action: keyof typeof counters, counterAttributes?: CounterOperationParams["counterAttributes"]) => void;
14
19
  export { increment };
@@ -24,16 +24,40 @@ const counters = {
24
24
  name: 'jackson.oauth.authorize',
25
25
  counterOptions: { description: 'Number of oauth authorize requests' },
26
26
  }),
27
+ oauthAuthorizeError: (counterAttributes) => (0, metrics_1.incrementCounter)({
28
+ meter: METER,
29
+ name: 'jackson.oauth.authorize.error',
30
+ counterOptions: { description: 'Number of errors in oauth authorize requests' },
31
+ counterAttributes,
32
+ }),
33
+ oAuthResponseError: (counterAttributes) => (0, metrics_1.incrementCounter)({
34
+ meter: METER,
35
+ name: 'jackson.oauth.response.error',
36
+ counterOptions: { description: 'Number of errors in idp response path' },
37
+ counterAttributes,
38
+ }),
27
39
  oauthToken: () => (0, metrics_1.incrementCounter)({
28
40
  meter: METER,
29
41
  name: 'jackson.oauth.token',
30
42
  counterOptions: { description: 'Number of oauth token requests' },
31
43
  }),
44
+ oauthTokenError: (counterAttributes) => (0, metrics_1.incrementCounter)({
45
+ meter: METER,
46
+ name: 'jackson.oauth.token.error',
47
+ counterOptions: { description: 'Number of errors in oauth token requests' },
48
+ counterAttributes,
49
+ }),
32
50
  oauthUserInfo: () => (0, metrics_1.incrementCounter)({
33
51
  meter: METER,
34
52
  name: 'jackson.oauth.userinfo',
35
53
  counterOptions: { description: 'Number of oauth user info requests' },
36
54
  }),
55
+ oauthUserInfoError: (counterAttributes) => (0, metrics_1.incrementCounter)({
56
+ meter: METER,
57
+ name: 'jackson.oauth.userinfo.error',
58
+ counterOptions: { description: 'Number of errors in oauth user info requests' },
59
+ counterAttributes,
60
+ }),
37
61
  createDsyncConnection: () => (0, metrics_1.incrementCounter)({
38
62
  meter: METER,
39
63
  name: 'jackson.dsync.connection.create',
@@ -57,10 +81,10 @@ const counters = {
57
81
  });
58
82
  },
59
83
  };
60
- const increment = (action) => {
84
+ const increment = (action, counterAttributes) => {
61
85
  const counterIncrement = counters[action];
62
86
  if (typeof counterIncrement === 'function') {
63
- counterIncrement();
87
+ counterIncrement(counterAttributes);
64
88
  }
65
89
  };
66
90
  exports.increment = increment;
@@ -1 +1 @@
1
- {"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/opentelemetry/metrics.ts"],"names":[],"mappings":";;;AAAA,6CAAmD;AAEnD,MAAM,KAAK,GAAG,SAAS,CAAC;AAExB,MAAM,QAAQ,GAAG;IACf,gBAAgB,EAAE,GAAG,EAAE,CACrB,IAAA,0BAAgB,EAAC;QACf,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,2BAA2B;QACjC,cAAc,EAAE,EAAE,WAAW,EAAE,0CAA0C,EAAE;KAC5E,CAAC;IACJ,cAAc,EAAE,GAAG,EAAE,CACnB,IAAA,0BAAgB,EAAC;QACf,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,wBAAwB;QAC9B,cAAc,EAAE,EAAE,WAAW,EAAE,wCAAwC,EAAE;KAC1E,CAAC;IACJ,iBAAiB,EAAE,GAAG,EAAE,CACtB,IAAA,0BAAgB,EAAC;QACf,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,2BAA2B;QACjC,cAAc,EAAE,EAAE,WAAW,EAAE,2CAA2C,EAAE;KAC7E,CAAC;IACJ,cAAc,EAAE,GAAG,EAAE,CACnB,IAAA,0BAAgB,EAAC;QACf,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,yBAAyB;QAC/B,cAAc,EAAE,EAAE,WAAW,EAAE,oCAAoC,EAAE;KACtE,CAAC;IACJ,UAAU,EAAE,GAAG,EAAE,CACf,IAAA,0BAAgB,EAAC;QACf,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,qBAAqB;QAC3B,cAAc,EAAE,EAAE,WAAW,EAAE,gCAAgC,EAAE;KAClE,CAAC;IAEJ,aAAa,EAAE,GAAG,EAAE,CAClB,IAAA,0BAAgB,EAAC;QACf,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,wBAAwB;QAC9B,cAAc,EAAE,EAAE,WAAW,EAAE,oCAAoC,EAAE;KACtE,CAAC;IAEJ,qBAAqB,EAAE,GAAG,EAAE,CAC1B,IAAA,0BAAgB,EAAC;QACf,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,iCAAiC;QACvC,cAAc,EAAE,EAAE,WAAW,EAAE,4CAA4C,EAAE;KAC9E,CAAC;IAEJ,mBAAmB,EAAE,GAAG,EAAE,CACxB,IAAA,0BAAgB,EAAC;QACf,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,8BAA8B;QACpC,cAAc,EAAE,EAAE,WAAW,EAAE,0CAA0C,EAAE;KAC5E,CAAC;IAEJ,sBAAsB,EAAE,GAAG,EAAE,CAC3B,IAAA,0BAAgB,EAAC;QACf,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,iCAAiC;QACvC,cAAc,EAAE,EAAE,WAAW,EAAE,6CAA6C,EAAE;KAC/E,CAAC;IAEJ,sBAAsB,EAAE,GAAG,EAAE;QAC3B,IAAA,0BAAgB,EAAC;YACf,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,mCAAmC;YACzC,cAAc,EAAE,EAAE,WAAW,EAAE,8CAA8C,EAAE;SAChF,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,MAA6B,EAAE,EAAE;IAClD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,OAAO,gBAAgB,KAAK,UAAU,EAAE,CAAC;QAC3C,gBAAgB,EAAE,CAAC;IACrB,CAAC;AACH,CAAC,CAAC;AAEO,8BAAS"}
1
+ {"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/opentelemetry/metrics.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { GetByProductParams, Records, Storable, JacksonOption } from '../typings';
1
+ import { GetByProductParams, Records, Storable, JacksonOptionWithRequiredLogger } from '../typings';
2
2
  import type { SSOTrace, Trace } from './types';
3
3
  /**
4
4
  * @swagger
@@ -48,7 +48,7 @@ import type { SSOTrace, Trace } from './types';
48
48
  */
49
49
  declare class SSOTraces {
50
50
  tracesStore: Storable;
51
- opts: JacksonOption;
51
+ opts: JacksonOptionWithRequiredLogger;
52
52
  constructor({ tracesStore, opts }: {
53
53
  tracesStore: any;
54
54
  opts: any;
@@ -113,7 +113,7 @@ class SSOTraces {
113
113
  return traceId;
114
114
  }
115
115
  catch (err) {
116
- console.error(`Failed to save trace`, err);
116
+ this.opts.logger.error(`Failed to save trace`, err);
117
117
  }
118
118
  });
119
119
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sso-traces/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sso-traces/index.ts"],"names":[],"mappings":"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"}
package/dist/typings.d.ts CHANGED
@@ -24,7 +24,6 @@ export interface SSOConnection {
24
24
  name?: string;
25
25
  label?: string;
26
26
  description?: string;
27
- ory?: OryConfig;
28
27
  sortOrder?: number | null;
29
28
  }
30
29
  export interface SAMLSSOConnection extends SSOConnection {
@@ -126,7 +125,6 @@ export type UpdateConnectionParams = TenantProduct & {
126
125
  defaultRedirectUrl?: string;
127
126
  redirectUrl?: string[] | string;
128
127
  deactivated?: boolean;
129
- ory?: OryConfig;
130
128
  sortOrder?: number | null;
131
129
  };
132
130
  export type UpdateSAMLConnectionParams = UpdateConnectionParams & {
@@ -176,15 +174,18 @@ export interface IOAuthController {
176
174
  authorize(body: OAuthReq): Promise<{
177
175
  redirect_url?: string;
178
176
  authorize_form?: string;
177
+ error?: string;
179
178
  }>;
180
179
  samlResponse(body: SAMLResponsePayload): Promise<{
181
180
  redirect_url?: string;
182
181
  app_select_form?: string;
183
182
  response_form?: string;
183
+ error?: string;
184
184
  }>;
185
185
  oidcAuthzResponse(body: OIDCAuthzResponsePayload): Promise<{
186
186
  redirect_url?: string;
187
187
  response_form?: string;
188
+ error?: string;
188
189
  }>;
189
190
  token(body: OAuthTokenReq): Promise<OAuthTokenRes>;
190
191
  userInfo(token: string): Promise<Profile>;
@@ -428,11 +429,12 @@ export interface JacksonOption {
428
429
  /** The number of days a setup link is valid for. Defaults to 3 days. */
429
430
  setupLinkExpiryDays?: number;
430
431
  boxyhqHosted?: boolean;
431
- ory?: {
432
- projectId: string | undefined;
433
- sdkToken: string | undefined;
434
- };
435
432
  ssoTraces?: SSOTracesOption;
433
+ logger?: {
434
+ info?: (msg: string, err?: any) => void;
435
+ warn?: (msg: string, err?: any) => void;
436
+ error?: (msg: string, err?: any) => void;
437
+ };
436
438
  }
437
439
  export interface SLORequestParams {
438
440
  nameId: string;
@@ -536,7 +538,6 @@ export interface ProductConfig {
536
538
  primaryColor: string | null;
537
539
  faviconUrl: string | null;
538
540
  companyName: string | null;
539
- ory: OryConfig | null;
540
541
  development?: boolean;
541
542
  }
542
543
  export interface SSOTracesOption {
@@ -544,3 +545,11 @@ export interface SSOTracesOption {
544
545
  redact?: boolean;
545
546
  ttl?: number;
546
547
  }
548
+ export type RequiredLogger = {
549
+ info: (msg: string, err?: any) => void;
550
+ error: (msg: string, err?: any) => void;
551
+ warn: (msg: string, err?: any) => void;
552
+ };
553
+ export type JacksonOptionWithRequiredLogger = Omit<JacksonOption, 'logger'> & {
554
+ logger: RequiredLogger;
555
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@boxyhq/saml-jackson",
3
- "version": "1.35.0",
3
+ "version": "1.36.0",
4
4
  "description": "SAML Jackson library",
5
5
  "keywords": [
6
6
  "SAML 2.0"
@@ -43,9 +43,9 @@
43
43
  "coverage-map": "map.js"
44
44
  },
45
45
  "dependencies": {
46
- "@aws-sdk/client-dynamodb": "3.716.0",
47
- "@aws-sdk/credential-providers": "3.716.0",
48
- "@aws-sdk/util-dynamodb": "3.716.0",
46
+ "@aws-sdk/client-dynamodb": "3.726.1",
47
+ "@aws-sdk/credential-providers": "3.726.1",
48
+ "@aws-sdk/util-dynamodb": "3.726.1",
49
49
  "@boxyhq/error-code-mnemonic": "0.1.1",
50
50
  "@boxyhq/metrics": "0.2.9",
51
51
  "@boxyhq/saml20": "1.7.0",
@@ -58,7 +58,7 @@
58
58
  "mixpanel": "0.18.0",
59
59
  "mongodb": "6.12.0",
60
60
  "mssql": "11.0.1",
61
- "mysql2": "3.11.5",
61
+ "mysql2": "3.12.0",
62
62
  "node-forge": "1.3.1",
63
63
  "openid-client": "6.1.7",
64
64
  "pg": "8.13.1",
@@ -70,8 +70,8 @@
70
70
  },
71
71
  "devDependencies": {
72
72
  "@faker-js/faker": "9.3.0",
73
- "@types/lodash": "4.17.13",
74
- "@types/node": "22.10.2",
73
+ "@types/lodash": "4.17.14",
74
+ "@types/node": "22.10.6",
75
75
  "@types/sinon": "17.0.3",
76
76
  "cross-env": "7.0.3",
77
77
  "migrate-mongo": "11.0.0",
@@ -80,7 +80,7 @@
80
80
  "tap": "21.0.1",
81
81
  "ts-node": "10.9.2",
82
82
  "tsconfig-paths": "4.2.0",
83
- "typescript": "5.7.2"
83
+ "typescript": "5.7.3"
84
84
  },
85
85
  "engines": {
86
86
  "node": ">=16",
@@ -1,18 +0,0 @@
1
- import { JacksonOption, OryConfig, OryRes } from '../../typings';
2
- import { ProductController } from '../product';
3
- export declare class OryController {
4
- private opts;
5
- private productController;
6
- constructor({ opts, productController }: {
7
- opts: JacksonOption;
8
- productController: ProductController;
9
- });
10
- private getOrgName;
11
- private getIssuerUrl;
12
- private addOrUpdateConnection;
13
- private createOrganization;
14
- private sanitizeConfig;
15
- createConnection(config: OryConfig, tenant: string, product: string): Promise<OryRes | null>;
16
- updateConnection(config: OryConfig, tenant: string, product: string): Promise<OryRes | null>;
17
- private isEnabled;
18
- }
@@ -1,202 +0,0 @@
1
- "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- var __importDefault = (this && this.__importDefault) || function (mod) {
12
- return (mod && mod.__esModule) ? mod : { "default": mod };
13
- };
14
- Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.OryController = void 0;
16
- const axios_1 = __importDefault(require("axios"));
17
- const checkLicense_1 = require("../common/checkLicense");
18
- const basePath = 'https://api.console.ory.sh';
19
- const providerId = 'sso_boxyhq';
20
- const dataMapping = 'base64://bG9jYWwgY2xhaW1zID0gewogIGVtYWlsX3ZlcmlmaWVkOiB0cnVlLAp9ICsgc3RkLmV4dFZhcignY2xhaW1zJyk7Cgp7CiAgaWRlbnRpdHk6IHsKICAgIHRyYWl0czogewogICAgICBbaWYgJ2VtYWlsJyBpbiBjbGFpbXMgJiYgY2xhaW1zLmVtYWlsX3ZlcmlmaWVkIHRoZW4gJ2VtYWlsJyBlbHNlIG51bGxdOiBjbGFpbXMuZW1haWwsCiAgICB9LAogIH0sCn0=';
21
- const issuerUrl = 'https://sso.eu.boxyhq.com';
22
- class OryController {
23
- constructor({ opts, productController }) {
24
- this.opts = opts;
25
- this.productController = productController;
26
- }
27
- getOrgName(tenant, product) {
28
- return this.opts.boxyhqHosted ? tenant : `${tenant}:${product}`;
29
- }
30
- getIssuerUrl() {
31
- if (this.opts.boxyhqHosted) {
32
- return issuerUrl;
33
- }
34
- else {
35
- return this.opts.externalUrl;
36
- }
37
- }
38
- addOrUpdateConnection(config, tenant, product) {
39
- return __awaiter(this, void 0, void 0, function* () {
40
- const project = yield axios_1.default.get(`${basePath}/projects/${config.projectId}`, {
41
- headers: {
42
- Authorization: `Bearer ${config.sdkToken}`,
43
- },
44
- });
45
- let index = '-';
46
- try {
47
- for (const idx in project.data.services.identity.config.selfservice.methods.oidc.config.providers) {
48
- const provider = project.data.services.identity.config.selfservice.methods.oidc.config.providers[idx];
49
- if (provider.id === providerId && provider.organization_id === config.organizationId) {
50
- index = idx;
51
- break;
52
- }
53
- }
54
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
55
- }
56
- catch (err) {
57
- // empty
58
- }
59
- const op = index === '-' ? 'add' : 'replace';
60
- yield axios_1.default.patch(`${basePath}/normalized/projects/${config.projectId}/revision/${project.data.revision_id}`, [
61
- { op: 'replace', path: '/kratos_selfservice_methods_oidc_enabled', value: true },
62
- {
63
- op,
64
- path: `/kratos_selfservice_methods_oidc_config_providers/${index}`,
65
- value: {
66
- provider_id: providerId,
67
- provider: 'generic',
68
- label: 'SSO',
69
- client_id: `tenant=${tenant}&product=${product}`,
70
- client_secret: this.opts.clientSecretVerifier,
71
- organization_id: config.organizationId,
72
- scope: [],
73
- mapper_url: dataMapping,
74
- additional_id_token_audiences: [],
75
- issuer_url: this.getIssuerUrl(),
76
- },
77
- },
78
- ], {
79
- headers: {
80
- Authorization: `Bearer ${config.sdkToken}`,
81
- },
82
- });
83
- });
84
- }
85
- createOrganization(config, label) {
86
- return __awaiter(this, void 0, void 0, function* () {
87
- var _a;
88
- if (!config.sdkToken || !config.projectId) {
89
- throw new Error('Ory SDK Token or Project ID not set');
90
- }
91
- if (config && config.organizationId) {
92
- try {
93
- const res = yield axios_1.default.get(`${basePath}/projects/${config.projectId}/organizations/${config.organizationId}`, {
94
- headers: {
95
- Authorization: `Bearer ${config.sdkToken}`,
96
- },
97
- });
98
- return res.data.organization.id;
99
- }
100
- catch (err) {
101
- // if org doesn't exist fall through to section that creates it below
102
- if (((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) !== 404) {
103
- throw err;
104
- }
105
- }
106
- }
107
- const res = yield axios_1.default.post(`${basePath}/projects/${config.projectId}/organizations`, {
108
- label,
109
- domains: config.domains,
110
- }, {
111
- headers: {
112
- Authorization: `Bearer ${config.sdkToken}`,
113
- },
114
- });
115
- return res.data.id;
116
- });
117
- }
118
- sanitizeConfig(config, tenant) {
119
- return __awaiter(this, void 0, void 0, function* () {
120
- var _a, _b;
121
- if (!config.sdkToken) {
122
- config.sdkToken = (_a = this.opts.ory) === null || _a === void 0 ? void 0 : _a.sdkToken;
123
- }
124
- if (!config.projectId) {
125
- config.projectId = (_b = this.opts.ory) === null || _b === void 0 ? void 0 : _b.projectId;
126
- }
127
- config.domains = config.domains || [];
128
- if (!config.domains.includes(tenant)) {
129
- config.domains.push(tenant);
130
- }
131
- return config;
132
- });
133
- }
134
- createConnection(config, tenant, product) {
135
- return __awaiter(this, void 0, void 0, function* () {
136
- if (!(yield this.isEnabled(config, tenant, product))) {
137
- return null;
138
- }
139
- const organizationId = yield this.createOrganization(config, this.getOrgName(tenant, product));
140
- config.organizationId = organizationId;
141
- let error;
142
- try {
143
- yield this.addOrUpdateConnection(config, tenant, product);
144
- }
145
- catch (err) {
146
- error = err;
147
- }
148
- return { projectId: config.projectId, domains: config.domains, organizationId, error };
149
- });
150
- }
151
- updateConnection(config, tenant, product) {
152
- return __awaiter(this, void 0, void 0, function* () {
153
- if (!(yield this.isEnabled(config, tenant, product))) {
154
- return null;
155
- }
156
- const organizationId = yield this.createOrganization(config, this.getOrgName(tenant, product));
157
- let error;
158
- try {
159
- yield this.addOrUpdateConnection(config, tenant, product);
160
- }
161
- catch (err) {
162
- error = err;
163
- }
164
- return { projectId: config.projectId, domains: config.domains, organizationId, error };
165
- });
166
- }
167
- isEnabled(config, tenant, product) {
168
- return __awaiter(this, void 0, void 0, function* () {
169
- var _a, _b;
170
- if (this.opts.boxyhqHosted) {
171
- const productConfig = yield this.productController.get(product);
172
- if (!productConfig ||
173
- !productConfig.ory ||
174
- !productConfig.ory.sdkToken ||
175
- !productConfig.ory.projectId) {
176
- return false;
177
- }
178
- config.sdkToken = productConfig.ory.sdkToken;
179
- config.projectId = productConfig.ory.projectId;
180
- this.sanitizeConfig(config, tenant);
181
- return true;
182
- }
183
- else {
184
- if (!((_a = this.opts.ory) === null || _a === void 0 ? void 0 : _a.sdkToken) || !((_b = this.opts.ory) === null || _b === void 0 ? void 0 : _b.projectId)) {
185
- return false;
186
- }
187
- try {
188
- yield (0, checkLicense_1.throwIfInvalidLicense)(this.opts.boxyhqLicenseKey);
189
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
190
- }
191
- catch (err) {
192
- console.error('Ory is not enabled because of invalid license');
193
- return false;
194
- }
195
- this.sanitizeConfig(config, tenant);
196
- return true;
197
- }
198
- });
199
- }
200
- }
201
- exports.OryController = OryController;
202
- //# sourceMappingURL=ory.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"ory.js","sourceRoot":"","sources":["../../../src/ee/ory/ory.ts"],"names":[],"mappings":"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"}