From ae9feefb2564f84cc436a927cf868ad60fbcbd43 Mon Sep 17 00:00:00 2001 From: Hongxin <5400599+zhx828@users.noreply.github.com> Date: Mon, 20 May 2024 20:24:05 -0500 Subject: [PATCH 01/10] Update webpack.common.js --- webpack/webpack.common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js index f493ba34c..773d541d5 100644 --- a/webpack/webpack.common.js +++ b/webpack/webpack.common.js @@ -105,7 +105,7 @@ module.exports = async options => { // If this URL is left empty (""), then it will be relative to the current context. // If you use an API server, in `prod` mode, you will need to enable CORS // (see the `jhipster.cors` common JHipster property in the `application-*.yml` configurations) - SERVER_API_URL: `''`, + SERVER_API_URL: `'${process.env.hasOwnProperty('NETLIFY_SERVER_API_URL') ? process.env.NETLIFY_SERVER_API_URL : ''}'`, }, }), new webpack.DefinePlugin({ @@ -141,7 +141,7 @@ module.exports = async options => { base: '/', }), ], - } + }, // jhipster-needle-add-webpack-config - JHipster will add custom config ); }; From 27931bdaf2adc624a610fb8c0aba8d9a8634fe54 Mon Sep 17 00:00:00 2001 From: Hongxin <5400599+zhx828@users.noreply.github.com> Date: Mon, 20 May 2024 20:43:30 -0500 Subject: [PATCH 02/10] Create netlify.toml --- netlify.toml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 netlify.toml diff --git a/netlify.toml b/netlify.toml new file mode 100644 index 000000000..acaae833c --- /dev/null +++ b/netlify.toml @@ -0,0 +1,40 @@ +[[redirects]] + from = "/websocket" + to = "https://beta.curation.oncokb.org/websocket" + +[[redirects]] + from = "/api" + to = "https://beta.curation.oncokb.org/api" + +[[redirects]] + from = "/legacy-api" + to = "https://beta.curation.oncokb.org/legacy-api" + +[[redirects]] + from = "/services" + to = "https://beta.curation.oncokb.org/services" + +[[redirects]] + from = "/management" + to = "https://beta.curation.oncokb.org/management" + +[[redirects]] + from = "/v3/api-docs" + to = "https://beta.curation.oncokb.org/v3/api-docs" + +[[redirects]] + from = "/h2-console" + to = "https://beta.curation.oncokb.org/h2-console" + +[[redirects]] + from = "/oauth2" + to = "https://beta.curation.oncokb.org/oauth2" + +[[redirects]] + from = "/login" + to = "https://beta.curation.oncokb.org/login" + +[[redirects]] + from = "/auth" + to = "https://beta.curation.oncokb.org/auth" + From bdd6148b02e1c923efa72d44baad37c4a1cb725c Mon Sep 17 00:00:00 2001 From: Hongxin <5400599+zhx828@users.noreply.github.com> Date: Mon, 20 May 2024 20:47:15 -0500 Subject: [PATCH 03/10] Update netlify.toml --- netlify.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netlify.toml b/netlify.toml index acaae833c..68173826f 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,8 +3,8 @@ to = "https://beta.curation.oncokb.org/websocket" [[redirects]] - from = "/api" - to = "https://beta.curation.oncokb.org/api" + from = "/api/*" + to = "https://beta.curation.oncokb.org/api/:splat" [[redirects]] from = "/legacy-api" @@ -27,8 +27,8 @@ to = "https://beta.curation.oncokb.org/h2-console" [[redirects]] - from = "/oauth2" - to = "https://beta.curation.oncokb.org/oauth2" + from = "/oauth2/*" + to = "https://beta.curation.oncokb.org/oauth2/:splat" [[redirects]] from = "/login" From d7ad0e640a91169abf0662af37ff26aa59f2188e Mon Sep 17 00:00:00 2001 From: Hongxin <5400599+zhx828@users.noreply.github.com> Date: Mon, 20 May 2024 21:03:32 -0500 Subject: [PATCH 04/10] Update netlify.toml --- netlify.toml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/netlify.toml b/netlify.toml index 68173826f..7d712dba5 100644 --- a/netlify.toml +++ b/netlify.toml @@ -7,34 +7,34 @@ to = "https://beta.curation.oncokb.org/api/:splat" [[redirects]] - from = "/legacy-api" - to = "https://beta.curation.oncokb.org/legacy-api" + from = "/legacy-api/*" + to = "https://beta.curation.oncokb.org/legacy-api/:splat" [[redirects]] - from = "/services" - to = "https://beta.curation.oncokb.org/services" + from = "/services/*" + to = "https://beta.curation.oncokb.org/services/:splat" [[redirects]] - from = "/management" - to = "https://beta.curation.oncokb.org/management" + from = "/management/*" + to = "https://beta.curation.oncokb.org/management/:splat" [[redirects]] - from = "/v3/api-docs" - to = "https://beta.curation.oncokb.org/v3/api-docs" + from = "/v3/api-docs/*" + to = "https://beta.curation.oncokb.org/v3/api-docs/:splat" [[redirects]] - from = "/h2-console" - to = "https://beta.curation.oncokb.org/h2-console" + from = "/h2-console/*" + to = "https://beta.curation.oncokb.org/h2-console/:splat" [[redirects]] from = "/oauth2/*" to = "https://beta.curation.oncokb.org/oauth2/:splat" [[redirects]] - from = "/login" - to = "https://beta.curation.oncokb.org/login" + from = "/login/*" + to = "https://beta.curation.oncokb.org/login/:splat" [[redirects]] - from = "/auth" - to = "https://beta.curation.oncokb.org/auth" + from = "/auth/*" + to = "https://beta.curation.oncokb.org/auth/:splat" From 03025b5057e6b5d04cb0fbd8f118469c179ed3d5 Mon Sep 17 00:00:00 2001 From: Hongxin <5400599+zhx828@users.noreply.github.com> Date: Tue, 21 May 2024 08:39:10 -0500 Subject: [PATCH 05/10] Update netlify.toml --- netlify.toml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/netlify.toml b/netlify.toml index 7d712dba5..d460e254c 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,6 +5,12 @@ [[redirects]] from = "/api/*" to = "https://beta.curation.oncokb.org/api/:splat" +status = 302 + +[[redirects]] + from = "/oidc/*" + to = "https://beta.curation.oncokb.org/oidc/:splat" + status = 302 [[redirects]] from = "/legacy-api/*" @@ -29,10 +35,12 @@ [[redirects]] from = "/oauth2/*" to = "https://beta.curation.oncokb.org/oauth2/:splat" + status = 302 [[redirects]] from = "/login/*" to = "https://beta.curation.oncokb.org/login/:splat" + status = 302 [[redirects]] from = "/auth/*" From ade9f77a270ff0125169848cba37ba486018e47d Mon Sep 17 00:00:00 2001 From: Hongxin <5400599+zhx828@users.noreply.github.com> Date: Tue, 21 May 2024 08:45:24 -0500 Subject: [PATCH 06/10] Update netlify.toml --- netlify.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netlify.toml b/netlify.toml index d460e254c..45327a393 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,12 +5,12 @@ [[redirects]] from = "/api/*" to = "https://beta.curation.oncokb.org/api/:splat" -status = 302 +status = 200 [[redirects]] from = "/oidc/*" to = "https://beta.curation.oncokb.org/oidc/:splat" - status = 302 + status = 200 [[redirects]] from = "/legacy-api/*" @@ -35,12 +35,12 @@ status = 302 [[redirects]] from = "/oauth2/*" to = "https://beta.curation.oncokb.org/oauth2/:splat" - status = 302 + status = 200 [[redirects]] from = "/login/*" to = "https://beta.curation.oncokb.org/login/:splat" - status = 302 + status = 200 [[redirects]] from = "/auth/*" From d69b1d658c1a14050959696847b9a921c352ba15 Mon Sep 17 00:00:00 2001 From: Hongxin <5400599+zhx828@users.noreply.github.com> Date: Tue, 21 May 2024 08:52:17 -0500 Subject: [PATCH 07/10] Update netlify.toml --- netlify.toml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 45327a393..d4fde5699 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,11 +1,12 @@ [[redirects]] from = "/websocket" to = "https://beta.curation.oncokb.org/websocket" + status = 200 [[redirects]] from = "/api/*" to = "https://beta.curation.oncokb.org/api/:splat" -status = 200 + status = 200 [[redirects]] from = "/oidc/*" @@ -15,22 +16,27 @@ status = 200 [[redirects]] from = "/legacy-api/*" to = "https://beta.curation.oncokb.org/legacy-api/:splat" + status = 200 [[redirects]] from = "/services/*" to = "https://beta.curation.oncokb.org/services/:splat" + status = 200 [[redirects]] from = "/management/*" to = "https://beta.curation.oncokb.org/management/:splat" + status = 200 [[redirects]] from = "/v3/api-docs/*" to = "https://beta.curation.oncokb.org/v3/api-docs/:splat" + status = 200 [[redirects]] from = "/h2-console/*" to = "https://beta.curation.oncokb.org/h2-console/:splat" + status = 200 [[redirects]] from = "/oauth2/*" @@ -45,4 +51,5 @@ status = 200 [[redirects]] from = "/auth/*" to = "https://beta.curation.oncokb.org/auth/:splat" + status = 200 From 7e6408c3d6006b006c439ae1c781ba5090a1eb33 Mon Sep 17 00:00:00 2001 From: Hongxin <5400599+zhx828@users.noreply.github.com> Date: Tue, 21 May 2024 08:55:59 -0500 Subject: [PATCH 08/10] Update netlify.toml --- netlify.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index d4fde5699..dd0db0d2b 100644 --- a/netlify.toml +++ b/netlify.toml @@ -12,6 +12,7 @@ from = "/oidc/*" to = "https://beta.curation.oncokb.org/oidc/:splat" status = 200 + force = true [[redirects]] from = "/legacy-api/*" @@ -42,14 +43,16 @@ from = "/oauth2/*" to = "https://beta.curation.oncokb.org/oauth2/:splat" status = 200 + force = true [[redirects]] from = "/login/*" to = "https://beta.curation.oncokb.org/login/:splat" status = 200 + force = true [[redirects]] from = "/auth/*" to = "https://beta.curation.oncokb.org/auth/:splat" status = 200 - + force = true From 85b594427c8cc577bbd417e9d01ad11e0af72190 Mon Sep 17 00:00:00 2001 From: Hongxin <5400599+zhx828@users.noreply.github.com> Date: Tue, 21 May 2024 09:19:52 -0500 Subject: [PATCH 09/10] Update netlify.toml --- netlify.toml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/netlify.toml b/netlify.toml index dd0db0d2b..16c3ac77b 100644 --- a/netlify.toml +++ b/netlify.toml @@ -8,12 +8,6 @@ to = "https://beta.curation.oncokb.org/api/:splat" status = 200 -[[redirects]] - from = "/oidc/*" - to = "https://beta.curation.oncokb.org/oidc/:splat" - status = 200 - force = true - [[redirects]] from = "/legacy-api/*" to = "https://beta.curation.oncokb.org/legacy-api/:splat" @@ -40,17 +34,18 @@ status = 200 [[redirects]] - from = "/oauth2/*" - to = "https://beta.curation.oncokb.org/oauth2/:splat" + from = "/oauth2/authorization/oidc" + to = "https://beta.curation.oncokb.org/oauth2/authorization/oidc/:splat" status = 200 force = true [[redirects]] - from = "/login/*" - to = "https://beta.curation.oncokb.org/login/:splat" + from = "/login/oauth2/code/*" + to = "https://beta.curation.oncokb.org/login/oauth2/code/:splat" status = 200 force = true + [[redirects]] from = "/auth/*" to = "https://beta.curation.oncokb.org/auth/:splat" From 7b804aaa5df915ac8761a4141658dbe97fcc6e13 Mon Sep 17 00:00:00 2001 From: Hongxin <5400599+zhx828@users.noreply.github.com> Date: Tue, 21 May 2024 09:27:45 -0500 Subject: [PATCH 10/10] Update netlify.toml --- netlify.toml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/netlify.toml b/netlify.toml index 16c3ac77b..f74cd383c 100644 --- a/netlify.toml +++ b/netlify.toml @@ -35,19 +35,22 @@ [[redirects]] from = "/oauth2/authorization/oidc" - to = "https://beta.curation.oncokb.org/oauth2/authorization/oidc/:splat" + to = "https://beta.curation.oncokb.org/oauth2/authorization/oidc" status = 200 force = true +[[redirects]] + from = "/oauth2/authorization/oidc/*" + to = "https://beta.curation.oncokb.org/oauth2/authorization/oidc/:splat" + status = 200 + [[redirects]] from = "/login/oauth2/code/*" to = "https://beta.curation.oncokb.org/login/oauth2/code/:splat" status = 200 - force = true [[redirects]] from = "/auth/*" to = "https://beta.curation.oncokb.org/auth/:splat" status = 200 - force = true