From: Nick Downing <nick@ndcode.org>
Date: Sun, 19 Dec 2021 03:11:08 +0000 (+1100)
Subject: Make _library/*.jst functions load _config/config.json themselves as originally
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=7835f7786c79660f5418e368e1ac0817b88b97e8;p=square_example_site.git

Make _library/*.jst functions load _config/config.json themselves as originally
---

diff --git a/_library/capture_order.jst b/_library/capture_order.jst
index 8af6381..237e6b8 100644
--- a/_library/capture_order.jst
+++ b/_library/capture_order.jst
@@ -1,10 +1,11 @@
 let https = require('https');
 
-return async (config, order_id) => {
+return async (env, order_id) => {
+  let config = await env.site.get_json('/_config/config.json');
   let get_access_token = await _require('get_access_token.jst');
 
   return new Promise(resolve => {
-    get_access_token(config).then((access_token) => {
+    get_access_token(env).then((access_token) => {
     const options = {
       hostname: 'api.' + (config.environment === 'sandbox' ? 'sandbox.' : '') + 'paypal.com',
       port: 443,
diff --git a/_library/create_order.jst b/_library/create_order.jst
index baa7ba4..7d5a1e9 100644
--- a/_library/create_order.jst
+++ b/_library/create_order.jst
@@ -1,10 +1,11 @@
 let https = require('https');
 
-return async (config, item_obj) => {
+return async (env, item_obj) => {
+  let config = await env.site.get_json('/_config/config.json');
   let get_access_token = await _require('get_access_token.jst');
 
   return new Promise(resolve => {
-    get_access_token(config).then((access_token) => {
+    get_access_token(env).then((access_token) => {
   
     const options = {
       hostname: 'api.' + (config.environment === 'sandbox' ? 'sandbox.' : '') + 'paypal.com',
diff --git a/_library/get_access_token.jst b/_library/get_access_token.jst
index 52df668..7dedac0 100644
--- a/_library/get_access_token.jst
+++ b/_library/get_access_token.jst
@@ -1,10 +1,10 @@
 let https = require('https');
 
-return async config => {
+return async env => {
   let get_oauth = await _require('get_oauth.jst');
 
   return new Promise(resolve => {
-    get_oauth(config).then((response) => {
+    get_oauth(env).then((response) => {
       resolve(response.access_token);
     });
   });
diff --git a/_library/get_oauth.jst b/_library/get_oauth.jst
index ef7f732..b22ea02 100644
--- a/_library/get_oauth.jst
+++ b/_library/get_oauth.jst
@@ -1,6 +1,8 @@
 let https = require('https');
 
-return async config => {
+return async env => {
+  let config = await env.site.get_json('/_config/config.json');
+
   return new Promise(resolve => {
       
       const data = 'grant_type=client_credentials';
diff --git a/_library/get_order_details.jst b/_library/get_order_details.jst
index 3025472..6b4c9f6 100644
--- a/_library/get_order_details.jst
+++ b/_library/get_order_details.jst
@@ -1,10 +1,11 @@
 let https = require('https');
 
-return async (config, order_id) => {
+return async (env, order_id) => {
+  let config = await env.site.get_json('/_config/config.json');
   let get_access_token = await _require('get_access_token.jst');
 
   return new Promise(resolve => {
-    get_access_token(config).then((access_token) => {
+    get_access_token(env).then((access_token) => {
   
     const options = {
       hostname: 'api.' + (config.environment === 'sandbox' ? 'sandbox.' : '') + 'paypal.com',
diff --git a/_library/patch_order_details.jst b/_library/patch_order_details.jst
index c603cfb..d1933ec 100644
--- a/_library/patch_order_details.jst
+++ b/_library/patch_order_details.jst
@@ -1,10 +1,11 @@
 let https = require('https');
 
-return async (config, new_order_details) => {
+return async (env, new_order_details) => {
+  let config = await env.site.get_json('/_config/config.json');
   let get_access_token = await _require('get_access_token.jst');
 
   return new Promise((resolve, reject) => {
-    get_access_token(config).then((access_token) => {
+    get_access_token(env).then((access_token) => {
       patch_details = new_order_details.patch_details;
       order_id = new_order_details.order_id;
       const options = {
diff --git a/api/captureOrder.json.jst b/api/captureOrder.json.jst
index fa9c869..57c092a 100644
--- a/api/captureOrder.json.jst
+++ b/api/captureOrder.json.jst
@@ -2,10 +2,9 @@ let cookie = require('cookie')
 
 return async env => {
   let capture_order = await _require('/_library/capture_order.jst')
-  let config = await env.site.get_json('/_config/config.json')
 
   let cookies = cookie.parse(env.request.headers.cookie || '')
-  let response = await capture_order(config, cookies.order_id)
+  let response = await capture_order(env, cookies.order_id)
   console.log('capture_order()', response)
 
   env.site.serve(
diff --git a/api/createOrder.json.jst b/api/createOrder.json.jst
index 44209bd..dfe3428 100644
--- a/api/createOrder.json.jst
+++ b/api/createOrder.json.jst
@@ -3,7 +3,6 @@ let stream_buffers = require('stream-buffers')
 let XDate = require('xdate')
 
 return async env => {
-  let config = await env.site.get_json('/_config/config.json')
   let create_order = await _require('/_library/create_order.jst')
   let random_number = await _require('/_library/random_number.jst')
 
@@ -94,7 +93,7 @@ return async env => {
       }
     }
     console.log('item_obj', item_obj)
-    response = await create_order(config, item_obj)
+    response = await create_order(env, item_obj)
     console.log('create_order()', response)
 
     //sess.order_id = response.id
diff --git a/api/getOrderDetails.json.jst b/api/getOrderDetails.json.jst
index af08353..dc6637a 100644
--- a/api/getOrderDetails.json.jst
+++ b/api/getOrderDetails.json.jst
@@ -1,11 +1,10 @@
 let cookie = require('cookie')
 
 return async env => {
-  let config = await env.site.get_json('/_config/config.json')
   let get_order_details = await _require('/_library/get_order_details.jst')
 
   let cookies = cookie.parse(env.request.headers.cookie || '')
-  let response = await get_order_details(config, cookies.order_id)
+  let response = await get_order_details(env, cookies.order_id)
   console.log('get_order_details()', response)
 
   env.site.serve(
diff --git a/api/patchOrder.json.jst b/api/patchOrder.json.jst
index c7ff181..1e327ca 100644
--- a/api/patchOrder.json.jst
+++ b/api/patchOrder.json.jst
@@ -4,7 +4,6 @@ let stream_buffers = require('stream-buffers')
 let XDate = require('xdate')
 
 return async env => {
-  let config = await env.site.get_json('/_config/config.json')
   let patch_order_details = await _require('/_library/patch_order_details.jst')
   let random_number = await _require('/_library/random_number.jst')
 
@@ -61,7 +60,7 @@ return async env => {
       "order_id": cookies.order_id
     }
     response = {
-      http_code: await patch_order_details(config, new_order_details)
+      http_code: await patch_order_details(env, new_order_details)
     }
     console.log('patch_order_details()', response)
   }