@crimson-education/browser-logger 5.0.0-beta.8.0 → 5.0.0-beta.9

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.
@@ -10,7 +10,7 @@ export interface AmplifyReporterConfig extends ReporterConfigBase {
10
10
  * The Identity Pool Id to use for reporting, if set to false, Auth.configure is not called.
11
11
  * This must be called manually for the reporter to work.
12
12
  */
13
- identityPoolId: string | false;
13
+ identityPoolId: string;
14
14
  /**
15
15
  * The Pinpoint App Id to report to.
16
16
  */
@@ -1 +1 @@
1
- {"version":3,"file":"amplifyReporter.d.ts","sourceRoot":"","sources":["../../src/reporters/amplifyReporter.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,SAAS,EACT,QAAQ,EAER,kBAAkB,EAGlB,WAAW,EACZ,MAAM,UAAU,CAAC;AAMlB,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;AAE7D,KAAK,sBAAsB,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,CAAC;AAkI/D,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,cAAc,EAAE,MAAM,GAAG,KAAK,CAAC;IAC/B;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,eAAe,CAAC,CAAC,MAAM,EAAE,sBAAsB,GAAG,QAAQ,GAAG,SAAS,CAAC;IAEvE;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,EAAE,8BAA8B,CAAC;CAC5C;AAED;;;;GAIG;AACH,KAAK,8BAA8B,GAAG;IACpC,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4EAA4E;IAC5E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,wEAAwE;IACxE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,qBAAqB,GAAG,SAAS,CAoF3F;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,UAAO,GAAG,YAAY,CAqBhG;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,SAAS,GAAE,MAAM,GAAG,SAAqB,EACzC,WAAW,UAAO,GACjB,YAAY,CAsBd"}
1
+ {"version":3,"file":"amplifyReporter.d.ts","sourceRoot":"","sources":["../../src/reporters/amplifyReporter.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,SAAS,EACT,QAAQ,EAER,kBAAkB,EAGlB,WAAW,EACZ,MAAM,UAAU,CAAC;AAMlB,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;AAE7D,KAAK,sBAAsB,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,CAAC;AAkI/D,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,eAAe,CAAC,CAAC,MAAM,EAAE,sBAAsB,GAAG,QAAQ,GAAG,SAAS,CAAC;IAEvE;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,EAAE,8BAA8B,CAAC;CAC5C;AAED;;;;GAIG;AACH,KAAK,8BAA8B,GAAG;IACpC,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4EAA4E;IAC5E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,wEAAwE;IACxE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,qBAAqB,GAAG,SAAS,CAuF3F;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,UAAO,GAAG,YAAY,CAqBhG;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,SAAS,GAAE,MAAM,GAAG,SAAqB,EACzC,WAAW,UAAO,GACjB,YAAY,CAsBd"}
@@ -1,8 +1,6 @@
1
1
  import { identifyUser, record } from '@aws-amplify/analytics';
2
- import { HttpRequest } from '@aws-sdk/protocol-http';
3
2
  import { logger } from '../logger';
4
- import { initAmplifyAnalytics } from './amplifyUtils';
5
- import { fetchAuthSession } from '@aws-amplify/auth';
3
+ import { Amplify } from 'aws-amplify';
6
4
  // Auto-tracking implementation for Gen2
7
5
  class AmplifyAutoTracker {
8
6
  config;
@@ -116,13 +114,20 @@ class AmplifyAutoTracker {
116
114
  }
117
115
  }
118
116
  export function amplifyReporter(info, config) {
119
- initAmplifyAnalytics({
120
- region: config.region,
121
- analyticsAppId: config.analyticsAppId,
122
- identityPoolId: config.identityPoolId,
123
- userPoolId: config.userPoolId,
124
- userPoolWebClientId: config.userPoolWebClientId,
125
- buffering: config.buffering,
117
+ Amplify.configure({
118
+ Auth: {
119
+ Cognito: {
120
+ identityPoolId: config.identityPoolId,
121
+ allowGuestAccess: true,
122
+ },
123
+ },
124
+ Analytics: {
125
+ Pinpoint: {
126
+ appId: config.analyticsAppId,
127
+ region: config.region,
128
+ ...config.buffering,
129
+ },
130
+ },
126
131
  });
127
132
  const allMetadata = asAttributeMap({
128
133
  appName: info.service,
@@ -131,10 +136,6 @@ export function amplifyReporter(info, config) {
131
136
  environment: info.environment,
132
137
  version: info.version,
133
138
  });
134
- fetchAuthSession({ forceRefresh: true }).then((session) => {
135
- console.log('Auth session fetched successfully');
136
- console.log('Session:', session);
137
- });
138
139
  // Initialize auto-tracker for Gen2
139
140
  const autoTracker = new AmplifyAutoTracker(config, allMetadata);
140
141
  if (config.proxyUrl) {
@@ -239,53 +240,57 @@ export function buildAttributeMap(values, parentKey = undefined, groupValues = t
239
240
  });
240
241
  return valuesWithStringArrays;
241
242
  }
242
- function installPinpointProxy(proxyUrl) {
243
- // No public API for overriding where the Pinpoint client sends events to... 🤮
244
- // In theory you can pass in an `endpoint` to the Pinpoint client's constructor like any other AWS
245
- // client, but Amplify's analytics doesn't expose anything we can use to get an endpoint threaded
246
- // down to the Pinpoint client's constructor.
247
- //
248
- // The Pinpoint client _also_ isn't available synchronously because it is instantiated when events
249
- // get sent out, and then reconfigured whenever the API credentials change. We need to hook `_initClients`
250
- // to ensure that the Pinpoint client being used is always patched with our custom endpoint.
251
- const provider = globalThis.Analytics?.getPluggable?.('AWSPinpoint');
252
- if (!provider || typeof provider._initClients !== 'function') {
253
- logger.error('Installation of the Pinpoint proxy failed. This likely means the internals of the @aws-amplify/analytics package have changed.');
254
- return;
255
- }
256
- const originalInitClients = provider._initClients;
257
- const requestMiddleware = (next) => async (args) => {
258
- const pinpointClient = provider.pinpointClient;
259
- if (pinpointClient && proxyUrl.pathname !== '/' && HttpRequest.isInstance(args.request)) {
260
- // Add proxyUrl.pathname to final request url if it was provided
261
- const shouldStripSlash = proxyUrl.pathname.endsWith('/');
262
- args.request.path = `${proxyUrl.pathname}${args.request.path.slice(shouldStripSlash ? 1 : 0)}`;
263
- // Wrap request body so the proxy has signing info
264
- if (typeof args.request.body === 'string') {
265
- const credentials = await pinpointClient.config.credentials();
266
- args.request.body = JSON.stringify({
267
- credentials,
268
- data: JSON.parse(args.request.body),
269
- });
270
- }
271
- }
272
- return next(args);
273
- };
274
- provider._initClients = async (credentials) => {
275
- const result = await originalInitClients.call(provider, credentials);
276
- const pinpointClient = provider.pinpointClient;
277
- if (pinpointClient) {
278
- pinpointClient.config.endpoint = () => Promise.resolve({
279
- hostname: proxyUrl.hostname,
280
- // Passing proxyUrl.pathname here doesn't work; it gets overridden
281
- path: '/',
282
- port: undefined,
283
- protocol: proxyUrl.protocol,
284
- });
285
- pinpointClient.middlewareStack.remove(requestMiddleware);
286
- pinpointClient.middlewareStack.add(requestMiddleware, { step: 'finalizeRequest' });
287
- }
288
- return result;
289
- };
290
- }
243
+ // function installPinpointProxy(proxyUrl: URL) {
244
+ // // No public API for overriding where the Pinpoint client sends events to... 🤮
245
+ // // In theory you can pass in an `endpoint` to the Pinpoint client's constructor like any other AWS
246
+ // // client, but Amplify's analytics doesn't expose anything we can use to get an endpoint threaded
247
+ // // down to the Pinpoint client's constructor.
248
+ // //
249
+ // // The Pinpoint client _also_ isn't available synchronously because it is instantiated when events
250
+ // // get sent out, and then reconfigured whenever the API credentials change. We need to hook `_initClients`
251
+ // // to ensure that the Pinpoint client being used is always patched with our custom endpoint.
252
+ // const provider = (globalThis as any).Analytics?.getPluggable?.('AWSPinpoint') as any;
253
+ // if (!provider || typeof provider._initClients !== 'function') {
254
+ // logger.error(
255
+ // 'Installation of the Pinpoint proxy failed. This likely means the internals of the @aws-amplify/analytics package have changed.',
256
+ // );
257
+ // return;
258
+ // }
259
+ // const originalInitClients = provider._initClients;
260
+ // const requestMiddleware: FinalizeRequestMiddleware<ServiceInputTypes, ServiceOutputTypes> =
261
+ // (next) => async (args) => {
262
+ // const pinpointClient = provider.pinpointClient as PinpointClient | undefined;
263
+ // if (pinpointClient && proxyUrl.pathname !== '/' && HttpRequest.isInstance(args.request)) {
264
+ // // Add proxyUrl.pathname to final request url if it was provided
265
+ // const shouldStripSlash = proxyUrl.pathname.endsWith('/');
266
+ // args.request.path = `${proxyUrl.pathname}${args.request.path.slice(shouldStripSlash ? 1 : 0)}`;
267
+ // // Wrap request body so the proxy has signing info
268
+ // if (typeof args.request.body === 'string') {
269
+ // const credentials = await pinpointClient.config.credentials();
270
+ // args.request.body = JSON.stringify({
271
+ // credentials,
272
+ // data: JSON.parse(args.request.body),
273
+ // });
274
+ // }
275
+ // }
276
+ // return next(args);
277
+ // };
278
+ // provider._initClients = async (credentials: unknown) => {
279
+ // const result = await originalInitClients.call(provider, credentials);
280
+ // const pinpointClient = provider.pinpointClient as PinpointClient | undefined;
281
+ // if (pinpointClient) {
282
+ // pinpointClient.config.endpoint = (): Promise<Endpoint> =>
283
+ // Promise.resolve({
284
+ // hostname: proxyUrl.hostname,
285
+ // // Passing proxyUrl.pathname here doesn't work; it gets overridden
286
+ // path: '/',
287
+ // port: undefined,
288
+ // protocol: proxyUrl.protocol,
289
+ // });
290
+ // pinpointClient.middlewareStack.remove(requestMiddleware);
291
+ // pinpointClient.middlewareStack.add(requestMiddleware, { step: 'finalizeRequest' });
292
+ // }
293
+ // return result;
294
+ // };
295
+ // }
291
296
  //# sourceMappingURL=amplifyReporter.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"amplifyReporter.js","sourceRoot":"","sources":["../../src/reporters/amplifyReporter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"amplifyReporter.js","sourceRoot":"","sources":["../../src/reporters/amplifyReporter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@crimson-education/browser-logger",
3
- "version": "5.0.0-beta.8.0",
3
+ "version": "5.0.0-beta.9",
4
4
  "description": "An abstract logger and reporting utility for browser environments",
5
5
  "scripts": {
6
6
  "prepack": "npm run build",
@@ -45,12 +45,6 @@
45
45
  "ts-jest": "^29.1.2",
46
46
  "typescript": "^5.4.3"
47
47
  },
48
- "peerDependencies": {
49
- "@aws-amplify/analytics": ">=7.0.0",
50
- "@aws-amplify/auth": ">=6.0.0",
51
- "@aws-amplify/core": ">=6.0.0",
52
- "@aws-sdk/client-pinpoint": ">=3.370.0"
53
- },
54
48
  "files": [
55
49
  "lib",
56
50
  "src"
@@ -1,7 +1,7 @@
1
1
  import { identifyUser, record } from '@aws-amplify/analytics';
2
- import { Endpoint, FinalizeRequestMiddleware } from '@aws-sdk/types';
3
- import { HttpRequest } from '@aws-sdk/protocol-http';
4
- import { PinpointClient, ServiceInputTypes, ServiceOutputTypes } from '@aws-sdk/client-pinpoint';
2
+ // import { Endpoint, FinalizeRequestMiddleware } from '@aws-sdk/types';
3
+ // import { HttpRequest } from '@aws-sdk/protocol-http';
4
+ // import { PinpointClient, ServiceInputTypes, ServiceOutputTypes } from '@aws-sdk/client-pinpoint';
5
5
 
6
6
  import {
7
7
  IReporter,
@@ -13,8 +13,8 @@ import {
13
13
  ServiceInfo,
14
14
  } from '../types';
15
15
  import { logger } from '../logger';
16
- import { initAmplifyAnalytics } from './amplifyUtils';
17
16
  import { fetchAuthSession } from '@aws-amplify/auth';
17
+ import { Amplify } from 'aws-amplify';
18
18
 
19
19
  /* eslint-disable @typescript-eslint/no-unused-vars */
20
20
  type AttributeMap = Record<string, string[] | string | null>;
@@ -158,7 +158,7 @@ export interface AmplifyReporterConfig extends ReporterConfigBase {
158
158
  * The Identity Pool Id to use for reporting, if set to false, Auth.configure is not called.
159
159
  * This must be called manually for the reporter to work.
160
160
  */
161
- identityPoolId: string | false;
161
+ identityPoolId: string;
162
162
  /**
163
163
  * The Pinpoint App Id to report to.
164
164
  */
@@ -225,13 +225,20 @@ type AmplifyReporterBufferingConfig = {
225
225
  };
226
226
 
227
227
  export function amplifyReporter(info: ServiceInfo, config: AmplifyReporterConfig): IReporter {
228
- initAmplifyAnalytics({
229
- region: config.region,
230
- analyticsAppId: config.analyticsAppId,
231
- identityPoolId: config.identityPoolId,
232
- userPoolId: config.userPoolId,
233
- userPoolWebClientId: config.userPoolWebClientId,
234
- buffering: config.buffering,
228
+ Amplify.configure({
229
+ Auth: {
230
+ Cognito: {
231
+ identityPoolId: config.identityPoolId,
232
+ allowGuestAccess: true,
233
+ },
234
+ },
235
+ Analytics: {
236
+ Pinpoint: {
237
+ appId: config.analyticsAppId,
238
+ region: config.region,
239
+ ...config.buffering,
240
+ },
241
+ },
235
242
  });
236
243
 
237
244
  const allMetadata = asAttributeMap({
@@ -241,10 +248,6 @@ export function amplifyReporter(info: ServiceInfo, config: AmplifyReporterConfig
241
248
  environment: info.environment,
242
249
  version: info.version,
243
250
  });
244
- fetchAuthSession({ forceRefresh: true }).then((session) => {
245
- console.log('Auth session fetched successfully');
246
- console.log('Session:', session);
247
- });
248
251
 
249
252
  // Initialize auto-tracker for Gen2
250
253
  const autoTracker = new AmplifyAutoTracker(config, allMetadata);
@@ -369,63 +372,63 @@ export function buildAttributeMap(
369
372
  return valuesWithStringArrays;
370
373
  }
371
374
 
372
- function installPinpointProxy(proxyUrl: URL) {
373
- // No public API for overriding where the Pinpoint client sends events to... 🤮
374
- // In theory you can pass in an `endpoint` to the Pinpoint client's constructor like any other AWS
375
- // client, but Amplify's analytics doesn't expose anything we can use to get an endpoint threaded
376
- // down to the Pinpoint client's constructor.
377
- //
378
- // The Pinpoint client _also_ isn't available synchronously because it is instantiated when events
379
- // get sent out, and then reconfigured whenever the API credentials change. We need to hook `_initClients`
380
- // to ensure that the Pinpoint client being used is always patched with our custom endpoint.
381
- const provider = (globalThis as any).Analytics?.getPluggable?.('AWSPinpoint') as any;
382
- if (!provider || typeof provider._initClients !== 'function') {
383
- logger.error(
384
- 'Installation of the Pinpoint proxy failed. This likely means the internals of the @aws-amplify/analytics package have changed.',
385
- );
386
- return;
387
- }
388
-
389
- const originalInitClients = provider._initClients;
390
- const requestMiddleware: FinalizeRequestMiddleware<ServiceInputTypes, ServiceOutputTypes> =
391
- (next) => async (args) => {
392
- const pinpointClient = provider.pinpointClient as PinpointClient | undefined;
393
-
394
- if (pinpointClient && proxyUrl.pathname !== '/' && HttpRequest.isInstance(args.request)) {
395
- // Add proxyUrl.pathname to final request url if it was provided
396
- const shouldStripSlash = proxyUrl.pathname.endsWith('/');
397
- args.request.path = `${proxyUrl.pathname}${args.request.path.slice(shouldStripSlash ? 1 : 0)}`;
398
-
399
- // Wrap request body so the proxy has signing info
400
- if (typeof args.request.body === 'string') {
401
- const credentials = await pinpointClient.config.credentials();
402
- args.request.body = JSON.stringify({
403
- credentials,
404
- data: JSON.parse(args.request.body),
405
- });
406
- }
407
- }
408
-
409
- return next(args);
410
- };
411
-
412
- provider._initClients = async (credentials: unknown) => {
413
- const result = await originalInitClients.call(provider, credentials);
414
- const pinpointClient = provider.pinpointClient as PinpointClient | undefined;
415
-
416
- if (pinpointClient) {
417
- pinpointClient.config.endpoint = (): Promise<Endpoint> =>
418
- Promise.resolve({
419
- hostname: proxyUrl.hostname,
420
- // Passing proxyUrl.pathname here doesn't work; it gets overridden
421
- path: '/',
422
- port: undefined,
423
- protocol: proxyUrl.protocol,
424
- });
425
-
426
- pinpointClient.middlewareStack.remove(requestMiddleware);
427
- pinpointClient.middlewareStack.add(requestMiddleware, { step: 'finalizeRequest' });
428
- }
429
- return result;
430
- };
431
- }
375
+ // function installPinpointProxy(proxyUrl: URL) {
376
+ // // No public API for overriding where the Pinpoint client sends events to... 🤮
377
+ // // In theory you can pass in an `endpoint` to the Pinpoint client's constructor like any other AWS
378
+ // // client, but Amplify's analytics doesn't expose anything we can use to get an endpoint threaded
379
+ // // down to the Pinpoint client's constructor.
380
+ // //
381
+ // // The Pinpoint client _also_ isn't available synchronously because it is instantiated when events
382
+ // // get sent out, and then reconfigured whenever the API credentials change. We need to hook `_initClients`
383
+ // // to ensure that the Pinpoint client being used is always patched with our custom endpoint.
384
+ // const provider = (globalThis as any).Analytics?.getPluggable?.('AWSPinpoint') as any;
385
+ // if (!provider || typeof provider._initClients !== 'function') {
386
+ // logger.error(
387
+ // 'Installation of the Pinpoint proxy failed. This likely means the internals of the @aws-amplify/analytics package have changed.',
388
+ // );
389
+ // return;
390
+ // }
391
+
392
+ // const originalInitClients = provider._initClients;
393
+ // const requestMiddleware: FinalizeRequestMiddleware<ServiceInputTypes, ServiceOutputTypes> =
394
+ // (next) => async (args) => {
395
+ // const pinpointClient = provider.pinpointClient as PinpointClient | undefined;
396
+
397
+ // if (pinpointClient && proxyUrl.pathname !== '/' && HttpRequest.isInstance(args.request)) {
398
+ // // Add proxyUrl.pathname to final request url if it was provided
399
+ // const shouldStripSlash = proxyUrl.pathname.endsWith('/');
400
+ // args.request.path = `${proxyUrl.pathname}${args.request.path.slice(shouldStripSlash ? 1 : 0)}`;
401
+
402
+ // // Wrap request body so the proxy has signing info
403
+ // if (typeof args.request.body === 'string') {
404
+ // const credentials = await pinpointClient.config.credentials();
405
+ // args.request.body = JSON.stringify({
406
+ // credentials,
407
+ // data: JSON.parse(args.request.body),
408
+ // });
409
+ // }
410
+ // }
411
+
412
+ // return next(args);
413
+ // };
414
+
415
+ // provider._initClients = async (credentials: unknown) => {
416
+ // const result = await originalInitClients.call(provider, credentials);
417
+ // const pinpointClient = provider.pinpointClient as PinpointClient | undefined;
418
+
419
+ // if (pinpointClient) {
420
+ // pinpointClient.config.endpoint = (): Promise<Endpoint> =>
421
+ // Promise.resolve({
422
+ // hostname: proxyUrl.hostname,
423
+ // // Passing proxyUrl.pathname here doesn't work; it gets overridden
424
+ // path: '/',
425
+ // port: undefined,
426
+ // protocol: proxyUrl.protocol,
427
+ // });
428
+
429
+ // pinpointClient.middlewareStack.remove(requestMiddleware);
430
+ // pinpointClient.middlewareStack.add(requestMiddleware, { step: 'finalizeRequest' });
431
+ // }
432
+ // return result;
433
+ // };
434
+ // }
@@ -1,15 +0,0 @@
1
- export interface AmplifyAnalyticsConfig {
2
- region: string;
3
- analyticsAppId: string;
4
- identityPoolId?: string | false;
5
- userPoolId?: string;
6
- userPoolWebClientId?: string;
7
- buffering?: {
8
- bufferSize?: number;
9
- flushSize?: number;
10
- flushInterval?: number;
11
- resendLimit?: number;
12
- };
13
- }
14
- export declare function initAmplifyAnalytics(config: AmplifyAnalyticsConfig): Promise<void>;
15
- //# sourceMappingURL=amplifyUtils.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"amplifyUtils.d.ts","sourceRoot":"","sources":["../../src/reporters/amplifyUtils.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE;QACV,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,sBAAsB,iBAwBxE"}
@@ -1,27 +0,0 @@
1
- import { Amplify } from '@aws-amplify/core';
2
- export async function initAmplifyAnalytics(config) {
3
- if (config.identityPoolId !== false && config.identityPoolId) {
4
- // if (config.userPoolId && config.userPoolWebClientId) {
5
- // authConfig.Cognito.userPoolId = config.userPoolId;
6
- // authConfig.Cognito.userPoolClientId = config.userPoolWebClientId;
7
- // }
8
- Amplify.configure({
9
- Auth: {
10
- Cognito: {
11
- identityPoolId: config.identityPoolId,
12
- allowGuestAccess: true,
13
- },
14
- },
15
- });
16
- }
17
- Amplify.configure({
18
- Analytics: {
19
- Pinpoint: {
20
- appId: config.analyticsAppId,
21
- region: config.region,
22
- ...config.buffering,
23
- },
24
- },
25
- });
26
- }
27
- //# sourceMappingURL=amplifyUtils.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"amplifyUtils.js","sourceRoot":"","sources":["../../src/reporters/amplifyUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAgB5C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAA8B;IACvE,IAAI,MAAM,CAAC,cAAc,KAAK,KAAK,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QAC7D,yDAAyD;QACzD,uDAAuD;QACvD,sEAAsE;QACtE,IAAI;QACJ,OAAO,CAAC,SAAS,CAAC;YAChB,IAAI,EAAE;gBACJ,OAAO,EAAE;oBACP,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,gBAAgB,EAAE,IAAI;iBACvB;aACF;SACF,CAAC,CAAC;IACL,CAAC;IACD,OAAO,CAAC,SAAS,CAAC;QAChB,SAAS,EAAE;YACT,QAAQ,EAAE;gBACR,KAAK,EAAE,MAAM,CAAC,cAAc;gBAC5B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,GAAG,MAAM,CAAC,SAAS;aACpB;SACF;KACF,CAAC,CAAC;AACL,CAAC"}
@@ -1,41 +0,0 @@
1
- import { Amplify } from '@aws-amplify/core';
2
-
3
- export interface AmplifyAnalyticsConfig {
4
- region: string;
5
- analyticsAppId: string;
6
- identityPoolId?: string | false;
7
- userPoolId?: string;
8
- userPoolWebClientId?: string;
9
- buffering?: {
10
- bufferSize?: number;
11
- flushSize?: number;
12
- flushInterval?: number;
13
- resendLimit?: number;
14
- };
15
- }
16
-
17
- export async function initAmplifyAnalytics(config: AmplifyAnalyticsConfig) {
18
- if (config.identityPoolId !== false && config.identityPoolId) {
19
- // if (config.userPoolId && config.userPoolWebClientId) {
20
- // authConfig.Cognito.userPoolId = config.userPoolId;
21
- // authConfig.Cognito.userPoolClientId = config.userPoolWebClientId;
22
- // }
23
- Amplify.configure({
24
- Auth: {
25
- Cognito: {
26
- identityPoolId: config.identityPoolId,
27
- allowGuestAccess: true,
28
- },
29
- },
30
- });
31
- }
32
- Amplify.configure({
33
- Analytics: {
34
- Pinpoint: {
35
- appId: config.analyticsAppId,
36
- region: config.region,
37
- ...config.buffering,
38
- },
39
- },
40
- });
41
- }