insert-affiliate-react-native-sdk 1.3.5 → 1.4.0

package/dist/DeepLinkIapProvider.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 type T_DEEPLINK_IAP_PROVIDER = {
     children: React.ReactNode;
 };
@@ -12,7 +12,7 @@ type T_DEEPLINK_IAP_CONTEXT = {
     validatePurchaseWithIapticAPI: (jsonIapPurchase: CustomPurchase, iapticAppId: string, iapticAppName: string, iapticPublicKey: string) => Promise<boolean>;
     trackEvent: (eventName: string) => Promise<void>;
     setShortCode: (shortCode: string) => Promise<void>;
-    setInsertAffiliateIdentifier: (referringLink: string) => Promise<void>;
+    setInsertAffiliateIdentifier: (referringLink: string) => Promise<void | string>;
     initialize: (code: string | null) => Promise<void>;
     isInitialized: boolean;
 };

package/dist/DeepLinkIapProvider.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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) {
@@ -41,42 +51,42 @@ const react_native_1 = require("react-native");
 const axios_1 = __importDefault(require("axios"));
 const async_storage_1 = __importDefault(require("@react-native-async-storage/async-storage"));
 const ASYNC_KEYS = {
-    REFERRER_LINK: "@app_referrer_link",
-    USER_PURCHASE: "@app_user_purchase",
-    USER_ID: "@app_user_id",
-    COMPANY_CODE: "@app_company_code",
+    REFERRER_LINK: '@app_referrer_link',
+    USER_PURCHASE: '@app_user_purchase',
+    USER_ID: '@app_user_id',
+    COMPANY_CODE: '@app_company_code',
 };
 // STARTING CONTEXT IMPLEMENTATION
 exports.DeepLinkIapContext = (0, react_1.createContext)({
-    referrerLink: "",
-    userId: "",
-    returnInsertAffiliateIdentifier: () => __awaiter(void 0, void 0, void 0, function* () { return ""; }),
+    referrerLink: '',
+    userId: '',
+    returnInsertAffiliateIdentifier: () => __awaiter(void 0, void 0, void 0, function* () { return ''; }),
     validatePurchaseWithIapticAPI: (jsonIapPurchase, iapticAppId, iapticAppName, iapticPublicKey) => __awaiter(void 0, void 0, void 0, function* () { return false; }),
     trackEvent: (eventName) => __awaiter(void 0, void 0, void 0, function* () { }),
     setShortCode: (shortCode) => __awaiter(void 0, void 0, void 0, function* () { }),
     setInsertAffiliateIdentifier: (referringLink) => __awaiter(void 0, void 0, void 0, function* () { }),
     initialize: (code) => __awaiter(void 0, void 0, void 0, function* () { }),
-    isInitialized: false
+    isInitialized: false,
 });
 const DeepLinkIapProvider = ({ children, }) => {
-    const [referrerLink, setReferrerLink] = (0, react_1.useState)("");
-    const [userId, setUserId] = (0, react_1.useState)("");
+    const [referrerLink, setReferrerLink] = (0, react_1.useState)('');
+    const [userId, setUserId] = (0, react_1.useState)('');
     const [companyCode, setCompanyCode] = (0, react_1.useState)(null);
     const [isInitialized, setIsInitialized] = (0, react_1.useState)(false);
     // MARK: Initialize the SDK
     const initialize = (companyCode) => __awaiter(void 0, void 0, void 0, function* () {
         if (isInitialized) {
-            console.error("[Insert Affiliate] SDK is already initialized.");
+            console.error('[Insert Affiliate] SDK is already initialized.');
             return;
         }
-        if (companyCode && companyCode.trim() !== "") {
+        if (companyCode && companyCode.trim() !== '') {
             setCompanyCode(companyCode);
             yield saveValueInAsync(ASYNC_KEYS.COMPANY_CODE, companyCode);
             setIsInitialized(true);
             console.log(`[Insert Affiliate] SDK initialized with company code: ${companyCode}`);
         }
         else {
-            console.warn("[Insert Affiliate] SDK initialized without a company code.");
+            console.warn('[Insert Affiliate] SDK initialized without a company code.');
             setIsInitialized(true);
         }
     });
@@ -103,14 +113,18 @@ const DeepLinkIapProvider = ({ children, }) => {
             let userId = yield getValueFromAsync(ASYNC_KEYS.USER_ID);
             if (!userId) {
                 userId = generateUserID();
+                setUserId(userId);
                 yield saveValueInAsync(ASYNC_KEYS.USER_ID, userId);
+            }
+            else {
                 setUserId(userId);
             }
+            return userId;
         });
     }
     const generateUserID = () => {
-        const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-        let uniqueId = "";
+        const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        let uniqueId = '';
         for (let i = 0; i < 6; i++) {
             const randomIndex = Math.floor(Math.random() * characters.length);
             uniqueId += characters[randomIndex];
@@ -120,7 +134,7 @@ const DeepLinkIapProvider = ({ children, }) => {
     const reset = () => {
         setCompanyCode(null);
         setIsInitialized(false);
-        console.log("[Insert Affiliate] SDK has been reset.");
+        console.log('[Insert Affiliate] SDK has been reset.');
     };
     // Helper funciton Storage / Retrieval
     const saveValueInAsync = (key, value) => __awaiter(void 0, void 0, void 0, function* () {
@@ -136,10 +150,10 @@ const DeepLinkIapProvider = ({ children, }) => {
     // Helper function to log errors
     const errorLog = (message, type) => {
         switch (type) {
-            case "error":
+            case 'error':
                 console.error(`ENCOUNTER ERROR ~ ${message}`);
                 break;
-            case "warn":
+            case 'warn':
                 console.warn(`ENCOUNTER WARNING ~ ${message}`);
                 break;
             default:
@@ -155,8 +169,8 @@ const DeepLinkIapProvider = ({ children, }) => {
     };
     function setShortCode(shortCode) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log("[Insert Affiliate] Setting short code.");
-            generateThenSetUserID();
+            console.log('[Insert Affiliate] Setting short code.');
+            yield generateThenSetUserID();
             // Validate it is a short code
             const capitalisedShortCode = shortCode.toUpperCase();
             isShortCode(capitalisedShortCode);
@@ -177,60 +191,65 @@ const DeepLinkIapProvider = ({ children, }) => {
     // MARK: Insert Affiliate Identifier
     function setInsertAffiliateIdentifier(referringLink) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log("[Insert Affiliate] Setting affiliate identifier.");
+            console.log('[Insert Affiliate] Setting affiliate identifier.');
             try {
-                yield generateThenSetUserID();
-                console.log("[Insert Affiliate] Completed generateThenSetUserID within setInsertAffiliateIdentifier.");
+                const customerID = yield generateThenSetUserID();
+                console.log('[Insert Affiliate] Completed generateThenSetUserID within setInsertAffiliateIdentifier.');
                 if (!referringLink) {
-                    console.warn("[Insert Affiliate] Referring link is invalid.");
+                    console.warn('[Insert Affiliate] Referring link is invalid.');
+                    let heldReferrerLinkBeforeAsyncStateUpdate = referrerLink;
                     yield storeInsertAffiliateIdentifier({ link: referringLink });
-                    return;
+                    return `${heldReferrerLinkBeforeAsyncStateUpdate}-${customerID}`;
                 }
-                if (!companyCode || companyCode.trim() === "" && companyCode !== null) {
+                if (!companyCode || (companyCode.trim() === '' && companyCode !== null)) {
                     let companyCodeFromStorage = yield getValueFromAsync(ASYNC_KEYS.COMPANY_CODE);
                     if (companyCodeFromStorage !== null) {
                         setCompanyCode(companyCodeFromStorage);
                     }
                     else {
-                        console.error("[Insert Affiliate] Company code is not set. Please initialize the SDK with a valid company code.");
+                        console.error('[Insert Affiliate] Company code is not set. Please initialize the SDK with a valid company code.');
                         return;
                     }
                 }
                 // Check if referring link is already a short code, if so save it and stop here.
                 if (isShortCode(referringLink)) {
-                    console.log("[Insert Affiliate] Referring link is already a short code.");
+                    console.log('[Insert Affiliate] Referring link is already a short code.');
+                    let heldReferrerLinkBeforeAsyncStateUpdate = referrerLink;
                     yield storeInsertAffiliateIdentifier({ link: referringLink });
-                    return;
+                    return `${heldReferrerLinkBeforeAsyncStateUpdate}-${customerID}`;
                 }
                 // If the code is not already a short code, encode it raedy to send to our endpoint to return the short code. Save it before making the call in case something goes wrong
                 // Encode the referring link
                 const encodedAffiliateLink = encodeURIComponent(referringLink);
                 if (!encodedAffiliateLink) {
-                    console.error("[Insert Affiliate] Failed to encode affiliate link.");
+                    console.error('[Insert Affiliate] Failed to encode affiliate link.');
+                    let heldReferrerLinkBeforeAsyncStateUpdate = referrerLink;
                     yield storeInsertAffiliateIdentifier({ link: referringLink });
-                    return;
+                    return `${heldReferrerLinkBeforeAsyncStateUpdate}-${customerID}`;
                 }
                 // Create the request URL
                 const urlString = `https://api.insertaffiliate.com/V1/convert-deep-link-to-short-link?companyId=${companyCode}&deepLinkUrl=${encodedAffiliateLink}`;
-                console.log("[Insert Affiliate] urlString .", urlString);
+                console.log('[Insert Affiliate] urlString .', urlString);
                 const response = yield axios_1.default.get(urlString, {
                     headers: {
-                        "Content-Type": "application/json",
+                        'Content-Type': 'application/json',
                     },
                 });
                 // Call to the backend for the short code and save the resolse in valid
                 if (response.status === 200 && response.data.shortLink) {
                     const shortLink = response.data.shortLink;
-                    console.log("[Insert Affiliate] Short link received:", shortLink);
-                    yield storeInsertAffiliateIdentifier({ link: shortLink });
+                    console.log('[Insert Affiliate] Short link received:', shortLink);
+                    return `${shortLink}-${customerID}`;
                 }
                 else {
-                    console.warn("[Insert Affiliate] Unexpected response format.");
+                    console.warn('[Insert Affiliate] Unexpected response format.');
+                    let heldReferrerLinkBeforeAsyncStateUpdate = referrerLink;
                     yield storeInsertAffiliateIdentifier({ link: referringLink });
+                    return `${heldReferrerLinkBeforeAsyncStateUpdate}-${customerID}`;
                 }
             }
             catch (error) {
-                console.error("[Insert Affiliate] Error:", error);
+                console.error('[Insert Affiliate] Error:', error);
             }
         });
     }
@@ -238,29 +257,29 @@ const DeepLinkIapProvider = ({ children, }) => {
     function storeInsertAffiliateIdentifier(_a) {
         return __awaiter(this, arguments, void 0, function* ({ link }) {
             console.log(`[Insert Affiliate] Storing affiliate identifier: ${link}`);
-            yield saveValueInAsync(ASYNC_KEYS.REFERRER_LINK, link);
             setReferrerLink(link);
+            yield saveValueInAsync(ASYNC_KEYS.REFERRER_LINK, link);
         });
     }
     const validatePurchaseWithIapticAPI = (jsonIapPurchase, iapticAppId, iapticAppName, iapticPublicKey) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const baseRequestBody = {
                 id: iapticAppId,
-                type: "application",
+                type: 'application',
             };
             let transaction;
-            if (react_native_1.Platform.OS === "ios") {
+            if (react_native_1.Platform.OS === 'ios') {
                 transaction = {
                     id: iapticAppId,
-                    type: "ios-appstore",
+                    type: 'ios-appstore',
                     appStoreReceipt: jsonIapPurchase.transactionReceipt,
                 };
             }
             else {
-                const receiptJson = JSON.parse(atob(jsonIapPurchase.transactionReceipt || ""));
+                const receiptJson = JSON.parse(atob(jsonIapPurchase.transactionReceipt || ''));
                 transaction = {
                     id: receiptJson.orderId, // Extracted orderId
-                    type: "android-playstore",
+                    type: 'android-playstore',
                     purchaseToken: receiptJson.purchaseToken, // Extracted purchase token
                     receipt: jsonIapPurchase.transactionReceipt, // Full receipt (Base64)
                     signature: receiptJson.signature, // Receipt signature
@@ -276,19 +295,19 @@ const DeepLinkIapProvider = ({ children, }) => {
             // Send validation request to server
             const response = yield (0, axios_1.default)({
                 url: `https://validator.iaptic.com/v1/validate`,
-                method: "POST",
+                method: 'POST',
                 headers: {
                     Authorization: `Basic ${btoa(`${iapticAppName}:${iapticPublicKey}`)}`,
-                    "Content-Type": "application/json",
+                    'Content-Type': 'application/json',
                 },
                 data: requestBody,
             });
             if (response.status === 200) {
-                console.log("Validation successful:", response.data);
+                console.log('Validation successful:', response.data);
                 return true;
             }
             else {
-                console.error("Validation failed:", response.data);
+                console.error('Validation failed:', response.data);
                 return false;
             }
         }
@@ -302,29 +321,29 @@ const DeepLinkIapProvider = ({ children, }) => {
             return false;
         }
     });
-    // MARK: Track Event 
+    // MARK: Track Event
     const trackEvent = (eventName) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             if (!referrerLink || !userId) {
-                console.warn("[Insert Affiliate] No affiliate identifier found. Please set one before tracking events.");
+                console.warn('[Insert Affiliate] No affiliate identifier found. Please set one before tracking events.');
                 return Promise.resolve();
             }
             const payload = {
                 eventName,
                 deepLinkParam: `${referrerLink}/${userId}`,
             };
-            const response = yield axios_1.default.post("https://api.insertaffiliate.com/v1/trackEvent", payload, {
-                headers: { "Content-Type": "application/json" },
+            const response = yield axios_1.default.post('https://api.insertaffiliate.com/v1/trackEvent', payload, {
+                headers: { 'Content-Type': 'application/json' },
             });
             if (response.status === 200) {
-                console.log("[Insert Affiliate] Event tracked successfully");
+                console.log('[Insert Affiliate] Event tracked successfully');
             }
             else {
                 console.error(`[Insert Affiliate] Failed to track event with status code: ${response.status}`);
             }
         }
         catch (error) {
-            console.error("[Insert Affiliate] Error tracking event:", error);
+            console.error('[Insert Affiliate] Error tracking event:', error);
             return Promise.reject(error);
         }
     });
@@ -337,7 +356,7 @@ const DeepLinkIapProvider = ({ children, }) => {
             trackEvent,
             setInsertAffiliateIdentifier,
             initialize,
-            isInitialized
+            isInitialized,
         } }, children));
 };
 exports.default = DeepLinkIapProvider;

package/dist/useDeepLinkIapProvider.d.ts

@@ -7,7 +7,7 @@ declare const useDeepLinkIapProvider: () => {
     returnInsertAffiliateIdentifier: () => Promise<string | null>;
     trackEvent: (eventName: string) => Promise<void>;
     setShortCode: (shortCode: string) => Promise<void>;
-    setInsertAffiliateIdentifier: (referringLink: string) => Promise<void>;
+    setInsertAffiliateIdentifier: (referringLink: string) => Promise<void | string>;
     initialize: (code: string | null) => Promise<void>;
     isInitialized: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "insert-affiliate-react-native-sdk",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "description": "A package for connecting with the Insert Affiliate Platform to add app based affiliate marketing.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/readme.md

@@ -226,7 +226,7 @@ After setting up your Branch integration, add the following code to your ```App.
 import { useDeepLinkIapProvider } from 'insert-affiliate-react-native-sdk';
 
 //...
-    const {setInsertAffiliateIdentifier, returnInsertAffiliateIdentifier} = useDeepLinkIapProvider();
+    const {setInsertAffiliateIdentifier} = useDeepLinkIapProvider();
     
     useEffect(() => {
       if (!isInitialized) return;
@@ -244,9 +244,8 @@ import { useDeepLinkIapProvider } from 'insert-affiliate-react-native-sdk';
           const referringLink = params['~referring_link'];
           if (referringLink) {
             try {
-              await setInsertAffiliateIdentifier(referringLink);
+             let insertAffiliateIdentifier = await setInsertAffiliateIdentifier(referringLink);
 
-              let insertAffiliateIdentifier = await returnInsertAffiliateIdentifier();
               if (insertAffiliateIdentifier) {
                 const { customerInfo, created } = await Purchases.logIn(insertAffiliateIdentifier);
               }

package/src/DeepLinkIapProvider.tsx

@@ -1,7 +1,7 @@
-import React, { createContext, useEffect, useState } from "react";
-import { Platform } from "react-native";
-import axios from "axios";
-import AsyncStorage from "@react-native-async-storage/async-storage";
+import React, { createContext, useEffect, useState } from 'react';
+import { Platform } from 'react-native';
+import axios from 'axios';
+import AsyncStorage from '@react-native-async-storage/async-storage';
 
 // TYPES USED IN THIS PROVIDER
 type T_DEEPLINK_IAP_PROVIDER = {
@@ -24,7 +24,9 @@ type T_DEEPLINK_IAP_CONTEXT = {
   ) => Promise<boolean>;
   trackEvent: (eventName: string) => Promise<void>;
   setShortCode: (shortCode: string) => Promise<void>;
-  setInsertAffiliateIdentifier: (referringLink: string) => Promise<void>;
+  setInsertAffiliateIdentifier: (
+    referringLink: string
+  ) => Promise<void | string>;
   initialize: (code: string | null) => Promise<void>;
   isInitialized: boolean;
 };
@@ -46,17 +48,17 @@ type RequestBody = {
 };
 
 const ASYNC_KEYS = {
-  REFERRER_LINK: "@app_referrer_link",
-  USER_PURCHASE: "@app_user_purchase",
-  USER_ID: "@app_user_id",
-  COMPANY_CODE: "@app_company_code",
+  REFERRER_LINK: '@app_referrer_link',
+  USER_PURCHASE: '@app_user_purchase',
+  USER_ID: '@app_user_id',
+  COMPANY_CODE: '@app_company_code',
 };
 
 // STARTING CONTEXT IMPLEMENTATION
 export const DeepLinkIapContext = createContext<T_DEEPLINK_IAP_CONTEXT>({
-  referrerLink: "",
-  userId: "",
-  returnInsertAffiliateIdentifier: async () => "",
+  referrerLink: '',
+  userId: '',
+  returnInsertAffiliateIdentifier: async () => '',
   validatePurchaseWithIapticAPI: async (
     jsonIapPurchase: CustomPurchase,
     iapticAppId: string,
@@ -67,31 +69,35 @@ export const DeepLinkIapContext = createContext<T_DEEPLINK_IAP_CONTEXT>({
   setShortCode: async (shortCode: string) => {},
   setInsertAffiliateIdentifier: async (referringLink: string) => {},
   initialize: async (code: string | null) => {},
-  isInitialized: false
+  isInitialized: false,
 });
 
 const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
   children,
 }) => {
-  const [referrerLink, setReferrerLink] = useState<string>("");
-  const [userId, setUserId] = useState<string>("");
+  const [referrerLink, setReferrerLink] = useState<string>('');
+  const [userId, setUserId] = useState<string>('');
   const [companyCode, setCompanyCode] = useState<string | null>(null);
   const [isInitialized, setIsInitialized] = useState<boolean>(false);
 
   // MARK: Initialize the SDK
   const initialize = async (companyCode: string | null): Promise<void> => {
     if (isInitialized) {
-      console.error("[Insert Affiliate] SDK is already initialized.");
+      console.error('[Insert Affiliate] SDK is already initialized.');
       return;
     }
-  
-    if (companyCode && companyCode.trim() !== "") {
+
+    if (companyCode && companyCode.trim() !== '') {
       setCompanyCode(companyCode);
       await saveValueInAsync(ASYNC_KEYS.COMPANY_CODE, companyCode);
       setIsInitialized(true);
-      console.log(`[Insert Affiliate] SDK initialized with company code: ${companyCode}`);
+      console.log(
+        `[Insert Affiliate] SDK initialized with company code: ${companyCode}`
+      );
     } else {
-      console.warn("[Insert Affiliate] SDK initialized without a company code.");
+      console.warn(
+        '[Insert Affiliate] SDK initialized without a company code.'
+      );
       setIsInitialized(true);
     }
   };
@@ -120,15 +126,19 @@ const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
     let userId = await getValueFromAsync(ASYNC_KEYS.USER_ID);
     if (!userId) {
       userId = generateUserID();
+      setUserId(userId);
       await saveValueInAsync(ASYNC_KEYS.USER_ID, userId);
+    } else {
       setUserId(userId);
     }
+
+    return userId;
   }
 
   const generateUserID = () => {
     const characters =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-    let uniqueId = "";
+      'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    let uniqueId = '';
     for (let i = 0; i < 6; i++) {
       const randomIndex = Math.floor(Math.random() * characters.length);
       uniqueId += characters[randomIndex];
@@ -139,7 +149,7 @@ const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
   const reset = (): void => {
     setCompanyCode(null);
     setIsInitialized(false);
-    console.log("[Insert Affiliate] SDK has been reset.");
+    console.log('[Insert Affiliate] SDK has been reset.');
   };
 
   // Helper funciton Storage / Retrieval
@@ -157,12 +167,12 @@ const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
   };
 
   // Helper function to log errors
-  const errorLog = (message: string, type?: "error" | "warn" | "log") => {
+  const errorLog = (message: string, type?: 'error' | 'warn' | 'log') => {
     switch (type) {
-      case "error":
+      case 'error':
         console.error(`ENCOUNTER ERROR ~ ${message}`);
         break;
-      case "warn":
+      case 'warn':
         console.warn(`ENCOUNTER WARNING ~ ${message}`);
         break;
       default:
@@ -171,7 +181,6 @@ const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
     }
   };
 
-
   // MARK: Short Codes
   const isShortCode = (referringLink: string): boolean => {
     // Short codes are less than 10 characters
@@ -180,8 +189,8 @@ const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
   };
 
   async function setShortCode(shortCode: string): Promise<void> {
-    console.log("[Insert Affiliate] Setting short code.");
-    generateThenSetUserID();
+    console.log('[Insert Affiliate] Setting short code.');
+    await generateThenSetUserID();
 
     // Validate it is a short code
     const capitalisedShortCode = shortCode.toUpperCase();
@@ -194,85 +203,99 @@ const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
   // MARK: Return Insert Affiliate Identifier
   const returnInsertAffiliateIdentifier = async (): Promise<string | null> => {
     try {
+      
       return `${referrerLink}-${userId}`;
     } catch (error) {
       errorLog(`ERROR ~ returnInsertAffiliateIdentifier: ${error}`);
       return null;
     }
-  }
-  
+  };
 
   // MARK: Insert Affiliate Identifier
 
-  async function setInsertAffiliateIdentifier(referringLink: string): Promise<void> {
-    console.log("[Insert Affiliate] Setting affiliate identifier.");
+  async function setInsertAffiliateIdentifier(
+    referringLink: string
+  ): Promise<void | string> {
+    console.log('[Insert Affiliate] Setting affiliate identifier.');
 
     try {
-      await generateThenSetUserID();
-      console.log("[Insert Affiliate] Completed generateThenSetUserID within setInsertAffiliateIdentifier.");
+      const customerID = await generateThenSetUserID();
+      console.log(
+        '[Insert Affiliate] Completed generateThenSetUserID within setInsertAffiliateIdentifier.'
+      );
 
       if (!referringLink) {
-        console.warn("[Insert Affiliate] Referring link is invalid.");
+        console.warn('[Insert Affiliate] Referring link is invalid.');
+        let heldReferrerLinkBeforeAsyncStateUpdate = referrerLink;
         await storeInsertAffiliateIdentifier({ link: referringLink });
-        return;
+        return `${heldReferrerLinkBeforeAsyncStateUpdate}-${customerID}`;
       }
-      
-      if (!companyCode || companyCode.trim() === "" && companyCode !== null) {
-        let companyCodeFromStorage = await getValueFromAsync(ASYNC_KEYS.COMPANY_CODE);
+
+      if (!companyCode || (companyCode.trim() === '' && companyCode !== null)) {
+        let companyCodeFromStorage = await getValueFromAsync(
+          ASYNC_KEYS.COMPANY_CODE
+        );
 
         if (companyCodeFromStorage !== null) {
           setCompanyCode(companyCodeFromStorage);
         } else {
           console.error(
-            "[Insert Affiliate] Company code is not set. Please initialize the SDK with a valid company code."
+            '[Insert Affiliate] Company code is not set. Please initialize the SDK with a valid company code.'
           );
           return;
         }
       }
-  
+
       // Check if referring link is already a short code, if so save it and stop here.
       if (isShortCode(referringLink)) {
-        console.log("[Insert Affiliate] Referring link is already a short code.");
+        console.log(
+          '[Insert Affiliate] Referring link is already a short code.'
+        );
+        let heldReferrerLinkBeforeAsyncStateUpdate = referrerLink;
         await storeInsertAffiliateIdentifier({ link: referringLink });
-        return;
+        return `${heldReferrerLinkBeforeAsyncStateUpdate}-${customerID}`;
       }
-  
+
       // If the code is not already a short code, encode it raedy to send to our endpoint to return the short code. Save it before making the call in case something goes wrong
       // Encode the referring link
       const encodedAffiliateLink = encodeURIComponent(referringLink);
       if (!encodedAffiliateLink) {
-        console.error("[Insert Affiliate] Failed to encode affiliate link.");
+        console.error('[Insert Affiliate] Failed to encode affiliate link.');
+
+        let heldReferrerLinkBeforeAsyncStateUpdate = referrerLink;
         await storeInsertAffiliateIdentifier({ link: referringLink });
-        return;
+        return `${heldReferrerLinkBeforeAsyncStateUpdate}-${customerID}`;
       }
-  
+
       // Create the request URL
       const urlString = `https://api.insertaffiliate.com/V1/convert-deep-link-to-short-link?companyId=${companyCode}&deepLinkUrl=${encodedAffiliateLink}`;
-      console.log("[Insert Affiliate] urlString .", urlString);
+      console.log('[Insert Affiliate] urlString .', urlString);
       const response = await axios.get(urlString, {
         headers: {
-          "Content-Type": "application/json",
+          'Content-Type': 'application/json',
         },
       });
-  
+
       // Call to the backend for the short code and save the resolse in valid
       if (response.status === 200 && response.data.shortLink) {
         const shortLink = response.data.shortLink;
-        console.log("[Insert Affiliate] Short link received:", shortLink);
-        await storeInsertAffiliateIdentifier({ link: shortLink });
+        console.log('[Insert Affiliate] Short link received:', shortLink);
+        return `${shortLink}-${customerID}`;
       } else {
-        console.warn("[Insert Affiliate] Unexpected response format.");
+        console.warn('[Insert Affiliate] Unexpected response format.');
+        let heldReferrerLinkBeforeAsyncStateUpdate = referrerLink;
         await storeInsertAffiliateIdentifier({ link: referringLink });
+        return `${heldReferrerLinkBeforeAsyncStateUpdate}-${customerID}`;
       }
     } catch (error) {
-      console.error("[Insert Affiliate] Error:", error);
+      console.error('[Insert Affiliate] Error:', error);
     }
   };
   
   async function storeInsertAffiliateIdentifier({ link }: { link: string }) {
     console.log(`[Insert Affiliate] Storing affiliate identifier: ${link}`);
-    await saveValueInAsync(ASYNC_KEYS.REFERRER_LINK, link);
     setReferrerLink(link);
+    await saveValueInAsync(ASYNC_KEYS.REFERRER_LINK, link);
   }
 
   const validatePurchaseWithIapticAPI = async (
@@ -284,22 +307,24 @@ const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
     try {
       const baseRequestBody: RequestBody = {
         id: iapticAppId,
-        type: "application",
+        type: 'application',
       };
-  
+
       let transaction;
 
-      if (Platform.OS === "ios") {
+      if (Platform.OS === 'ios') {
         transaction = {
           id: iapticAppId,
-          type: "ios-appstore",
+          type: 'ios-appstore',
           appStoreReceipt: jsonIapPurchase.transactionReceipt,
         };
       } else {
-        const receiptJson = JSON.parse(atob(jsonIapPurchase.transactionReceipt || ""));
+        const receiptJson = JSON.parse(
+          atob(jsonIapPurchase.transactionReceipt || '')
+        );
         transaction = {
           id: receiptJson.orderId, // Extracted orderId
-          type: "android-playstore",
+          type: 'android-playstore',
           purchaseToken: receiptJson.purchaseToken, // Extracted purchase token
           receipt: jsonIapPurchase.transactionReceipt, // Full receipt (Base64)
           signature: receiptJson.signature, // Receipt signature
@@ -318,43 +343,46 @@ const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
           applicationUsername: `${insertAffiliateIdentifier}`,
         };
       }
-  
+
       // Send validation request to server
       const response = await axios({
         url: `https://validator.iaptic.com/v1/validate`,
-        method: "POST",
+        method: 'POST',
         headers: {
           Authorization: `Basic ${btoa(`${iapticAppName}:${iapticPublicKey}`)}`,
-          "Content-Type": "application/json",
+          'Content-Type': 'application/json',
         },
         data: requestBody,
       });
-  
+
       if (response.status === 200) {
-        console.log("Validation successful:", response.data);
+        console.log('Validation successful:', response.data);
         return true;
       } else {
-        console.error("Validation failed:", response.data);
+        console.error('Validation failed:', response.data);
         return false;
       }
     } catch (error) {
       if (error instanceof Error) {
         console.error(`validatePurchaseWithIapticAPI Error: ${error.message}`);
       } else {
-        console.error(`validatePurchaseWithIapticAPI Unknown Error: ${JSON.stringify(error)}`);
+        console.error(
+          `validatePurchaseWithIapticAPI Unknown Error: ${JSON.stringify(
+            error
+          )}`
+        );
       }
 
       return false;
     }
   };
-  
 
-  // MARK: Track Event 
+  // MARK: Track Event
   const trackEvent = async (eventName: string): Promise<void> => {
     try {
       if (!referrerLink || !userId) {
         console.warn(
-          "[Insert Affiliate] No affiliate identifier found. Please set one before tracking events."
+          '[Insert Affiliate] No affiliate identifier found. Please set one before tracking events.'
         );
         return Promise.resolve();
       }
@@ -365,22 +393,22 @@ const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
       };
 
       const response = await axios.post(
-        "https://api.insertaffiliate.com/v1/trackEvent",
+        'https://api.insertaffiliate.com/v1/trackEvent',
         payload,
         {
-          headers: { "Content-Type": "application/json" },
+          headers: { 'Content-Type': 'application/json' },
         }
       );
 
       if (response.status === 200) {
-        console.log("[Insert Affiliate] Event tracked successfully");
+        console.log('[Insert Affiliate] Event tracked successfully');
       } else {
         console.error(
           `[Insert Affiliate] Failed to track event with status code: ${response.status}`
         );
       }
     } catch (error) {
-      console.error("[Insert Affiliate] Error tracking event:", error);
+      console.error('[Insert Affiliate] Error tracking event:', error);
       return Promise.reject(error);
     }
   };
@@ -396,7 +424,7 @@ const DeepLinkIapProvider: React.FC<T_DEEPLINK_IAP_PROVIDER> = ({
         trackEvent,
         setInsertAffiliateIdentifier,
         initialize,
-        isInitialized
+        isInitialized,
       }}
     >
       {children}