@aws-amplify/core 6.0.1-console-preview.5a31ca1.0 → 6.0.1-console-preview.8d88eef.0

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

@@ -1,7 +1,7 @@
 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?: {
         appId: string;
@@ -25,13 +25,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/providers/pinpoint/utils/index.d.ts

@@ -1,3 +1,4 @@
 export { cacheEndpointId } from './cacheEndpointId';
 export { getCacheKey } from './getCacheKey';
 export { getEndpointId } from './getEndpointId';
+export { resolveEndpointId } from './resolveEndpointId';

package/lib/providers/pinpoint/utils/index.js

@@ -2,10 +2,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEndpointId = exports.getCacheKey = exports.cacheEndpointId = void 0;
+exports.resolveEndpointId = exports.getEndpointId = exports.getCacheKey = exports.cacheEndpointId = void 0;
 var cacheEndpointId_1 = require("./cacheEndpointId");
 Object.defineProperty(exports, "cacheEndpointId", { enumerable: true, get: function () { return cacheEndpointId_1.cacheEndpointId; } });
 var getCacheKey_1 = require("./getCacheKey");
 Object.defineProperty(exports, "getCacheKey", { enumerable: true, get: function () { return getCacheKey_1.getCacheKey; } });
 var getEndpointId_1 = require("./getEndpointId");
 Object.defineProperty(exports, "getEndpointId", { enumerable: true, get: function () { return getEndpointId_1.getEndpointId; } });
+var resolveEndpointId_1 = require("./resolveEndpointId");
+Object.defineProperty(exports, "resolveEndpointId", { enumerable: true, get: function () { return resolveEndpointId_1.resolveEndpointId; } });

package/lib/providers/pinpoint/utils/resolveEndpointId.d.ts

@@ -0,0 +1,8 @@
+import { PinpointUpdateEndpointInput } from '../types';
+/**
+ * Resolves an endpoint id from cache or prepare via updateEndpoint if one does not already exist,
+ * which will generate and cache an endpoint id between calls.
+ *
+ * @internal
+ */
+export declare const resolveEndpointId: ({ address, appId, category, channelType, credentials, identityId, region, userAgentValue, }: PinpointUpdateEndpointInput) => Promise<string>;

package/lib/providers/pinpoint/utils/resolveEndpointId.js

@@ -0,0 +1,85 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+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 };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveEndpointId = void 0;
+var errors_1 = require("../../../errors");
+var types_1 = require("../../../types");
+var apis_1 = require("../apis");
+var getEndpointId_1 = require("./getEndpointId");
+/**
+ * Resolves an endpoint id from cache or prepare via updateEndpoint if one does not already exist,
+ * which will generate and cache an endpoint id between calls.
+ *
+ * @internal
+ */
+var resolveEndpointId = function (_a) {
+    var address = _a.address, appId = _a.appId, category = _a.category, channelType = _a.channelType, credentials = _a.credentials, identityId = _a.identityId, region = _a.region, userAgentValue = _a.userAgentValue;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var endpointId;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, (0, getEndpointId_1.getEndpointId)(appId, category)];
+                case 1:
+                    endpointId = _b.sent();
+                    if (!!endpointId) return [3 /*break*/, 4];
+                    return [4 /*yield*/, (0, apis_1.updateEndpoint)({
+                            address: address,
+                            appId: appId,
+                            category: category,
+                            channelType: channelType,
+                            credentials: credentials,
+                            identityId: identityId,
+                            region: region,
+                            userAgentValue: userAgentValue,
+                        })];
+                case 2:
+                    _b.sent();
+                    return [4 /*yield*/, (0, getEndpointId_1.getEndpointId)(appId, category)];
+                case 3:
+                    endpointId = _b.sent();
+                    _b.label = 4;
+                case 4:
+                    (0, errors_1.assert)(!!endpointId, types_1.AmplifyErrorCode.NoEndpointId);
+                    return [2 /*return*/, endpointId];
+            }
+        });
+    });
+};
+exports.resolveEndpointId = resolveEndpointId;

package/lib/singleton/Auth/types.d.ts

@@ -63,12 +63,12 @@ export type AuthIdentityPoolConfig = {
     Cognito: CognitoIdentityPoolConfig & {
         userPoolClientId?: never;
         userPoolId?: never;
+        userPoolEndpoint?: never;
         loginWith?: never;
         signUpVerificationMethod?: never;
         userAttributes?: never;
         mfa?: never;
         passwordFormat?: never;
-        endpoint?: never;
     };
 };
 export type CognitoIdentityPoolConfig = {
@@ -84,6 +84,7 @@ export type AuthUserPoolConfig = {
 export type CognitoUserPoolConfig = {
     userPoolClientId: string;
     userPoolId: string;
+    userPoolEndpoint?: string;
     signUpVerificationMethod?: 'code' | 'link';
     loginWith?: {
         oauth?: OAuthConfig;
@@ -104,7 +105,6 @@ export type CognitoUserPoolConfig = {
         requireNumbers?: boolean;
         requireSpecialCharacters?: boolean;
     };
-    endpoint?: string;
 };
 export type OAuthConfig = {
     domain: string;

package/lib/singleton/Notifications/PushNotification/types.d.ts

@@ -0,0 +1,2 @@
+import { PinpointProviderConfig } from '../../../providers/pinpoint/types';
+export type PushNotificationConfig = PinpointProviderConfig;

package/lib/singleton/Notifications/PushNotification/types.js

@@ -0,0 +1,4 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/singleton/Notifications/types.d.ts

@@ -1,4 +1,6 @@
 import { InAppMessagingConfig } from './InAppMessaging/types';
+import { PushNotificationConfig } from './PushNotification/types';
 export type NotificationsConfig = {
-    InAppMessaging: InAppMessagingConfig;
+    InAppMessaging?: InAppMessagingConfig;
+    PushNotification?: PushNotificationConfig;
 };