From df49c67fe4fc34c9e8adb562a2ad87251d7d0d91 Mon Sep 17 00:00:00 2001 From: danigiac Date: Mon, 24 Jun 2024 14:33:17 +0000 Subject: [PATCH 1/7] modified: advanced-integration/.added mymerchant_id instead of merchant_id --- advanced-integration/.env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/advanced-integration/.env.example b/advanced-integration/.env.example index 0fb8a60..bc9cbfa 100644 --- a/advanced-integration/.env.example +++ b/advanced-integration/.env.example @@ -1,5 +1,5 @@ # Create an application to obtain credentials at # https://developer.paypal.com/dashboard/applications/sandbox -PAYPAL_CLIENT_ID="YOUR_CLIENT_ID_GOES_HERE" -PAYPAL_CLIENT_SECRET="YOUR_SECRET_GOES_HERE" +PAYPAL_CLIENT_ID="Abqhij49wrgTDvmw5nHjgGqvWJG62Umbf2yeUcmVeYcYNZQ2Gs3f4MZis0mWT4eapLdUyw9XUPLiBfmW" +PAYPAL_CLIENT_SECRET="EMTG4xNqiamsStLRJ9MFJWBsH6uZ_aEk2qjwhC32AtM91yAV7Lf1hL7oK8l8SKYfqoSdc_sJCcJOSs79" From 4f129d6e0f17dc72e2961378d1804ba25789745c Mon Sep 17 00:00:00 2001 From: danigiac Date: Mon, 24 Jun 2024 14:38:59 +0000 Subject: [PATCH 2/7] modified server.js (added mymerchant_id) --- advanced-integration/server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/advanced-integration/server.js b/advanced-integration/server.js index 0def822..be8eceb 100644 --- a/advanced-integration/server.js +++ b/advanced-integration/server.js @@ -11,8 +11,9 @@ app.use(express.static("public")); app.get("/", async (req, res) => { const clientId = process.env.PAYPAL_CLIENT_ID, merchantId = process.env.PAYPAL_MERCHANT_ID; const clientSecret = process.env.PAYPAL_CLIENT_SECRET; + const mymerchantId = process.env.PAYPAL_MERCHANT_ID; try { - if (!clientId || !merchantId || !clientSecret){ + if (!clientId || !mymerchantId || !clientSecret){ throw new Error("Client Id or App Secret or Merchant Id is missing."); } const clientToken = await paypal.generateClientToken(); From e301f9e9f60b38e41becba6fe134ccb3d73e2330 Mon Sep 17 00:00:00 2001 From: danigiac Date: Mon, 24 Jun 2024 14:40:06 +0000 Subject: [PATCH 3/7] modified checkout.ejs (mymerchant_id) --- advanced-integration/.env.example | 5 ----- advanced-integration/views/checkout.ejs | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 advanced-integration/.env.example diff --git a/advanced-integration/.env.example b/advanced-integration/.env.example deleted file mode 100644 index bc9cbfa..0000000 --- a/advanced-integration/.env.example +++ /dev/null @@ -1,5 +0,0 @@ -# Create an application to obtain credentials at -# https://developer.paypal.com/dashboard/applications/sandbox - -PAYPAL_CLIENT_ID="Abqhij49wrgTDvmw5nHjgGqvWJG62Umbf2yeUcmVeYcYNZQ2Gs3f4MZis0mWT4eapLdUyw9XUPLiBfmW" -PAYPAL_CLIENT_SECRET="EMTG4xNqiamsStLRJ9MFJWBsH6uZ_aEk2qjwhC32AtM91yAV7Lf1hL7oK8l8SKYfqoSdc_sJCcJOSs79" diff --git a/advanced-integration/views/checkout.ejs b/advanced-integration/views/checkout.ejs index 59932ad..f838fba 100644 --- a/advanced-integration/views/checkout.ejs +++ b/advanced-integration/views/checkout.ejs @@ -31,7 +31,7 @@ From cb16e4e3711209897932c76ed0b74d33ee05d866 Mon Sep 17 00:00:00 2001 From: danigiac Date: Tue, 25 Jun 2024 10:06:08 +0000 Subject: [PATCH 4/7] aggirornamento --- .vscode/launch.json | 18 ++++++++++++++++++ advanced-integration/package.json | 2 +- advanced-integration/server.js | 6 ++++-- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..a0db360 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,18 @@ +{ + // Usare IntelliSense per informazioni sui possibili attributi. + // Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti. + // Per altre informazioni, visitare: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + + { + "type": "node", + "request": "launch", + "name": "Launch Program", + "skipFiles": [ + "/**" + ], + "program": "${workspaceFolder}/advanced-integration/server.js" + } + ] +} \ No newline at end of file diff --git a/advanced-integration/package.json b/advanced-integration/package.json index 41e3ccd..3e9ddfa 100644 --- a/advanced-integration/package.json +++ b/advanced-integration/package.json @@ -12,7 +12,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "dotenv": "^16.0.0", + "dotenv": "^16.4.5", "ejs": "^3.1.6", "express": "^4.17.3", "node-fetch": "^3.2.1" diff --git a/advanced-integration/server.js b/advanced-integration/server.js index be8eceb..78100fc 100644 --- a/advanced-integration/server.js +++ b/advanced-integration/server.js @@ -1,15 +1,17 @@ import "dotenv/config"; import express from "express"; import * as paypal from "./paypal-api.js"; +require('dotenv').config(); //dani 25 giu const {PORT = 8888} = process.env; const app = express(); -app.set("view engine", "ejs"); +app.set("view engine", "ejs"); //if "view engine" is not set "ejs" is the default app.use(express.static("public")); // render checkout page with client id & unique client token app.get("/", async (req, res) => { - const clientId = process.env.PAYPAL_CLIENT_ID, merchantId = process.env.PAYPAL_MERCHANT_ID; + const clientId = process.env.PAYPAL_CLIENT_ID + const merchantId = process.env.PAYPAL_MERCHANT_ID; //testare const clientSecret = process.env.PAYPAL_CLIENT_SECRET; const mymerchantId = process.env.PAYPAL_MERCHANT_ID; try { From ab0eee6fbae287f886fb78df6665b0ba89d5d236 Mon Sep 17 00:00:00 2001 From: danigiac Date: Tue, 25 Jun 2024 10:09:22 +0000 Subject: [PATCH 5/7] prova --- advanced-integration/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced-integration/server.js b/advanced-integration/server.js index 78100fc..ba41c26 100644 --- a/advanced-integration/server.js +++ b/advanced-integration/server.js @@ -1,7 +1,7 @@ import "dotenv/config"; import express from "express"; import * as paypal from "./paypal-api.js"; -require('dotenv').config(); //dani 25 giu +//require('dotenv').config(); //dani 25 giu const {PORT = 8888} = process.env; const app = express(); From 654bb23e393093c9bd1d9452389de198e70737ea Mon Sep 17 00:00:00 2001 From: danigiac Date: Tue, 25 Jun 2024 11:55:23 +0000 Subject: [PATCH 6/7] prova --- .dockerignore | 25 +++++++++++++++++++++++++ Dockerfile | 4 ++++ docker-compose.debug.yml | 8 ++++++++ docker-compose.yml | 8 ++++++++ 4 files changed, 45 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 docker-compose.debug.yml create mode 100644 docker-compose.yml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..7347a7f --- /dev/null +++ b/.dockerignore @@ -0,0 +1,25 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/bin +**/charts +**/docker-compose* +**/compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..8994575 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM docker/whalesay:latest +LABEL Name=googlepay Version=0.0.1 +RUN apt-get -y update && apt-get install -y fortunes +CMD ["sh", "-c", "/usr/games/fortune -a | cowsay"] diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml new file mode 100644 index 0000000..1763ad1 --- /dev/null +++ b/docker-compose.debug.yml @@ -0,0 +1,8 @@ +version: '3.4' + +services: + googlepay: + image: googlepay + build: + context: . + dockerfile: ./Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..1763ad1 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +version: '3.4' + +services: + googlepay: + image: googlepay + build: + context: . + dockerfile: ./Dockerfile From d7e03f1315957ed5e1355364cec49fcc874b1fdf Mon Sep 17 00:00:00 2001 From: danigiac Date: Tue, 25 Jun 2024 11:55:34 +0000 Subject: [PATCH 7/7] prova --- .vscode/launch.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/launch.json b/.vscode/launch.json index a0db360..bbe3554 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,6 +5,7 @@ "version": "0.2.0", "configurations": [ + { "type": "node", "request": "launch",