Merge branch 'develop' into TASK-4158

opencb · Oct 24, 2023 · d474f3d · d474f3d
2 parents 713c603 + 63c70a0
commit d474f3d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 21 deletions.
diff --git a/src/core/clients/opencga/opencga-client.js b/src/core/clients/opencga/opencga-client.js
@@ -57,7 +57,10 @@ export class OpenCGAClient {
                 prefix: ""
                 // expirationTime: ""
             },
-            sso: false,
+            sso: {
+                active: false,
+                cookie: "JSESSIONID",
+            },
         };
     }
 
@@ -80,7 +83,7 @@ export class OpenCGAClient {
             console.error(e);
             // Josemi NOTE 20230324 Terrible hack to prevent displaying OpenCGA host not available error
             // when iva starts, as the /meta/about is restricted when SSO is enabled
-            if (!this._config.sso) {
+            if (!this._config?.sso?.active) {
                 globalEvent("signingInError", {value: "Opencga host not available."});
                 globalEvent("hostInit", {host: "opencga", value: "NOT AVAILABLE"});
             }

diff --git a/src/core/clients/opencga/opencga-parent-class.js b/src/core/clients/opencga/opencga-parent-class.js
@@ -49,7 +49,7 @@ export default class OpenCGAParentClass {
         }
 
         // Enable credentials
-        _options.includeCredentials = !!this._config.sso;
+        _options.includeCredentials = !!this._config?.sso?.active;
 
         // console.log(`OpenCGA client calling to ${url}`);
         // if the URL query fails we try with next host
@@ -83,7 +83,7 @@ export default class OpenCGAParentClass {
         }
 
         // Enable credentials
-        _options.includeCredentials = !!this._config.sso;
+        _options.includeCredentials = !!this._config?.sso?.active;
 
         return this.restClient.call(url, _options, k);
     }
@@ -106,7 +106,7 @@ export default class OpenCGAParentClass {
         // _options.body = _params.body;
 
         // Enable credentials
-        _options.includeCredentials = !!this._config.sso;
+        _options.includeCredentials = !!this._config?.sso?.active;
 
         return this.restClient.call(url, _options, k);
     }

diff --git a/src/sites/iva/iva-app.js b/src/sites/iva/iva-app.js
@@ -381,7 +381,10 @@ class IvaApp extends LitElement {
                     active: true,
                     prefix: opencgaPrefix,
                 },
-                sso: opencgaSsoActive,
+                sso: {
+                    active: opencgaSsoActive,
+                    cookie: opencgaSsoCookie,
+                },
             });
 
             this.reactomeClient = new ReactomeClient();
@@ -638,9 +641,9 @@ class IvaApp extends LitElement {
         await this.opencgaClient.logout();
 
         // Check if sso is active: we will redirect to 'meta/sso/logout' endpoint
-        if (this.opencgaClient?._config?.sso) {
+        if (this.opencgaClient?._config?.sso?.active) {
             // eslint-disable-next-line no-undef
-            Cookies.expire("JSESSIONID");
+            Cookies.expire(this.opencgaClient._config.sso.cookie);
 
             const config = this.opencgaClient._config;
             const ivaUrl = window.location;

diff --git a/src/webcomponents/commons/forms/select-token-filter.js b/src/webcomponents/commons/forms/select-token-filter.js
@@ -55,6 +55,7 @@ export default class SelectTokenFilter extends LitElement {
     firstUpdated() {
         this.select = $("#" + this._prefix);
         this.select.select2({
+            dropdownParent: document.querySelector(`#${this._prefix}`).parentElement,
             separator: this._config.separator ?? [","],
             tags: this._config.freeTag ?? true,
             multiple: this._config.multiple ?? true,

diff --git a/src/webcomponents/commons/layouts/custom-landing.js b/src/webcomponents/commons/layouts/custom-landing.js
@@ -242,20 +242,22 @@ export default class CustomLanding extends LitElement {
                     ` : null}
                     <!-- Landing login -->
                     <div class="landing-login">
-                        ${this.opencgaSession?.opencgaClient?._config?.sso ? html`
+                        ${this.opencgaSession?.opencgaClient?._config?.sso?.active ? html`
                             <div>
-                                <a class="btn-group" role="group" href="${this.getSSOUrl()}">
-                                    <button type="button" class="btn btn-primary btn-lg" style="">
-                                        <i class="fas fa-user"></i>
-                                    </button>
-                                    <button type="button" class="btn btn-primary btn-lg">
-                                        <strong style="color:white;">Login with SSO</strong>
-                                    </button>
-                                </a>
-                            </div>
-                            <div class="landing-login-sso-helper">
-                                By clicking on the <b>Login with SSO</b> button you will be redirected to your SSO login
-                                page.
+                                <div align="center">
+                                    <a class="btn-group" role="group" href="${this.getSSOUrl()}">
+                                        <button type="button" class="btn btn-primary btn-lg" style="">
+                                            <i class="fas fa-user"></i>
+                                        </button>
+                                        <button type="button" class="btn btn-primary btn-lg">
+                                            <strong style="color:white;">Login with SSO</strong>
+                                        </button>
+                                    </a>
+                                </div>
+                                <div class="landing-login-sso-helper">
+                                    By clicking on the <b>Login with SSO</b> button you will be redirected to your SSO login
+                                    page.
+                                </div>
                             </div>
                         ` : html`
                             <user-login