Skip to content

Commit 7a115ef

Browse files
author
Brijesh
committed
Caddy order templates before encode
1 parent 8f7b28c commit 7a115ef

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Caddyfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
order templates before encode
23
auto_https off
34
}
45
:2015
@@ -13,7 +14,8 @@ log {
1314
encode gzip
1415
try_files {path} /index.html
1516
templates /static/js/* {
16-
mime application/javascript
17+
between [[! !]]
18+
mime application/javascript text/javascript
1719
}
1820

1921
header /service-worker.js {

src/constants/api.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ export const DEV_ENV = {
3333
};
3434

3535
export const SSO_BASE_URL = isBundled
36-
? '{{env "SSO_BASE_URL"}}' // Caddy will replace this with the environment variable configured in Openshift
36+
? '[[! env "SSO_BASE_URL" !]]' // Caddy will replace this with the environment variable configured in Openshift
3737
: DEV_ENV.SSO_BASE_URL;
3838

39-
export const SSO_REALM_NAME = isBundled ? '{{env "SSO_REALM_NAME"}}' : process.env.REACT_APP_SSO_REALM_NAME;
40-
export const SSO_CLIENT_ID = isBundled ? '{{env "SSO_CLIENT_ID"}}' : process.env.REACT_APP_SSO_CLIENT_ID;
39+
export const SSO_REALM_NAME = isBundled ? '[[! env "SSO_REALM_NAME" !]]' : process.env.REACT_APP_SSO_REALM_NAME;
40+
export const SSO_CLIENT_ID = isBundled ? '[[! env "SSO_CLIENT_ID" !]]' : process.env.REACT_APP_SSO_CLIENT_ID;
4141
export const SSO_BASE_AUTH_ENDPOINT = `${SSO_BASE_URL}/auth/realms/${SSO_REALM_NAME}/protocol/openid-connect`;
4242
export const SSO_LOGIN_REDIRECT_URI = `${window.location.origin}/return-page?type=${RETURN_PAGE_TYPE.LOGIN}`;
4343
export const SSO_LOGIN_ENDPOINT = `${SSO_BASE_AUTH_ENDPOINT}/auth?response_type=code&client_id=${SSO_CLIENT_ID}&redirect_uri=${SSO_LOGIN_REDIRECT_URI}&code_challenge_method=S256&code_challenge=_CODE_CHALLENGE_VALUE_`;
@@ -50,7 +50,7 @@ export const SSO_LOGOUT_ENDPOINT =
5050
encodeURIComponent(SSO_LOGOUT_REDIRECT_URI) +
5151
`&client_id=${SSO_CLIENT_ID}`;
5252

53-
export const SITEMINDER_BASE_URL = isBundled ? '{{env "SITEMINDER_BASE_URL"}}' : DEV_ENV.SITEMINDER_BASE_URL;
53+
export const SITEMINDER_BASE_URL = isBundled ? '[[! env "SITEMINDER_BASE_URL" !]]' : DEV_ENV.SITEMINDER_BASE_URL;
5454

5555
export const SITEMINDER_LOGOUT_REDIRECT_URI = `${window.location.origin}/return-page?type=${RETURN_PAGE_TYPE.SITEMINDER_LOGOUT}`;
5656
export const SITEMINDER_LOGOUT_ENDPOINT =

0 commit comments

Comments
 (0)