@aws-amplify/core 6.0.1-preview-testing.be90020.0 → 6.0.1-ssr-api.df60e41.0

package/lib-esm/providers/pinpoint/apis/updateEndpoint.js

@@ -1,116 +1,71 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-import { v4 as uuidv4 } from 'uuid';
-import { ClientDevice } from '../../../ClientDevice';
-import { updateEndpoint as clientUpdateEndpoint, } from '../../../AwsClients/Pinpoint';
+import { amplifyUuid } from '../../../utils/amplifyUuid';
+import { getClientInfo } from '../../../utils/getClientInfo';
+import { updateEndpoint as clientUpdateEndpoint, } from '../../../awsClients/pinpoint';
 import { cacheEndpointId, getEndpointId } from '../utils';
 /**
  * @internal
  */
-export var updateEndpoint = function (_a) {
-    var address = _a.address, appId = _a.appId, category = _a.category, channelType = _a.channelType, credentials = _a.credentials, identityId = _a.identityId, optOut = _a.optOut, region = _a.region, userId = _a.userId, userProfile = _a.userProfile, userAgentValue = _a.userAgentValue;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var endpointId, createdEndpointId, _b, attributes, demographic, location, metrics, clientInfo, mergedDemographic, input;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, getEndpointId(appId, category)];
-                case 1:
-                    endpointId = _c.sent();
-                    createdEndpointId = !endpointId ? uuidv4() : undefined;
-                    _b = userProfile !== null && userProfile !== void 0 ? userProfile : {}, attributes = _b.attributes, demographic = _b.demographic, location = _b.location, metrics = _b.metrics;
-                    clientInfo = ClientDevice.clientInfo();
-                    mergedDemographic = __assign({ appVersion: clientInfo.appVersion, make: clientInfo.make, model: clientInfo.model, modelVersion: clientInfo.version, platform: clientInfo.platform }, demographic);
-                    input = {
-                        ApplicationId: appId,
-                        EndpointId: endpointId !== null && endpointId !== void 0 ? endpointId : createdEndpointId,
-                        EndpointRequest: {
-                            RequestId: uuidv4(),
-                            EffectiveDate: new Date().toISOString(),
-                            ChannelType: channelType,
-                            Address: address,
-                            Attributes: attributes,
-                            Demographic: {
-                                AppVersion: mergedDemographic.appVersion,
-                                Locale: mergedDemographic.locale,
-                                Make: mergedDemographic.make,
-                                Model: mergedDemographic.model,
-                                ModelVersion: mergedDemographic.modelVersion,
-                                Platform: mergedDemographic.platform,
-                                PlatformVersion: mergedDemographic.platformVersion,
-                                Timezone: mergedDemographic.timezone,
-                            },
-                            Location: {
-                                City: location === null || location === void 0 ? void 0 : location.city,
-                                Country: location === null || location === void 0 ? void 0 : location.country,
-                                Latitude: location === null || location === void 0 ? void 0 : location.latitude,
-                                Longitude: location === null || location === void 0 ? void 0 : location.longitude,
-                                PostalCode: location === null || location === void 0 ? void 0 : location.postalCode,
-                                Region: location === null || location === void 0 ? void 0 : location.region,
-                            },
-                            Metrics: metrics,
-                            OptOut: optOut,
-                            User: {
-                                UserId: userId !== null && userId !== void 0 ? userId : identityId,
-                                UserAttributes: attributes,
-                            },
-                        },
-                    };
-                    return [4 /*yield*/, clientUpdateEndpoint({ credentials: credentials, region: region, userAgentValue: userAgentValue }, input)];
-                case 2:
-                    _c.sent();
-                    // if we had to create an endpoint id, we need to now cache it
-                    if (!!createdEndpointId) {
-                        cacheEndpointId(appId, category, createdEndpointId);
-                    }
-                    return [2 /*return*/];
-            }
-        });
-    });
+export const updateEndpoint = async ({ address, appId, category, channelType, credentials, identityId, optOut, region, userAttributes, userId, userProfile, userAgentValue, }) => {
+    const endpointId = await getEndpointId(appId, category);
+    // only generate a new endpoint id if one was not found in cache
+    const createdEndpointId = !endpointId ? amplifyUuid() : undefined;
+    const { customProperties, demographic, email, location, metrics, name, plan, } = userProfile ?? {};
+    const clientInfo = getClientInfo();
+    const mergedDemographic = {
+        appVersion: clientInfo.appVersion,
+        make: clientInfo.make,
+        model: clientInfo.model,
+        modelVersion: clientInfo.version,
+        platform: clientInfo.platform,
+        ...demographic,
+    };
+    const shouldAddAttributes = email || customProperties || name || plan;
+    const attributes = {
+        ...(email && { email: [email] }),
+        ...(name && { name: [name] }),
+        ...(plan && { plan: [plan] }),
+        ...customProperties,
+    };
+    const input = {
+        ApplicationId: appId,
+        EndpointId: endpointId ?? createdEndpointId,
+        EndpointRequest: {
+            RequestId: amplifyUuid(),
+            EffectiveDate: new Date().toISOString(),
+            ChannelType: channelType,
+            Address: address,
+            Attributes: shouldAddAttributes ? attributes : undefined,
+            Demographic: {
+                AppVersion: mergedDemographic.appVersion,
+                Locale: mergedDemographic.locale,
+                Make: mergedDemographic.make,
+                Model: mergedDemographic.model,
+                ModelVersion: mergedDemographic.modelVersion,
+                Platform: mergedDemographic.platform,
+                PlatformVersion: mergedDemographic.platformVersion,
+                Timezone: mergedDemographic.timezone,
+            },
+            Location: {
+                City: location?.city,
+                Country: location?.country,
+                Latitude: location?.latitude,
+                Longitude: location?.longitude,
+                PostalCode: location?.postalCode,
+                Region: location?.region,
+            },
+            Metrics: metrics,
+            OptOut: optOut,
+            User: {
+                UserId: userId ?? identityId,
+                UserAttributes: userAttributes,
+            },
+        },
+    };
+    await clientUpdateEndpoint({ credentials, region, userAgentValue }, input);
+    // if we had to create an endpoint id, we need to now cache it
+    if (!!createdEndpointId) {
+        return cacheEndpointId(appId, category, createdEndpointId);
+    }
 };

package/lib-esm/providers/pinpoint/index.d.ts

@@ -1,2 +1,3 @@
 export * from './apis';
-export { PinpointAnalyticsEvent, PinpointServiceOptions } from './types';
+export { PinpointAnalyticsEvent, PinpointServiceOptions, UpdateEndpointException, } from './types';
+export { resolveEndpointId } from './utils';

package/lib-esm/providers/pinpoint/index.js

@@ -1,3 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 export * from './apis';
+export { UpdateEndpointException, } from './types';
+export { resolveEndpointId } from './utils';

package/lib-esm/providers/pinpoint/types/errors.d.ts

@@ -0,0 +1,9 @@
+export declare enum UpdateEndpointException {
+    BadRequestException = "BadRequestException",
+    ForbiddenException = "ForbiddenException",
+    InternalServerErrorException = "InternalServerErrorException",
+    MethodNotAllowedException = "MethodNotAllowedException",
+    NotFoundException = "NotFoundException",
+    PayloadTooLargeException = "PayloadTooLargeException",
+    TooManyRequestsException = "TooManyRequestsException"
+}

package/lib-esm/providers/pinpoint/types/errors.js

@@ -0,0 +1,12 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export var UpdateEndpointException;
+(function (UpdateEndpointException) {
+    UpdateEndpointException["BadRequestException"] = "BadRequestException";
+    UpdateEndpointException["ForbiddenException"] = "ForbiddenException";
+    UpdateEndpointException["InternalServerErrorException"] = "InternalServerErrorException";
+    UpdateEndpointException["MethodNotAllowedException"] = "MethodNotAllowedException";
+    UpdateEndpointException["NotFoundException"] = "NotFoundException";
+    UpdateEndpointException["PayloadTooLargeException"] = "PayloadTooLargeException";
+    UpdateEndpointException["TooManyRequestsException"] = "TooManyRequestsException";
+})(UpdateEndpointException || (UpdateEndpointException = {}));

package/lib-esm/providers/pinpoint/types/index.d.ts

@@ -1 +1,2 @@
+export { UpdateEndpointException } from './errors';
 export * from './pinpoint';

package/lib-esm/providers/pinpoint/types/index.js

@@ -1,3 +1,4 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+export { UpdateEndpointException } from './errors';
 export * from './pinpoint';

package/lib-esm/providers/pinpoint/types/pinpoint.d.ts

@@ -1,9 +1,9 @@
 import { AuthSession } from '../../../singleton/Auth/types';
 import { UserProfile } from '../../../types';
-export type SupportedCategory = 'Analytics' | 'InAppMessaging' | 'PushNotification';
-export type SupportedChannelType = 'APNS' | 'APNS_SANDBOX' | 'GCM' | 'IN_APP';
+export type SupportedCategory = 'Analytics' | 'Core' | 'InAppMessaging' | 'PushNotification';
+type SupportedChannelType = 'APNS' | 'APNS_SANDBOX' | 'GCM' | 'IN_APP';
 export type PinpointProviderConfig = {
-    Pinpoint: {
+    Pinpoint?: {
         appId: string;
         region: string;
     };
@@ -11,10 +11,13 @@ export type PinpointProviderConfig = {
 export type PinpointServiceOptions = {
     address?: string;
     optOut?: 'ALL' | 'NONE';
+    userAttributes?: Record<string, string[]>;
 };
 export type PinpointSession = {
     Id: string;
+    Duration?: number;
     StartTimestamp: string;
+    StopTimestamp?: string;
 };
 export type PinpointAnalyticsEvent = {
     name: string;
@@ -24,13 +27,13 @@ export type PinpointAnalyticsEvent = {
 type PinpointCommonParameters = {
     appId: string;
     category: SupportedCategory;
+    channelType?: SupportedChannelType;
     credentials: Required<AuthSession>['credentials'];
     identityId?: AuthSession['identityId'];
     region: string;
     userAgentValue?: string;
 };
 export type PinpointUpdateEndpointInput = PinpointCommonParameters & PinpointServiceOptions & {
-    channelType?: SupportedChannelType;
     userId?: string;
     userProfile?: UserProfile;
 };

package/lib-esm/providers/pinpoint/utils/PinpointEventBuffer.d.ts

@@ -12,6 +12,7 @@ export declare class PinpointEventBuffer {
     resume(): void;
     flush(): void;
     identityHasChanged(identityId: AuthSession['identityId']): boolean;
+    flushAll(): void;
     private _startLoop;
     private _sendBatch;
     private _putEvents;