Merge branch 'main' into admin-ui-1846

.github/workflows/activate-release.yml

@@ -5,6 +5,8 @@ on:
   pull_request:
     types:
       - closed
+permissions:
+  contents: read
 jobs:
   create_release:
     if: ${{ (github.event.pull_request.merged == true) && (contains(github.event.pull_request.labels.*.name, 'autorelease:pending')) }}

.github/workflows/build-docs.yml

@@ -28,6 +28,8 @@ on:
 concurrency:
   group: run-once
   cancel-in-progress: false
+permissions:
+  contents: read
 jobs:
   build:
     if: github.repository_owner == 'GluuFederation'

.github/workflows/build-packages.yml

@@ -5,6 +5,8 @@ on:
     tags:
     - 'v**'
     - 'nightly'
+permissions:
+  contents: read
 jobs:
   publish_binary_packages:
     if: github.repository == 'GluuFederation/flex'
@@ -98,7 +100,7 @@ jobs:
       id: run_build
       run: |
          cd flex/
-         sudo python${{ matrix.python_version }} flex_setup.py --jans-branch="v1.2.0" --jans-setup-branch="v1.2.0" -download-exit -yes --keep-downloads --keep-setup -force-download
+         sudo python${{ matrix.python_version }} flex_setup.py --jans-branch="main" --jans-setup-branch="main" -download-exit -yes --keep-downloads --keep-setup -force-download
          cp -r /opt/dist flex-src/opt/
          cp -r /opt/jans flex-src/opt/
          touch flex-src/opt/jans/jans-setup/package

.github/workflows/central_code_quality_check.yml

@@ -21,7 +21,8 @@ on:
       - 'docker-**/version.txt'
       - '**.md'
   workflow_dispatch:
-
+permissions:
+  contents: read
 jobs:
   sonar-scan:
     name: sonar scan

.github/workflows/clean_github_cache.yml

@@ -4,7 +4,8 @@ on:
     types:
       - closed
   workflow_dispatch:
-
+permissions:
+  contents: read
 jobs:
   cleanup:
     runs-on: ubuntu-latest

.github/workflows/codeql-analysis.yml

@@ -9,7 +9,8 @@ on:
   workflow_dispatch:
   schedule:
     - cron: '0 8 * * *'
-
+permissions:
+  contents: read
 jobs:
   analyze:
     name: Analyze

.github/workflows/commit-check.yml

@@ -15,7 +15,8 @@ on:
       - reopened
       - synchronize
   push:
-
+permissions:
+  contents: read
 jobs:
   check-commit-message:
     name: Check Commit Message
@@ -24,7 +25,7 @@ jobs:
       - name: Checkout Project
         uses: actions/checkout@v3
         with:
-          # We need to fetch with a depth of 2 for pull_request so we can do HEAD^2
+          # We need to fetch with a depth of 2 for pull_request, so we can do HEAD^2
           fetch-depth: 2
 
       - uses: actions/setup-node@v3

.github/workflows/delete_workflow_runs.yml

@@ -3,6 +3,8 @@ on:
   schedule:
     - cron: '0 0 */2 * *'
   workflow_dispatch:
+permissions:
+  contents: read
 jobs:
   del_runs:
     runs-on: ubuntu-latest

.github/workflows/docker_build_image.yml

@@ -74,9 +74,9 @@ jobs:
         if: steps.build_docker_image.outputs.build || github.event_name == 'tags'
         run: |
           sudo apt-get update
-          #sudo python3 -m pip install --upgrade pip
-          sudo pip3 install setuptools --upgrade
-          sudo pip3 install -r ./automation/requirements.txt
+          sudo python3 -m pip install --upgrade pip || echo "Failed to upgrade pip"
+          sudo pip3 install --ignore-installed setuptools --upgrade
+          sudo pip3 install --ignore-installed -r ./automation/requirements.txt 
           sudo apt-get update
 
 
@@ -149,11 +149,11 @@ jobs:
         if: github.event_name == 'workflow_dispatch'
         run: |
           sudo apt-get update
-          #sudo python3 -m pip install --upgrade pip
-          sudo pip3 install setuptools --upgrade
-          sudo pip3 install -r ./automation/requirements.txt
+          sudo python3 -m pip install --upgrade pip || echo "Failed to upgrade pip"
+          sudo pip3 install --ignore-installed setuptools --upgrade
+          sudo pip3 install --ignore-installed -r ./automation/requirements.txt 
           sudo apt-get update
-          sudo apt-get install jq
+          sudo apt-get install --ignore-installed jq
 
       - name: Update Build date in Dockerfile
         if: github.event_name == 'workflow_dispatch'

.github/workflows/docker_imagescan.yml

@@ -18,6 +18,8 @@ on:
       - "!docker-**/version.txt"
       - "!**.md"
   workflow_dispatch:
+permissions:
+  contents: read
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/label_pr_issues.yml

@@ -13,7 +13,8 @@ on:
       - opened
       - edited
   workflow_dispatch:
-
+permissions:
+  contents: read
 jobs:
   label:
     # This cannot run on forks as the user mo-auto does not have access to forks
@@ -32,11 +33,11 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo python3 -m pip install --upgrade pip
-          sudo pip3 install setuptools --upgrade
-          sudo pip3 install -r ./automation/requirements.txt
+          sudo python3 -m pip install --upgrade pip || echo "Failed to upgrade pip"
+          sudo pip3 install --ignore-installed setuptools --upgrade
+          sudo pip3 install --ignore-installed -r ./automation/requirements.txt 
           sudo apt-get update
-          sudo apt-get install jq
+          sudo apt-get install --ignore-installed jq
           curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
           echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
           sudo apt update

.github/workflows/test-report.yml

@@ -4,6 +4,8 @@ on:
     workflows: ['Test Linux installer']
     types:
       - completed
+permissions:
+  contents: read
 jobs:
   report:
     runs-on: ubuntu-latest

.github/workflows/test_docker_linux_installer.yml

@@ -11,6 +11,8 @@ on:
       - main
     paths:
       - "flex-linux-setup/**"
+permissions:
+  contents: read
 jobs:
   build:
     runs-on: ubuntu-20.04

.github/workflows/testcases.yml

@@ -15,6 +15,8 @@ on:
       - "pygluu/**"
       - "tests/**"
       - "setup.py"
+permissions:
+  contents: read
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/update_janssen_helm_chart.yml

@@ -6,6 +6,8 @@ on:
       - main
     paths:
       - 'charts/gluu/*'
+permissions:
+  contents: read
 jobs:
   createPullRequest:
     runs-on: ubuntu-latest
@@ -23,10 +25,10 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo python3 -m pip install --upgrade pip
-          sudo pip3 install -r ./automation/requirements.txt
+          sudo python3 -m pip install --upgrade pip || echo "Failed to upgrade pip"
+          sudo pip3 install --ignore-installed -r ./automation/requirements.txt 
           sudo apt-get update
-          sudo apt-get install jq
+          sudo apt-get install --ignore-installed jq
 
       - name: install helm-docs
         run: |

.github/workflows/uploadrelease.yml

@@ -12,6 +12,8 @@ on:
         required: false
   schedule:
     - cron: "0 0 * * *"
+permissions:
+  contents: read
 jobs:
   publish:
     name: Publish for ${{ matrix.asset_name }}

admin-ui/app/routes/Apps/Gluu/GluuPermissionModal.js

@@ -1,8 +1,9 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from "reactstrap";
+import PropTypes from 'prop-types'
 
-const GluuPermissionModal = ({ description = "", handler, isOpen }) => {
+const GluuPermissionModal = ({ handler, isOpen }) => {
   const { t } = useTranslation();
 
   return (
@@ -46,4 +47,10 @@ const GluuPermissionModal = ({ description = "", handler, isOpen }) => {
   );
 };
 
+
+GluuPermissionModal.propTypes = {
+  handler: PropTypes.func,
+  isOpen: PropTypes.bool,
+}
+
 export default GluuPermissionModal;

admin-ui/app/routes/Dashboards/DashboardPage.js

@@ -28,9 +28,11 @@ import OAuthIcon from "Components/SVG/menu/OAuth";
 import { getHealthServerStatus } from "../../redux/features/healthSlice";
 import GluuPermissionModal from "Routes/Apps/Gluu/GluuPermissionModal";
 import { auditLogoutLogs } from "../../../plugins/user-management/redux/features/userSlice";
+import { useNavigate } from "react-router";
 
 function DashboardPage() {
   const { t } = useTranslation();
+   const navigate = useNavigate();
   const isTabletOrMobile = useMediaQuery({ query: "(max-width: 1224px)" });
   const breakDashboardCard = useMediaQuery({ query: "(max-width: 1424px)" });
   const isMobile = useMediaQuery({ maxWidth: 767 });
@@ -294,7 +296,11 @@ function DashboardPage() {
   }, [serverStatus, serverHealth, dbStatus, t, statusDetails, classes]);
 
   const handleLogout = () => {
-    dispatch(auditLogoutLogs({ message: "Logging out due to insufficient permissions for Admin UI access." }));
+    if(access_token){
+      dispatch(auditLogoutLogs({ message: "Logging out due to insufficient permissions for Admin UI access." }));
+    }
+    else navigate("/logout")
+
   };
 
   return (
@@ -303,7 +309,7 @@ function DashboardPage() {
         handler={() => {
           handleLogout();
         }}
-        isOpen={!hasBoth(permissions, STAT_READ, STAT_JANS_READ)}
+        isOpen={!access_token || !hasBoth(permissions, STAT_READ, STAT_JANS_READ)}
       />
       <GluuViewWrapper
         canShow={hasBoth(permissions, STAT_READ, STAT_JANS_READ)}

admin-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gluu-admin-ui",
-  "version": "5.2.0",
+  "version": "0.0.0",
   "description": "UI to administer the jans-sever features",
   "keywords": [
     "jans-server",

automation/rancher-partner-charts/questions.yaml

@@ -703,7 +703,7 @@ questions:
 - variable: auth-server.image.tag
   required: true
   type: string
-  default: "1.2.0-1"
+  default: "0.0.0-nightly"
   description: "The Auth Server Image tag"
   label: Auth Server image tag
   group: "Images"
@@ -732,7 +732,7 @@ questions:
 - variable: admin-ui.image.tag
   required: true
   type: string
-  default: "5.2.0-1"
+  default: "0.0.0-nightly"
   description: "The AdminUI Image tag"
   label: AdminUI image tag
   group: "Images"
@@ -761,7 +761,7 @@ questions:
 - variable: auth-server-key-rotation.image.tag
   required: true
   type: string
-  default: "1.2.0-1"
+  default: "0.0.0-nightly"
   description: "The Auth Server Image tag"
   label: Auth Server KeyRotation image tag
   group: "Images"
@@ -790,7 +790,7 @@ questions:
 - variable: casa.image.tag
   required: true
   type: string
-  default: "1.2.0-1"
+  default: "0.0.0-nightly"
   description: "The Casa Image tag"
   label: Casa image tag
   group: "Images"
@@ -819,7 +819,7 @@ questions:
 - variable: config.image.tag
   required: true
   type: string
-  default: "1.2.0-1"
+  default: "0.0.0-nightly"
   description: "The Configurator Image tag"
   label: Configurator image tag
   group: "Images"
@@ -848,7 +848,7 @@ questions:
 - variable: config-api.image.tag
   required: true
   type: string
-  default: "1.2.0-1"
+  default: "0.0.0-nightly"
   description: "The ConfigAPI Image tag"
   label: ConfigAPI image tag
   group: "Images"
@@ -877,7 +877,7 @@ questions:
 - variable: fido2.image.tag
   required: true
   type: string
-  default: "1.2.0-1"
+  default: "0.0.0-nightly"
   description: "The Fido2 Image tag"
   label: Fido2 image tag
   group: "Images"
@@ -906,7 +906,7 @@ questions:
 - variable: persistence.image.tag
   required: true
   type: string
-  default: "1.2.0-1"
+  default: "0.0.0-nightly"
   description: "The Persistence Image tag"
   label: Persistence image tag
   group: "Images"
@@ -935,7 +935,7 @@ questions:
 - variable: scim.image.tag
   required: true
   type: string
-  default: "1.2.0-1"
+  default: "0.0.0-nightly"
   description: "The SCIM Image tag"
   label: SCIM image tag
   group: "Images"

charts/gluu-all-in-one/Chart.yaml

@@ -3,13 +3,13 @@ annotations:
   artifacthub.io/containsSecurityUpdates: 'true'
   artifacthub.io/images: |
     - name: all-in-one
-      image: ghcr.io/gluufederation/flex/flex-all-in-one:1.2.0-1
+      image: ghcr.io/gluufederation/flex/flex-all-in-one:0.0.0-nightly
   artifacthub.io/license: Apache-2.0
   catalog.cattle.io/certified: partner
   catalog.cattle.io/release-name: gluu-all-in-one
   catalog.cattle.io/display-name: Gluu Flex Cloud Identity and Access Management All-in-One
 apiVersion: v2
-appVersion: "5.2.0"
+appVersion: "0.0.0-nightly"
 icon: >-
   https://gluu.org/docs/gluu-server/favicon.ico
 home: https://docs.gluu.org
@@ -21,4 +21,4 @@ maintainers:
     email: [email protected]
 description: Gluu Access and Identity Management All-in-One Chart. This chart deploys the selected janssen microservice all in one deployment.
 name: gluu-all-in-one
-version: 1.2.0
+version: 0.0.0-nightly