Skip to content

Env variables naming changes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cnallam wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Env variables naming changes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9114fe1
Env variables naming changes
cnallam Oct 22, 2023
b5fef00
Modified heathcheck api
cnallam Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
}
},
"secrets": {
"CLIENT_ID": {
"PAYPAL_CLIENT_ID": {
"description": "Sandbox client ID of the application.",
"documentationUrl": "https://developer.paypal.com/dashboard/applications/sandbox"
},
"APP_SECRET": {
"PAYPAL_CLIENT_SECRET": {
"description": "Sandbox secret of the application.",
"documentationUrl": "https://developer.paypal.com/dashboard/applications/sandbox"
},
"MERCHANT_ID":{
"PAYPAL_MERCHANT_ID":{
"description": "Sandbox merchant ID of the application.",
"documentationUrl": "https://www.sandbox.paypal.com/businessmanage/account/aboutBusiness"
}
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ jobs:
dontuseforce: false
docker_build_args: |
NODE_ENV
CLIENT_ID
APP_SECRET
CLIENT_SECRET
MERCHANT_ID
PAYPAL_CLIENT_ID
PAYPAL_CLIENT_SECRET
PAYPAL_MERCHANT_ID
env:
NODE_ENV: staging
CLIENT_ID: ${{secrets.CLIENT_ID}}
APP_SECRET: ${{secrets.APP_SECRET}}
CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
MERCHANT_ID: ${{secrets.MERCHANT_ID}}
PAYPAL_CLIENT_ID: ${{secrets.CLIENT_ID}}
PAYPAL_CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
PAYPAL_MERCHANT_ID: ${{secrets.MERCHANT_ID}}
6 changes: 3 additions & 3 deletions advanced-integration/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Create an application to obtain credentials at
# https://developer.paypal.com/dashboard/applications/sandbox

CLIENT_ID="YOUR_PAYPAL_CLIENT_ID_GOES_HERE"
APP_SECRET="YOUR_SECRET_GOES_HERE"
MERCHANT_ID="YOUR_MERCHANT_ID_GOES_HERE"
PAYPAL_CLIENT_ID="YOUR_PAYPAL_CLIENT_ID_GOES_HERE"
PAYPAL_CLIENT_SECRET="YOUR_SECRET_GOES_HERE"
PAYPAL_MERCHANT_ID="YOUR_MERCHANT_ID_GOES_HERE"
```
14 changes: 6 additions & 8 deletions advanced-integration/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
FROM node:16

ARG CLIENT_ID
ARG CLIENT_SECRET
ARG MERCHANT_ID
ARG PAYPAL_CLIENT_ID
ARG PAYPAL_CLIENT_SECRET
ARG PAYPAL_MERCHANT_ID
ARG NODE_ENV
ARG APP_SECRET

ENV CLIENT_ID=$CLIENT_ID
ENV CLIENT_SECRET=$CLIENT_SECRET
ENV PAYPAL_CLIENT_ID=$PAYPAL_CLIENT_ID
ENV PAYPAL_CLIENT_SECRET=$PAYPAL_CLIENT_SECRET
ENV NODE_ENV=$NODE_ENV
ENV APP_SECRET=$APP_SECRET
ENV MERCHANT_ID=$MERCHANT_ID
ENV PAYPAL_MERCHANT_ID=$PAYPAL_MERCHANT_ID

WORKDIR /app
COPY package.json ./
Expand Down
6 changes: 3 additions & 3 deletions advanced-integration/paypal-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fetch from "node-fetch";

// set some important variables
const { CLIENT_ID, APP_SECRET, MERCHANT_ID } = process.env;
const { PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PAYPAL_MERCHANT_ID } = process.env;
const base = "https://api-m.sandbox.paypal.com";

// call the create order method
Expand All @@ -24,7 +24,7 @@ export async function createOrder() {
value: purchaseAmount,
},
payee: {
merchant_id: MERCHANT_ID,
merchant_id: PAYPAL_MERCHANT_ID,
}
},
],
Expand All @@ -51,7 +51,7 @@ export async function capturePayment(orderId) {

// generate access token
export async function generateAccessToken() {
const auth = Buffer.from(CLIENT_ID + ":" + APP_SECRET).toString("base64");
const auth = Buffer.from(PAYPAL_CLIENT_ID + ":" + PAYPAL_CLIENT_SECRET).toString("base64");
const response = await fetch(`${base}/v1/oauth2/token`, {
method: "post",
body: "grant_type=client_credentials",
Expand Down
5 changes: 1 addition & 4 deletions advanced-integration/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ app.get("/check", (req, res) => {
res.json({
message: "ok",
env: process.env.NODE_ENV,
clientId: process.env.CLIENT_ID,
appSecret: process.env.APP_SECRET || "Couldn't load App Secret",
clientSecret: process.env.CLIENT_SECRET,
merchantId: process.env.MERCHANT_ID
merchantId: process.env.PAYPAL_MERCHANT_ID
})
})

Expand Down