diff options
| author |   Lorraine Welch <lb2391@att.com> | 2020-08-07 13:45:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-08-07 13:45:22 +0000 |
| commit | cde8efbcfaca206c858f2c4b11e444317a29b765 (patch) | |
| tree | 5feb1c109e5206d1d30978b7e71a5ca857bd836a | |
| parent | 03378017698ab255afe1bc576742a753990c50fc (diff) | |
| parent | e4a4b56799d773d033ae2ef57a19891cd384de32 (diff) | |
Merge "Dynamic context determination via basehref"
3 files changed, 33 insertions, 6 deletions
diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/angular.json b/ecomp-sdk/epsdk-app-os/ngappsrc/angular.json index 02ce9452..64b13511 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/angular.json +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/angular.json @@ -12,7 +12,6 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "baseHref": "/ONAPPORTALSDK/", "outputPath": "dist", "index": "src/ngwelcome.html", "main": "src/main.ts", diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/ngwelcome.html b/ecomp-sdk/epsdk-app-os/ngappsrc/src/ngwelcome.html index d290b96f..b85e25d2 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/ngwelcome.html +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/ngwelcome.html @@ -39,9 +39,35 @@ <!doctype html> <html lang="en"> <head> + +<script> + __Zone_enable_cross_context_check = true; + function nthIndex(str, pat, n) { + var L = str.length, i = -1; + while (n-- && i++ < L) { + i = str.indexOf(pat, i); + if (i < 0) break; + } + return i; + } + function addBaseHref(base) { + //document.write("<base href='" + base + "' />"); + baseNode=document.createElement('base'); + baseNode.href=base; + + //document.getElementsByTagName('head')[0].appendChild(baseNode); + var head = document.getElementsByTagName('head')[0]; + head.insertBefore(baseNode,head.childNodes[0] || null); + window.base = base; + } + + var base = window.location.pathname.substring(0, nthIndex(window.location.pathname,"/", 2) + 1); + addBaseHref(base); + + + </script> <meta charset="utf-8"> <title>Portal SDK</title> - <base href="/"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="icon" type="image/x-icon" href="favicon.ico"> diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/listener/PortalTimeoutHandler.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/listener/PortalTimeoutHandler.java index 1b3c79c0..90c39b52 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/listener/PortalTimeoutHandler.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/listener/PortalTimeoutHandler.java @@ -84,7 +84,8 @@ public class PortalTimeoutHandler { String sessionSlot = SessionCommunicationService.getSessionSlotCheckInterval(ecompRestURL, userName, pwd, uebKey); if (sessionSlot == null) - return null; + sessionSlot = "30000"; // default to 5 minutes + return Integer.parseInt(sessionSlot); } @@ -341,18 +342,19 @@ public class PortalTimeoutHandler { Object portalSessionSlotCheckObj = session.getServletContext() .getAttribute(PortalApiConstants.PORTAL_SESSION_SLOT_CHECK); - Integer portalSessionSlotCheckinMilliSec = 5 * 60 * 1000; // (5 minutes) + Integer portalSessionSlotCheckinMilliSec = 0; if (portalSessionSlotCheckObj != null) { portalSessionSlotCheckinMilliSec = Integer.valueOf(portalSessionSlotCheckObj.toString()); } else { portalSessionSlotCheckObj = _sessionComm .fetchSessionSlotCheckInterval(new String[] { ecompRestURL, userName, pwd, uebKey }); - logger.debug("Fetching Portal Session Slot Object: " + portalSessionSlotCheckObj); + logger.debug("Fetched Portal Session Slot Object: " + portalSessionSlotCheckObj); + if (portalSessionSlotCheckObj != null) { portalSessionSlotCheckinMilliSec = Integer.valueOf(portalSessionSlotCheckObj.toString()); session.getServletContext().setAttribute(PortalApiConstants.PORTAL_SESSION_SLOT_CHECK, portalSessionSlotCheckinMilliSec); - } + } } Object previousToLastAccessTimeObj = session.getAttribute(PortalApiConstants.SESSION_PREVIOUS_ACCESS_TIME); |