react-amwal-pay 0.1.1 → 0.1.2

package/src/AmwalPaySDK.ts

@@ -1,98 +1,98 @@
-import { initiate, onCustomerId, onResponse, type AmwalPayConfig } from './index';
-import NetworkClient from './network/NetworkClient';
-import {  type EventSubscription } from 'react-native';
-
-
-class AmwalPaySDK {
-  private static instance: AmwalPaySDK;
-
-  private onResponseSubscription: EventSubscription|null = null;
-
-  private onCustomerIdSubscription: EventSubscription|null = null;
-  
-  private constructor() {
-    // Initialize the event emitter
-    
-  }
-  
-  static getInstance(): AmwalPaySDK {
-    if (!AmwalPaySDK.instance) {
-      AmwalPaySDK.instance = new AmwalPaySDK();
-    }
-    return AmwalPaySDK.instance;
-  }
-  
-  /**
-   * Initiates the payment process by first fetching a session token and then starting the payment flow
-   * @param config The payment configuration
-   */
-  async startPayment(config: Omit<AmwalPayConfig, 'sessionToken'>): Promise<void> {
-    try {
-      // Set up event listeners before starting the payment process
-      this.setupEventListeners(config);
-      
-      // Get network client instance
-      const networkClient = NetworkClient.getInstance();
-      
-      // Fetch session token
-      const sessionToken = await networkClient.fetchSessionToken(
-        config.environment,
-        config.merchantId,
-        config.customerId,
-        config.secureHash
-      );
-      
-      if (!sessionToken) {
-        // If session token is null, the error has already been shown by NetworkClient
-        return;
-      }
-      
-      // Create complete config with session token
-      const completeConfig: AmwalPayConfig = {
-        ...config,
-        sessionToken
-      };
-      
-      // Initiate the payment process
-      initiate(completeConfig);
-    } catch (error) {
-      console.error('Error starting payment:', error);
-    }
-  }
-
-  dispose(): void {
-    // Remove all event listeners
-    this.removeEventListeners();
-  }
-  
-  /**
-   * Sets up event listeners for AmwalPay events
-   * @param config The payment configuration containing callback functions
-   */
-  private setupEventListeners(config: Omit<AmwalPayConfig, 'sessionToken'>): void {
-    // Remove any existing listeners
-    this.removeEventListeners();
-    
-    this.onResponseSubscription = onResponse((response) => {
-      console.log('Received AmwalPayResponse:', response);
-      config.onResponse(response);
-    });
-
-    this.onCustomerIdSubscription = onCustomerId((customerId) => {
-      console.log('Received customerId:', customerId);
-      config.onCustomerId(customerId);
-    });
-  }
-  
-  /**
-   * Removes all event listeners
-   */
-  private removeEventListeners(): void {
-    this.onResponseSubscription?.remove();
-    this.onCustomerIdSubscription?.remove();
-    this.onResponseSubscription = null;
-    this.onCustomerIdSubscription = null;
-  }
-}
-
+import { initiate, onCustomerId, onResponse, type AmwalPayConfig } from './index';
+import NetworkClient from './network/NetworkClient';
+import {  type EventSubscription } from 'react-native';
+
+
+class AmwalPaySDK {
+  private static instance: AmwalPaySDK;
+
+  private onResponseSubscription: EventSubscription|null = null;
+
+  private onCustomerIdSubscription: EventSubscription|null = null;
+  
+  private constructor() {
+    // Initialize the event emitter
+    
+  }
+  
+  static getInstance(): AmwalPaySDK {
+    if (!AmwalPaySDK.instance) {
+      AmwalPaySDK.instance = new AmwalPaySDK();
+    }
+    return AmwalPaySDK.instance;
+  }
+  
+  /**
+   * Initiates the payment process by first fetching a session token and then starting the payment flow
+   * @param config The payment configuration
+   */
+  async startPayment(config: Omit<AmwalPayConfig, 'sessionToken'>): Promise<void> {
+    try {
+      // Set up event listeners before starting the payment process
+      this.setupEventListeners(config);
+      
+      // Get network client instance
+      const networkClient = NetworkClient.getInstance();
+      
+      // Fetch session token
+      const sessionToken = await networkClient.fetchSessionToken(
+        config.environment,
+        config.merchantId,
+        config.customerId,
+        config.secureHash
+      );
+      
+      if (!sessionToken) {
+        // If session token is null, the error has already been shown by NetworkClient
+        return;
+      }
+      
+      // Create complete config with session token
+      const completeConfig: AmwalPayConfig = {
+        ...config,
+        sessionToken
+      };
+      
+      // Initiate the payment process
+      initiate(completeConfig);
+    } catch (error) {
+      console.error('Error starting payment:', error);
+    }
+  }
+
+  dispose(): void {
+    // Remove all event listeners
+    this.removeEventListeners();
+  }
+  
+  /**
+   * Sets up event listeners for AmwalPay events
+   * @param config The payment configuration containing callback functions
+   */
+  private setupEventListeners(config: Omit<AmwalPayConfig, 'sessionToken'>): void {
+    // Remove any existing listeners
+    this.removeEventListeners();
+    
+    this.onResponseSubscription = onResponse((response) => {
+      console.log('Received AmwalPayResponse:', response);
+      config.onResponse(response);
+    });
+
+    this.onCustomerIdSubscription = onCustomerId((customerId) => {
+      console.log('Received customerId:', customerId);
+      config.onCustomerId(customerId);
+    });
+  }
+  
+  /**
+   * Removes all event listeners
+   */
+  private removeEventListeners(): void {
+    this.onResponseSubscription?.remove();
+    this.onCustomerIdSubscription?.remove();
+    this.onResponseSubscription = null;
+    this.onCustomerIdSubscription = null;
+  }
+}
+
 export default AmwalPaySDK;

package/src/network/NetworkClient.ts

@@ -1,84 +1,84 @@
-import { Alert } from 'react-native'; 
-import { Environment } from '../NativeReactAmwalPay'; 
-import SecureHashUtil from '../utils/SecureHashUtil'; 
- 
-class NetworkClient { 
-  private static instance: NetworkClient; 
-   
-  private constructor() {} 
-   
-  static getInstance(): NetworkClient { 
-    if (!NetworkClient.instance) { 
-      NetworkClient.instance = new NetworkClient(); 
-    } 
-    return NetworkClient.instance; 
-  } 
- 
-  private getWebhookUrl(env: Environment): string { 
-    switch (env) { 
-      case Environment.SIT: 
-        return 'https://test.amwalpg.com:24443/'; 
-      case Environment.UAT: 
-        return 'https://test.amwalpg.com:14443/'; 
-      case Environment.PROD: 
-        return 'https://webhook.amwalpg.com/'; 
-      default: 
-        return 'https://test.amwalpg.com:24443/'; 
-    } 
-  } 
- 
-  async fetchSessionToken( 
-    env: Environment, 
-    merchantId: string, 
-    customerId: string | null, 
-    secureHashValue: string 
-  ): Promise<string | null> { 
-    try { 
-      const webhookUrl = this.getWebhookUrl(env); 
-       
-      const dataMap = { 
-        merchantId, 
-        customerId 
-      }; 
- 
-      const secureHash = SecureHashUtil.clearSecureHash(secureHashValue, dataMap); 
- 
-      const response = await fetch(`${webhookUrl}Membership/GetSDKSessionToken`, { 
-        method: 'POST', 
-        headers: { 
-          'Accept': 'text/plain', 
-          'Accept-Language': 'en-US,en;q=0.9', 
-          'Content-Type': 'application/json', 
-        }, 
-        body: JSON.stringify({ 
-          merchantId, 
-          secureHashValue: secureHash, 
-          customerId 
-        }) 
-      }); 
- 
-      const responseData = await response.json(); 
- 
-      if (response.ok && responseData.success) { 
-        return responseData.data.sessionToken; 
-      } else { 
-        const errorMessage = responseData.errorList?.join(',') || 'Unknown error'; 
-        this.showErrorDialog(errorMessage); 
-        return null; 
-      } 
-    } catch (error) { 
-      this.showErrorDialog('Something Went Wrong'); 
-      return null; 
-    } 
-  } 
- 
-  private showErrorDialog(message: string): void { 
-    Alert.alert( 
-      'Error', 
-      message, 
-      [{ text: 'OK' }] 
-    ); 
-  } 
-} 
- 
+import { Alert } from 'react-native'; 
+import { Environment } from '../NativeReactAmwalPay'; 
+import SecureHashUtil from '../utils/SecureHashUtil'; 
+ 
+class NetworkClient { 
+  private static instance: NetworkClient; 
+   
+  private constructor() {} 
+   
+  static getInstance(): NetworkClient { 
+    if (!NetworkClient.instance) { 
+      NetworkClient.instance = new NetworkClient(); 
+    } 
+    return NetworkClient.instance; 
+  } 
+ 
+  private getWebhookUrl(env: Environment): string { 
+    switch (env) { 
+      case Environment.SIT: 
+        return 'https://test.amwalpg.com:24443/'; 
+      case Environment.UAT: 
+        return 'https://test.amwalpg.com:14443/'; 
+      case Environment.PROD: 
+        return 'https://webhook.amwalpg.com/'; 
+      default: 
+        return 'https://test.amwalpg.com:24443/'; 
+    } 
+  } 
+ 
+  async fetchSessionToken( 
+    env: Environment, 
+    merchantId: string, 
+    customerId: string | null, 
+    secureHashValue: string 
+  ): Promise<string | null> { 
+    try { 
+      const webhookUrl = this.getWebhookUrl(env); 
+       
+      const dataMap = { 
+        merchantId, 
+        customerId 
+      }; 
+ 
+      const secureHash = SecureHashUtil.clearSecureHash(secureHashValue, dataMap); 
+ 
+      const response = await fetch(`${webhookUrl}Membership/GetSDKSessionToken`, { 
+        method: 'POST', 
+        headers: { 
+          'Accept': 'text/plain', 
+          'Accept-Language': 'en-US,en;q=0.9', 
+          'Content-Type': 'application/json', 
+        }, 
+        body: JSON.stringify({ 
+          merchantId, 
+          secureHashValue: secureHash, 
+          customerId 
+        }) 
+      }); 
+ 
+      const responseData = await response.json(); 
+ 
+      if (response.ok && responseData.success) { 
+        return responseData.data.sessionToken; 
+      } else { 
+        const errorMessage = responseData.errorList?.join(',') || 'Unknown error'; 
+        this.showErrorDialog(errorMessage); 
+        return null; 
+      } 
+    } catch (error) { 
+      this.showErrorDialog('Something Went Wrong'); 
+      return null; 
+    } 
+  } 
+ 
+  private showErrorDialog(message: string): void { 
+    Alert.alert( 
+      'Error', 
+      message, 
+      [{ text: 'OK' }] 
+    ); 
+  } 
+} 
+ 
 export default NetworkClient;

package/src/utils/SecureHashUtil.ts

@@ -1,45 +1,45 @@
-import HmacSHA256 from 'crypto-js/hmac-sha256'; 
-import Hex from 'crypto-js/enc-hex'; 
-
-type DataMap = { [key: string]: string | null }; 
-
-class SecureHashUtil { 
-  static clearSecureHash(secretKey: string, data: DataMap): string { 
-    delete data.secureHashValue; 
-    const concatenatedString = this.composeData(data); 
-    return this.generateSecureHash(concatenatedString, secretKey); 
-  } 
-
-  private static composeData(requestParameters: DataMap): string { 
-    return Object.entries(requestParameters) 
-      .sort(([keyA], [keyB]) => keyA.localeCompare(keyB)) 
-      .filter(([_, value]) => value != null && value !== '') 
-      .map(([key, value]) => `${key}=${value}`) 
-      .join('&'); 
-  } 
-
-  private static generateSecureHash(message: string, secretKey: string): string { 
-    try { 
-      // Convert hex string to byte array 
-      const keyBytes = secretKey.match(/.{2}/g)?.map(byte => parseInt(byte, 16)); 
-      
-      if (!keyBytes) { 
-        throw new Error('Invalid secret key format'); 
-      } 
-
-      // Convert key bytes to hex string for crypto-js 
-      const keyHex = keyBytes.map(byte => byte.toString(16).padStart(2, '0')).join(''); 
-      
-      // Generate HMAC-SHA256 
-      const hash = HmacSHA256(message, Hex.parse(keyHex)); 
-      
-      // Convert to uppercase hex string 
-      return hash.toString(Hex).toUpperCase(); 
-    } catch (e) { 
-      console.error('Error generating secure hash:', e); 
-      return ''; 
-    } 
-  } 
-} 
-
+import HmacSHA256 from 'crypto-js/hmac-sha256'; 
+import Hex from 'crypto-js/enc-hex'; 
+
+type DataMap = { [key: string]: string | null }; 
+
+class SecureHashUtil { 
+  static clearSecureHash(secretKey: string, data: DataMap): string { 
+    delete data.secureHashValue; 
+    const concatenatedString = this.composeData(data); 
+    return this.generateSecureHash(concatenatedString, secretKey); 
+  } 
+
+  private static composeData(requestParameters: DataMap): string { 
+    return Object.entries(requestParameters) 
+      .sort(([keyA], [keyB]) => keyA.localeCompare(keyB)) 
+      .filter(([_, value]) => value != null && value !== '') 
+      .map(([key, value]) => `${key}=${value}`) 
+      .join('&'); 
+  } 
+
+  private static generateSecureHash(message: string, secretKey: string): string { 
+    try { 
+      // Convert hex string to byte array 
+      const keyBytes = secretKey.match(/.{2}/g)?.map(byte => parseInt(byte, 16)); 
+      
+      if (!keyBytes) { 
+        throw new Error('Invalid secret key format'); 
+      } 
+
+      // Convert key bytes to hex string for crypto-js 
+      const keyHex = keyBytes.map(byte => byte.toString(16).padStart(2, '0')).join(''); 
+      
+      // Generate HMAC-SHA256 
+      const hash = HmacSHA256(message, Hex.parse(keyHex)); 
+      
+      // Convert to uppercase hex string 
+      return hash.toString(Hex).toUpperCase(); 
+    } catch (e) { 
+      console.error('Error generating secure hash:', e); 
+      return ''; 
+    } 
+  } 
+} 
+
 export default SecureHashUtil;

package/android/build.gradle

@@ -1,95 +0,0 @@
-buildscript {
-  ext.getExtOrDefault = {name ->
-    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['ReactAmwalPay_' + name]
-  }
-
-  repositories {
-    google()
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath "com.android.tools.build:gradle:8.7.3"
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
-  }
-}
-
-
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
-
-apply plugin: "com.facebook.react"
-
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["ReactAmwalPay_" + name]).toInteger()
-}
-
-android {
-  namespace "com.reactamwalpay"
-
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
-
-  defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-  }
-
-  buildFeatures {
-    buildConfig true
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-      shrinkResources false
-    }
-  }
-
-  lintOptions {
-    disable "GradleCompatible"
-  }
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
-  sourceSets {
-    main {
-      java.srcDirs += [
-        "generated/java",
-        "generated/jni"
-      ]
-    }
-  }
-}
-
-repositories {
-  mavenCentral()
-  google()
-}
-rootProject.allprojects { Project subproject ->
-    subproject.repositories {
-    maven { url  uri("E:/react_amwal_pay/android/repo") }
-
-    maven { url = uri("https://storage.googleapis.com/download.flutter.io") }
-    }
-}
-def kotlin_version = getExtOrDefault("kotlinVersion")
-
-dependencies {
-  implementation "com.facebook.react:react-android"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation("com.amwal-pay:amwal_sdk:1.0.91"){
-    exclude group: 'com.android.support', module: 'support-v4'
-    exclude group: 'com.android.support', module: 'design'
-  }
-
-}
-
-react {
-  jsRootDir = file("../src/")
-  libraryName = "ReactAmwalPay"
-  codegenJavaPackageName = "com.reactamwalpay"
-}

package/android/gradle.properties

@@ -1,5 +0,0 @@
-ReactAmwalPay_kotlinVersion=2.0.0
-ReactAmwalPay_minSdkVersion=24
-ReactAmwalPay_targetSdkVersion=34
-ReactAmwalPay_compileSdkVersion=35
-ReactAmwalPay_ndkVersion=27.1.12297006

package/android/src/main/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-</manifest>

package/android/src/main/java/com/reactamwalpay/ReactAmwalPayModule.kt

@@ -1,115 +0,0 @@
-package com.reactamwalpay
-
-import android.util.Log
-import com.facebook.react.bridge.*
-import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.anwalpay.sdk.AmwalSDK
-import org.json.JSONObject
-
-@ReactModule(name = ReactAmwalPayModule.NAME)
-class ReactAmwalPayModule(reactContext: ReactApplicationContext) :
-  NativeReactAmwalPaySpec(reactContext) {
-
-  private val amwalSDK = AmwalSDK()
-
-  override fun getName(): String {
-    return NAME
-  }
-
- 
-  
-  private fun sendEvent(eventName: String, params: WritableMap?) {
-    reactApplicationContext
-      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      .emit(eventName, params)
-  }
-  
-  override fun initiate(config: ReadableMap) {
-    Log.d(NAME, "initiate called")
-    val activity = reactApplicationContext.currentActivity
-    if (activity == null) {
-      // Since we can't use Promise here (method signature must match the spec),
-      // we'll send an error event
-      val params = Arguments.createMap()
-      params.putString("type", "onResponse")
-      val errorData = Arguments.createMap()
-      errorData.putString("status", "ERROR")
-      errorData.putString("message", "Activity context is not available")
-      params.putMap("data", errorData)
-      sendEvent("AmwalPayEvent", params)
-      return
-    }
-    
-    Log.d(NAME, "initiate got here")
-    try {
-      val sdkConfig = AmwalSDK.Config(
-        environment = AmwalSDK.Config.Environment.valueOf(config.getString("environment") ?: ""),
-        sessionToken = config.getString("sessionToken") ?: "",
-        currency = AmwalSDK.Config.Currency.valueOf(config.getString("currency") ?: ""),
-        amount = config.getString("amount") ?: "",
-        merchantId = config.getString("merchantId") ?: "",
-        terminalId = config.getString("terminalId") ?: "",
-        locale = java.util.Locale(config.getString("locale") ?: "en"),
-        customerId = if (config.hasKey("customerId")) config.getString("customerId") else null,
-        transactionType = AmwalSDK.Config.TransactionType.valueOf(config.getString("transactionType") ?: "")
-      )
-      
-      // Ensure this runs on the UI thread
-      (reactApplicationContext.currentActivity ?: return).runOnUiThread {
-        amwalSDK.start(
-          activity,
-          sdkConfig,
-          onResponse = {
-            Log.d(NAME, "onResponse called")
-            val params = Arguments.createMap()
-            try {
-              val json = JSONObject(it.toString())
-              val dataMap = jsonToWritableMap(json)
-              params.putMap("data", dataMap)
-            } catch (e: Exception) {
-              params.putString("data", it.toString())
-            }
-            emitOnResponse(params)
-          }, 
-          onCustomerId = {
-            Log.d(NAME, "onCustomerId called")
-            emitOnCustomerId(it)
-          }
-        )
-      }
-    } catch (e: Exception) {
-      Log.e(NAME, "Error initializing AmwalSDK", e)
-      val params = Arguments.createMap()
-      params.putString("type", "onResponse")
-      val errorData = Arguments.createMap()
-      errorData.putString("status", "ERROR")
-      errorData.putString("message", e.message ?: "Unknown error")
-      params.putMap("data", errorData)
-      sendEvent("AmwalPayEvent", params)
-    }
-  }
-
-  // Helper function to convert JSONObject to WritableMap
-  private fun jsonToWritableMap(jsonObject: JSONObject): WritableMap {
-    val map = Arguments.createMap()
-    val keys = jsonObject.keys()
-    while (keys.hasNext()) {
-      val key = keys.next()
-      val value = jsonObject.get(key)
-      when (value) {
-        is JSONObject -> map.putMap(key, jsonToWritableMap(value))
-        is Boolean -> map.putBoolean(key, value)
-        is Int -> map.putInt(key, value)
-        is Double -> map.putDouble(key, value)
-        is String -> map.putString(key, value)
-        else -> map.putString(key, value.toString())
-      }
-    }
-    return map
-  }
-
-  companion object {
-    const val NAME = "ReactAmwalPay"
-  }
-}