Merge branch 'main' into path_to_salt

JanssenProject · Jan 17, 2025 · d60527c · d60527c
2 parents 88f3cb1 + 4f44337
commit d60527c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -334,8 +334,10 @@ jobs:
           TAG="0.0.0"
         fi
         wget https://github.com/${{ github.repository }}/releases/download/"${VER}"/cedarling_wasm_"${TAG}"_pkg.tar.gz -O cedarling_wasm.tar.gz
-        mkdir wasm
-        tar -xvf cedarling_wasm.tar.gz -C wasm
+        mkdir -p src/wasm
+        tar -xvf cedarling_wasm.tar.gz -C src/wasm
+        rm cedarling_wasm.tar.gz
+        ls src/wasm
         # END Get the latest cedarling wasm package
         npm install
         npm run build
@@ -435,4 +437,4 @@ jobs:
         sha256sum cedarling_wasm_"${TAG}"_pkg.tar.gz > cedarling_wasm_"${TAG}"_pkg.tar.gz.sha256sum
         gpg --armor --detach-sign cedarling_wasm_"${TAG}"_pkg.tar.gz || echo "Failed to sign"
         echo "${{ secrets.MOAUTO_WORKFLOW_TOKEN }}" | gh auth login --with-token
-        gh release upload "${VERSION}" *.tar.gz *.sha256sum *.asc
+        gh release upload "${VERSION}" *.tar.gz *.sha256sum *.asc
diff --git a/demos/jans-tarp/src/options/homePage.tsx b/demos/jans-tarp/src/options/homePage.tsx
@@ -5,11 +5,9 @@ import Tab from '@mui/material/Tab';
 import Box from '@mui/material/Box';
 import Password from '@mui/icons-material/Password';
 import LockPerson from '@mui/icons-material/LockPerson';
-import OIDCClients from './OIDCClients';
+import OIDCClients from './oidcClients';
 import Cedarling from './cedarling';
 import Grid from '@mui/material/Grid';
-import Paper from '@mui/material/Paper';
-import { styled } from '@mui/material/styles';
 
 interface TabPanelProps {
   children?: React.ReactNode;

diff --git a/docs/janssen-server/install/vm-install/rhel.md b/docs/janssen-server/install/vm-install/rhel.md
@@ -41,15 +41,15 @@ sudo rpm -import automation-jans-public-gpg.asc
   [Releases](https://github.com/JanssenProject/jans/releases)
 
 ```
-wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version-stable.el8.x86_64.rpm -P ~/
+wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version.el8.x86_64.rpm -P ~/
 ```
 
 - Verify integrity of the downloaded package using published `sha256sum`.
 
     Download `sha256sum` file for the package
 
     ```shell
-    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version-stable.el8.x86_64.rpm.sha256sum -P ~/
+    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version.el8.x86_64.rpm.sha256sum -P ~/
     ```
 
     Check the hash if it is matching.

diff --git a/docs/janssen-server/install/vm-install/suse.md b/docs/janssen-server/install/vm-install/suse.md
@@ -53,15 +53,15 @@ sudo rpm -import automation-jans-public-gpg.asc
   [Releases](https://github.com/JanssenProject/jans/releases)
 
 ```shell
-wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version-stable.suse15.x86_64.rpm
+wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version.suse15.x86_64.rpm
 ```
 
 - Verify integrity of the downloaded package using published `sha256sum`.
 
 Download `sha256sum` file for the package
 
 ```shell
-wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version-stable.suse15.x86_64.rpm.sha256sum
+wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version.suse15.x86_64.rpm.sha256sum
 ```
 
 Check the hash if it is matching. You may need to change your working directory

diff --git a/docs/janssen-server/install/vm-install/ubuntu.md b/docs/janssen-server/install/vm-install/ubuntu.md
@@ -38,15 +38,15 @@ sudo gpg --import automation-jans-public-gpg.asc;
 [Releases](https://github.com/JanssenProject/jans/releases)
 
 ```
-wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version-stable.ubuntu22.04_amd64.deb -P /tmp
+wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version.ubuntu22.04_amd64.deb -P /tmp
 ```
 
 - Verify integrity of the downloaded package by verifying published `sha256sum`.   
 
     Download `sha256sum` file for the package
 
     ```shell
-    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version-stable.ubuntu22.04_amd64.deb.sha256sum -P /tmp
+    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version.ubuntu22.04_amd64.deb.sha256sum -P /tmp
     ```
 
     Check the hash if it is matching.
@@ -74,15 +74,15 @@ sudo apt install  ./jans_replace-janssen-version.ubuntu22.04_amd64.deb
 [Releases](https://github.com/JanssenProject/jans/releases)
 
 ```
-wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version-stable.ubuntu20.04_amd64.deb -P /tmp
+wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version.ubuntu20.04_amd64.deb -P /tmp
 ```
 
 - Verify integrity of the downloaded package by verifying published `sha256sum`.   
 
     Download `sha256sum` file for the package
 
     ```shell
-    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version-stable.ubuntu20.04_amd64.deb.sha256sum -P /tmp
+    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version.ubuntu20.04_amd64.deb.sha256sum -P /tmp
     ```
 
     Check the hash if it is matching.

diff --git a/jans-linux-setup/jans_setup/templates/jans-keycloak-link/jans-keycloak-link-config.json b/jans-linux-setup/jans_setup/templates/jans-keycloak-link/jans-keycloak-link-config.json
@@ -73,13 +73,13 @@
   "snapshotFolder": "%(snapshots_dir)s",
   "snapshotMaxCount": 10,
   "keycloakConfiguration": {
-    "serverUrl": "http://localhost:8180",
-    "realm": "master",
-    "clientId": "clientserviceaccount",
-    "clientSecret": "cbyFHt3MMU2vNluAmzXopl9SHx9CUmfC",
-    "grantType": "client_credentials",
-    "username": "admin",
-    "password": "keycloak"
+    "serverUrl": "",
+    "realm": "",
+    "clientId": "",
+    "clientSecret": "",
+    "grantType": "",
+    "username": "",
+    "password": ""
   },
   "baseDN": null,
   "personObjectClassTypes": null,