docker fix

Author: andriibiloussigma

.env .env_example.env renamed to .env_example

@@ -1,30 +1,30 @@
 # Configuration file for the example
 ##
 # Integration key is the same as client ID
-DS_CLIENT_ID=95157842-624a-4cba-8c73-59004b270417
+DS_CLIENT_ID={DS_CLIENT_ID}
 # Integration secret key
-DS_CLIENT_SECRET=f9c17b5c-973e-4f31-acf3-1dec7222170e
+DS_CLIENT_SECRET={DS_CLIENT_SECRET}
 
 # API Username
-DS_IMPERSONATED_USER_GUID=8a1318df-e2d3-48af-ae26-27fa85fe80e9
+DS_IMPERSONATED_USER_GUID={DS_USER_GUID}
 
 # Target account ID. Use FALSE to indicate that the user's default account should be used.
 DS_TARGET_ACCOUNT_ID=FALSE
 
-PAYMENT_GATEWAY_ACCOUNT_ID=8e0c89fd-ff6f-4bbf-98fc-95e10596e120
-PAYMENT_GATEWAY_NAME=Stripe_3758
-PAYMENT_GATEWAY_DISPLAY_NAME=Stripe_3758
+DS_PAYMENT_GATEWAY_ID={DS_PAYMENT_GATEWAY_ID}
+DS_PAYMENT_GATEWAY_NAME={DS_PAYMENT_GATEWAY_NAME}
+DS_PAYMENT_GATEWAY_DISPLAY_NAME={DS_PAYMENT_GATEWAY_DISPLAY_NAME}
 
 # Private key string - source or path, for instance: /home/user/app/id_rsa
 # NOTE: the Python config file parser requires that you
 # add a space at the beginning of the second and
 # subsequent lines of the multiline key value:
-DS_PRIVATE_KEY=./app/private.key
+DS_PRIVATE_KEY={RSA_KEY}
 
 # React environment variables
 # UI and BE links
-REACT_APP_DS_RETURN_URL=http://localhost
-REACT_APP_API_BASE_URL=http://localhost/api
+REACT_APP_DS_RETURN_URL=http://localhost:3000
+REACT_APP_API_BASE_URL=http://localhost:5001/api
 
 # The DS Authentication server
 DS_AUTH_SERVER=https://account-d.docusign.com

.gitignore

@@ -1,7 +1,7 @@
 *.pyc
 .idea
-*.env*
 
+.env
 __pycache__/
 
 # pyenv

client/Dockerfile

@@ -5,15 +5,15 @@ ENV REACT_APP_API_BASE_URL=$REACT_APP_API_BASE_URL
 
 WORKDIR /app
 COPY .env ./
-COPY ./package.json ./yarn.lock ./
+COPY ./client/package.json ./client/yarn.lock ./
 RUN npm install
 
-COPY . .
+COPY ./client/ .
 
 RUN npm run build
 
 # Run stage
 FROM --platform=linux/amd64 nginx:1.23-alpine
 COPY --from=base /app/build /var/www/app
-COPY ./nginx/conf/ /etc/nginx/conf.d
+COPY ./client/nginx/conf/ /etc/nginx/conf.d
 EXPOSE 80 443

client/src/api/auth.js

@@ -64,6 +64,7 @@ export async function getStatus(setStatus, setAuthType) {
 }
 
 export async function jwtAuth(navigate) {
+    console.log('process.env',process.env)
     try {
         await axios.get(
             process.env.REACT_APP_API_BASE_URL + "/jwt_auth",

docker-compose.yml

@@ -4,8 +4,8 @@ services:
     image: myuni/front:latest
     restart: always
     build:
-      context: ./client/
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./client/Dockerfile
       args:
         REACT_APP_API_BASE_URL: "http://localhost/api" 
     env_file:
@@ -18,7 +18,7 @@ services:
     image: myuni/back:latest
     restart: always
     build:
-      context: ./server/
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./server/Dockerfile
     env_file:
       - .env

server/Dockerfile

@@ -1,13 +1,13 @@
-FROM python:3.9-slim
+FROM --platform=linux/amd64 python:3.9-slim
 
 WORKDIR /app
 
-COPY requirements.txt ./
+COPY ./server/requirements.txt ./
 COPY .env ./
 RUN pip install --no-cache-dir -r requirements.txt
 
-COPY . .
+COPY ./server/ .
 
 EXPOSE 5001
 
-CMD ["flask", "run", "--host", "0.0.0.0", "--port", "5001"]
+CMD ["flask","run", "--host", "0.0.0.0", "--port", "5001"]

server/app/__init__.py

@@ -1,12 +1,15 @@
 from flask import Flask
 from flask_cors import CORS
 from dotenv import load_dotenv
+import os
 
 from app.api import auth, clickwrap, requests, common
 
 load_dotenv()
 
 URL_PREFIX = '/api'
+print(os.environ)
+print('=====')
 
 app = Flask(__name__)
 app.config.from_pyfile("config.py")

server/app/api/auth.py

@@ -53,6 +53,11 @@ def jwt_auth():
     """
     Authorization by JWT
     """
+
+    print("INSIDE /api/jwt_auth !!!")
+    # print("Request Headers:", dict(request.headers))
+    # print("Request Args:", request.args)
+
     try:
         auth_data = DsClient.update_token()
     except ApiException as exc: