@sudoplatform/sudo-notification 1.0.2 → 2.0.0

package/lib/private/apiClient.js

@@ -1,19 +1,27 @@
-/*
- * Copyright © 2025 Anonyome Labs, Inc. All rights reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
 import { DefaultApiClientManager, } from '@sudoplatform/sudo-api-client';
-import { DefaultLogger, FatalError, UnknownGraphQLError, } from '@sudoplatform/sudo-common';
-import { DeleteAppFromDeviceDocument, GetNotificationSettingsDocument, RegisterAppOnDeviceDocument, SendTestNotificationDocument, UpdateDeviceInfoDocument, UpdateNotificationSettingsDocument, } from '../gen/graphqlTypes';
+import { DefaultLogger, FatalError, isGraphQLNetworkError, mapNetworkErrorToClientError, UnknownGraphQLError, } from '@sudoplatform/sudo-common';
+import { DeleteAppFromDeviceDocument, GetNotificationSettingsDocument, GetUserAndDeviceNotificationSettingsDocument, RegisterAppOnDeviceDocument, SendTestNotificationDocument, UpdateDeviceInfoDocument, UpdateNotificationSettingsDocument, } from '../gen/graphqlTypes';
 import { SERVICE_NAME } from './constants';
 import { ErrorTransformer } from './transformers/errorTransformer';
 export class ApiClient {
     constructor(apiClientManager) {
+        this.mapGraphQLCallError = (err) => {
+            if ('graphQLErrors' in err && Array.isArray(err.graphQLErrors)) {
+                const error = err.graphQLErrors[0];
+                if (error) {
+                    this.log.debug('appSync operation failed with error', { err });
+                    return ErrorTransformer.toClientError(error);
+                }
+            }
+            if ('errorType' in err) {
+                this.log.debug('appSync operation failed with error', { err });
+                return ErrorTransformer.toClientError(err);
+            }
+            return new UnknownGraphQLError(err);
+        };
         this.log = new DefaultLogger(this.constructor.name);
         const clientManager = apiClientManager ?? DefaultApiClientManager.getInstance();
         this.client = clientManager.getClient({
-            disableOffline: true,
             configNamespace: SERVICE_NAME,
         });
     }
@@ -45,11 +53,18 @@ export class ApiClient {
         const data = await this.performQuery({
             query: GetNotificationSettingsDocument,
             variables: { input },
-            fetchPolicy: 'network-only',
             calleeName: this.getNotificationSettings.name,
         });
         return data.getNotificationSettings;
     }
+    async getUserAndDeviceNotificationSettings(input) {
+        const data = await this.performQuery({
+            query: GetUserAndDeviceNotificationSettingsDocument,
+            variables: { input },
+            calleeName: this.getUserAndDeviceNotificationSettings.name,
+        });
+        return data.getUserAndDeviceNotificationSettings;
+    }
     async updateNotificationSettings(input) {
         const data = await this.performMutation({
             mutation: UpdateNotificationSettingsDocument,
@@ -66,30 +81,24 @@ export class ApiClient {
         });
         return data.sendTestNotification;
     }
-    async performQuery({ variables, fetchPolicy, query, calleeName, }) {
+    async performQuery({ variables, query, calleeName, }) {
         let result;
         try {
             result = await this.client.query({
                 variables,
-                fetchPolicy,
                 query,
             });
         }
         catch (err) {
-            const clientError = err;
-            this.log.debug('error received', { calleeName, clientError });
-            const error = clientError.graphQLErrors?.[0];
-            if (error) {
-                this.log.debug('appSync query failed with error', { error });
-                throw ErrorTransformer.toClientError(error);
-            }
-            else {
-                throw new UnknownGraphQLError(err);
+            const error = err;
+            this.log.debug('error received via query', { calleeName, error });
+            if (isGraphQLNetworkError(error)) {
+                throw mapNetworkErrorToClientError(error);
             }
+            throw this.mapGraphQLCallError(error);
         }
         const error = result.errors?.[0];
         if (error) {
-            this.log.debug('error received', { error });
             throw ErrorTransformer.toClientError(error);
         }
         if (result.data) {
@@ -108,20 +117,15 @@ export class ApiClient {
             });
         }
         catch (err) {
-            const clientError = err;
-            this.log.debug('error received', { calleeName, clientError });
-            const error = clientError.graphQLErrors?.[0];
-            if (error) {
-                this.log.debug('appSync mutation failed with error', { error });
-                throw ErrorTransformer.toClientError(error);
-            }
-            else {
-                throw new UnknownGraphQLError(err);
+            const error = err;
+            this.log.debug('error received via mutation', { calleeName, error });
+            if (isGraphQLNetworkError(error)) {
+                throw mapNetworkErrorToClientError(error);
             }
+            throw this.mapGraphQLCallError(error);
         }
         const error = result.errors?.[0];
         if (error) {
-            this.log.debug('appSync mutation failed with error', { error });
             throw ErrorTransformer.toClientError(error);
         }
         if (result.data) {

package/lib/private/apiClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiClient.js","sourceRoot":"","sources":["../../src/private/apiClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apiClient.js","sourceRoot":"","sources":["../../src/private/apiClient.ts"],"names":[],"mappings":"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"}

package/lib/private/transformers/errorTransformer.js

@@ -3,11 +3,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-import { mapGraphQLToClientError, } from '@sudoplatform/sudo-common';
-import { DeviceAlreadyRegisteredError, DeviceCreateError, DeviceDeleteError, DeviceNotFoundError, DeviceReadError, DeviceUpdateError, SchemaValidationError, } from '../../public/errors';
+import { mapGraphQLToClientError } from '@sudoplatform/sudo-common';
+import { DeviceAlreadyRegisteredError, DeviceCreateError, DeviceDeleteError, DeviceNotFoundError, DeviceReadError, DeviceUpdateError, SchemaValidationError, UserInfoReadError, UserInfoUpdateError, } from '../../public/errors';
 export class ErrorTransformer {
     static toClientError(error) {
-        switch (error.errorType) {
+        const errorType = 'errorType' in error ? error.errorType : error.message;
+        switch (errorType) {
             case 'sudoplatform.ns.DeviceExist':
                 return new DeviceAlreadyRegisteredError(error.message);
             case 'sudoplatform.ns.DeviceNotFound':
@@ -22,6 +23,10 @@ export class ErrorTransformer {
                 return new DeviceReadError(error.message);
             case 'sudoplatform.ns.SchemaValidation':
                 return new SchemaValidationError(error.message);
+            case 'sudoplatform.ns.UserInfoRead':
+                return new UserInfoReadError(error.message);
+            case 'sudoplatform.ns.UserInfoUpdate':
+                return new UserInfoUpdateError(error.message);
             default:
                 return mapGraphQLToClientError(error);
         }

package/lib/private/transformers/errorTransformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorTransformer.js","sourceRoot":"","sources":["../../../src/private/transformers/errorTransformer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAEL,uBAAuB,GACxB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EACL,4BAA4B,EAC5B,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,qBAAqB,CAAA;AAE5B,MAAM,OAAO,gBAAgB;IAC3B,MAAM,CAAC,aAAa,CAAC,KAAmB;QACtC,QAAQ,KAAK,CAAC,SAAS,EAAE,CAAC;YACxB,KAAK,6BAA6B;gBAChC,OAAO,IAAI,4BAA4B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACxD,KAAK,gCAAgC;gBACnC,OAAO,IAAI,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC/C,KAAK,8BAA8B;gBACjC,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC7C,KAAK,8BAA8B;gBACjC,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC7C,KAAK,8BAA8B;gBACjC,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC7C,KAAK,4BAA4B;gBAC/B,OAAO,IAAI,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC3C,KAAK,kCAAkC;gBACrC,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACjD;gBACE,OAAO,uBAAuB,CAAC,KAAK,CAAC,CAAA;QACzC,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"errorTransformer.js","sourceRoot":"","sources":["../../../src/private/transformers/errorTransformer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,OAAO,EACL,4BAA4B,EAC5B,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,qBAAqB,CAAA;AAE5B,MAAM,OAAO,gBAAgB;IAC3B,MAAM,CAAC,aAAa,CAClB,KAA4D;QAE5D,MAAM,SAAS,GAAG,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;QAExE,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,6BAA6B;gBAChC,OAAO,IAAI,4BAA4B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACxD,KAAK,gCAAgC;gBACnC,OAAO,IAAI,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC/C,KAAK,8BAA8B;gBACjC,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC7C,KAAK,8BAA8B;gBACjC,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC7C,KAAK,8BAA8B;gBACjC,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC7C,KAAK,4BAA4B;gBAC/B,OAAO,IAAI,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC3C,KAAK,kCAAkC;gBACrC,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACjD,KAAK,8BAA8B;gBACjC,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC7C,KAAK,gCAAgC;gBACnC,OAAO,IAAI,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC/C;gBACE,OAAO,uBAAuB,CAAC,KAAK,CAAC,CAAA;QACzC,CAAC;IACH,CAAC;CACF"}

package/lib/public/errors.js

@@ -113,4 +113,20 @@ export class SchemaValidationError extends NotificationError {
         super(message);
     }
 }
+/**
+ * The user notification settings could not be read
+ */
+export class UserInfoReadError extends NotificationError {
+    constructor(msg) {
+        super(msg);
+    }
+}
+/**
+ * The user notification settings could not be updated
+ */
+export class UserInfoUpdateError extends NotificationError {
+    constructor(msg) {
+        super(msg);
+    }
+}
 //# sourceMappingURL=errors.js.map

package/lib/public/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/public/errors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,iBAAkB,SAAQ,KAAK;IACnC,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;QACV,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;QACjC,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC5B,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACjD,CAAC;IACH,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,sCAAuC,SAAQ,iBAAiB;IAC3E,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,yBAA0B,SAAQ,iBAAiB;IAC9D,YAAY,WAAmB;QAC7B,KAAK,CAAC,WAAW,CAAC,CAAA;IACpB,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,OAAO,4BAA6B,SAAQ,iBAAiB;IACjE,YAAY,QAAgB;QAC1B,KAAK,CAAC,QAAQ,CAAC,CAAA;IACjB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,4BAA6B,SAAQ,iBAAiB;IACjE,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,mBAAoB,SAAQ,iBAAiB;IACxD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,iBAAiB;IACtD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,iBAAiB;IACpD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,iBAAiB;IACtD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,iBAAiB;IACtD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,sCAAuC,SAAQ,iBAAiB;IAC3E,YAAY,WAAmB;QAC7B,KAAK,CAAC,WAAW,CAAC,CAAA;IACpB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,8BAA+B,SAAQ,iBAAiB;IACnE,YAAY,WAAmB;QAC7B,KAAK,CAAC,WAAW,CAAC,CAAA;IACpB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,qBAAsB,SAAQ,iBAAiB;IAC1D,YAAY,OAAgB;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;CACF"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/public/errors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,iBAAkB,SAAQ,KAAK;IACnC,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;QACV,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;QACjC,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC5B,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACjD,CAAC;IACH,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,sCAAuC,SAAQ,iBAAiB;IAC3E,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,yBAA0B,SAAQ,iBAAiB;IAC9D,YAAY,WAAmB;QAC7B,KAAK,CAAC,WAAW,CAAC,CAAA;IACpB,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,OAAO,4BAA6B,SAAQ,iBAAiB;IACjE,YAAY,QAAgB;QAC1B,KAAK,CAAC,QAAQ,CAAC,CAAA;IACjB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,4BAA6B,SAAQ,iBAAiB;IACjE,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,mBAAoB,SAAQ,iBAAiB;IACxD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,iBAAiB;IACtD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,iBAAiB;IACpD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,iBAAiB;IACtD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,iBAAiB;IACtD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,sCAAuC,SAAQ,iBAAiB;IAC3E,YAAY,WAAmB;QAC7B,KAAK,CAAC,WAAW,CAAC,CAAA;IACpB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,8BAA+B,SAAQ,iBAAiB;IACnE,YAAY,WAAmB;QAC7B,KAAK,CAAC,WAAW,CAAC,CAAA;IACpB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,qBAAsB,SAAQ,iBAAiB;IAC1D,YAAY,OAAgB;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,iBAAiB;IACtD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,mBAAoB,SAAQ,iBAAiB;IACxD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACF"}

package/lib/public/sudoNotificationClient.js

@@ -102,14 +102,47 @@ export class DefaultSudoNotificationClient {
         });
         return NotificationConfigurationTransformer.toAPI(settings);
     }
-    async setNotificationConfiguration(deviceInfo, config) {
+    async getUserNotificationConfiguration(bundleId) {
+        await this.checkIsSignedInOrThrow();
+        const settings = await this.apiClient.getUserAndDeviceNotificationSettings({
+            bundleId,
+        });
+        return settings.user
+            ? NotificationConfigurationTransformer.toAPI(settings.user)
+            : undefined;
+    }
+    async getUserAndDeviceNotificationConfiguration(deviceInfo) {
+        await this.checkIsSignedInOrThrow();
+        const settings = await this.apiClient.getUserAndDeviceNotificationSettings({
+            bundleId: deviceInfo.bundleId,
+            deviceId: deviceInfo.deviceId,
+        });
+        return {
+            user: settings.user
+                ? NotificationConfigurationTransformer.toAPI(settings.user)
+                : undefined,
+            device: settings.device
+                ? NotificationConfigurationTransformer.toAPI(settings.device)
+                : undefined,
+        };
+    }
+    setNotificationConfiguration(deviceInfo, config) {
+        return this.setUserOrDeviceNotificationConfiguration(deviceInfo, config);
+    }
+    setUserNotificationConfiguration(bundleId, config) {
+        return this.setUserOrDeviceNotificationConfiguration(bundleId, config);
+    }
+    async setUserOrDeviceNotificationConfiguration(deviceInfoOrBundleId, config) {
+        const { bundleId, deviceId } = typeof deviceInfoOrBundleId === 'string'
+            ? { bundleId: deviceInfoOrBundleId, deviceId: undefined }
+            : deviceInfoOrBundleId;
         await this.checkIsSignedInOrThrow();
         const services = this.notifiableServices
             .map((client) => client.getSchema())
             .map((schema) => NotificationMetadataTransformer.toGraphQL(schema));
         await this.apiClient.updateNotificationSettings({
-            bundleId: deviceInfo.bundleId,
-            deviceId: deviceInfo.deviceId,
+            bundleId,
+            deviceId,
             filter: NotificationConfigurationTransformer.toGraphQLFilters(config),
             services,
         });

package/lib/public/sudoNotificationClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"sudoNotificationClient.js","sourceRoot":"","sources":["../../src/public/sudoNotificationClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sudoNotificationClient.js","sourceRoot":"","sources":["../../src/public/sudoNotificationClient.ts"],"names":[],"mappings":"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"}

package/lib/public/types/index.js

@@ -14,4 +14,5 @@ export * from './sudoNotification';
 export * from './sudoNotificationClientOptions';
 export * from './sudoNotificationData';
 export * from './sudoNotificationFilterClient';
+export * from './userAndDeviceNotificationConfiguration';
 //# sourceMappingURL=index.js.map

package/lib/public/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/public/types/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,cAAc,aAAa,CAAA;AAC3B,cAAc,6BAA6B,CAAA;AAC3C,cAAc,0BAA0B,CAAA;AACxC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,wBAAwB,CAAA;AACtC,cAAc,gCAAgC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/public/types/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,cAAc,aAAa,CAAA;AAC3B,cAAc,6BAA6B,CAAA;AAC3C,cAAc,0BAA0B,CAAA;AACxC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,wBAAwB,CAAA;AACtC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,0CAA0C,CAAA"}

package/lib/public/types/userAndDeviceNotificationConfiguration.js

@@ -0,0 +1,7 @@
+/*
+ * Copyright © 2025 Anonyome Labs, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};
+//# sourceMappingURL=userAndDeviceNotificationConfiguration.js.map

package/lib/public/types/userAndDeviceNotificationConfiguration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"userAndDeviceNotificationConfiguration.js","sourceRoot":"","sources":["../../../src/public/types/userAndDeviceNotificationConfiguration.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@sudoplatform/sudo-notification",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "author": "Anonyome Labs, Inc.",
   "repository": {
     "type": "git",
-    "url": "https://github.com/sudoplatform/sudo-notification-web.git"
+    "url": "git+https://github.com/sudoplatform/sudo-notification-web.git"
   },
   "license": "Apache-2.0",
   "scripts": {
-    "audit": "./node_modules/.bin/audit-with-suppressions",
+    "audit": "true",
     "prepare": "husky",
     "lint": "yarn lint:eslint && yarn lint:prettier",
     "lint:eslint": "eslint \"{bin,test,src}/**/*.{js,ts,tsx}\"",
@@ -16,7 +16,8 @@
     "codegen": "graphql-codegen -c codegen.yml",
     "verify": "yarn audit && yarn lint && yarn unit-test",
     "unit-test": "jest --coverage test/unit",
-    "integration-test": "jest test/integration",
+    "integration-test": "jest test/integration --passWithNoTests",
+    "test": "yarn unit-test && yarn integration-test",
     "clean": "rm -rf esm lib docs",
     "build": "yarn codegen && yarn build:transpile && yarn build:docs",
     "build:transpile": "concurrently \"yarn build:transpile:declarations\" \"yarn build:transpile:cjs\" \"yarn build:transpile:esm\"",
@@ -42,63 +43,63 @@
     "types"
   ],
   "peerDependencies": {
-    "@sudoplatform/sudo-api-client": "^15.0.0",
-    "@sudoplatform/sudo-common": "^10.0.4",
-    "@sudoplatform/sudo-user": "^15.1.1"
+    "@sudoplatform/sudo-api-client": "^16.0.0",
+    "@sudoplatform/sudo-common": "^12.2.0",
+    "@sudoplatform/sudo-user": "^16.0.0"
   },
   "dependencies": {
-    "fp-ts": "^2.16.10",
-    "graphql": "^15.10.1",
+    "aws-amplify": "^6.15.8",
+    "fp-ts": "^2.16.11",
+    "graphql": "^16.12.0",
     "io-ts": "^2.2.22",
     "monocle-ts": "^2.3.13",
     "newtype-ts": "^0.3.5",
     "tslib": "^2.8.1"
   },
+  "resolutions": {
+    "graphql": "^16.12.0"
+  },
   "devDependencies": {
-    "@eslint/compat": "^1.2.9",
-    "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.27.0",
-    "@graphql-codegen/add": "^5.0.3",
-    "@graphql-codegen/cli": "^5.0.6",
-    "@graphql-codegen/typed-document-node": "^5.1.1",
-    "@graphql-codegen/typescript": "^4.1.6",
-    "@graphql-codegen/typescript-operations": "^4.6.1",
-    "@graphql-typed-document-node/apollo-client-2": "^1.0.0",
-    "@sudoplatform/sudo-api-client": "^15.0.0",
-    "@sudoplatform/sudo-common": "^10.0.5",
-    "@sudoplatform/sudo-user": "^15.1.1",
-    "@types/jest": "^29.5.14",
-    "@types/lodash": "^4.17.17",
-    "@types/node": "^20.17.50",
-    "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.32.1",
-    "@typescript-eslint/parser": "^8.32.1",
-    "apollo-client": "^2.6.10",
-    "aws-appsync": "^4.1.10",
-    "concurrently": "^9.1.2",
-    "eslint": "^9.27.0",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^28.11.0",
-    "eslint-plugin-prettier": "^5.4.0",
+    "@eslint/compat": "^1.4.1",
+    "@eslint/eslintrc": "^3.3.3",
+    "@eslint/js": "^9.39.1",
+    "@graphql-codegen/add": "^6.0.0",
+    "@graphql-codegen/cli": "^6.1.0",
+    "@graphql-codegen/typed-document-node": "^6.1.4",
+    "@graphql-codegen/typescript": "^5.0.6",
+    "@graphql-codegen/typescript-operations": "^5.0.6",
+    "@sudoplatform/sudo-api-client": "^16.0.0",
+    "@sudoplatform/sudo-common": "^12.2.0",
+    "@sudoplatform/sudo-user": "^16.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/lodash": "^4.17.21",
+    "@types/node": "^22.19.1",
+    "@typescript-eslint/eslint-plugin": "^8.48.0",
+    "@typescript-eslint/parser": "^8.48.0",
+    "concurrently": "^9.2.1",
+    "eslint": "^9.39.1",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jest": "^29.2.1",
+    "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-tree-shaking": "^1.12.2",
     "husky": "^9.1.7",
     "isomorphic-fetch": "^3.0.0",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
+    "jest": "^30.2.0",
+    "jest-environment-jsdom": "^30.2.0",
     "lodash": "^4.17.21",
-    "prettier": "^3.5.3",
-    "prettier-plugin-organize-imports": "^4.1.0",
-    "ts-jest": "^29.3.4",
+    "prettier": "^3.7.3",
+    "prettier-plugin-organize-imports": "^4.3.0",
+    "ts-jest": "^29.4.6",
     "ts-mockito": "^2.6.1",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.28.4",
-    "typescript": "^5.8.3",
+    "typedoc": "^0.28.15",
+    "typescript": "^5.9.3",
     "uuid": "^11.1.0",
-    "wait-for-expect": "^3.0.2"
+    "wait-for-expect": "^4.0.0"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "packageManager": "yarn@4.9.1+sha512.f95ce356460e05be48d66401c1ae64ef84d163dd689964962c6888a9810865e39097a5e9de748876c2e0bf89b232d583c33982773e9903ae7a76257270986538"
-}
+}

package/types/gen/graphqlTypes.d.ts

@@ -68,6 +68,10 @@ export type GetSettingsInput = {
     bundleId: Scalars['String']['input'];
     deviceId: Scalars['String']['input'];
 };
+export type GetUserAndDeviceSettingsInput = {
+    bundleId: Scalars['String']['input'];
+    deviceId?: InputMaybe<Scalars['String']['input']>;
+};
 export type Mutation = {
     __typename?: 'Mutation';
     deleteAppFromDevice?: Maybe<Scalars['Boolean']['output']>;
@@ -102,10 +106,14 @@ export type NotificationSettingsOutput = {
 export type Query = {
     __typename?: 'Query';
     getNotificationSettings: NotificationSettingsOutput;
+    getUserAndDeviceNotificationSettings: UserAndDeviceNotificationSettingsOutput;
 };
 export type QueryGetNotificationSettingsArgs = {
     input: GetSettingsInput;
 };
+export type QueryGetUserAndDeviceNotificationSettingsArgs = {
+    input: GetUserAndDeviceSettingsInput;
+};
 export type RegisterAppOnDeviceInput = {
     build: BuildType;
     bundleId: Scalars['String']['input'];
@@ -144,10 +152,15 @@ export type UpdateInfoInput = {
 };
 export type UpdateSettingsInput = {
     bundleId: Scalars['String']['input'];
-    deviceId: Scalars['String']['input'];
+    deviceId?: InputMaybe<Scalars['String']['input']>;
     filter: Array<InputMaybe<Filter>>;
     services: Array<NotifiableServiceSchema>;
 };
+export type UserAndDeviceNotificationSettingsOutput = {
+    __typename?: 'UserAndDeviceNotificationSettingsOutput';
+    device?: Maybe<NotificationSettingsOutput>;
+    user?: Maybe<NotificationSettingsOutput>;
+};
 export declare enum BuildType {
     Debug = "DEBUG",
     Release = "RELEASE"
@@ -182,6 +195,35 @@ export type GetNotificationSettingsQuery = {
         }>;
     };
 };
+export type GetUserAndDeviceNotificationSettingsQueryVariables = Exact<{
+    input: GetUserAndDeviceSettingsInput;
+}>;
+export type GetUserAndDeviceNotificationSettingsQuery = {
+    __typename?: 'Query';
+    getUserAndDeviceNotificationSettings: {
+        __typename?: 'UserAndDeviceNotificationSettingsOutput';
+        user?: {
+            __typename?: 'NotificationSettingsOutput';
+            filter: Array<{
+                __typename?: 'FilterOutputEntry';
+                serviceName: string;
+                actionType: FilterAction;
+                rule: string;
+                enableMeta?: string | null;
+            }>;
+        } | null;
+        device?: {
+            __typename?: 'NotificationSettingsOutput';
+            filter: Array<{
+                __typename?: 'FilterOutputEntry';
+                serviceName: string;
+                actionType: FilterAction;
+                rule: string;
+                enableMeta?: string | null;
+            }>;
+        } | null;
+    };
+};
 export type NotificationSettingsOutputFragment = {
     __typename?: 'NotificationSettingsOutput';
     filter: Array<{
@@ -220,9 +262,34 @@ export type UpdateNotificationSettingsMutation = {
     __typename?: 'Mutation';
     updateNotificationSettings?: boolean | null;
 };
+export type UserAndDeviceNotificationSettingsOutputFragment = {
+    __typename?: 'UserAndDeviceNotificationSettingsOutput';
+    user?: {
+        __typename?: 'NotificationSettingsOutput';
+        filter: Array<{
+            __typename?: 'FilterOutputEntry';
+            serviceName: string;
+            actionType: FilterAction;
+            rule: string;
+            enableMeta?: string | null;
+        }>;
+    } | null;
+    device?: {
+        __typename?: 'NotificationSettingsOutput';
+        filter: Array<{
+            __typename?: 'FilterOutputEntry';
+            serviceName: string;
+            actionType: FilterAction;
+            rule: string;
+            enableMeta?: string | null;
+        }>;
+    } | null;
+};
 export declare const NotificationSettingsOutputFragmentDoc: DocumentNode<NotificationSettingsOutputFragment, unknown>;
+export declare const UserAndDeviceNotificationSettingsOutputFragmentDoc: DocumentNode<UserAndDeviceNotificationSettingsOutputFragment, unknown>;
 export declare const DeleteAppFromDeviceDocument: DocumentNode<DeleteAppFromDeviceMutation, DeleteAppFromDeviceMutationVariables>;
 export declare const GetNotificationSettingsDocument: DocumentNode<GetNotificationSettingsQuery, GetNotificationSettingsQueryVariables>;
+export declare const GetUserAndDeviceNotificationSettingsDocument: DocumentNode<GetUserAndDeviceNotificationSettingsQuery, GetUserAndDeviceNotificationSettingsQueryVariables>;
 export declare const RegisterAppOnDeviceDocument: DocumentNode<RegisterAppOnDeviceMutation, RegisterAppOnDeviceMutationVariables>;
 export declare const SendTestNotificationDocument: DocumentNode<SendTestNotificationMutation, SendTestNotificationMutationVariables>;
 export declare const UpdateDeviceInfoDocument: DocumentNode<UpdateDeviceInfoMutation, UpdateDeviceInfoMutationVariables>;

package/types/private/apiClient.d.ts

@@ -1,6 +1,6 @@
+import { GraphQLOptions } from '@aws-amplify/api-graphql';
 import { ApiClientManager } from '@sudoplatform/sudo-api-client';
-import { MutationOptions, QueryOptions } from 'apollo-client/core/watchQueryOptions';
-import { DeleteAppFromDeviceInput, GetSettingsInput, NotificationSettingsOutput, RegisterAppOnDeviceInput, SendTestNotificationInput, UpdateInfoInput, UpdateSettingsInput } from '../gen/graphqlTypes';
+import { DeleteAppFromDeviceInput, GetSettingsInput, GetUserAndDeviceSettingsInput, NotificationSettingsOutput, RegisterAppOnDeviceInput, SendTestNotificationInput, UpdateInfoInput, UpdateSettingsInput, UserAndDeviceNotificationSettingsOutput } from '../gen/graphqlTypes';
 export declare class ApiClient {
     private readonly log;
     private readonly client;
@@ -9,12 +9,15 @@ export declare class ApiClient {
     deleteAppFromDevice(input: DeleteAppFromDeviceInput): Promise<boolean>;
     updateDeviceInfo(input: UpdateInfoInput): Promise<boolean>;
     getNotificationSettings(input: GetSettingsInput): Promise<NotificationSettingsOutput>;
+    getUserAndDeviceNotificationSettings(input: GetUserAndDeviceSettingsInput): Promise<UserAndDeviceNotificationSettingsOutput>;
     updateNotificationSettings(input: UpdateSettingsInput): Promise<boolean>;
     sendTestNotification(input: SendTestNotificationInput): Promise<boolean>;
-    performQuery<Q>({ variables, fetchPolicy, query, calleeName, }: QueryOptions & {
+    performQuery<Q>({ variables, query, calleeName, }: GraphQLOptions & {
         calleeName?: string;
     }): Promise<Q>;
-    performMutation<M>({ mutation, variables, calleeName, }: Omit<MutationOptions<M>, 'fetchPolicy'> & {
+    performMutation<M>({ mutation, variables, calleeName, }: Omit<GraphQLOptions, 'query'> & {
+        mutation: GraphQLOptions['query'];
         calleeName?: string;
     }): Promise<M>;
+    mapGraphQLCallError: (err: Error) => Error;
 }

package/types/private/transformers/errorTransformer.d.ts

@@ -1,4 +1,7 @@
-import { AppSyncError } from '@sudoplatform/sudo-common';
+import { GraphQLError } from 'graphql/error';
 export declare class ErrorTransformer {
-    static toClientError(error: AppSyncError): Error;
+    static toClientError(error: {
+        errorType: string;
+        message: string;
+    } | GraphQLError): Error;
 }

package/types/public/errors.d.ts

@@ -78,4 +78,16 @@ export declare class DuplicateNotifiableClientError extends NotificationError {
 export declare class SchemaValidationError extends NotificationError {
     constructor(message?: string);
 }
+/**
+ * The user notification settings could not be read
+ */
+export declare class UserInfoReadError extends NotificationError {
+    constructor(msg?: string);
+}
+/**
+ * The user notification settings could not be updated
+ */
+export declare class UserInfoUpdateError extends NotificationError {
+    constructor(msg?: string);
+}
 export {};