ouisys-engine 2.1.52 → 2.1.55

package/dist/reducers/moFlow/utils.js

@@ -54,8 +54,6 @@ require("regenerator-runtime/runtime");
 
 var RDS = _interopRequireWildcard(require("../../common-types/RemoteDataState"));
 
-var _loadScriptInnerHtml = _interopRequireDefault(require("../../utilities/loadScriptInnerHtml"));
-
 var _loadScriptSrc = _interopRequireDefault(require("../../utilities/loadScriptSrc"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -177,11 +175,10 @@ var getGoogleReCaptchaConfig = /*#__PURE__*/function () {
 
             if (result.success === true) {
               srcUrl = "https://www.google.com/recaptcha/api.js?render=".concat(result.site_key);
-              (0, _loadScriptSrc.default)(srcUrl);
-              setTimeout(function () {
-                var script = "\n        grecaptcha.ready(function() {\n            grecaptcha.execute(\"".concat(result.site_key, "\", {action: 'submit'}).then(function(token) {\n              // To be used by tallyman\n              window.reCaptchaToken = token;\n              console.log(\"-------\" + token);\n            });\n        });\n      ");
-                (0, _loadScriptInnerHtml.default)(script, true);
-              }, 0);
+              (0, _loadScriptSrc.default)({
+                url: srcUrl,
+                key: result.site_key
+              });
             }
 
             return _context2.abrupt("return", result);

package/dist/utilities/loadScriptSrc.d.ts

@@ -1,2 +1,5 @@
-declare const loadScriptSrc: (src: string) => void;
+declare const loadScriptSrc: ({ url, key }: {
+    url: string;
+    key: string;
+}) => void;
 export default loadScriptSrc;

package/dist/utilities/loadScriptSrc.js

@@ -5,13 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var loadScriptSrc = function loadScriptSrc(src) {
+var _loadScriptInnerHtml = _interopRequireDefault(require("./loadScriptInnerHtml"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var loadScriptSrc = function loadScriptSrc(_ref) {
+  var url = _ref.url,
+      key = _ref.key;
   var script = document.createElement('script');
   script.type = 'text/javascript';
-  script.src = src;
+  script.src = url;
   var headElem = document.getElementsByTagName('head')[0];
   headElem.insertBefore(script, headElem.firstChild);
-  console.log('loadScript');
+
+  script.onload = function () {
+    var scriptInner = "\n      grecaptcha.ready(function() {\n          grecaptcha.execute(\"".concat(key, "\", {action: 'submit'}).then(function(token) {\n            // To be used by tallyman\n            window.reCaptchaToken = token;\n            console.log(\"-------\" + token);\n          });\n      });\n    ");
+    (0, _loadScriptInnerHtml.default)(scriptInner, true);
+  };
 };
 
 var _default = loadScriptSrc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ouisys-engine",
-  "version": "2.1.52",
+  "version": "2.1.55",
   "description": "",
   "main": "dist/index.js",
   "directories": "dist dev-tools",

package/src/reducers/moFlow/utils.ts

@@ -48,19 +48,7 @@ export const getGoogleReCaptchaConfig = async ({ slug, country, device, host }:I
   const result: IGoogleReCaptcha = await window.tallymanApi.getGoogleCaptcha(host, country, slug, device, domain);
   if(result.success === true){
     const srcUrl = `https://www.google.com/recaptcha/api.js?render=${result.site_key}`;
-    loadScriptSrc(srcUrl);
-    setTimeout(() => {
-        const script = `
-        grecaptcha.ready(function() {
-            grecaptcha.execute("${result.site_key}", {action: 'submit'}).then(function(token) {
-              // To be used by tallyman
-              window.reCaptchaToken = token;
-              console.log("-------" + token);
-            });
-        });
-      `;
-      loadScriptInnerHtml(script, true);
-    }, 0);
+    loadScriptSrc({url:srcUrl, key: result.site_key});
   }
   return result;
 }

package/src/reducers/oneClickFlow/index.ts

@@ -47,12 +47,12 @@ export function getRedirectUrlAction({extraParams, autoRedirect = false, isGetRe
                     window.location.href = redirectUrl;
                   }, 0);
                 }
-              }, 500);
+              }, 100);
             }else{
               tracker.advancedInFlow('tallyman.v1-one-click', 'click-redirect-url', {redirect_url:redirectUrl});
               setTimeout(() => {
                 window.location.href = redirectUrl;
-              }, 1000);
+              }, 0);
             }
 
 
@@ -104,7 +104,7 @@ export function getRedirectUrlAction({extraParams, autoRedirect = false, isGetRe
 
               setTimeout(() => { 
                 window.location.href = redirect_url;
-              }, 3000);
+              }, 0);
             }else{
               dispatch({
                 type: "GET_REDIRECT_URL",

package/src/utilities/loadScriptSrc.ts

@@ -1,10 +1,23 @@
-const loadScriptSrc = (src:string)=>{
+import loadScriptInnerHtml from "./loadScriptInnerHtml";
+
+const loadScriptSrc = ({url, key}:{url:string, key:string})=>{
   var script = document.createElement('script');
   script.type = 'text/javascript';
-  script.src = src;
+  script.src = url;
   var headElem = document.getElementsByTagName('head')[0];
   headElem.insertBefore(script, headElem.firstChild)
-  console.log('loadScript');
+  script.onload = () => {
+    const scriptInner = `
+      grecaptcha.ready(function() {
+          grecaptcha.execute("${key}", {action: 'submit'}).then(function(token) {
+            // To be used by tallyman
+            window.reCaptchaToken = token;
+            console.log("-------" + token);
+          });
+      });
+    `;
+    loadScriptInnerHtml(scriptInner, true);
+  }  
 }
 
 export default loadScriptSrc;