@aws-amplify/notifications 2.0.1-console-preview.8d88eef.0 → 2.0.1-console-preview.be08038.0

package/lib/inAppMessaging/providers/pinpoint/apis/identifyUser.d.ts

@@ -40,10 +40,10 @@
  *     },
  *     options: {
  *         address: 'device-address',
- *             optOut: 'NONE',
- * 			   userAttributes: {
- * 			      interests: ['food']
- * 		   },
+ *         optOut: 'NONE',
+ *         userAttributes: {
+ *             interests: ['food']
+ *         },
  *     },
  * });
  */

package/lib/inAppMessaging/providers/pinpoint/apis/identifyUser.js

@@ -49,10 +49,10 @@ var utils_3 = require("../../../utils");
  *     },
  *     options: {
  *         address: 'device-address',
- *             optOut: 'NONE',
- * 			   userAttributes: {
- * 			      interests: ['food']
- * 		   },
+ *         optOut: 'NONE',
+ *         userAttributes: {
+ *             interests: ['food']
+ *         },
  *     },
  * });
  */

package/lib/inAppMessaging/providers/pinpoint/apis/initializeInAppMessaging.js

@@ -2,15 +2,14 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var sessionTracker_1 = tslib_1.__importDefault(require("../../../sessionTracker"));
+var utils_1 = require("@aws-amplify/core/internals/utils");
 var eventListeners_1 = require("../../../../eventListeners");
 var helpers_1 = require("../utils/helpers");
 var types_1 = require("../types");
 var core_1 = require("@aws-amplify/core");
 var dispatchEvent_1 = require("./dispatchEvent");
-var utils_1 = require("../utils");
-var utils_2 = require("../../../utils");
+var utils_2 = require("../utils");
+var utils_3 = require("../../../utils");
 /**
  * Initialize and set up in-app messaging category. This API needs to be called to enable other InAppMessaging APIs.
  *
@@ -23,16 +22,15 @@ var utils_2 = require("../../../utils");
  * ```
  */
 function initializeInAppMessaging() {
-    if (utils_2.isInitialized()) {
+    if (utils_3.isInitialized()) {
         return;
     }
-    // set up the session tracker and start it
-    var sessionTracker = new sessionTracker_1.default(utils_1.sessionStateChangeHandler);
-    sessionTracker.start();
+    // register with the session listener
+    utils_1.sessionListener.addStateChangeListener(utils_2.sessionStateChangeHandler, true);
     // wire up default Pinpoint message event handling
     eventListeners_1.addEventListener('messageDisplayed', function (message) {
         helpers_1.recordAnalyticsEvent(types_1.PinpointMessageEvent.MESSAGE_DISPLAYED, message);
-        utils_1.incrementMessageCounts(message.id);
+        utils_2.incrementMessageCounts(message.id);
     });
     eventListeners_1.addEventListener('messageDismissed', function (message) {
         helpers_1.recordAnalyticsEvent(types_1.PinpointMessageEvent.MESSAGE_DISMISSED, message);
@@ -42,7 +40,7 @@ function initializeInAppMessaging() {
     });
     // listen to analytics hub events
     core_1.Hub.listen('analytics', analyticsListener);
-    utils_2.initialize();
+    utils_3.initialize();
 }
 exports.initializeInAppMessaging = initializeInAppMessaging;
 function analyticsListener(_a) {

package/lib/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.d.ts

@@ -1,6 +1,6 @@
 import { InAppMessage, InAppMessagingEvent } from '../../../types';
 import type { InAppMessageCampaign as PinpointInAppMessage } from '@aws-amplify/core/internals/aws-clients/pinpoint';
-import { SessionState } from '../../../sessionTracker';
+import { SessionState } from '@aws-amplify/core/internals/utils';
 export declare function processInAppMessages(messages: PinpointInAppMessage[], event: InAppMessagingEvent): Promise<InAppMessage[]>;
 export declare function sessionStateChangeHandler(state: SessionState): void;
 export declare function incrementMessageCounts(messageId: string): Promise<void>;

package/lib/pushNotifications/errors/errorHelpers.d.ts

@@ -6,3 +6,4 @@ export declare enum PushNotificationValidationErrorCode {
     NotInitialized = "NotInitialized"
 }
 export declare const assert: AssertionFunction<PushNotificationValidationErrorCode>;
+export declare const assertIsInitialized: () => void;

package/lib/pushNotifications/errors/errorHelpers.js

@@ -4,6 +4,7 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("@aws-amplify/core/internals/utils");
+var utils_2 = require("../utils");
 var PushNotificationError_1 = require("./PushNotificationError");
 var PushNotificationValidationErrorCode;
 (function (PushNotificationValidationErrorCode) {
@@ -28,3 +29,6 @@ var pushNotificationValidationErrorMap = (_a = {},
     },
     _a);
 exports.assert = utils_1.createAssertionFunction(pushNotificationValidationErrorMap, PushNotificationError_1.PushNotificationError);
+exports.assertIsInitialized = function () {
+    exports.assert(utils_2.isInitialized(), PushNotificationValidationErrorCode.NotInitialized);
+};

package/lib/pushNotifications/providers/pinpoint/apis/getBadgeCount.native.js

@@ -4,7 +4,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var react_native_1 = require("@aws-amplify/react-native");
+var errorHelpers_1 = require("../../../errors/errorHelpers");
 var getBadgeCountNative = react_native_1.loadAmplifyPushNotification().getBadgeCount;
-exports.getBadgeCount = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
-    return [2 /*return*/, getBadgeCountNative()];
-}); }); };
+exports.getBadgeCount = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+    return tslib_1.__generator(this, function (_a) {
+        errorHelpers_1.assertIsInitialized();
+        return [2 /*return*/, getBadgeCountNative()];
+    });
+}); };

package/lib/pushNotifications/providers/pinpoint/apis/getLaunchNotification.native.js

@@ -3,7 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_native_1 = require("@aws-amplify/react-native");
+var errorHelpers_1 = require("../../../errors/errorHelpers");
 var getLaunchNotificationNative = react_native_1.loadAmplifyPushNotification().getLaunchNotification;
 exports.getLaunchNotification = function () {
+    errorHelpers_1.assertIsInitialized();
     return getLaunchNotificationNative();
 };

package/lib/pushNotifications/providers/pinpoint/apis/getPermissionStatus.native.js

@@ -3,7 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_native_1 = require("@aws-amplify/react-native");
+var errorHelpers_1 = require("../../../errors/errorHelpers");
 var getPermissionStatusNative = react_native_1.loadAmplifyPushNotification().getPermissionStatus;
 exports.getPermissionStatus = function () {
+    errorHelpers_1.assertIsInitialized();
     return getPermissionStatusNative();
 };

package/lib/pushNotifications/providers/pinpoint/apis/identifyUser.native.js

@@ -5,21 +5,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var utils_1 = require("@aws-amplify/core/internals/utils");
 var pinpoint_1 = require("@aws-amplify/core/internals/providers/pinpoint");
-var utils_2 = require("../utils");
+var errorHelpers_1 = require("../../../errors/errorHelpers");
+var utils_2 = require("../../../utils");
+var utils_3 = require("../utils");
 exports.identifyUser = function (_a) {
     var userId = _a.userId, userProfile = _a.userProfile, options = _a.options;
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {
         var _b, credentials, identityId, _c, appId, region, _d, address, optOut, userAttributes;
         return tslib_1.__generator(this, function (_e) {
             switch (_e.label) {
-                case 0: return [4 /*yield*/, utils_2.resolveCredentials()];
+                case 0:
+                    errorHelpers_1.assertIsInitialized();
+                    return [4 /*yield*/, utils_2.resolveCredentials()];
                 case 1:
                     _b = _e.sent(), credentials = _b.credentials, identityId = _b.identityId;
                     _c = utils_2.resolveConfig(), appId = _c.appId, region = _c.region;
                     _d = options !== null && options !== void 0 ? options : {}, address = _d.address, optOut = _d.optOut, userAttributes = _d.userAttributes;
                     pinpoint_1.updateEndpoint({
                         address: address,
-                        channelType: utils_2.getChannelType(),
+                        channelType: utils_3.getChannelType(),
                         optOut: optOut,
                         appId: appId,
                         category: 'PushNotification',
@@ -29,7 +33,7 @@ exports.identifyUser = function (_a) {
                         userAttributes: userAttributes,
                         userId: userId,
                         userProfile: userProfile,
-                        userAgentValue: utils_2.getPushNotificationUserAgentString(utils_1.PushNotificationAction.IdentifyUser),
+                        userAgentValue: utils_3.getPushNotificationUserAgentString(utils_1.PushNotificationAction.IdentifyUser),
                     });
                     return [2 /*return*/];
             }

package/lib/pushNotifications/providers/pinpoint/apis/initializePushNotifications.native.js

@@ -8,7 +8,8 @@ var utils_1 = require("@aws-amplify/core/internals/utils");
 var pinpoint_1 = require("@aws-amplify/core/internals/providers/pinpoint");
 var react_native_1 = require("@aws-amplify/react-native");
 var eventListeners_1 = require("../../../../eventListeners");
-var utils_2 = require("../utils");
+var utils_2 = require("../../../utils");
+var utils_3 = require("../utils");
 var _a = react_native_1.loadAmplifyPushNotification(), addMessageEventListener = _a.addMessageEventListener, addTokenEventListener = _a.addTokenEventListener, completeNotification = _a.completeNotification, getConstants = _a.getConstants, registerHeadlessTask = _a.registerHeadlessTask;
 var logger = new core_1.ConsoleLogger('Notifications.PushNotification');
 var BACKGROUND_TASK_TIMEOUT = 25; // seconds
@@ -24,16 +25,16 @@ exports.initializePushNotifications = function () {
 var addAnalyticsListeners = function () {
     var launchNotificationOpenedListenerRemover;
     // wire up default Pinpoint message event handling
-    eventListeners_1.addEventListener('backgroundMessageReceived', utils_2.createMessageEventRecorder('backgroundMessageReceived'));
-    eventListeners_1.addEventListener('foregroundMessageReceived', utils_2.createMessageEventRecorder('foregroundMessageReceived'));
-    launchNotificationOpenedListenerRemover = eventListeners_1.addEventListener('launchNotificationsOpened', utils_2.createMessageEventRecorder('notificationOpened', 
+    eventListeners_1.addEventListener('backgroundMessageReceived', utils_3.createMessageEventRecorder('backgroundMessageReceived'));
+    eventListeners_1.addEventListener('foregroundMessageReceived', utils_3.createMessageEventRecorder('foregroundMessageReceived'));
+    launchNotificationOpenedListenerRemover = eventListeners_1.addEventListener('launchNotificationsOpened', utils_3.createMessageEventRecorder('notificationOpened', 
     // once we are done with it we can remove the listener
     launchNotificationOpenedListenerRemover === null || 
     // once we are done with it we can remove the listener
     launchNotificationOpenedListenerRemover === void 0 ? void 0 : 
     // once we are done with it we can remove the listener
     launchNotificationOpenedListenerRemover.remove));
-    eventListeners_1.addEventListener('notificationOpened', utils_2.createMessageEventRecorder('notificationOpened', 
+    eventListeners_1.addEventListener('notificationOpened', utils_3.createMessageEventRecorder('notificationOpened', 
     // if we are in this state, we no longer need the listener as the app was launched via some other means
     launchNotificationOpenedListenerRemover === null || 
     // if we are in this state, we no longer need the listener as the app was launched via some other means
@@ -148,9 +149,9 @@ var registerDevice = function () { return tslib_1.__awaiter(void 0, void 0, void
                         category: 'PushNotification',
                         credentials: credentials,
                         region: region,
-                        channelType: utils_2.getChannelType(),
+                        channelType: utils_3.getChannelType(),
                         identityId: identityId,
-                        userAgentValue: utils_2.getPushNotificationUserAgentString(utils_1.PushNotificationAction.InitializePushNotifications),
+                        userAgentValue: utils_3.getPushNotificationUserAgentString(utils_1.PushNotificationAction.InitializePushNotifications),
                     })];
         }
     });

package/lib/pushNotifications/providers/pinpoint/apis/onNotificationOpened.native.js

@@ -3,6 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var eventListeners_1 = require("../../../../eventListeners");
+var errorHelpers_1 = require("../../../errors/errorHelpers");
 exports.onNotificationOpened = function (input) {
+    errorHelpers_1.assertIsInitialized();
     return eventListeners_1.addEventListener('notificationOpened', input);
 };

package/lib/pushNotifications/providers/pinpoint/apis/onNotificationReceivedInBackground.native.js

@@ -3,4 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var eventListeners_1 = require("../../../../eventListeners");
-exports.onNotificationReceivedInBackground = function (input) { return eventListeners_1.addEventListener('backgroundMessageReceived', input); };
+var errorHelpers_1 = require("../../../errors/errorHelpers");
+exports.onNotificationReceivedInBackground = function (input) {
+    errorHelpers_1.assertIsInitialized();
+    return eventListeners_1.addEventListener('backgroundMessageReceived', input);
+};

package/lib/pushNotifications/providers/pinpoint/apis/onNotificationReceivedInForeground.native.js

@@ -3,4 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var eventListeners_1 = require("../../../../eventListeners");
-exports.onNotificationReceivedInForeground = function (input) { return eventListeners_1.addEventListener('foregroundMessageReceived', input); };
+var errorHelpers_1 = require("../../../errors/errorHelpers");
+exports.onNotificationReceivedInForeground = function (input) {
+    errorHelpers_1.assertIsInitialized();
+    return eventListeners_1.addEventListener('foregroundMessageReceived', input);
+};

package/lib/pushNotifications/providers/pinpoint/apis/onTokenReceived.native.js

@@ -3,6 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var eventListeners_1 = require("../../../../eventListeners");
+var errorHelpers_1 = require("../../../errors/errorHelpers");
 exports.onTokenReceived = function (input) {
+    errorHelpers_1.assertIsInitialized();
     return eventListeners_1.addEventListener('tokenReceived', input);
 };

package/lib/pushNotifications/providers/pinpoint/apis/requestPermissions.native.js

@@ -3,7 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_native_1 = require("@aws-amplify/react-native");
+var errorHelpers_1 = require("../../../errors/errorHelpers");
 var requestPermissionsNative = react_native_1.loadAmplifyPushNotification().requestPermissions;
 exports.requestPermissions = function (input) {
+    errorHelpers_1.assertIsInitialized();
     return requestPermissionsNative(input);
 };

package/lib/pushNotifications/providers/pinpoint/apis/setBadgeCount.native.js

@@ -3,5 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_native_1 = require("@aws-amplify/react-native");
+var errorHelpers_1 = require("../../../errors/errorHelpers");
 var setBadgeCountNative = react_native_1.loadAmplifyPushNotification().setBadgeCount;
-exports.setBadgeCount = function (input) { return setBadgeCountNative(input); };
+exports.setBadgeCount = function (input) {
+    errorHelpers_1.assertIsInitialized();
+    setBadgeCountNative(input);
+};

package/lib/pushNotifications/providers/pinpoint/utils/createMessageEventRecorder.js

@@ -7,8 +7,7 @@ var pinpoint_1 = require("@aws-amplify/core/internals/providers/pinpoint");
 var core_1 = require("@aws-amplify/core");
 var getAnalyticsEvent_1 = require("./getAnalyticsEvent");
 var getChannelType_1 = require("./getChannelType");
-var resolveCredentials_1 = require("./resolveCredentials");
-var resolveConfig_1 = require("./resolveConfig");
+var utils_1 = require("../../../utils");
 var logger = new core_1.ConsoleLogger('PushNotification.recordMessageEvent');
 /**
  * @internal
@@ -18,10 +17,10 @@ exports.createMessageEventRecorder = function (event, callback) {
         var credentials, _a, appId, region;
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
-                case 0: return [4 /*yield*/, resolveCredentials_1.resolveCredentials()];
+                case 0: return [4 /*yield*/, utils_1.resolveCredentials()];
                 case 1:
                     credentials = (_b.sent()).credentials;
-                    _a = resolveConfig_1.resolveConfig(), appId = _a.appId, region = _a.region;
+                    _a = utils_1.resolveConfig(), appId = _a.appId, region = _a.region;
                     return [4 /*yield*/, recordMessageEvent({
                             appId: appId,
                             credentials: credentials,

package/lib/pushNotifications/providers/pinpoint/utils/index.d.ts

@@ -1,7 +1,3 @@
 export { createMessageEventRecorder } from './createMessageEventRecorder';
 export { getChannelType } from './getChannelType';
 export { getPushNotificationUserAgentString } from './getPushNotificationUserAgentString';
-export { initialize, isInitialized } from './initializationManager';
-export { resolveConfig } from './resolveConfig';
-export { resolveCredentials } from './resolveCredentials';
-export { getToken, setToken } from './tokenManager';

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

@@ -8,13 +8,3 @@ var getChannelType_1 = require("./getChannelType");
 exports.getChannelType = getChannelType_1.getChannelType;
 var getPushNotificationUserAgentString_1 = require("./getPushNotificationUserAgentString");
 exports.getPushNotificationUserAgentString = getPushNotificationUserAgentString_1.getPushNotificationUserAgentString;
-var initializationManager_1 = require("./initializationManager");
-exports.initialize = initializationManager_1.initialize;
-exports.isInitialized = initializationManager_1.isInitialized;
-var resolveConfig_1 = require("./resolveConfig");
-exports.resolveConfig = resolveConfig_1.resolveConfig;
-var resolveCredentials_1 = require("./resolveCredentials");
-exports.resolveCredentials = resolveCredentials_1.resolveCredentials;
-var tokenManager_1 = require("./tokenManager");
-exports.getToken = tokenManager_1.getToken;
-exports.setToken = tokenManager_1.setToken;

package/lib/pushNotifications/utils/index.d.ts

@@ -0,0 +1,4 @@
+export { initialize, isInitialized } from './initializationManager';
+export { resolveConfig } from './resolveConfig';
+export { resolveCredentials } from './resolveCredentials';
+export { getToken, setToken } from './tokenManager';

package/lib/pushNotifications/utils/index.js

@@ -0,0 +1,14 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+var initializationManager_1 = require("./initializationManager");
+exports.initialize = initializationManager_1.initialize;
+exports.isInitialized = initializationManager_1.isInitialized;
+var resolveConfig_1 = require("./resolveConfig");
+exports.resolveConfig = resolveConfig_1.resolveConfig;
+var resolveCredentials_1 = require("./resolveCredentials");
+exports.resolveCredentials = resolveCredentials_1.resolveCredentials;
+var tokenManager_1 = require("./tokenManager");
+exports.getToken = tokenManager_1.getToken;
+exports.setToken = tokenManager_1.setToken;

package/lib/pushNotifications/{providers/pinpoint/utils → utils}/resolveConfig.js

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@aws-amplify/core");
-var errors_1 = require("../../../errors");
+var errors_1 = require("../errors");
 /**
  * @internal
  */

package/lib/pushNotifications/{providers/pinpoint/utils → utils}/resolveCredentials.js

@@ -4,7 +4,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var core_1 = require("@aws-amplify/core");
-var errors_1 = require("../../../errors");
+var errors_1 = require("../errors");
 /**
  * @internal
  */