Skip to content

Commit a8f2288

Browse files
committed
feat: injecting env properties dynamically in admin-ui built #1720
1 parent 2d58066 commit a8f2288

File tree

7 files changed

+15
-8
lines changed

7 files changed

+15
-8
lines changed

admin-ui/app/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</div>
102102
</div>
103103
</div>
104-
104+
<script src="/admin/env-config.js" defer></script>
105105
<script>
106106
(function() {
107107
var bodyElement = document.querySelector("body");

admin-ui/app/redux/api/axios.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import axios from "axios"
22

3-
export const baseUrl = process.env.CONFIG_API_BASE_URL || "http://localhost:8080"
3+
export const baseUrl = window['configApiBaseUrl'] || process.env.CONFIG_API_BASE_URL || "http://localhost:8080"
44
export default axios.create({
55
baseURL: baseUrl,
66
timeout: 60000

admin-ui/app/redux/api/base.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export const getDefaultClient = (JansConfigApi) => {
22
let defaultClient = JansConfigApi.ApiClient.instance
33
defaultClient.timeout = 60000
44
const jansauth = defaultClient.authentications['jans-auth']
5-
defaultClient =
5+
defaultClient = window['configApiBaseUrl'] ||
66
process.env.CONFIG_API_BASE_URL ||
77
'https://admin-ui-test.gluu.org'.replace(/\/+$/, '')
88
const headers = {
@@ -22,7 +22,7 @@ export const getClient = (JansConfigApi, r_token, r_issuer) => {
2222
const defaultClient = JansConfigApi.ApiClient.instance
2323
defaultClient.timeout = 60000
2424
const jansauth = defaultClient.authentications['oauth2']
25-
defaultClient.basePath =
25+
defaultClient.basePath = window['configApiBaseUrl'] ||
2626
process.env.CONFIG_API_BASE_URL ||
2727
'https://admin-ui-test.gluu.org'.replace(/\/+$/, '')
2828
const headers = {
@@ -41,7 +41,7 @@ export const getClientWithToken = (JansConfigApi, token) => {
4141
const defaultClient = JansConfigApi.ApiClient.instance
4242
defaultClient.timeout = 60000
4343
const jansauth = defaultClient.authentications['oauth2']
44-
defaultClient.basePath =
44+
defaultClient.basePath = window['configApiBaseUrl'] ||
4545
process.env.CONFIG_API_BASE_URL ||
4646
'https://admin-ui-test.gluu.org'.replace(/\/+$/, '')
4747
const headers = {

admin-ui/app/redux/api/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import axios from "axios"
22

3-
export const baseUrl = process.env.CONFIG_API_BASE_URL || "http://localhost:8080"
3+
export const baseUrl = window['configApiBaseUrl'] || process.env.CONFIG_API_BASE_URL || "http://localhost:8080"
44
export default axios.create({
55
baseURL: baseUrl,
66
timeout: 60000

admin-ui/env-config.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
const CONFIG_API_BASE_URL = "https://%(hostname)s/jans-config-api"
2+
const API_BASE_URL = "https://%(hostname)s/jans-config-api/admin-ui"
3+
const BASE_PATH = "/admin/"
4+
5+
window.configApiBaseUrl = CONFIG_API_BASE_URL
6+
window.apiBaseUrl = API_BASE_URL
7+
window.basePath = BASE_PATH

admin-ui/plugins/admin/components/Settings/SettingsPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ function SettingsPage() {
106106
>
107107
<h3>
108108
<Badge color={`primary-${selectedTheme}`}>
109-
{process.env.CONFIG_API_BASE_URL}
109+
{window.configApiBaseUrl}
110110
</Badge>
111111
</h3>
112112
</Label>

admin-ui/plugins/services/redux/api/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import axios from "axios"
22

3-
export const baseUrl = process.env.API_BASE_URL || "http://localhost:8080";
3+
export const baseUrl = window['apiBaseUrl'] || process.env.API_BASE_URL || "http://localhost:8080";
44
export default axios.create({
55
baseURL: baseUrl,
66
timeout: 60000

0 commit comments

Comments
 (0)