Merge pull request #25 from rwth-acis/develop

Update dependencies
rwth-acis · May 1, 2022 · 87d0a1f · 87d0a1f
2 parents 0cc915f + ad6eb34
commit 87d0a1f
Show file tree

Hide file tree

Showing 15 changed files with 297 additions and 485 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ ENV HTTP_PORT=8080
 ENV HTTPS_PORT=8443
 ENV LAS2PEER_PORT=9011
 
-RUN apk add --update bash && rm -f /var/cache/apk/*
+RUN apk add --update bash curl && rm -f /var/cache/apk/*
 RUN addgroup -g 1000 -S las2peer && \
     adduser -u 1000 -S las2peer -G las2peer
 

diff --git a/bin/start_ServiceAgentGenerator.sh b/bin/start_ServiceAgentGenerator.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-
 # this scripts generates a xml file for the specified ServiceClass with the desired ServicePass
 # pls run the script form the root folder of your deployment, e. g. ./bin/start_ServiceAgentGenerator.sh
-
 java -cp "lib/*" i5.las2peer.tools.ServiceAgentGenerator "$@"
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -102,6 +102,8 @@ if [[ ! -z "${BOOTSTRAP}" ]]; then
     done
 fi
 
+echo external_address = $(curl -s https://ipinfo.io/ip):${LAS2PEER_PORT} >etc/pastry.properties
+
 # prevent glob expansion in lib/*
 set -f
 LAUNCH_COMMAND='java -cp lib/* --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED i5.las2peer.tools.L2pNodeLauncher -s service -p '"${LAS2PEER_PORT} ${SERVICE_EXTRA_ARGS}"

diff --git a/frontend/callbacks/openidconnect-icons.js b/frontend/callbacks/openidconnect-icons.js
diff --git a/frontend/callbacks/openidconnect-popup-signin-callback.js b/frontend/callbacks/openidconnect-popup-signin-callback.js
diff --git a/frontend/callbacks/openidconnect-popup-signout-callback.js b/frontend/callbacks/openidconnect-popup-signout-callback.js
diff --git a/frontend/callbacks/openidconnect-signin-silent-callback.js b/frontend/callbacks/openidconnect-signin-silent-callback.js
diff --git a/frontend/callbacks/popup-signin-callback.html b/frontend/callbacks/popup-signin-callback.html
diff --git a/frontend/callbacks/popup-signout-callback.html b/frontend/callbacks/popup-signout-callback.html
diff --git a/frontend/callbacks/silent-callback.html b/frontend/callbacks/silent-callback.html
diff --git a/frontend/dev/demo-element.js b/frontend/dev/demo-element.js
@@ -61,12 +61,10 @@ export class DemoElement extends LitElement {
     <las2peer-frontend-statusbar
     id="statusBar"
     service="Project List Demo"
-    oidcpopupsigninurl="/callbacks/popup-signin-callback.html"
-    oidcpopupsignouturl="/callbacks/popup-signout-callback.html"
-    oidcsilentsigninurl="/callbacks/silent-callback.html"
     oidcclientid="localtestclient"
     suppresswidgeterror="true"
     autoAppendWidget=true
+    oidcAuthority="https://api.learning-layers.eu/o/oauth2"
     ></las2peer-frontend-statusbar>
       <h2>Project list with "All Projects" enabled</h2>
       <div style="display: flex">