chore: rebase

Signed-off-by: Mohamed Nur <[email protected]>

Author: Mohamed Nur

docker/docker-entrypoint.sh

@@ -8,6 +8,7 @@ if mount | grep '/static/config.json'; then
 else
   # Apply ENV vars to temporary config.json
   jq '.API_BASE_URL = env.API_BASE_URL
+        | .API_WITH_CREDENTIALS = env.API_WITH_CREDENTIALS 
         | .OIDC_ISSUER = env.OIDC_ISSUER
         | .OIDC_CLIENT_ID = env.OIDC_CLIENT_ID
         | .OIDC_SCOPE = env.OIDC_SCOPE

public/static/config.json

@@ -1,6 +1,6 @@
 {
   "API_BASE_URL": "",
-  "API_WITH_CREDENTIALS": false,
+  "API_WITH_CREDENTIALS": "",
   "OIDC_ISSUER": "",
   "OIDC_CLIENT_ID": "",
   "OIDC_SCOPE": "openid email profile",

src/App.vue

@@ -38,7 +38,7 @@
 
       setJwtForAjax(getToken());
 
-      // Enable credentialed cross-site Access-Control requests
+      // Send XHR cross-site cookie credentials
       if (this.$api.WITH_CREDENTIALS){
         this.axios.interceptors.request.use(
           function(config) {

src/main.js

@@ -45,7 +45,7 @@ axios.get(contextPath + "/static/config.json").then(response => {
     Vue.prototype.$api.BASE_URL = contextPath;
   }
 
-  // XHR cross-site cookie credentials
+  // Send XHR cross-site cookie credentials
   Vue.prototype.$api.WITH_CREDENTIALS = response.data.API_WITH_CREDENTIALS;
 
   // OpenID Connect

src/shared/api.json

@@ -9,6 +9,7 @@
   "METHOD_PUT": "PUT",
   "METHOD_DELETE": "DELETE",
   "FORCE_PASSWORD_CHANGE": "FORCE_PASSWORD_CHANGE",
+  "WITH_CREDENTIALS": "",
 
   "BASE_URL": "",
   "URL_ABOUT": "api/version",