diff --git a/.env old.local b/.env old.local new file mode 100644 index 00000000..ad6df2a5 --- /dev/null +++ b/.env old.local @@ -0,0 +1,119 @@ +ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/ +//ESNR Tenant +//TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502 +//WGO Tenant +TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5 +GRANT_TYPE = "client_credentials" + +HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c +NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c + + +//Dev oauth ESNR +CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a +//CLIENT_SECRET = 4Vt8Q~olL1hx7n01B0~tXf-N2YL5DyC_Fk6waagX +CLIENT_SECRET = AU88Q~NBOVOXqwb4mBx9y.NMIZ9s1o7boqZoKcSE +RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ +RELAYURI = "dev-pedw-ns.servicebus.windows.net" +RELAYPATH = "dev-pedw-hc" + + +//Test Oauth ESNR +//CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1 +//CLIENT_SECRET = IXI8Q~D5oqsC-nrtayHHc~tUAfjQFzNiKVQ~fc2S +//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/ +//RELAYURI = "test-pedw-ns.servicebus.windows.net" +//RELAYPATH = "test-pedw-hc" + + +//Preprod Oauth WGO +//CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a +//CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF +//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/ +//RELAYURI = "pp-pedw-ns.servicebus.windows.net" +//RELAYPATH = "pp-pedw-hc" + + + +//Prod Oauth WGO +//CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc +//CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~ +//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ +//RELAYURI = "prod-pedw-ns.servicebus.windows.net" +//RELAYPATH = "prod-pedw-hc" + + +GOOGLE_TAG_MANAGER = GTM-T78CBC3 +SHOWLOGIN = "true" +SHOWREPRESENTATIONS = true +SHOWFILEUPLOAD = "false" +SHOWMAPS = "false" +//BASIC_AUTH_CREDENTIALS = pinswg:password|pinswg2:password2 + + +PORT= "3000" +DEFAULT_DOMAIN = "localhost" +I18N_DOMAIN = "cymru.local" +//I18N_DOMAIN ="dev-gwaithcynllunio.gwasanaeth.llyw.cymru" +//I18N_DOMAIN ="stage-gwaithcynllunio.gwasanaeth.llyw.cymru" +//I18N_DOMAIN ="pp-gwaithcynllunio.gwasanaeth.llyw.cymru"s +//I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru" + + +//gov gateway +GG_PROVIDER_CONFIG_ENDPOINT = "https://api.ete.access.service.gov.uk/.well-known/openid-configuration" +GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ +GG_CLIENT_SECRET = z1PGLAKPxIhjMBegTdzX22AayIORc1GsCbMQZ6mieBn7zChjzzxup5lkIByEmsYS +//GG_REDIRECT_URI = "http://localhost:3000" +GG_REDIRECT_URI = "https://dev-planningcasework.service.gov.wales" + +NEXT_PUBLIC_GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ +NEXT_PUBLIC_GG_REDIRECT_URI = "http://localhost:3000" + +API_ROOT = "http://localhost:3000" + + +GOOGLE_MAP_API_KEY = AIzaSyCzeVrHt544bp_72YCFkw21eDsmI2JEsQo + + + +//Next Auth vars +//EMAIL_SERVER_HOST=smtp.sendgrid.net +//EMAIL_SERVER_PORT=465 +//EMAIL_SERVER_USER=apikey +//EMAIL_SERVER_PASSWORD=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 +//EMAIL_FROM=rob@rdbsolutions.co.uk + + +EMAIL_SERVER_HOST=rdbdigital.com +EMAIL_SERVER_PORT=465 +EMAIL_SERVER_USER=rob@rdbdigital.com +EMAIL_SERVER_PASSWORD=!Sky9fish2020 +EMAIL_FROM=no-reply@rdbdigital.com + +NEXTAUTH_URL=http://localhost:3000 +NEXTAUTH_URL_INTERNAL=http://localhost:3000 +//DATABASE_URL=mysql://nextAuthAdmin:!Sky9fish1972@77.68.17.157:3306/nextauthDB?synchronise=true +DATABASE_URL = sqlserver://pedw-dev-test-sql-svr.database.windows.net:1433;database=PEDWDev;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword + +SECRET = SuperSecret + + +//Azure Storage Account + +AZURE_CLIENT_ID = $CLIENT_ID +AZURE_TENANT_ID = $TENANT +AZURE_CLIENT_SECRET = $CLIENT_SECRET +AZURE_STORAGE_ACCOUNT_NAME= "pedwdev" +AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg== + + +AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net +AZURE_PEDW_CONTAINER = "pedwapplications" +AZURE_PEDW_QUEUE_ENDPOINT = https://$AZURE_STORAGE_ACCOUNT_NAME.queue.core.windows.net + + + +//gov.notify + +NOTIFY_API_KEY = pedwnextauthkey-90f93710-9dae-423e-aea1-11eccd0dc132-0c9469d9-d671-444d-9e9d-3e5a62001043 \ No newline at end of file diff --git a/.env.local b/.env.local index 37374e1a..2748700e 100644 --- a/.env.local +++ b/.env.local @@ -1,17 +1,11 @@ ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/ -//ESNR Tenant -//TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502 -//WGO Tenant TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5 GRANT_TYPE = "client_credentials" HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c -NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c - //Dev oauth ESNR CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a -//CLIENT_SECRET = 4Vt8Q~olL1hx7n01B0~tXf-N2YL5DyC_Fk6waagX CLIENT_SECRET = AU88Q~NBOVOXqwb4mBx9y.NMIZ9s1o7boqZoKcSE RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ RELAYURI = "dev-pedw-ns.servicebus.windows.net" @@ -44,59 +38,21 @@ RELAYPATH = "dev-pedw-hc" GOOGLE_TAG_MANAGER = GTM-T78CBC3 -SHOWLOGIN = "true" -SHOWREPRESENTATIONS = true +SHOWLOGIN = true +//SHOWREPRESENTATIONS = true SHOWFILEUPLOAD = "false" SHOWMAPS = "false" -//BASIC_AUTH_CREDENTIALS = pinswg:password|pinswg2:password2 - - -PORT= "3000" -DEFAULT_DOMAIN = "localhost" -I18N_DOMAIN = "cymru.local" -//I18N_DOMAIN ="dev-gwaithcynllunio.gwasanaeth.llyw.cymru" -//I18N_DOMAIN ="stage-gwaithcynllunio.gwasanaeth.llyw.cymru" -//I18N_DOMAIN ="pp-gwaithcynllunio.gwasanaeth.llyw.cymru"s -//I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru" - - -//gov gateway -GG_PROVIDER_CONFIG_ENDPOINT = "https://api.ete.access.service.gov.uk/.well-known/openid-configuration" -GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ -GG_CLIENT_SECRET = z1PGLAKPxIhjMBegTdzX22AayIORc1GsCbMQZ6mieBn7zChjzzxup5lkIByEmsYS -//GG_REDIRECT_URI = "http://localhost:3000" -GG_REDIRECT_URI = "https://dev-planningcasework.service.gov.wales" - -NEXT_PUBLIC_GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ -NEXT_PUBLIC_GG_REDIRECT_URI = "http://localhost:3000" - API_ROOT = "http://localhost:3000" - -GOOGLE_MAP_API_KEY = AIzaSyCzeVrHt544bp_72YCFkw21eDsmI2JEsQo - +I18N_DOMAIN = "cymru.local" //Next Auth vars -//EMAIL_SERVER_HOST=smtp.sendgrid.net -//EMAIL_SERVER_PORT=465 -//EMAIL_SERVER_USER=apikey -//EMAIL_SERVER_PASSWORD=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 -//EMAIL_FROM=rob@rdbsolutions.co.uk +NEXTAUTH_URL=$API_ROOT +NEXTAUTH_URL_INTERNAL=$API_ROOT - -EMAIL_SERVER_HOST=rdbdigital.com -EMAIL_SERVER_PORT=465 -EMAIL_SERVER_USER=rob@rdbdigital.com -EMAIL_SERVER_PASSWORD=!Sky9fish2020 -EMAIL_FROM=no-reply@rdbdigital.com - -NEXTAUTH_URL=http://localhost:3000 -NEXTAUTH_URL_INTERNAL=http://localhost:3000 -//DATABASE_URL=mysql://nextAuthAdmin:!Sky9fish1972@77.68.17.157:3306/nextauthDB?synchronise=true DATABASE_URL = sqlserver://pedw-dev-test-sql-svr.database.windows.net:1433;database=PEDWDev;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword - -SECRET=SuperSecret +SECRET = SuperSecret //Azure Storage Account @@ -107,13 +63,9 @@ AZURE_CLIENT_SECRET = $CLIENT_SECRET AZURE_STORAGE_ACCOUNT_NAME= "pedwdev" AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg== - AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net AZURE_PEDW_CONTAINER = "pedwapplications" AZURE_PEDW_QUEUE_ENDPOINT = https://$AZURE_STORAGE_ACCOUNT_NAME.queue.core.windows.net - - //gov.notify - NOTIFY_API_KEY = pedwnextauthkey-90f93710-9dae-423e-aea1-11eccd0dc132-0c9469d9-d671-444d-9e9d-3e5a62001043 \ No newline at end of file diff --git a/pages/api/auth/[...nextauth].js b/pages/api/auth/[...nextauth].js index fd854422..4fc6da6b 100644 --- a/pages/api/auth/[...nextauth].js +++ b/pages/api/auth/[...nextauth].js @@ -13,15 +13,15 @@ export default NextAuth({ // https://next-auth.js.org/configuration/providers providers: [ EmailProvider({ - server: { - host: process.env.EMAIL_SERVER_HOST, - port: process.env.EMAIL_SERVER_PORT, - auth: { - user: process.env.EMAIL_SERVER_USER, - pass: process.env.EMAIL_SERVER_PASSWORD, - }, - }, - from: process.env.EMAIL_FROM, + // server: { + // host: process.env.EMAIL_SERVER_HOST, + // port: process.env.EMAIL_SERVER_PORT, + // auth: { + // user: process.env.EMAIL_SERVER_USER, + // pass: process.env.EMAIL_SERVER_PASSWORD, + // }, + // }, + // from: process.env.EMAIL_FROM, maxAge: 10 * 60, // Magic links are valid for 10 min only async sendVerificationRequest({ identifier: email,