apps-sdk 1.0.13 → 1.0.14

package/config.js

@@ -1,7 +1,7 @@
 export var ENDPOINTS = {
     INIT : 'https://ap0404.gways.org/v6/init',
     NOTIFICATION_TOKEN: 'https://ap0404.gways.org/user/set_expo_id',
-    TRACKING: 'https://ap0404.gways.org/v3/',
+    TRACKING: 'https://ap0404.gways.org/v3/log-event',
     GET_USER_ID: 'https://ap0404.gways.org/user/generate_public_id',
     CHECK_SUBSCRIPTION: 'https://ap0404.gways.org/create-sub',
     SET_ATTRIBUTION: 'https://ap0404.gways.org/user/set_attribution_data',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Apps SDK",
   "main": "index.js",
   "scripts": {
@@ -11,6 +11,7 @@
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.21.0",
     "crypto-es": "^2.1.0",
+    "encode-utf8": "^2.0.0",
     "expo-constants": "^15.4.5",
     "expo-device": "^5.9.3",
     "expo-localization": "^14.8.3",

package/src/libraries/Networking.js

@@ -2,6 +2,7 @@ import * as config from '../../config';
 import { default as storage } from './Storage';
 import Session from './Session';
 import CryptoES from "crypto-es";
+import encodeUtf8 from "encode-utf8";
 
 class Networking {
     constructor() {
@@ -9,11 +10,7 @@ class Networking {
         this.DEFAULT_ENCRYPT_VALUE = false;
     }
 
-    setEncryptKey() {
-        return this.ENCRYPT_KEY;
-    }
-
-    getEncryptKey(value) {
+    setEncryptKey(value) {
         this.ENCRYPT_KEY = value;
     }
 
@@ -89,16 +86,23 @@ class Networking {
 
     async request(url, data = {}, encrypt = this.DEFAULT_ENCRYPT_VALUE) {
         data = { ...Session.sessionData, ...data };
+        Object.keys(data).map(key => {
+            if (typeof data[key] === 'string') {
+                data[key] = encodeUtf8(data[key]);
+            }
+        });
         config.DEBUG_MODE && console.debug("request data: ", url, data);
 
         let headers = { Accept: 'application/json', 'Content-Type': 'application/json' };
 
         if (encrypt) {
-            const secretKey = this.ENCRYPT_KEY;
+            const secretKey = CryptoES.enc.Utf8.parse(this.ENCRYPT_KEY); // ensure key is 32 bytes
             const iv = CryptoES.lib.WordArray.random(128/8);
-            const encryptedData = CryptoES.AES.encrypt(JSON.stringify(data), secretKey, { iv: iv }).toString();
-            data = { data: iv.toString(CryptoES.enc.Base64) + '$' + encryptedData };
-            headers['Content-Type'] = 'application/octet-stream';
+            const cipherParams = CryptoES.AES.encrypt(JSON.stringify(data), secretKey, { iv: iv, mode: CryptoES.mode.CBC, padding: CryptoES.pad.Pkcs7 });
+            const base64IV = CryptoES.enc.Base64.stringify(iv);
+            const base64Ciphertext = cipherParams.ciphertext.toString(CryptoES.enc.Base64);
+            data = { data: base64IV + '$' + base64Ciphertext };
+            headers['Content-Type'] = 'application/octet-stream; charset=utf-8';
         }
 
         try {
@@ -135,11 +139,15 @@ class Networking {
     }
 
     setEndpoints(domains) {
-        // domains.events && (config.ENDPOINTS.TRACKING = domains.events);
+        domains.contents && (config.ENDPOINTS.CONTENTS = domains.contents);
         // domains.audiences && (config.ENDPOINTS.SET_ATTRIBUTION = domains.audiences);
         // domains.notification_token && (config.ENDPOINTS.NOTIFICATION_TOKEN = domains.notification_token);
     }
 
+    getEndpoints() {
+        return config.ENDPOINTS;
+    }
+
     setEvents(events) {
         events && (config.EVENTS = events);
     }
@@ -149,6 +157,7 @@ class Networking {
         try {
             let eventResponse = await this.request(config.ENDPOINTS.TRACKING, {
                 event_name: eventType,
+                event_type: eventType,
                 action: eventKeyword,
                 data: eventData,
                 ...Session.sessionData,

package/src/libraries/Session.js

@@ -56,6 +56,7 @@ class Session {
         this.sessionData.isFirstOpen = !(await Storage.getData("FirstOpenAlreadyExecuted"));
         if (this.sessionData.isFirstOpen) {
             config.DEBUG_MODE && console.debug("checkFirstOpen - First Open");
+            await this.sendFirstOpen();
             await Storage.storeData("FirstOpenAlreadyExecuted", true);
         } else {
             config.DEBUG_MODE && console.debug("checkFirstOpen - Not First Open");
@@ -84,9 +85,9 @@ class Session {
             userID = await Networking.getUserID();
             if (userID) {
                 await Storage.storeData("userID", userID);
-                this.setUserID(userID);
             }
         }
+        this.setUserID(userID);
         config.DEBUG_MODE && console.debug("checkUserID - userID: ", userID);
         return userID;
     }
@@ -123,6 +124,10 @@ class Session {
         this.sessionData.user_id = userID;
     }
 
+    getUserID = () => {
+        return this.sessionData.user_id;
+    }
+
     sendFirstOpen = async () => {
         config.DEBUG_MODE && console.debug("sendFirstOpen");
         try {

package/types/index.d.ts

@@ -41,17 +41,19 @@ declare module 'apps-sdk' {
         getIsDevUser(): boolean;
         setIsSubscribed(isSubscribed: boolean): void;
         setIsDevUser(isDevUser: boolean): void;
+        setUserID(userID: string): void;
+        getUserID(): string | null;
     }
 
     export class Networking {
         setEncryptKey(key: string): void;
-        getEncryptKey(): string;
         setDefaultEncryptValue(value: boolean): void;
         trackEvent(wid: string, event: string, user_id?: string | null): Promise<void>;
         executeInit(): Promise<void>;
         setToken(token: string): Promise<boolean | null>;
         request(url: string, data?: any): Promise<any>;
         setEndpoints(endpoints: any): void;
+        getEndpoints(): any;
         setEvents(events: any): void;
         sendEvent(eventType: string, eventKeyword:string, eventData?: object): Promise<void>;
         }