From d4eb0ce3f2d54cb65789d47bb05d92215b5983f1 Mon Sep 17 00:00:00 2001 From: Eli Bosley Date: Fri, 12 Jan 2024 13:42:15 -0500 Subject: [PATCH] feat: add new staging url for connect website (#841) * feat: add new staging url for connect website * feat: add url to plg --- api/dev/states/myservers.cfg | 2 +- api/src/__test__/common/allowed-origins.test.ts | 2 +- .../__test__/core/utils/files/config-file-normalizer.test.ts | 4 ++-- api/src/common/allowed-origins.ts | 2 +- plugin/plugins/dynamix.unraid.net.plg | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/dev/states/myservers.cfg b/api/dev/states/myservers.cfg index 2ca71e753..bc8628ad3 100644 --- a/api/dev/states/myservers.cfg +++ b/api/dev/states/myservers.cfg @@ -16,7 +16,7 @@ regWizTime="1611175408732_0951-1653-3509-FBA155FA23C0" idtoken="" accesstoken="" refreshtoken="" -allowedOrigins="/var/run/unraid-notifications.sock, /var/run/unraid-php.sock, /var/run/unraid-cli.sock, http://localhost:8080, https://localhost:4443, https://tower.local:4443, https://192.168.1.150:4443, https://tower:4443, https://192-168-1-150.thisisfourtyrandomcharacters012345678900.myunraid.net:4443, https://85-121-123-122.thisisfourtyrandomcharacters012345678900.myunraid.net:8443, https://10-252-0-1.hash.myunraid.net:4443, https://10-252-1-1.hash.myunraid.net:4443, https://10-253-3-1.hash.myunraid.net:4443, https://10-253-4-1.hash.myunraid.net:4443, https://10-253-5-1.hash.myunraid.net:4443, https://google.com, https://test.com, https://connect.myunraid.net, https://staging.connect.myunraid.net, https://dev-my.myunraid.net:4000, https://studio.apollographql.com" +allowedOrigins="/var/run/unraid-notifications.sock, /var/run/unraid-php.sock, /var/run/unraid-cli.sock, http://localhost:8080, https://localhost:4443, https://tower.local:4443, https://192.168.1.150:4443, https://tower:4443, https://192-168-1-150.thisisfourtyrandomcharacters012345678900.myunraid.net:4443, https://85-121-123-122.thisisfourtyrandomcharacters012345678900.myunraid.net:8443, https://10-252-0-1.hash.myunraid.net:4443, https://10-252-1-1.hash.myunraid.net:4443, https://10-253-3-1.hash.myunraid.net:4443, https://10-253-4-1.hash.myunraid.net:4443, https://10-253-5-1.hash.myunraid.net:4443, https://google.com, https://test.com, https://connect.myunraid.net, https://connect-staging.myunraid.net, https://dev-my.myunraid.net:4000, https://studio.apollographql.com" dynamicRemoteAccessType="DISABLED" [upc] apikey="unupc_fab6ff6ffe51040595c6d9ffb63a353ba16cc2ad7d93f813a2e80a5810" diff --git a/api/src/__test__/common/allowed-origins.test.ts b/api/src/__test__/common/allowed-origins.test.ts index af4860300..4b2341248 100644 --- a/api/src/__test__/common/allowed-origins.test.ts +++ b/api/src/__test__/common/allowed-origins.test.ts @@ -36,7 +36,7 @@ test('Returns allowed origins', async () => { "https://google.com", "https://test.com", "https://connect.myunraid.net", - "https://staging.connect.myunraid.net", + "https://connect-staging.myunraid.net", "https://dev-my.myunraid.net:4000", ] `); diff --git a/api/src/__test__/core/utils/files/config-file-normalizer.test.ts b/api/src/__test__/core/utils/files/config-file-normalizer.test.ts index fc3b3d2c5..f10052c36 100644 --- a/api/src/__test__/core/utils/files/config-file-normalizer.test.ts +++ b/api/src/__test__/core/utils/files/config-file-normalizer.test.ts @@ -54,7 +54,7 @@ test('it creates a MEMORY config with NO OPTIONAL values', () => { }, "remote": { "accesstoken": "", - "allowedOrigins": "/var/run/unraid-notifications.sock, /var/run/unraid-php.sock, /var/run/unraid-cli.sock, https://connect.myunraid.net, https://staging.connect.myunraid.net, https://dev-my.myunraid.net:4000", + "allowedOrigins": "/var/run/unraid-notifications.sock, /var/run/unraid-php.sock, /var/run/unraid-cli.sock, https://connect.myunraid.net, https://connect-staging.myunraid.net, https://dev-my.myunraid.net:4000", "apikey": "", "avatar": "", "dynamicRemoteAccessType": "DISABLED", @@ -146,7 +146,7 @@ test('it creates a MEMORY config with OPTIONAL values', () => { "remote": { "2Fa": "yes", "accesstoken": "", - "allowedOrigins": "/var/run/unraid-notifications.sock, /var/run/unraid-php.sock, /var/run/unraid-cli.sock, https://connect.myunraid.net, https://staging.connect.myunraid.net, https://dev-my.myunraid.net:4000", + "allowedOrigins": "/var/run/unraid-notifications.sock, /var/run/unraid-php.sock, /var/run/unraid-cli.sock, https://connect.myunraid.net, https://connect-staging.myunraid.net, https://dev-my.myunraid.net:4000", "apikey": "", "avatar": "", "dynamicRemoteAccessType": "DISABLED", diff --git a/api/src/common/allowed-origins.ts b/api/src/common/allowed-origins.ts index 5e886f1cb..dcda5e754 100644 --- a/api/src/common/allowed-origins.ts +++ b/api/src/common/allowed-origins.ts @@ -86,7 +86,7 @@ const getExtraOrigins = (): string[] => { const getConnectOrigins = (): string[] => { const connectMain = 'https://connect.myunraid.net'; - const connectStaging = 'https://staging.connect.myunraid.net'; + const connectStaging = 'https://connect-staging.myunraid.net'; const connectDev = 'https://dev-my.myunraid.net:4000'; return [connectMain, connectStaging, connectDev]; diff --git a/plugin/plugins/dynamix.unraid.net.plg b/plugin/plugins/dynamix.unraid.net.plg index 658057403..ef720a175 100755 --- a/plugin/plugins/dynamix.unraid.net.plg +++ b/plugin/plugins/dynamix.unraid.net.plg @@ -566,7 +566,7 @@ if [ "${PLGTYPE}" = "staging" ]; then CHANGED=yes [[ ! -f "$FILE-" ]] && cp "$FILE" "$FILE-" OLD="add_header Content-Security-Policy \"frame-ancestors 'self' https://connect.myunraid.net/\";" - NEW="add_header Content-Security-Policy \"frame-ancestors 'self' https://connect.myunraid.net/ https://dev-my.myunraid.net:4000/\";" + NEW="add_header Content-Security-Policy \"frame-ancestors 'self' https://connect-staging.myunraid.net https://connect.myunraid.net/ https://dev-my.myunraid.net:4000/\";" sed -i "s#${OLD}#${NEW}#" "${FILE}" fi fi