Merge pull request #239 from OpenBankProject/update_for_v100.0.5

release update
OpenBankProject · Dec 14, 2023 · 015143e · 015143e
2 parents b534b43 + e026e3c
commit 015143e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
@@ -26,7 +26,7 @@ jobs:
         run: |
           echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin docker.io
           docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop
-          docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:v100.0.5-OC 
+          docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC
           docker push docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }} --all-tags
           echo docker done
 

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -260,7 +260,7 @@ <h2 class="info-box__headline">Use the API in the context of your login</h2>
                     </div>
 
                     <div class="version_path">
-                        <lift:loc locid="api_host">API Host: </lift:loc><a name="version_path" class="version" href="version path">version path</a>
+                        <lift:loc locid="api_host">API Host: </lift:loc><a id="version-path" name="version_path" class="version" href="version path">version path</a>
                     </div>
                 </div>
             </section>

diff --git a/src/main/webapp/media/js/inactivity.js b/src/main/webapp/media/js/inactivity.js
@@ -60,7 +60,7 @@ function logout() {
 async function makeObpApiCall() {
   let timeoutInSeconds;
   try {
-    let obpApiHost = document.getElementById("api_home_link");
+    let obpApiHost = document.getElementById("version-path");
     if(obpApiHost) {
       obpApiHost = obpApiHost.href.split("?")[0];
     }
@@ -76,6 +76,9 @@ async function makeObpApiCall() {
     }
   } catch (e) {
     console.error(e);
+    timeoutInSeconds = 5 * 60 + 1; // Set default value to 301 seconds
+    console.log(`Default value ${timeoutInSeconds} is used`);
+    return timeoutInSeconds;
   }
   return timeoutInSeconds;
 }