From 90780354f634ff330a7c17a67328bd4006f3876b Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 16 Sep 2024 12:38:11 +0100 Subject: [PATCH] update sas function --- .env.local | 56 ++++++++++++++++---------------- pages/api/file/setupcontainer.js | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.env.local b/.env.local index 0851a106..ed19f240 100644 --- a/.env.local +++ b/.env.local @@ -5,35 +5,35 @@ GRANT_TYPE = "client_credentials" HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c //CNR oauth CNR -CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a -CLIENT_SECRET = AU88Q~NBOVOXqwb4mBx9y.NMIZ9s1o7boqZoKcSE +CLIENT_ID = 3125ac03-91ac-46a7-a166-0086f0ed90b3 +CLIENT_SECRET = bFq8Q~9VX5Ra3lKnGGIXsB.G6-ZGMx7LqyqXjdr4 RELAY_ROOT = https://ar-ns-lz-pedw-cnr-uks-01.servicebus.windows.net/ar-hc-lz-pedw-cnr-uks-01/ RELAYURI = "ar-ns-lz-pedw-cnr-uks-01.servicebus.windows.net" RELAYPATH = "ar-hc-lz-pedw-cnr-uks-01" //Dev oauth ESNR -CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a -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" +//CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a +//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" +//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_ID = ab6c4678-b31a-4eb3-b429-e039120e488a ////CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF -CLIENT_SECRET = V288Q~P1lFMvvX9Xnkx2pLixK~GOREH983Owqc1E -RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/ -RELAYURI = "pp-pedw-ns.servicebus.windows.net" -RELAYPATH = "pp-pedw-hc" +//CLIENT_SECRET = V288Q~P1lFMvvX9Xnkx2pLixK~GOREH983Owqc1E +//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/ +//RELAYURI = "pp-pedw-ns.servicebus.windows.net" +//RELAYPATH = "pp-pedw-hc" @@ -64,11 +64,11 @@ NEXTAUTH_URL_INTERNAL = $API_ROOT NEXTAUTH_SECRET = SuperSecret // CNR sql server -//DATABASE_URL = sqlserver://sql-srv-plt-pedw-cnr-uks-01.database.windows.net:1433;database=PEDWDev;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword +DATABASE_URL = sqlserver://sql-srv-plt-pedw-cnr-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword // dev test sql server -DATABASE_URL = sqlserver://pedw-dev-test-sql-svr.database.windows.net:1433;database=PEDWDev;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword +//DATABASE_URL = sqlserver://pedw-dev-test-sql-svr.database.windows.net:1433;database=PEDWDev;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword // Pre prod sql server //DATABASE_URL = sqlserver://pp-pedw-sql.database.windows.net:1433;database=PEDWPreProd;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword @@ -92,15 +92,15 @@ AZURE_TENANT_ID = $TENANT AZURE_CLIENT_SECRET = $CLIENT_SECRET // CNR key -//AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwcnruks01" -//AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg== -//AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwcnruks01.blob.core.windows.net +AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwcnruks01" +AZURE_STORAGE_ACCOUNT_KEY = gADMeqLZNIWNeHiQbca1RR6BMacS0Dl8H18ZuP3CAM8QWEXDnH6GeBo57WOETqCBb2NGOXzmQphn+AStUZMgQA== +AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwcnruks01.blob.core.windows.net // dev key -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_STORAGE_ACCOUNT_NAME = "pedwdev" +//AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg== +//AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net // test key //AZURE_STORAGE_ACCOUNT_NAME = "pedwtest" @@ -110,9 +110,9 @@ AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net // preprod key -AZURE_STORAGE_ACCOUNT_NAME = "pedwpp" -AZURE_STORAGE_ACCOUNT_KEY = koZ46STRqapSa2Dod8MLL6aju1eYLhhyJ6DXpCLMTnFLJvbDT6CHUv/jwr5U/Ta8a60MWzwToHQy+AStADO7sg== -AZURE_PEDW_STORAGE_ENDPOINT = https://pedwpp.blob.core.windows.net +//AZURE_STORAGE_ACCOUNT_NAME = "pedwpp" +//AZURE_STORAGE_ACCOUNT_KEY = koZ46STRqapSa2Dod8MLL6aju1eYLhhyJ6DXpCLMTnFLJvbDT6CHUv/jwr5U/Ta8a60MWzwToHQy+AStADO7sg== +//AZURE_PEDW_STORAGE_ENDPOINT = https://pedwpp.blob.core.windows.net // PROD key diff --git a/pages/api/file/setupcontainer.js b/pages/api/file/setupcontainer.js index 3344521b..85e6c19c 100644 --- a/pages/api/file/setupcontainer.js +++ b/pages/api/file/setupcontainer.js @@ -22,7 +22,7 @@ ApiProxy.get(async (req, res) => { //console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash); if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) { - await createContainerSas(containerName) + await createContainer(containerName) .then((data) => { return res.status(200).json({ data: "success" }); })