From f5fbb40617ad23da08da621d55991314add7cfc2 Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Sat, 13 Apr 2024 02:07:59 +0300 Subject: [PATCH] commands moved around --- .env | 5 +++-- _deploy/entrypoint.sh | 6 ++++-- package.json | 4 ++-- pages/api/auth/[...nextauth].ts | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.env b/.env index f4b7091..e00cfb0 100644 --- a/.env +++ b/.env @@ -18,16 +18,17 @@ AZURE_AD_CLIENT_ID=9e13bedd-1f9d-4c23-910e-a806aba308b6 # Application (client) I AZURE_AD_CLIENT_SECRET=5ic8Q~GQmW-IUhuxzVGx3BE-i30GXDSpjfMHcb~z #client secret value AZURE_AD_TENANT_ID=f69d1a93-bfba-498a-9b60-e87c1bc26276 +# First APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjE3ODM0MiwiZXhwIjoxNzI3NzMwMzQzLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.XceA0qUQi0tXg0GM_LkJkpNU5AqXLiSB2JlEVbHCB_nINbQTWkjtoWxfqmvdOkIzwKtvdQ8FFb-crK9no9Bbbw APPLE_ID=com.mwhitnessing.sofia -APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjY5NzM5NywiZXhwIjoxNzI4MjQ5Mzk4LCJzdWIiOiJYQzU3UDlTWERLLmNvbS5td2hpdG5lc3Npbmcuc29maWEifQ.QDX9eoRWAKMd10iRMW9Od88-0H_oZ_B6sPG61fw-zjHbNOvlHG3ddfxY1AqfdSMvLrXg1URKM1lnxOB-OCxg4A +APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjk0NTIyNiwiZXhwIjoxNzI4NDk3MjI3LCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.PjViYOi015eLffx_p38q0F9Yc3y8Y6XUpTRaFSFVfYp11dDWudA6ZTq3KoJzn9eEinQWV67HjllAeeADNbJ-2Q + # with team in the ID? #APPLE_ID=XC57P9SXDK.com.mwhitnessing.sofia #APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjE3ODM0MiwiZXhwIjoxNzI3NzMwMzQzLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.XceA0qUQi0tXg0GM_LkJkpNU5AqXLiSB2JlEVbHCB_nINbQTWkjtoWxfqmvdOkIzwKtvdQ8FFb-crK9no9Bbbw # to generate APPLE_TEAM_ID=XC57P9SXDK APPLE_KEY_ID=TB3V355G5Y -APPLE_PRIVATE_KEY= AUTH0_ID=Aa9f3HJowauUrmBVY4iQzQJ7fYsaZDbK diff --git a/_deploy/entrypoint.sh b/_deploy/entrypoint.sh index f0ea095..db16b09 100644 --- a/_deploy/entrypoint.sh +++ b/_deploy/entrypoint.sh @@ -27,13 +27,15 @@ if [ "$UPDATE_CODE_FROM_GIT" = "true" ]; then rsync -av /tmp/clone/package.json /app/package.json || echo "Rsync failed: Issue copying package.json" rsync -av /tmp/clone/package-lock.json /app/package-lock.json || echo "Rsync failed: Issue copying package-lock.json" rm -rf /app/node_modules - cd /app - npm install --no-audit --no-fund --no-optional --omit=optional yes | npx prisma generate else echo "Package files have not changed. Skipping package installation." fi + cd /app + npm install --no-audit --no-fund --no-optional --omit=optional + npx next build + # Clean up rm -rf /tmp/clone echo "Update process completed." diff --git a/package.json b/package.json index 8f7bdbe..d602472 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "debug": "node server.js", "debug-env": "dotenv -e .env.$APP_ENV -- nodemon --inspect server.js", "nodeenv": "dotenv -e .env.$APP_ENV -- node server.js", - "prod": "npx next build && dotenv -e .env.production -- node server.js", + "prod": "dotenv -e .env.production -- node server.js", "build": "next build", "buildWin": "npm run build", "start": "next start", @@ -113,4 +113,4 @@ "depcheck": "^1.4.7", "prisma": "^5.12.1" } -} +} \ No newline at end of file diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts index 67b434f..9104b3d 100644 --- a/pages/api/auth/[...nextauth].ts +++ b/pages/api/auth/[...nextauth].ts @@ -18,6 +18,7 @@ const common = require("../../../src/helpers/common"); import { isLoggedIn, setAuthTokens, clearAuthTokens, getAccessToken, getRefreshToken } from 'axios-jwt' +console.log("appleID:", process.env.APPLE_ID); // console.log(process.env.EMAIL_SERVER) // For more information on each option (and a full list of options) go to // https://next-auth.js.org/configuration/options