OP-159-API-Payment-widget

OpenFuturePlatform · Aug 3, 2018 · 2d778fd · 2d778fd
1 parent 3ee38df
commit 2d778fd
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -237,6 +237,7 @@ certificates-development:
     DEPLOY_HOST: $DEPLOY_HOST_DEV
     DEPLOY_KEY: $DEPLOY_KEY_DEV
     SERVER_NAME: "api.open-platform.zensoft.io"
+    WIDGET_HOST: "https://api.open-platform.zensoft.io"
   before_script: *prepare_key
   script: *update_certificates
   only:
@@ -250,6 +251,7 @@ certificates-production:
     DEPLOY_HOST: $DEPLOY_HOST_PROD
     DEPLOY_KEY: $DEPLOY_KEY_PROD
     SERVER_NAME: "api.openfuture.io"
+    WIDGET_HOST: "https://api.openfuture.io"
   before_script: *prepare_key
   script: *update_certificates
   only:

diff --git a/src/main/kotlin/io/openfuture/api/config/propety/WidgetProperties.kt b/src/main/kotlin/io/openfuture/api/config/propety/WidgetProperties.kt
@@ -0,0 +1,13 @@
+package io.openfuture.api.config.propety
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.stereotype.Component
+import org.springframework.validation.annotation.Validated
+import javax.validation.constraints.NotBlank
+
+@ConfigurationProperties(prefix = "widget")
+@Validated
+@Component
+class WidgetProperties(
+    @field:NotBlank var host: String? = null
+)
diff --git a/src/main/kotlin/io/openfuture/api/controller/base/MainController.kt b/src/main/kotlin/io/openfuture/api/controller/base/MainController.kt
@@ -1,6 +1,7 @@
 package io.openfuture.api.controller.base
 
 import io.openfuture.api.config.propety.AuthorizationProperties
+import io.openfuture.api.config.propety.WidgetProperties
 import org.springframework.stereotype.Controller
 import org.springframework.ui.ModelMap
 import org.springframework.web.bind.annotation.GetMapping
@@ -10,7 +11,8 @@ import javax.servlet.http.HttpServletResponse
 
 @Controller
 class MainController(
-        private val properties: AuthorizationProperties
+        private val properties: AuthorizationProperties,
+        private val widgetProperties: WidgetProperties
 ) {
 
     @GetMapping("/logout")
@@ -26,6 +28,7 @@ class MainController(
     @GetMapping("/widget/{address}")
     fun widget(@PathVariable address: String, model: ModelMap): String {
         model["address"] = address
+        model["host"] = widgetProperties.host
         return "widget"
     }
 

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -18,4 +18,7 @@ ethereum.open-token-address=${OPEN_TOKEN_ADDRESS}
 ethereum.event-subscription=${EVENT_SUBSCRIPTION}
 
 # AUTH
-auth.cookie-name=open_key
+auth.cookie-name=open_key
+
+# WIDGET
+widget.host=${WIDGET_HOST}
diff --git a/widget/build/index.html b/widget/build/index.html
@@ -7,7 +7,7 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <title></title>
 </head>
-  <body data-address="${address}">
-    <script src="https://api.openfuture.io/js/open-widget.js"></script>
+  <body data-address="${address}" data-host="${host}">
+    <script src="${host}/static/js/open-widget.js"></script>
   </body>
 </html>
diff --git a/widget/src/index.js b/widget/src/index.js
@@ -1,7 +1,6 @@
 import * as internalWeb3 from 'web3';
-import * as style from './style.css';
 
-const _web3 = new internalWeb3(internalWeb3.givenProvider || 'http://localhost:8545');
+const _web3 = new internalWeb3(internalWeb3.givenProvider);
 let   windgetData;
 let   userInputData = [];
 let   currentNetwork;
@@ -107,7 +106,8 @@ function validateForm(){
 
 async function openWidget(){
   const scaffoldAddress = await document.body.dataset.address;
-  const OPEN_URL  = `https://api.openfuture.io/widget/scaffolds/${scaffoldAddress}`;
+  const host = await document.body.dataset.host;
+  const OPEN_URL  = `${host}/widget/scaffolds/${scaffoldAddress}`;
   windgetData = await getContractData(OPEN_URL);
 
   let widgetEl = document.createElement('div');

diff --git a/widget/webpack.config.js b/widget/webpack.config.js
@@ -7,7 +7,7 @@ module.exports = {
   entry: './src/index.js',
   output: {
     filename: 'open-widget.js',
-    path: path.resolve(`${__dirname}`, 'build/js')
+    path: path.resolve(`${__dirname}`, 'build/static/js')
   },
   performance: {
     maxEntrypointSize: 512000,