No-Code errors serialization fixes

Author: SpertsyanKM

src/NoCodes.ts

@@ -1,5 +1,5 @@
 import NoCodesApi from "./NoCodesApi";
-import NoCodesConfig from "./dto/NoCodesConfig";
+import NoCodesConfig from "./NoCodesConfig";
 import NoCodesInternal from "./internal/NoCodesInternal";
 
 export default class NoCodes {
@@ -17,18 +17,18 @@ export default class NoCodes {
    */
   static getSharedInstance(): NoCodesApi {
     if (!this.backingInstance) {
-      throw "NoCodes has not been initialized. You should call " +
+      throw "No-Codes has not been initialized. You should call " +
         "the initialize method before accessing the shared instance of NoCodes."
     }
 
     return this.backingInstance;
   }
 
   /**
-   * An entry point to use NoCodes SDK. Call to initialize NoCodes SDK with required configs.
+   * An entry point to use No-Codes SDK. Call to initialize No-Codes SDK with required configs.
    *
    * @param config a config that contains key SDK settings.
-   * @return Initialized instance of the NoCodes SDK.
+   * @return Initialized instance of the No-Codes SDK.
    */
   static initialize(config: NoCodesConfig): NoCodesApi {
     this.backingInstance = new NoCodesInternal(config);

src/dto/NoCodesConfig.ts src/NoCodesConfig.tssrc/dto/NoCodesConfig.ts renamed to src/NoCodesConfig.ts

@@ -1,4 +1,4 @@
-import { NoCodesListener } from './NoCodesListener';
+import { NoCodesListener } from './dto/NoCodesListener';
 
 class NoCodesConfig {
   readonly projectKey: string;
@@ -13,4 +13,4 @@ class NoCodesConfig {
   }
 }
 
-export default NoCodesConfig; 
+export default NoCodesConfig;

src/NoCodesConfigBuilder.ts

@@ -1,5 +1,5 @@
 import {NoCodesListener} from './dto/NoCodesListener';
-import NoCodesConfig from './dto/NoCodesConfig';
+import NoCodesConfig from './NoCodesConfig';
 
 class NoCodesConfigBuilder {
   private readonly projectKey: string;

src/dto/NoCodesError.ts

@@ -1,21 +1,25 @@
 import {NoCodesErrorCode} from './enums';
+import QonversionError from './QonversionError';
 
 class NoCodesError {
   code: NoCodesErrorCode;
-  description: string;
-  additionalMessage: string;
-  domain?: string;
+  description?: string | null;
+  additionalMessage?: string | null;
+  domain?: string | null;
+  error?: QonversionError;
 
   constructor(
     code: NoCodesErrorCode,
-    description: string,
-    additionalMessage: string,
-    domain?: string,
+    description?: string | null,
+    additionalMessage?: string | null,
+    domain?: string | null,
+    error?: QonversionError,
   ) {
     this.code = code;
     this.domain = domain;
     this.description = description;
     this.additionalMessage = additionalMessage;
+    this.error = error;
   }
 }
 

src/dto/QonversionError.ts

@@ -2,29 +2,22 @@ import {QonversionErrorCode} from './enums';
 
 class QonversionError {
   code: QonversionErrorCode;
-  domain?: string;
-  description: string;
-  additionalMessage: string;
-  private _userCanceled: boolean = false;
+  domain?: string | null;
+  description?: string | null;
+  additionalMessage?: string | null;
+  userCanceled: boolean = false;
 
   constructor(
     code: QonversionErrorCode,
-    description: string,
-    additionalMessage: string,
-    domain?: string,
+    description?: string | null,
+    additionalMessage?: string | null,
+    domain?: string | null,
   ) {
     this.code = code;
     this.domain = domain;
     this.description = description;
     this.additionalMessage = additionalMessage;
-  }
-
-  get userCanceled(): boolean {
-    return this._userCanceled;
-  }
-
-  setUserCanceled(value: boolean): void {
-    this._userCanceled = value;
+    this.userCanceled = code === QonversionErrorCode.PURCHASE_CANCELED;
   }
 }
 

src/index.ts

@@ -37,7 +37,7 @@ export { default as PurchaseOptions } from './dto/PurchaseOptionsBuilder';
 // NoCode exports
 export { default as NoCodes } from './NoCodes';
 export type { default as NoCodesApi } from './NoCodesApi';
-export { default as NoCodesConfig } from './dto/NoCodesConfig';
+export { default as NoCodesConfig } from './NoCodesConfig';
 export { default as NoCodesConfigBuilder } from './NoCodesConfigBuilder';
 export type { NoCodesListener } from './dto/NoCodesListener';
 export { default as NoCodesAction } from './dto/NoCodesAction';

src/internal/Mapper.ts

@@ -295,6 +295,17 @@ type QUserProperties = {
   properties: QUserProperty[];
 };
 
+type QQonversionError = {
+  code: string | undefined;
+  description: string | null | undefined,
+  additionalMessage: string | null | undefined,
+  domain: string | null | undefined,
+};
+
+type QNoCodesError = QQonversionError & {
+  qonversionError?: QQonversionError | null,
+};
+
 const priceMicrosRatio = 1000000;
 
 class Mapper {
@@ -1080,30 +1091,32 @@ class Mapper {
   }
 
   static convertNoCodesError(
-    payload: Record<string, string> | undefined
+    payload: QNoCodesError | undefined
   ): NoCodesError | undefined {
     if (!payload) return undefined;
 
-    const code = this.convertNoCodesErrorCode(payload["code"]);
+    const code = this.convertNoCodesErrorCode(payload.code);
+    const error = payload.qonversionError ? this.convertQonversionError(payload.qonversionError) : undefined;
     return new NoCodesError(
       code,
-      payload["description"],
-      payload["additionalMessage"],
-      payload["domain"],
+      payload.description,
+      payload.additionalMessage,
+      payload.domain,
+      error,
     );
   }
 
   static convertQonversionError(
-    payload: Record<string, string> | undefined
+    payload: QQonversionError | undefined
   ): QonversionError | undefined {
     if (!payload) return undefined;
 
-    const code = this.convertQonversionErrorCode(payload["code"]);
+    const code = this.convertQonversionErrorCode(payload.code);
     return new QonversionError(
       code,
-      payload["description"],
-      payload["additionalMessage"],
-      payload["domain"],
+      payload.description,
+      payload.additionalMessage,
+      payload.domain,
     );
   }
 

src/internal/NoCodesInternal.ts

@@ -1,6 +1,6 @@
 import {NativeEventEmitter, NativeModules} from "react-native";
 import NoCodesApi from "../NoCodesApi";
-import NoCodesConfig from "../dto/NoCodesConfig";
+import NoCodesConfig from "../NoCodesConfig";
 import Mapper from "./Mapper";
 import {NoCodesListener} from '../dto/NoCodesListener';
 import {ScreenPresentationConfig} from '../dto/ScreenPresentationConfig';

src/internal/QonversionInternal.ts

@@ -20,7 +20,6 @@ import PurchaseUpdateModel from '../dto/PurchaseUpdateModel';
 import {RemoteConfigList} from '../index';
 import PurchaseOptionsBuilder from "../dto/PurchaseOptionsBuilder";
 import PromotionalOffer from '../dto/PromotionalOffer';
-import QonversionError from '../dto/QonversionError';
 
 const {RNQonversion} = NativeModules;
 
@@ -106,10 +105,8 @@ export default class QonversionInternal implements QonversionApi {
       const mappedPermissions = Mapper.convertEntitlements(entitlements);
 
       return mappedPermissions;
-    } catch (e) {
-      if (e instanceof QonversionError) {
-        e.setUserCanceled(e.code === QonversionErrorCode.PURCHASE_CANCELED);
-      }
+    } catch (e: any) {
+      e.userCanceled = e.code === QonversionErrorCode.PURCHASE_CANCELED;
       throw e;
     }
   }
@@ -135,10 +132,8 @@ export default class QonversionInternal implements QonversionApi {
       const mappedPermissions = Mapper.convertEntitlements(entitlements);
 
       return mappedPermissions;
-    } catch (e) {
-      if (e instanceof QonversionError) {
-        e.setUserCanceled(e.code === QonversionErrorCode.PURCHASE_CANCELED);
-      }
+    } catch (e: any) {
+      e.userCanceled = e.code === QonversionErrorCode.PURCHASE_CANCELED;
       throw e;
     }
   }
@@ -162,10 +157,8 @@ export default class QonversionInternal implements QonversionApi {
       const mappedPermissions: Map<string, Entitlement> = Mapper.convertEntitlements(entitlements);
 
       return mappedPermissions;
-    } catch (e) {
-      if (e instanceof QonversionError) {
-        e.setUserCanceled(e.code === QonversionErrorCode.PURCHASE_CANCELED);
-      }
+    } catch (e: any) {
+      e.userCanceled = e.code === QonversionErrorCode.PURCHASE_CANCELED;
       throw e;
     }
   }