react-native-bootpay-api 4.0.0-beta.0 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bootpay-api",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0",
   "description": "React Native를 위한 bootpay 라이브러리 입니다.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/BootpayWebView.js

@@ -42,6 +42,17 @@ export class BootpayWebView extends Component {
         )
         UserInfo.setBootpayLastTime(Date.now());
     }
+
+    // componentDidMount() {
+    //     // if(this.webView == null || this.webView == undefined || this.webView == false) return;
+
+    //     console.log('componentDidMount: ' + this.close());
+
+    //     this.webView.injectJavaScript(`
+    //     javascript:(function(){${this.close()} })()
+    //     `);
+        
+    // }
  
     render() { 
         return <Modal
@@ -76,15 +87,14 @@ export class BootpayWebView extends Component {
                     </TouchableOpacity>
                 }
                 <WebView
-                    ref={(wv) => this.webView = wv}
-                    // ref={btWebView}
+                    ref={(wv) => this.webView = wv} 
                     useWebKit={true}
                     originWhitelist={['*']}
                     source={{
                         uri: 'https://webview.bootpay.co.kr/4.0.0/'
                     }}
                     onRequestClose={()=> {
-                        console.log('onRequestClose');
+                        // console.log('onRequestClose');
                         this.dismiss();
                     }}
                     injectedJavaScript={this.state.script}
@@ -114,7 +124,7 @@ export class BootpayWebView extends Component {
     bootpayRequest = async (payload, items, user, extra, requestMethod) => {              
         payload.application_id =  Platform.OS == 'ios' ? this.props.ios_application_id : this.props.android_application_id;
         payload.items = items;
-        payload.user_info = user;
+        payload.user = user;
         payload.extra = extra; 
   
 
@@ -123,8 +133,7 @@ export class BootpayWebView extends Component {
             {
                 visibility: true,
                 script: `
-                ${await this.getMountJavascript()}
-                ${quickPopup}
+                ${await this.getMountJavascript()} 
                 ${this.generateScript(payload, requestMethod)}
                 `,
                 firstLoad: false,
@@ -143,37 +152,41 @@ export class BootpayWebView extends Component {
                 visibility: false
             })
         )
-        this.removePaymentWindow();
+        // this.removePaymentWindow();
     }
  
 
     getMountJavascript = async () => { 
         return `
         ${this.getBootpayPlatform()}
+        ${this.close()}
         ${await this.getAnalyticsData()}
         `; 
     }
 
 
-    generateScript= (payload, requestMethod) => {  
-        var requestMethod = "requestPayment";
-
+    generateScript= (payload, requestMethod) => {    
         const script = "Bootpay." + requestMethod + 
         `(${JSON.stringify(payload)})` +
         ".then( function (res) {" + 
-        confirm() + 
-        issued() + 
-        done() + 
+        this.confirm() + 
+        this.issued() + 
+        this.done() + 
         "}, function (res) {" +
-        error() + 
-        cancel() + 
-        "})";
+        this.error() + 
+        this.cancel() + 
+        "}); void(0);";
+        
+        return script;
 
-        this.callJavaScript(script);
+        // return this.generateScript; 
     }
 
     onMessage = ({ nativeEvent }) => { 
         if (nativeEvent == undefined || nativeEvent.data == undefined) return;
+        
+
+        console.log(`onMessage: ${nativeEvent.data}`);
     
         if(nativeEvent.data == 'close') {
             if(this.props.onClose == undefined) return;
@@ -181,42 +194,35 @@ export class BootpayWebView extends Component {
                 action: 'BootpayClose',
                 message: '결제창이 닫혔습니다'
             }
+            // this.setState(
+            //     {
+            //         visibility: false
+            //     }
+            // )
             this.props.onClose(json);
             this.dismiss();
             return;
         }
 
         const data = JSON.parse(nativeEvent.data);
-        switch (data.action) {
-            case 'BootpayCancel':
-                if(this.props.onCancel != undefined) this.props.onCancel(data);
-                this.setState(
-                    {
-                        visibility: false
-                    }
-                )
+        switch (data.event) {
+            case 'cancel':
+                if(this.props.onCancel != undefined) this.props.onCancel(data); 
                 break;
-            case 'BootpayError':
-                if(this.props.onError != undefined) this.props.onError(data);
-                this.setState(
-                    {
-                        visibility: false
-                    }
-                )
+            case 'error':
+                if(this.props.onError != undefined) this.props.onError(data); 
                 break;
-            case 'BootpayBankReady':
-                if(this.props.onReady != undefined) this.props.onReady(data);
+            case 'issued':
+                if(this.props.onReady != undefined) this.props.onIssued(data);
                 break;
-            case 'BootpayConfirm':
+            case 'confirm':
                 if(this.props.onConfirm != undefined) this.props.onConfirm(data);
                 break;
-            case 'BootpayDone':
-                if(this.props.onDone != undefined) this.props.onDone(data);
-                this.setState(
-                    {
-                        visibility: false
-                    }
-                )
+            case 'done':
+                if(this.props.onDone != undefined) this.props.onDone(data); 
+                break;
+            case 'close':
+                if(this.props.onClose != undefined) this.props.onClose(data);
                 break;
         }
     }
@@ -245,25 +251,26 @@ export class BootpayWebView extends Component {
     transactionConfirm = () => { 
         const script = "Bootpay.confirm()" + 
         ".then( function (res) {" + 
-        confirm() + 
-        issued() + 
-        done() + 
+        this.confirm() + 
+        this.issued() + 
+        this.done() + 
         "}, function (res) {" +
-        error() + 
-        cancel() + 
+        this.error() + 
+        this.cancel() + 
         "})";
 
         this.callJavaScript(script);
     }
 
     removePaymentWindow = () => {
-        this.callJavaScript(`
-        Bootpay.removePaymentWindow();
-          `);
+        this.dismiss();
+        // this.callJavaScript(`
+        // Bootpay.removePaymentWindow();
+        //   `);
     } 
 
-    callJavaScript = (script) => {
-        if(this.webView == null || this.webView == undefined) return;
+    callJavaScript = (script) => { 
+        if(this.webView == null || this.webView == undefined || this.webView == false) return;
 
         // console.log('callJavascript: ' + script);