Merge branch 'production'
This commit is contained in:
17
.env
17
.env
@ -18,14 +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_CLIENT_SECRET=5ic8Q~GQmW-IUhuxzVGx3BE-i30GXDSpjfMHcb~z #client secret value
|
||||||
AZURE_AD_TENANT_ID=f69d1a93-bfba-498a-9b60-e87c1bc26276
|
AZURE_AD_TENANT_ID=f69d1a93-bfba-498a-9b60-e87c1bc26276
|
||||||
|
|
||||||
|
# First APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjE3ODM0MiwiZXhwIjoxNzI3NzMwMzQzLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.XceA0qUQi0tXg0GM_LkJkpNU5AqXLiSB2JlEVbHCB_nINbQTWkjtoWxfqmvdOkIzwKtvdQ8FFb-crK9no9Bbbw
|
||||||
|
|
||||||
APPLE_ID=XC57P9SXDK.com.mwhitnessing.sofia
|
APPLE_ID=com.mwhitnessing.sofia
|
||||||
#APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjY5NzM5NywiZXhwIjoxNzI4MjQ5Mzk4LCJzdWIiOiJYQzU3UDlTWERLLmNvbS5td2hpdG5lc3Npbmcuc29maWEifQ.QDX9eoRWAKMd10iRMW9Od88-0H_oZ_B6sPG61fw-zjHbNOvlHG3ddfxY1AqfdSMvLrXg1URKM1lnxOB-OCxg4A
|
APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjk0NTIyNiwiZXhwIjoxNzI4NDk3MjI3LCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.PjViYOi015eLffx_p38q0F9Yc3y8Y6XUpTRaFSFVfYp11dDWudA6ZTq3KoJzn9eEinQWV67HjllAeeADNbJ-2Q
|
||||||
APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjE3ODM0MiwiZXhwIjoxNzI3NzMwMzQzLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.XceA0qUQi0tXg0GM_LkJkpNU5AqXLiSB2JlEVbHCB_nINbQTWkjtoWxfqmvdOkIzwKtvdQ8FFb-crK9no9Bbbw
|
|
||||||
|
# with team in the ID?
|
||||||
|
#APPLE_ID=XC57P9SXDK.com.mwhitnessing.sofia
|
||||||
|
#APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjE3ODM0MiwiZXhwIjoxNzI3NzMwMzQzLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.XceA0qUQi0tXg0GM_LkJkpNU5AqXLiSB2JlEVbHCB_nINbQTWkjtoWxfqmvdOkIzwKtvdQ8FFb-crK9no9Bbbw
|
||||||
# to generate
|
# to generate
|
||||||
APPLE_TEAM_ID=XC57P9SXDK
|
APPLE_TEAM_ID=XC57P9SXDK
|
||||||
APPLE_KEY_ID=TB3V355G5Y
|
APPLE_KEY_ID=TB3V355G5Y
|
||||||
APPLE_PRIVATE_KEY=
|
|
||||||
|
|
||||||
|
|
||||||
AUTH0_ID=Aa9f3HJowauUrmBVY4iQzQJ7fYsaZDbK
|
AUTH0_ID=Aa9f3HJowauUrmBVY4iQzQJ7fYsaZDbK
|
||||||
@ -52,6 +55,12 @@ MAILTRAP_HOST=sandbox.smtp.mailtrap.io
|
|||||||
MAILTRAP_USER=8ec69527ff2104
|
MAILTRAP_USER=8ec69527ff2104
|
||||||
MAILTRAP_PASS=c7bc05f171c96c
|
MAILTRAP_PASS=c7bc05f171c96c
|
||||||
|
|
||||||
|
MAILERSEND_TOKEN=mlsn.27d1a8120e120e147e1bb9c6345739faf3a03688bd9bf1b34f797d08b0f9fc26
|
||||||
|
MAILERSEND_SERVER=smtp.mailersend.net
|
||||||
|
MAILERSEND_PORT=587
|
||||||
|
MAILERSEND_USER=MS_bL93ka@mwitnessing.com
|
||||||
|
MAILERSEND_PASS=v23Z2XrDSNjHJxgo
|
||||||
|
|
||||||
GMAIL_EMAIL_USERNAME=
|
GMAIL_EMAIL_USERNAME=
|
||||||
GMAIL_EMAIL_APP_PASS=
|
GMAIL_EMAIL_APP_PASS=
|
||||||
|
|
||||||
|
@ -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.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"
|
rsync -av /tmp/clone/package-lock.json /app/package-lock.json || echo "Rsync failed: Issue copying package-lock.json"
|
||||||
rm -rf /app/node_modules
|
rm -rf /app/node_modules
|
||||||
cd /app
|
|
||||||
npm install --no-audit --no-fund --no-optional --omit=optional
|
|
||||||
yes | npx prisma generate
|
yes | npx prisma generate
|
||||||
else
|
else
|
||||||
echo "Package files have not changed. Skipping package installation."
|
echo "Package files have not changed. Skipping package installation."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cd /app
|
||||||
|
npm install --no-audit --no-fund --no-optional --omit=optional
|
||||||
|
npx next build
|
||||||
|
|
||||||
# Clean up
|
# Clean up
|
||||||
rm -rf /tmp/clone
|
rm -rf /tmp/clone
|
||||||
echo "Update process completed."
|
echo "Update process completed."
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
"debug": "node server.js",
|
"debug": "node server.js",
|
||||||
"debug-env": "dotenv -e .env.$APP_ENV -- nodemon --inspect server.js",
|
"debug-env": "dotenv -e .env.$APP_ENV -- nodemon --inspect server.js",
|
||||||
"nodeenv": "dotenv -e .env.$APP_ENV -- node 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",
|
"build": "next build",
|
||||||
"buildWin": "npm run build",
|
"buildWin": "npm run build",
|
||||||
"start": "next start",
|
"start": "next start",
|
||||||
@ -113,4 +113,4 @@
|
|||||||
"depcheck": "^1.4.7",
|
"depcheck": "^1.4.7",
|
||||||
"prisma": "^5.12.1"
|
"prisma": "^5.12.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -18,6 +18,7 @@ const common = require("../../../src/helpers/common");
|
|||||||
import { isLoggedIn, setAuthTokens, clearAuthTokens, getAccessToken, getRefreshToken } from 'axios-jwt'
|
import { isLoggedIn, setAuthTokens, clearAuthTokens, getAccessToken, getRefreshToken } from 'axios-jwt'
|
||||||
|
|
||||||
|
|
||||||
|
console.log("appleID:", process.env.APPLE_ID);
|
||||||
// console.log(process.env.EMAIL_SERVER)
|
// console.log(process.env.EMAIL_SERVER)
|
||||||
// For more information on each option (and a full list of options) go to
|
// For more information on each option (and a full list of options) go to
|
||||||
// https://next-auth.js.org/configuration/options
|
// https://next-auth.js.org/configuration/options
|
||||||
|
@ -27,11 +27,11 @@ let mailtrapTestClient = null;
|
|||||||
|
|
||||||
//test
|
//test
|
||||||
var transporter = nodemailer.createTransport({
|
var transporter = nodemailer.createTransport({
|
||||||
host: process.env.MAILTRAP_HOST || "sandbox.smtp.mailtrap.io",
|
host: process.env.MAILERSEND_SERVER,
|
||||||
port: 2525,
|
port: process.env.MAILERSEND_PORT,
|
||||||
auth: {
|
auth: {
|
||||||
user: process.env.MAILTRAP_USER,
|
user: process.env.MAILERSEND_USER,
|
||||||
pass: process.env.MAILTRAP_PASS
|
pass: process.env.MAILERSEND_PASS
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// production
|
// production
|
||||||
|
Reference in New Issue
Block a user