chore: release 1.9.2

* fix: refactoring

* fix: refactoring

* fix: refactoring

.env.example

@@ -1,12 +1,11 @@
-# Environnement
+# Environment
 NODE_ENV=development
 
-# Base de données
+# Database
 DATABASE_URL=postgresql://devuser:changeme@localhost:5433/devdb?schema=public
 
-# Projet
+# Project
 PROJECT_NAME="Portabase"
-PROJECT_DESCRIPTION="Portabase is a powerful database manager"
 PROJECT_URL=http://localhost:8887
 PROJECT_SECRET=
 
@@ -21,11 +20,41 @@ SMTP_FROM=
 #Port 465 -> secure: true
 #By default : true
 
-# Google
+# OIDC SSO Authentification
-AUTH_GOOGLE_ID=
+AUTH_OIDC_ID=""
-AUTH_GOOGLE_SECRET=
+AUTH_OIDC_TITLE=""
-AUTH_GOOGLE_METHOD=
+AUTH_OIDC_DESC=""
+AUTH_OIDC_ICON=""
+AUTH_OIDC_CLIENT=""
+AUTH_OIDC_SECRET=""
+AUTH_OIDC_ISSUER_URL=""
+AUTH_OIDC_HOST=""
+AUTH_OIDC_SCOPES=""
+AUTH_OIDC_DISCOVERY_ENDPOINT=""
+AUTH_OIDC_JWKS_ENDPOINT=""
+AUTH_OIDC_PKCE=true
+ALLOWED_GROUP="admin"
+AUTH_OIDC_ROLE_MAP=""
+
+AUTH_ALLOW_LINKING=true
+AUTH_ALLOW_UNLINKING=true
+
+
+# Social OAuth2 Authentification
+AUTH_SOCIAL_ID=""
+AUTH_SOCIAL_TITLE=""
+AUTH_SOCIAL_DESC=""
+AUTH_SOCIAL_ICON=""
+AUTH_SOCIAL_CLIENT=""
+AUTH_SOCIAL_SECRET=""
+AUTH_SOCIAL_APPLE_APP_BUNDLE_IDENTIFIER=""
+
+# If true, the user's role will be updated from OIDC claims on every login.
+# If false, the role is only set when the user is first created.
+AUTH_SYNC_OIDC_ROLES_ON_LOGIN=true
+AUTH_EMAIL_PASSWORD_ENABLED=true
+AUTH_SIGNUP_ENABLED=true
+AUTH_PASSKEY_ENABLED=true
 
 # Retention
 RETENTION_CRON="* * * * *"
-

.github/CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-contact@soluce-technologies.com.
+contact@portabase.io.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

.github/CONTRIBUTING.md

@@ -72,7 +72,7 @@ If you encounter a bug or have a suggestion for improvement, follow these steps:
 
 3. **Push your branch**
    ```bash
-   git push origin feature/<feature-name>
+   git push origin feat/<feature-name>
    ```
 
 4. **Open a Pull Request (PR)**  
@@ -82,7 +82,7 @@ If you encounter a bug or have a suggestion for improvement, follow these steps:
 
 ## Code Style Guidelines
 
-- Follow the [specific coding style guide] (e.g., Prettier, ESLint, PEP8).
+- Follow the [specific coding style guide] (e.g., Prettier, ESLint, PEP8,Biome).
 - Use meaningful variable names and include comments where necessary.
 - Tests before submitting your changes.
 
@@ -107,4 +107,4 @@ If you encounter a bug or have a suggestion for improvement, follow these steps:
 
 Thank you for contributing! 🙌
 
----
+---

.github/SECURITY.md

@@ -18,7 +18,7 @@ We take security seriously and aim to support the following versions of the proj
 If you discover a security vulnerability in this project, we appreciate your help in disclosing it responsibly.
 
 1. **Contact Us**  
-   Please report the vulnerability by emailing **[contact@soluce-technologies.com](mailto:contact@soluce-technologies.com)**. Include the following details:
+   Please report the vulnerability by emailing **[contact@portabase.io](mailto:contact@portabase.io)**. Include the following details:
     - A detailed description of the issue.
     - Steps to reproduce the vulnerability (if applicable).
     - Any potential impacts or risks.

.github/workflows/discord.yml

@@ -0,0 +1,73 @@
+name: Discord Notification
+
+on:
+  workflow_call:
+    inputs:
+      release_tag:
+        required: true
+        type: string
+      discord_title:
+        required: true
+        type: string
+      discord_color:
+        required: true
+        type: number
+      discord_footer:
+        required: true
+        type: string
+    secrets:
+      DISCORD_WEBHOOK:
+        required: true
+      GH_TOKEN:
+        required: true
+
+jobs:
+  notify-discord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Discord Notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: |
+          RELEASE_INFO=$(gh release view "${{ inputs.release_tag }}" -R ${{ github.repository }} --json name,url,body,author)
+
+          RELEASE_TITLE=$(echo "$RELEASE_INFO" | jq -r .name)
+          if [ -z "$RELEASE_TITLE" ] || [ "$RELEASE_TITLE" = "null" ]; then RELEASE_TITLE="${{ inputs.release_tag }}"; fi
+
+          RELEASE_URL=$(echo "$RELEASE_INFO" | jq -r .url)
+          RELEASE_BODY=$(echo "$RELEASE_INFO" | jq -r .body)
+
+          AUTHOR_NAME="Portabase"
+          AUTHOR_ICON="https://github.com/Portabase.png"
+
+          PAYLOAD=$(jq -n \
+            --arg title "$RELEASE_TITLE" \
+            --arg description "$RELEASE_BODY" \
+            --arg url "$RELEASE_URL" \
+            --arg author "$AUTHOR_NAME" \
+            --arg icon "$AUTHOR_ICON" \
+            --arg discord_title "${{ inputs.discord_title }}" \
+            --arg discord_footer "${{ inputs.discord_footer }}" \
+            --argjson discord_color ${{ inputs.discord_color }} \
+            '{
+              content: $discord_title,
+              embeds: [{
+                title: $title,
+                url: $url,
+                description: $description,
+                color: $discord_color,
+                author: {
+                  name: $author,
+                  icon_url: $icon
+                },
+                footer: {
+                  text: $discord_footer
+                }
+              }]
+            }'
+          )
+
+          curl -H "Content-Type: application/json" \
+               -d "$PAYLOAD" \
+               "$DISCORD_WEBHOOK"

.github/workflows/docker.yml

@@ -3,10 +3,16 @@ name: Docker Publish
 on:
   workflow_call:
     inputs:
+      version:
+        required: true
+        type: string
+      ref:
+        required: true
+        type: string
       image_name:
         required: false
         type: string
-        default: 'portabase/portabase'
+        default: "portabase/portabase"
       add_latest:
         required: false
         type: boolean
@@ -14,11 +20,11 @@ on:
       target:
         required: false
         type: string
-        default: 'prod'
+        default: "prod"
       dockerfile:
         required: false
         type: string
-        default: './docker/dockerfile/Dockerfile'
+        default: "./docker/dockerfile/Dockerfile"
     secrets:
       DOCKER_USERNAME:
         required: true
@@ -26,10 +32,9 @@ on:
         required: true
 
 jobs:
-
   build:
-    name: Build and push Docker images
+    name: Build architectures
-    runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || matrix.platform == 'linux/arm64' && 'ubuntu-24.04-arm' }}
+    runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'ubuntu-24.04-arm' }}
     strategy:
       fail-fast: false
       matrix:
@@ -37,23 +42,26 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Set image tag
+      - name: Prepare Image Tags
-        id: set-tags
+        id: prep
         run: |
-          REF_NAME=${GITHUB_REF#refs/tags/}
+          ARCH=${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
-          if [ "${{ matrix.platform }}" = "linux/amd64" ]; then
+          echo "image=${{ inputs.image_name }}:${{inputs.version}}-$ARCH" >> $GITHUB_OUTPUT
-            IMAGE="${{ inputs.image_name }}:$REF_NAME-amd64"
+          echo "safe_platform=${{ matrix.platform == 'linux/amd64' && 'linux-amd64' || 'linux-arm64' }}" >> $GITHUB_OUTPUT
-          else
+
-            IMAGE="${{ inputs.image_name }}:$REF_NAME-arm64"
-          fi
-          echo "image=$IMAGE" >> $GITHUB_OUTPUT
 
       - name: Build and push image
         uses: docker/build-push-action@v6
@@ -62,61 +70,73 @@ jobs:
           file: ${{ inputs.dockerfile }}
           platforms: ${{ matrix.platform }}
           push: true
-          tags: ${{ steps.set-tags.outputs.image }}
+          tags: ${{ steps.prep.outputs.image }}
           target: ${{ inputs.target }}
+          cache-from: type=gha,scope=build-${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=build-${{ matrix.platform }}
 
-      - name: Prepare artifact name
+      - name: Save image name for manifest
-        id: artifact
+        run: echo "${{ steps.prep.outputs.image }}" > image.txt
-        run: |
-          platform=${{ matrix.platform }}
-          echo "safe_platform=${platform//\//-}" >> $GITHUB_OUTPUT
-          echo "${{ steps.set-tags.outputs.image }}" > image.txt
 
-      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+      - uses: actions/upload-artifact@v4
         with:
-          name: image-${{ steps.artifact.outputs.safe_platform }}
+          name: image-${{ steps.prep.outputs.safe_platform }}
           path: image.txt
-          if-no-files-found: warn
+          retention-days: 1
-          compression-level: 6
-          overwrite: false
-          include-hidden-files: false
 
   create-manifest:
-    name: Create multi-arch Docker manifest (Portabase)
+    name: Create multi-arch manifest
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
+      - uses: actions/download-artifact@v4
         with:
           name: image-linux-amd64
           path: /tmp/digests/amd64
 
-      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
+      - uses: actions/download-artifact@v4
         with:
           name: image-linux-arm64
           path: /tmp/digests/arm64
 
       - name: Login to Docker
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Generate semantic tags
+        id: tags
+        run: |
+          VERSION="${{ inputs.version }}"
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION"
+          
+          echo "VERSION_TAG=$VERSION" >> $GITHUB_OUTPUT
+          if [ -n "$MINOR" ]; then
+            echo "MINOR_TAG=$MAJOR.$MINOR" >> $GITHUB_OUTPUT
+          fi
+          if [ -n "$MAJOR" ]; then
+            echo "MAJOR_TAG=$MAJOR" >> $GITHUB_OUTPUT
+          fi
+          if [ "${{ inputs.add_latest }}" = "true" ]; then
+            echo "LATEST_TAG=latest" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ inputs.image_name }}
+          tags: |
+            type=raw,value=${{ steps.tags.outputs.VERSION_TAG }}
+            type=raw,value=${{ steps.tags.outputs.MINOR_TAG }}
+            type=raw,value=${{ steps.tags.outputs.MAJOR_TAG }}
+            type=raw,value=${{ steps.tags.outputs.LATEST_TAG }}
+
       - name: Create and push manifest list
         working-directory: /tmp/digests
         run: |
           DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
-          REF_NAME=${GITHUB_REF#refs/tags/}
+          TAG_ARGS=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
-          MANIFEST_IMAGE="${{ inputs.image_name }}:$REF_NAME"
+          echo $TAG_ARGS
-
+          docker buildx imagetools create $TAG_ARGS $DOCKER_IMAGES
-          docker buildx imagetools create $DOCKER_IMAGES -t $MANIFEST_IMAGE
-          docker buildx imagetools inspect $MANIFEST_IMAGE
-
-          if [ "${{ inputs.add_latest }}" = "true" ]; then
-            docker buildx imagetools create $DOCKER_IMAGES -t ${{ inputs.image_name }}:latest
-            docker buildx imagetools inspect ${{ inputs.image_name }}:latest
-          fi  
-
-  
-  
-  

.github/workflows/e2e.yml

@@ -0,0 +1,77 @@
+name: End-to-end testing
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./docker/dockerfile/Dockerfile
+          push: false
+          load: true
+          tags: portabase/portabase:test
+
+      - name: Run app container
+        run: |
+          docker run -d --name myapp \
+            -p 8887:80 \
+            -e NODE_ENV=production \
+            -e PROJECT_URL=http://localhost:8887 \
+            -e PROJECT_SECRET=80af5e4c875dfded3a6ba511c6ed8b0160cad723f848ee0851403ed6141f6ba1 \
+            portabase/portabase:test
+
+      - name: Wait for app port to be listening
+        run: |
+          for i in {1..40}; do
+          
+            if curl -fsS http://localhost:8887/ >/dev/null; then
+              echo "App is responding on port 8887"
+              exit 0
+            fi
+            echo "Waiting for app readiness... ($i/40)"
+            sleep 2
+          done
+          echo "Timeout: app never became ready"
+          docker logs myapp
+          exit 1
+
+      - name: Install Playwright browsers
+        run: pnpm exec playwright install --with-deps chromium firefox webkit
+
+      - name: Run Playwright tests
+        run: pnpm exec playwright test --project chromium
+        env:
+          PROJECT_URL: http://localhost:8887
+
+      - name: Upload report if failed
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 7
+
+      - name: Cleanup
+        if: always()
+        run: docker stop myapp && docker rm myapp || true

.github/workflows/github.yml

@@ -1,128 +0,0 @@
-name: GitHub Release
-
-on:
-  workflow_call:
-    inputs:
-      prerelease:
-        required: false
-        type: boolean
-        default: false
-      make_latest:
-        required: false
-        type: boolean
-        default: false
-      discord_title:
-        required: true
-        type: string
-      discord_color:
-        required: true
-        type: number
-      discord_footer:
-        required: true
-        type: string
-    secrets:
-      DISCORD_WEBHOOK:
-        required: true
-      GH_TOKEN:
-        required: true
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Build Changelog
-        id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v5
-        with:
-          mode: "COMMIT"
-          configurationJson: |
-            {
-              "template": "#{{CHANGELOG}}",
-              "categories": [
-                {
-                    "title": "## Feature",
-                    "labels": ["feat", "feature"]
-                },
-                {
-                    "title": "## Fix",
-                    "labels": ["fix", "bug"]
-                },
-                {
-                    "title": "## Other",
-                    "labels": []
-                }
-              ],
-              "label_extractor": [
-                {
-                  "pattern": "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\-\.]+\))?(!)?: ([\w ])+([\s\S]*)",
-                  "on_property": "title",
-                  "target": "$1"
-                }
-              ]
-            }
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          generate_release_notes: false
-          body: ${{ steps.build_changelog.outputs.changelog }}
-          prerelease: ${{ inputs.prerelease }}
-          make_latest: ${{ inputs.make_latest }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-
-      - name: Send Discord Notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: |
-          RELEASE_INFO=$(gh release view "${{ github.ref_name }}" -R ${{ github.repository }} --json name,url,body,author)
-          
-          RELEASE_TITLE=$(echo "$RELEASE_INFO" | jq -r .name)
-          if [ -z "$RELEASE_TITLE" ] || [ "$RELEASE_TITLE" = "null" ]; then RELEASE_TITLE="${{ github.ref_name }}"; fi
-          
-          RELEASE_URL=$(echo "$RELEASE_INFO" | jq -r .url)
-          RELEASE_BODY=$(echo "$RELEASE_INFO" | jq -r .body)
-          
-          AUTHOR_NAME="Portabase"
-          AUTHOR_ICON="https://github.com/Portabase.png" 
-
-          PAYLOAD=$(jq -n \
-            --arg title "$RELEASE_TITLE" \
-            --arg description "$RELEASE_BODY" \
-            --arg url "$RELEASE_URL" \
-            --arg author "$AUTHOR_NAME" \
-            --arg icon "$AUTHOR_ICON" \
-            --arg discord_title "${{ inputs.discord_title }}" \
-            --arg discord_footer "${{ inputs.discord_footer }}" \
-            --argjson discord_color ${{ inputs.discord_color }} \
-            '{ 
-              content: $discord_title,
-              embeds: [{
-                title: $title,
-                url: $url,
-                description: $description,
-                color: $discord_color,
-                author: {
-                  name: $author,
-                  icon_url: $icon
-                },
-                footer: {
-                  text: $discord_footer
-                }
-              }]
-            }'
-          ) 
-          
-          curl -H "Content-Type: application/json" \
-               -d "$PAYLOAD" \
-               "$DISCORD_WEBHOOK"

.github/workflows/helm.yml

@@ -0,0 +1,37 @@
+name: Publish Helm Chart
+on:
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        type: string
+    secrets:
+      GH_TOKEN:
+        required: true
+
+jobs:
+  publish-helm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v4
+
+      - name: Package Helm chart
+        run: |
+          mkdir -p ./helm-packages
+          helm package helm \
+            --version ${{ inputs.version }} \
+            --app-version ${{ inputs.version }} \
+            --destination ./helm-packages
+
+      - name: Authenticate to GitHub Packages
+        run: |
+          echo "${{ secrets.GH_TOKEN }}" | helm registry login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push Helm chart to GitHub Packages (OCI)
+        run: |
+          helm push ./helm-packages/portabase-${{ inputs.version }}.tgz oci://ghcr.io/portabase/charts

.github/workflows/release-candidate.yml

@@ -3,31 +3,28 @@ name: Publish Docker image for release candidate
 on:
   push:
     tags:
-      - '*-rc*'
+      - "*.*.*-rc*"
+      - "!*-*-rc*"
 
 permissions:
-  contents: write
+  contents: read
   packages: write
 
 jobs:
   docker_publish:
     uses: ./.github/workflows/docker.yml
     with:
-      add_latest: false
+      add_latest: true
     secrets:
-      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
-      DOCKER_USERNAME_2: ${{ secrets.DOCKER_USERNAME_2 }}
-      DOCKER_PASSWORD_2: ${{ secrets.DOCKER_PASSWORD_2 }}
 
-  github_release:
+  discord_notification:
     needs: docker_publish
-    uses: ./.github/workflows/github.yml
+    uses: ./.github/workflows/discord.yml
     with:
-      prerelease: true
+      discord_title: "New Release Candidate: ${{ github.ref_name }}"
-      make_latest: false
+      discord_color: 2044800
-      discord_title: "||@release-dashboard|| New release candidate published"
-      discord_color: 16776960
       discord_footer: "Portabase"
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/release.yml

@@ -1,34 +1,142 @@
-name: Publish Docker image for release
+name: Auto Release & Publish
 
 on:
-  push:
+  pull_request:
-    tags:
+    types: [ closed ]
-      - '*.*.*'
+    branches:
-      - '!*-*'
+      - main
 
 permissions:
   contents: write
   packages: write
 
 jobs:
-  docker_publish:
+
+  check-skip:
+    runs-on: ubuntu-latest
+    outputs:
+      skip: ${{ steps.set-skip.outputs.skip }}
+    steps:
+      - name: Determine if release should be skipped
+        id: set-skip
+        run: |
+          TITLE="${{ github.event.pull_request.title }}"
+          echo "PR title: $TITLE"
+
+          if [[ "$TITLE" == *"[skip-release]"* ]]; then
+            echo "PR title contains [skip-release], skipping release jobs."
+            echo "skip=true" >> $GITHUB_OUTPUT
+          else
+            echo "skip=false" >> $GITHUB_OUTPUT
+          fi
+
+  create-release:
+    needs: check-skip
+    if: ${{ needs.check-skip.outputs.skip == 'false' }}
+    runs-on: ubuntu-latest
+    outputs:
+      draft_tag: ${{ steps.release_step.outputs.draft_tag }}
+      version: ${{ steps.release_step.outputs.version }}
+    steps:
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+          ref: main
+
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+          cache: "pnpm"
+
+      - run: pnpm install --frozen-lockfile
+
+      - run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+
+      - name: Run release-it
+        id: release_step
+        run: |
+          git pull origin main
+          
+          VERSION=$(pnpm exec release-it --ci --release-version)
+          echo $VERSION
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          
+          OUTPUT=$(pnpm exec release-it --ci)
+          echo "$OUTPUT"
+          
+          DRAFT_TAG=$(echo "$OUTPUT" | grep -oE 'untagged-[a-z0-9]+')
+          echo $DRAFT_TAG
+          echo "draft_tag=$DRAFT_TAG" >> $GITHUB_OUTPUT
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+
+
+  publish-docker:
+    needs: create-release
+    if: ${{ needs.create-release.result == 'success' }}
     uses: ./.github/workflows/docker.yml
     with:
+      version: ${{ needs.create-release.outputs.version }}
+      ref: ${{ needs.create-release.outputs.version }}
       add_latest: true
     secrets:
-      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
-      DOCKER_USERNAME_2: ${{ secrets.DOCKER_USERNAME_2 }}
-      DOCKER_PASSWORD_2: ${{ secrets.DOCKER_PASSWORD_2 }}
 
-  github_release:
+  publish-helm:
-    needs: docker_publish
+    needs: create-release
-    uses: ./.github/workflows/github.yml
+    if: ${{ needs.create-release.result == 'success' }}
+    uses: ./.github/workflows/helm.yml
     with:
-      prerelease: false
+      version: ${{ needs.create-release.outputs.version }}
-      make_latest: true
+    secrets:
-      discord_title: "||@release-dashboard|| New release published"
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      discord_color: 5814783
+
+  finalize-release:
+    needs:
+      - create-release
+      - publish-docker
+      - publish-helm
+    runs-on: ubuntu-latest
+    outputs:
+      release_tag: ${{ steps.publish_release_step.outputs.release_tag }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Publish GitHub Release
+        id: publish_release_step
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          OUTPUT=$(gh release edit ${{ needs.create-release.outputs.draft_tag }} --draft=false)
+          echo "$OUTPUT"
+          RELEASE_TAG=$(echo "$OUTPUT" | sed -E 's|.*/releases/tag/||')
+          echo "release_tag=$RELEASE_TAG" >> $GITHUB_OUTPUT
+
+  notify-discord:
+    needs:
+      - publish-docker
+      - publish-helm
+      - create-release
+      - finalize-release
+    uses: ./.github/workflows/discord.yml
+    with:
+      release_tag: ${{ needs.create-release.outputs.version }}
+      discord_title: "New Release"
+      discord_color: 3066993
       discord_footer: "Portabase"
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/security.yml

@@ -5,27 +5,27 @@ on:
     branches: [ main ]
 
 jobs:
-  sca-deps: # Dependency & container scan
+  sca-deps:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: aquasecurity/trivy-action@0.20.0
+      - uses: aquasecurity/trivy-action@0.35.0
         with:
           scan-type: 'fs'
           format: 'table'
           severity: 'CRITICAL,HIGH'
           ignore-unfixed: true
 
-
+  secrets-gitleaks:
-  secrets-gitleaks: # Secrets exposure
+    if: github.event.pull_request.head.repo.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0   # Fetch full history for gitleaks
+          fetch-depth: 0
       - uses: gitleaks/gitleaks-action@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITLEAKS_LICENSE: ${{ secrets.GITLEAKS_LICENSE }}
         with:
-          config-path: .gitleaks.toml  # Optional, if you have a custom config
+          config-path: .gitleaks.toml

.gitignore

@@ -40,7 +40,17 @@ public/uploads/*
 !public/uploads/
 
 private/uploads/*
+private/keys/*
 
 /.env
 
-certificates
+seeds/pocket-id/*.db
+
+certificates
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+/playwright/.auth/

.gitleaks.toml

@@ -2,9 +2,7 @@ title = "Custom gitleaks config"
 
 [allowlist]
 # Global allowlist patterns (won’t be flagged)
-regexes = [
+regexes = []
-    "s3SecretAccessKey: env.S3_SECRET_KEY ?? null",
-]
 paths = [
     "src/utils/init.ts"
 ]

.release-it.json

@@ -0,0 +1,57 @@
+{
+  "github": {
+    "release": true,
+    "draft": true,
+    "tokenRef": "GITHUB_TOKEN"
+  },
+  "git": {
+    "commit": true,
+    "commitMessage": "chore: release ${version}",
+    "requireCleanWorkingDir": true,
+    "tag": true,
+    "tagName": "${version}",
+    "push": true
+  },
+  "plugins": {
+    "@release-it/conventional-changelog": {
+      "preset": {
+        "name": "conventionalcommits",
+        "types": [
+          {
+            "type": "feat",
+            "section": "✨ Features"
+          },
+          {
+            "type": "fix",
+            "section": "🐛 Bug Fixes"
+          },
+          {
+            "type": "perf",
+            "section": "⚡️ Performance Improvements"
+          },
+          {
+            "type": "revert",
+            "section": "⏪️ Reverts"
+          },
+          {
+            "type": "docs",
+            "section": "📝 Documentation",
+            "hidden": true
+          },
+          {
+            "type": "chore",
+            "section": "🔧 Chores",
+            "hidden": true
+          }
+        ]
+      }
+    },
+    "@release-it/bumper": {
+      "out": {
+        "file": "CITATION.cff",
+        "path": "version",
+        "type": "text/yaml"
+      }
+    }
+  }
+}

CITATION.cff

@@ -1,6 +1,6 @@
 cff-version: 1.2.0
 title: Portabase
-message: "If you use this software, please cite it as below."
+message: If you use this software, please cite it as below.
 type: software
 authors:
   - family-names: Gauthereau
@@ -9,7 +9,12 @@ authors:
     given-names: Killian
 repository-code: https://github.com/Portabase/portabase
 url: https://portabase.io
-abstract: "Portabase is a free, open-source, self-hosted solution for database administration, providing backup and restore capabilities, scheduling, retention policies, notifications, and support for multiple storage backends. Its headless agent architecture enables connection to multiple database instances securely and efficiently."
+abstract: >-
+  Portabase is a free, open-source, self-hosted solution for database
+  administration, providing backup and restore capabilities, scheduling,
+  retention policies, notifications, and support for multiple storage backends.
+  Its headless agent architecture enables connection to multiple database
+  instances securely and efficiently.
 keywords:
   - docker
   - kubernetes
@@ -26,5 +31,5 @@ keywords:
   - web-ui
   - agent
 license: Apache-2.0
-version: 1.2.5-rc.11
+version: 1.9.2
-date-released: "2026-02-10"
+date-released: '2026-03-02'

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Soluce Technologies
+   Copyright 2024 Portabase
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -1,4 +1,48 @@
 CLUSTER_SCRIPT=docker/entrypoints/app-dev-entrypoint.sh
 
 up:
-	@bash $(CLUSTER_SCRIPT)
+	@bash $(CLUSTER_SCRIPT)
+
+seed-keycloak:
+	@[ $$(ls -1 seeds/keycloak/*.json 2>/dev/null | wc -l) -gt 0 ] || (echo "No realm export found in seeds/keycloak. Add an export from Keycloak first."; exit 1)
+	@docker compose -f docker-compose.func.yml stop keycloak >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml rm -f -s keycloak >/dev/null 2>&1 || true
+	@docker volume rm portabase-dev-func_keycloak-data >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml up -d keycloak
+	@echo "Keycloak seed import triggered from seeds/keycloak/*.json"
+
+seed-pocket:
+	@[ -f seeds/pocket-id/portabase.zip ] || (echo "No export found in seeds/pocket-id. Add an export from Pocket ID first."; exit 1)
+	@docker compose -f docker-compose.func.yml stop pocket-id >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml rm -f -s pocket-id >/dev/null 2>&1 || true
+	@docker volume rm portabase-dev-func_pocket-id-data >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml run --rm -v ./seeds/pocket-id/portabase.zip:/tmp/portabase.zip pocket-id ./pocket-id import --yes --path /tmp/portabase.zip >/dev/null
+	@docker compose -f docker-compose.func.yml up -d pocket-id
+	@sleep 2
+	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id one-time-access-token admin
+	@echo "Pocket ID data restored from seeds/pocket-id/portabase.zip"
+
+seed-auth: seed-keycloak seed-pocket
+
+pocket-token:
+	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id one-time-access-token admin
+
+export-pocket:
+	@echo "Exporting Pocket ID data to seeds/pocket-id/portabase.zip..."
+	@mkdir -p ./seeds/pocket-id
+	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id export --path /tmp/portabase-export.zip
+	@docker compose -f docker-compose.func.yml cp pocket-id:/tmp/portabase-export.zip ./seeds/pocket-id/portabase.zip
+	@docker compose -f docker-compose.func.yml exec pocket-id rm /tmp/portabase-export.zip
+	@echo "Pocket ID data exported to seeds/pocket-id/portabase.zip"
+
+export-keycloak:
+	@echo "Exporting Keycloak configuration and users to seeds/keycloak/*.json..."
+	@mkdir -p ./seeds/keycloak
+	@rm -f ./seeds/keycloak/*.json
+	@docker compose -f docker-compose.func.yml stop keycloak >/dev/null 2>&1
+	@docker rm -f kc-exporter >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml run --name kc-exporter keycloak export --dir /tmp/kc-export --users realm_file
+	@docker cp kc-exporter:/tmp/kc-export/. ./seeds/keycloak/
+	@docker rm -f kc-exporter >/dev/null 2>&1
+	@docker compose -f docker-compose.func.yml start keycloak >/dev/null 2>&1
+	@echo "Keycloak configuration and users exported to seeds/keycloak/*.json"

README.md

@@ -7,23 +7,25 @@
 <h3 align="center">Portabase</h3>
 
   <p align="center" style="margin-top: 20px; font-style: italic;">
-  <i>Portabase is a tool designed to simplify the backup and restoration of your database instances. It integrates seamlessly with <a href="https://github.com/Portabase/agent">Portabase agents</a> for managing operations securely and efficiently.</i>
+  <i>Portabase is a tool designed to simplify the backup and restoration of your database instances. It integrates seamlessly with <a href="https://github.com/Portabase/agent-rust">Portabase agents</a> for managing operations securely and efficiently.</i>
   </p>
 
 
 [![License: Apache](https://img.shields.io/badge/License-apache-yellow.svg)](LICENSE)
-[![Docker Pulls](https://img.shields.io/docker/pulls/solucetechnologies/portabase?color=brightgreen)](https://hub.docker.com/r/solucetechnologies/portabase)
+[![Docker Pulls](https://img.shields.io/docker/pulls/portabase/portabase?color=brightgreen)](https://hub.docker.com/r/portabase/portabase)
 [![Platform](https://img.shields.io/badge/platform-linux%20%7C%20macos%20%7C%20windows-lightgrey)](https://github.com/Portabase/portabase)
 [![Support Portabase](https://img.shields.io/badge/Support-Portabase-orange)](https://www.buymeacoffee.com/portabase)
 
 [![PostgreSQL](https://img.shields.io/badge/PostgreSQL-336791?logo=postgresql&logoColor=white)](https://www.postgresql.org/)
 [![MySQL](https://img.shields.io/badge/MySQL-4479A1?logo=mysql&logoColor=white)](https://www.mysql.com/)
 [![MariaDB](https://img.shields.io/badge/MariaDB-003545?logo=mariadb&logoColor=white)](https://mariadb.org/)
+[![SQLite](https://img.shields.io/badge/-SQLite-blue?logo=sqlite&logoColor=white)](https://sqlite.org/)
+[![Redis](https://img.shields.io/badge/Redis-DC382D?style=flat&logo=Redis&logoColor=white)](https://redis.io/)
+[![Valkey](https://img.shields.io/badge/Valkey-6284fc?style=flat&logo=Valkey&logoColor=white)](https://valkey.io/)
 [![MongoDB](https://img.shields.io/badge/-MongoDB-13aa52?logo=mongodb&logoColor=white)](https://www.mongodb.com/)
 [![Self Hosted](https://img.shields.io/badge/self--hosted-yes-brightgreen)](https://github.com/Portabase/portabase)
 [![Open Source](https://img.shields.io/badge/open%20source-❤️-red)](https://github.com/Portabase/portabase)
 
-
 [![NextJS][NextJS]][NextJS-url]
 [![BetterAuth][BetterAuth]][BetterAuth-url]
 [![Drizzle][Drizzle]][Drizzle-url]
@@ -34,14 +36,14 @@
     <strong>
         <a href="https://portabase.io">Website</a> •
         <a href="https://portabase.io/docs">Documentation</a> •
-        <a href="https://www.youtube.com/watch?v=hvLbX5LN1UE">Demo</a> •
+        <a href="https://www.youtube.com/watch?v=nSTzT27GgAg">Demo</a> •
         <a href="https://portabase.io/docs/dashboard/setup">Installation</a> •
         <a href="https://github.com/Portabase/portabase/issues/new?labels=bug&template=bug-report---.md">Report Bug</a> •
         <a href="https://github.com/Portabase/portabase/issues/new?labels=enhancement&template=feature-request---.md">Request Feature</a>
     </strong>
   </p>
 
-![portabase-dashboard](https://github.com/user-attachments/assets/f5ec7204-79c0-43ac-ba17-f2ed682c39d6)
+![portabase-dashboard](https://github.com/user-attachments/assets/8f2c69d6-f1f9-4b80-b51c-01f6f13b9b62)
 
 
 </div>
@@ -51,13 +53,27 @@
 You have 4 ways to install Portabase:
 
 - Automated CLI (recommended) - [details](https://portabase.io/docs/dashboard/setup#cli)
-- Docker Compose setup - [details](https://portabase.io/docs/dashboard/setup#docker)
+- Docker Run - [details](https://portabase.io/docs/dashboard/setup#docker)
-- Kubernetes with Helm (soon)
+- Docker Compose setup - [details](https://portabase.io/docs/dashboard/setup#docker-compose)
+- Kubernetes with Helm [details](https://portabase.io/docs/dashboard/setup#helm)
 - Development setup - [details](https://portabase.io/docs/dashboard/setup#development)
 
 **Ensure Docker is installed on your machine before getting started.**
 
+## Supported databases
 
+| Engine             | Support   | Supported Versions                | Restore |
+|:-------------------|:----------|:----------------------------------|:--------|
+| **PostgreSQL**     | ✅ Stable  | 12, 13, 14, 15, 16, 17 et 18      | Yes     |
+| **MySQL**          | ✅ Stable  | 5.7, 8 et 9                       | Yes     |
+| **MariaDB**        | ✅ Stable  | 10 et 11                          | Yes     |
+| **MongoDB**        | ✅ Stable  | 4, 5, 6, 7 et 8                   | Yes     |
+| **SQLite**         | ✅ Stable  | 3.x                               | Yes     |
+| **Redis**          | ✅ Stable  | 2.8+                              | No      |
+| **Valkey**         | ✅ Stable  | 7.2+                              | No      |
+| **MSSQL Server**   | ❌ Ongoing | -                                 | Yes     |
+
+See the [Database Servers documentation](https://portabase.io/docs/agent/db) for version-specific backup and restore details.
 
 ## Contributors
 
@@ -89,4 +105,3 @@ Distributed under the Apache License. See `LICENSE.txt` for more details.
 [ShadcnUI-url]: https://ui.shadcn.com/
 
 [Docker-url]: https://www.docker.com/
-

app/(auth)/forgot-password/page.tsx

@@ -1,10 +1,15 @@
-import {CardContent, CardHeader} from "@/components/ui/card";
+import { CardContent, CardHeader } from "@/components/ui/card";
 
-import {TooltipProvider} from "@/components/ui/tooltip";
+import { TooltipProvider } from "@/components/ui/tooltip";
-import {ForgotPasswordForm} from "@/components/wrappers/auth/login/forgot-password-form/forgot-password-form";
+import { ForgotPasswordForm } from "@/components/wrappers/auth/login/forgot-password-form/forgot-password-form";
-import {CardAuth} from "@/features/layout/card-auth";
+import { env } from "@/env.mjs";
+import { CardAuth } from "@/features/layout/card-auth";
+import { redirect } from "next/navigation";
 
 export default async function RoutePage(props: { searchParams: Promise<{ callbackUrl: string | undefined }> }) {
+    if (env.AUTH_EMAIL_PASSWORD_ENABLED !== "true") {
+        redirect("/login");
+    }
 
     return (
         <TooltipProvider>
@@ -12,12 +17,11 @@ export default async function RoutePage(props: { searchParams: Promise<{ callbac
                 <CardHeader>
                     <div className="grid gap-2 text-center mb-2">
                         <h1 className="text-3xl font-bold">Reset password</h1>
-                        <p className="text-balance text-muted-foreground">Enter your email address and we'll send you a
+                        <p className="text-balance text-muted-foreground">Enter your email address and we'll send you a link to reset your password.</p>
-                            link to reset your password.</p>
                     </div>
                 </CardHeader>
                 <CardContent>
-                    <ForgotPasswordForm/>
+                    <ForgotPasswordForm />
                 </CardContent>
             </CardAuth>
         </TooltipProvider>

app/(auth)/guard/page.tsx

@@ -16,7 +16,7 @@ export default async function GuardPage() {
 
     return (
         <TooltipProvider>
-            <CardAuth className="w-full max-w-md">
+            <CardAuth className="w-full">
                 <CardHeader>
                     <div className="grid gap-2 text-center mb-2">
                         <h1 className="text-3xl font-bold">Two-factor verification</h1>

app/(auth)/layout.tsx

@@ -1,25 +1,35 @@
 import React from "react";
-import {redirect} from "next/navigation";
+import { redirect } from "next/navigation";
-import {currentUser} from "@/lib/auth/current-user";
+import { currentUser } from "@/lib/auth/current-user";
-import {AuthLogoSection} from "@/components/wrappers/auth/auth-logo-section";
+import { AuthLogoSection } from "@/components/wrappers/auth/auth-logo-section";
+import { Heart } from "lucide-react";
 
-export default async function Layout({children}: { children: React.ReactNode }) {
+export default async function Layout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const user = await currentUser();
 
-    const user = await currentUser();
+  if (user && !user.banned && user.role !== "pending") {
+    redirect("/dashboard/home");
+  }
 
-    if (user && !user.banned && user.role !== "pending") {
+  return (
-        redirect("/dashboard/home");
+    <div className="flex min-h-screen flex-col justify-between py-10 sm:px-6 lg:px-8 ">
-    }
+      <div className="flex flex-col items-center justify-center flex-1">
-
+        <div className="mx-auto w-full max-w-md">
-    return (
+          <AuthLogoSection />
-        <div className="flex min-h-full flex-1 flex-col justify-center py-12 sm:px-6 lg:px-8 ">
+          <div className="mt-4">{children}</div>
-            <div className="mx-auto w-full max-w-md">
-                <AuthLogoSection/>
-                <div>{children}</div>
-            </div>
-            <footer className="py-4 text-center text-xs justify-items-end text-muted-foreground">
-                Powered by <span className="font-medium">Soluce Technologies</span>
-            </footer>
         </div>
-    )
+      </div>
-}
+      <footer className="mt-8 text-center text-xs text-muted-foreground flex flex-col gap-1">
+        <p className="flex items-center justify-center gap-1">
+          Made with{" "}
+          <Heart className="size-3 fill-red-500 text-red-500 animate-pulse" />{" "}
+          by <span className="font-medium text-foreground">Portabase</span>
+        </p>
+      </footer>
+    </div>
+  );
+}

app/(auth)/login/page.tsx

@@ -1,52 +1,59 @@
-import {LoginForm} from "@/components/wrappers/auth/login/login-form/login-form";
+import { LoginForm } from "@/components/wrappers/auth/login/login-form/login-form";
-import {Metadata} from "next";
+import { Metadata } from "next";
-import {SUPPORTED_PROVIDERS} from "../../../portabase.config";
+import { SUPPORTED_PROVIDERS } from "@/lib/auth/config";
-import {SocialAuthButtons} from "@/components/wrappers/auth/social-buttons";
+import { SocialAuthButtons } from "@/components/wrappers/auth/social-buttons";
-import {TooltipProvider} from "@/components/ui/tooltip";
+import { TooltipProvider } from "@/components/ui/tooltip";
-import {CardContent, CardHeader} from "@/components/ui/card";
+import { CardContent, CardHeader } from "@/components/ui/card";
 import Link from "next/link";
-import {Separator} from "@/components/ui/separator";
+import { Separator } from "@/components/ui/separator";
-import {CardAuth} from "@/features/layout/card-auth";
+import { CardAuth } from "@/features/layout/card-auth";
+import { env } from "@/env.mjs";
 
 export const metadata: Metadata = {
-    title: "Login",
+  title: "Login",
 };
 
 export default async function SignInPage() {
+  return (
+    <TooltipProvider>
+      <CardAuth className="w-full">
+        <CardHeader>
+          <div className="grid gap-2 text-center mb-2">
+            <h1 className="text-3xl font-bold">Login</h1>
+            <p className="text-balance text-muted-foreground">
+              Fill your login informations
+            </p>
+          </div>
+        </CardHeader>
+        <CardContent className="space-y-4">
+          {env.AUTH_EMAIL_PASSWORD_ENABLED === "true" && (
+            <LoginForm isPasskeyEnabled={env.AUTH_PASSKEY_ENABLED === "true"} />
+          )}
 
-    return (
+          {env.AUTH_EMAIL_PASSWORD_ENABLED === "true" &&
-        <TooltipProvider>
+            SUPPORTED_PROVIDERS.filter((p) => !p.isManual && p.isActive)
-            <CardAuth className="w-full">
+              .length > 0 && (
-                <CardHeader>
+              <div className="relative my-4 flex items-center justify-center overflow-hidden">
-                    <div className="grid gap-2 text-center mb-2">
+                <Separator />
-                        <h1 className="text-3xl font-bold">Login</h1>
+                <div className="px-2 text-center  text-sm">OR</div>
-                        <p className="text-balance text-muted-foreground">Fill your login informations</p>
+                <Separator />
-                    </div>
+              </div>
-                </CardHeader>
+            )}
-                <CardContent className="space-y-4">
-                    <LoginForm/>
 
-                    {SUPPORTED_PROVIDERS.filter((p) => !p.isManual && p.isActive).length > 0 && (
+          {SUPPORTED_PROVIDERS.filter((p) => !p.isManual && p.isActive).length >
-                        <>
+            0 && <SocialAuthButtons providers={SUPPORTED_PROVIDERS} />}
-                            <div className="relative my-4 flex items-center justify-center overflow-hidden">
-                                <Separator/>
-                                <div className="px-2 text-center  text-sm">OR</div>
-                                <Separator/>
-                            </div>
-                            <SocialAuthButtons providers={SUPPORTED_PROVIDERS}/>
-                        </>
-                    )}
 
-                    <div className="mt-4 text-center text-sm">
+          {env.AUTH_SIGNUP_ENABLED !== "true" ||
-                        Don&apos;t have an account ?{" "}
+            (env.AUTH_EMAIL_PASSWORD_ENABLED === "true" && (
-                        <Link href="/register" className="underline">
+              <div className="mt-4 text-center text-sm">
-                            Sign up
+                Don&apos;t have an account ?{" "}
-                        </Link>
+                <Link href="/register" className="underline">
-                    </div>
+                  Sign up
-                </CardContent>
+                </Link>
-            </CardAuth>
+              </div>
-        </TooltipProvider>
+            ))}
-
+        </CardContent>
-
+      </CardAuth>
-    )
+    </TooltipProvider>
+  );
 }

app/(auth)/register/page.tsx

@@ -1,15 +1,24 @@
-import {PageParams} from "@/types/next";
+import { PageParams } from "@/types/next";
-import {RegisterForm} from "@/components/wrappers/auth/register/register-form/register-form";
+import { RegisterForm } from "@/components/wrappers/auth/register/register-form/register-form";
-import {Metadata} from "next";
+import { Metadata } from "next";
+import { redirect } from "next/navigation";
+import { env } from "@/env.mjs";
 
 export const metadata: Metadata = {
-    title: "Register",
+  title: "Register",
 };
 
 export default async function RoutePage(props: PageParams<{}>) {
-    return (
+  if (
-        <div className="mx-auto grid w-full gap-6">
+    env.AUTH_SIGNUP_ENABLED !== "true" ||
-            <RegisterForm/>
+    env.AUTH_EMAIL_PASSWORD_ENABLED !== "true"
-        </div>
+  ) {
-    )
+    redirect("/login");
-}
+  }
+
+  return (
+    <div className="mx-auto grid w-full gap-6">
+      <RegisterForm />
+    </div>
+  );
+}

app/(auth)/reset-password/page.tsx

@@ -1,11 +1,16 @@
-import { Card, CardContent, CardHeader } from "@/components/ui/card";
+import { CardContent, CardHeader } from "@/components/ui/card";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { ResetPasswordForm } from "@/components/wrappers/auth/login/reset-password-form/reset-password-form";
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth/auth";
 import { Avatar, AvatarImage, AvatarFallback } from "@radix-ui/react-avatar";
+import { CardAuth } from "@/features/layout/card-auth";
+import { env } from "@/env.mjs";
 
 export default async function RoutePage(props: { searchParams: Promise<{ token: string | undefined }> }) {
+    if (env.AUTH_EMAIL_PASSWORD_ENABLED !== "true") {
+        return redirect("/login");
+    }
 
     const { token } = await props.searchParams;
 
@@ -23,7 +28,7 @@ export default async function RoutePage(props: { searchParams: Promise<{ token:
 
     return (
         <TooltipProvider>
-            <Card className="w-full max-w-md shadow-lg">
+            <CardAuth className="w-full">
                 <CardHeader className="space-y-4">
                     <div className="space-y-1 text-center">
                         <h1 className="text-2xl font-bold tracking-tight">Set a new password</h1>
@@ -53,7 +58,7 @@ export default async function RoutePage(props: { searchParams: Promise<{ token:
                 <CardContent>
                     <ResetPasswordForm />
                 </CardContent>
-            </Card>
+            </CardAuth>
         </TooltipProvider>
     );
 }

app/(customer)/dashboard/(admin)/admin/settings/_email/page.tsx

@@ -1,30 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {db} from "@/db";
-import {SettingsEmailSection} from "@/components/wrappers/dashboard/admin/settings/email/settings-email-section";
-import {notFound} from "next/navigation";
-
-export default async function RoutePage(props: PageParams<{}>) {
-
-    const settings = await db.query.setting.findFirst({
-        where: (fields, {eq}) => eq(fields.name, "system"),
-    });
-
-    if (!settings) {
-        notFound()
-    }
-
-
-    return (
-        <Page>
-            <PageHeader className="flex flex-col">
-                <div className="flex justify-between">
-                    <PageTitle className="mb-3">System email</PageTitle>
-                </div>
-            </PageHeader>
-            <PageContent className="flex flex-col gap-5">
-                <SettingsEmailSection settings={settings}/>
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(admin)/admin/settings/_storage/page.tsx

@@ -1,29 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {SettingsStorageSection} from "@/components/wrappers/dashboard/admin/settings/storage/settings-storage-section";
-import {db} from "@/db";
-import {notFound} from "next/navigation";
-
-export default async function RoutePage(props: PageParams<{}>) {
-
-    const settings = await db.query.setting.findFirst({
-        where: (fields, {eq}) => eq(fields.name, "system"),
-    });
-
-    if (!settings) {
-        notFound()
-    }
-
-    return (
-        <Page>
-            <PageHeader className="flex flex-col">
-                <div className="flex justify-between">
-                    <PageTitle className="mb-3">System storage</PageTitle>
-                </div>
-            </PageHeader>
-            <PageContent className="flex flex-col gap-5">
-                <SettingsStorageSection settings={settings}/>
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(admin)/admin/settings/page.tsx

@@ -6,6 +6,7 @@ import {SettingsTabs} from "@/components/wrappers/dashboard/admin/settings/setti
 import {desc, isNull} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {StorageChannelWith} from "@/db/schema/12_storage-channel";
+import {NotificationChannelWith} from "@/db/schema/09_notification-channel";
 
 export default async function RoutePage(props: PageParams<{}>) {
 
@@ -13,6 +14,8 @@ export default async function RoutePage(props: PageParams<{}>) {
         where: (fields, {eq}) => eq(fields.name, "system"),
     });
 
+    console.log(settings)
+
     const storageChannels = await db.query.storageChannel.findMany({
         with: {
             organizations: true
@@ -21,7 +24,16 @@ export default async function RoutePage(props: PageParams<{}>) {
         orderBy: desc(drizzleDb.schemas.storageChannel.createdAt)
     }) as StorageChannelWith[]
 
-    if (!settings || !storageChannels ) {
+    const notificationChannels = await db.query.notificationChannel.findMany({
+        with: {
+            organizations: true
+        },
+        where: isNull(drizzleDb.schemas.notificationChannel.organizationId),
+        orderBy: desc(drizzleDb.schemas.notificationChannel.createdAt)
+    }) as NotificationChannelWith[]
+
+
+    if (!settings || !storageChannels || !notificationChannels ) {
         notFound()
     }
 
@@ -33,7 +45,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                 </div>
             </PageHeader>
             <PageContent className="flex flex-col gap-5">
-                <SettingsTabs storageChannels={storageChannels} settings={settings} />
+                <SettingsTabs storageChannels={storageChannels} notificationChannels={notificationChannels} settings={settings} />
             </PageContent>
         </Page>
     );

app/(customer)/dashboard/(admin)/admin/users/page.tsx

@@ -4,6 +4,7 @@ import {db} from "@/db";
 import {desc, isNull} from "drizzle-orm";
 import {AdminUserList} from "@/components/wrappers/dashboard/admin/users/admin-user-list";
 import {AdminUserAddModal} from "@/components/wrappers/dashboard/admin/users/admin-user-add-modal";
+import {SUPPORTED_PROVIDERS} from "@/lib/auth/config";
 
 export default async function RoutePage(props: PageParams<{}>) {
 
@@ -21,6 +22,9 @@ export default async function RoutePage(props: PageParams<{}>) {
         },
     });
 
+    const credentialProvider = SUPPORTED_PROVIDERS.find(p => p.id === 'credential');
+    const isPasswordAuthEnabled = credentialProvider?.isActive || false;
+
     return (
         <Page>
             <PageHeader className="flex flex-col">
@@ -32,7 +36,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                 </div>
             </PageHeader>
             <PageContent className="flex flex-col gap-5">
-                <AdminUserList users={users}/>
+                <AdminUserList users={users} isPasswordAuthEnabled={isPasswordAuthEnabled}/>
             </PageContent>
         </Page>
     );

app/(customer)/dashboard/(admin)/agents/[agentId]/page.tsx

@@ -1,61 +1,69 @@
-import {PageParams} from "@/types/next";
+import { PageParams } from "@/types/next";
-import {Page, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
+import {
-import {db} from "@/db";
+  Page,
+  PageContent,
+  PageDescription,
+  PageTitle,
+} from "@/features/layout/page";
+import { db } from "@/db";
 import * as drizzleDb from "@/db";
-import {eq} from "drizzle-orm";
+import { eq } from "drizzle-orm";
-import {notFound} from "next/navigation";
+import { notFound } from "next/navigation";
-import {ButtonDeleteAgent} from "@/components/wrappers/dashboard/agent/button-delete-agent/button-delete-agent";
+import { ButtonDeleteAgent } from "@/components/wrappers/dashboard/agent/button-delete-agent/button-delete-agent";
-import {capitalizeFirstLetter} from "@/utils/text";
+import { capitalizeFirstLetter } from "@/utils/text";
-import {generateEdgeKey} from "@/utils/edge_key";
+import { generateEdgeKey } from "@/utils/edge_key";
-import {getServerUrl} from "@/utils/get-server-url";
+import { getServerUrl } from "@/utils/get-server-url";
-import {AgentContentPage} from "@/components/wrappers/dashboard/agent/agent-content";
+import { AgentContentPage } from "@/components/wrappers/dashboard/agent/agent-content";
-import {AgentDialog} from "@/features/agents/components/agent.dialog";
+import { AgentDialog } from "@/features/agents/components/agent.dialog";
-import {AgentType} from "@/features/agents/agents.schema";
+import { AgentType } from "@/features/agents/agents.schema";
 
-export default async function RoutePage(props: PageParams<{ agentId: string }>) {
+export default async function RoutePage(
+  props: PageParams<{ agentId: string }>,
+) {
+  const { agentId } = await props.params;
 
-    const {agentId} = await props.params
+  const agent = await db.query.agent.findFirst({
+    where: eq(drizzleDb.schemas.agent.id, agentId),
+    with: {
+      databases: true,
+    },
+  });
 
-    const agent = await db.query.agent.findFirst({
+  if (!agent) {
-        where: eq(drizzleDb.schemas.agent.id, agentId),
+    notFound();
-        with: {
+  }
-            databases: true
-        }
-    })
 
-    if (!agent) {
+  const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
-        notFound()
-    }
 
-    const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
+  return (
-
+    <Page>
-    return (
+      <div className="justify-between gap-2 sm:flex">
-        <Page>
+        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
-            <div className="justify-between gap-2 sm:flex">
+          <div className="min-w-full md:min-w-fit ">
-                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+            {capitalizeFirstLetter(agent.name)}
-                    <div className="min-w-full md:min-w-fit ">
+          </div>
-                        {capitalizeFirstLetter(agent.name)}
+          <div className="flex items-center gap-2 md:justify-between w-full ">
-                    </div>
+            <div className="flex items-center gap-2">
-                    <div className="flex items-center gap-2 md:justify-between w-full ">
+              <AgentDialog
-                        <div className="flex items-center gap-2">
+                agent={agent as AgentType & { id: string }}
-                            <AgentDialog agent={agent as AgentType & { id: string }} typeTrigger={"edit"}/>
+                typeTrigger={"edit"}
-                        </div>
+              />
-                        <div className="flex items-center gap-2">
-                            <ButtonDeleteAgent agentId={agentId} text={"Delete Agent"}/>
-                        </div>
-                    </div>
-                </PageTitle>
             </div>
+            <div className="flex items-center gap-2">
+              <ButtonDeleteAgent agentId={agentId} text={"Delete Agent"} />
+            </div>
+          </div>
+        </PageTitle>
+      </div>
 
-            {agent.description && (
+      {agent.description && (
-                <PageDescription className="mt-5 sm:mt-0">{agent.description}</PageDescription>
+        <PageDescription className="mt-5 sm:mt-0">
-            )}
+          {agent.description}
-            <PageContent className="flex flex-col w-full h-full justify-between gap-6">
+        </PageDescription>
-                <AgentContentPage
+      )}
-                    agent={agent}
+      <PageContent className="flex flex-col w-full h-full justify-between gap-6">
-                    edgeKey={edgeKey}
+        <AgentContentPage agent={agent} edgeKey={edgeKey} />
-                />
+      </PageContent>
-            </PageContent>
+    </Page>
-        </Page>
+  );
-    )
+}
-}

app/(customer)/dashboard/(admin)/notifications/channels/page.tsx

@@ -35,12 +35,10 @@ export default async function RoutePage(props: PageParams<{}>) {
             <PageHeader>
                 <PageTitle>Notification channels</PageTitle>
                 <PageActions>
-                    {/*<NotifierAddEditModal adminView={false}/>*/}
                     <ChannelAddEditModal kind="notification" adminView={false}/>
                 </PageActions>
             </PageHeader>
             <PageContent>
-                {/*<NotificationChannelsSection organizations={organizations} notificationChannels={notificationChannels}/>*/}
                 <ChannelsSection kind="notification" organizations={organizations}
                                  channels={notificationChannels}/>
             </PageContent>

app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/edit/page.tsx

@@ -1,36 +0,0 @@
-import { PageParams } from "@/types/next";
-import { Page, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
-import { notFound } from "next/navigation";
-import { DatabaseForm } from "@/components/wrappers/dashboard/database/database-form/database-form";
-
-import { db } from "@/db";
-import * as drizzleDb from "@/db";
-
-import { eq } from "drizzle-orm";
-
-export default async function RoutePage(props: PageParams<{ databaseId: string }>) {
-    const { databaseId } = await props.params;
-
-    const dbItem = await db.query.database.findFirst({
-        where: eq(drizzleDb.schemas.database.id, databaseId),
-    });
-
-    if (!dbItem) {
-        notFound();
-    }
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Edit {dbItem.name}</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <DatabaseForm
-                    databaseId={databaseId}
-                    // @ts-ignore
-                    defaultValues={{ ...dbItem, dbms: dbItem.dbms ?? "inactive", description: dbItem.description ?? undefined }}
-                />
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/page.tsx

@@ -1,23 +1,14 @@
 import {PageParams} from "@/types/next";
 import {notFound, redirect} from "next/navigation";
-import {Page, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
+import {Page} from "@/features/layout/page";
-import {BackupButton} from "@/components/wrappers/dashboard/backup/backup-button/backup-button";
-import {DatabaseKpi} from "@/components/wrappers/dashboard/projects/database/database-kpi";
-import {CronButton} from "@/components/wrappers/dashboard/database/cron-button/cron-button";
 import {db} from "@/db";
 import {eq, and, inArray} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {getOrganizationProjectDatabases} from "@/lib/services";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
-import {RetentionPolicySheet} from "@/components/wrappers/dashboard/database/retention-policy/retention-policy-sheet";
-import {capitalizeFirstLetter} from "@/utils/text";
-import {getOrganizationChannels} from "@/db/services/notification-channel";
-import {ImportModal} from "@/components/wrappers/dashboard/database/import/import-modal";
-import {getOrganizationStorageChannels} from "@/db/services/storage-channel";
-import {ChannelPoliciesModal} from "@/components/wrappers/dashboard/database/channels-policy/policy-modal";
-import {HardDrive, Megaphone} from "lucide-react";
 import {BackupModalProvider} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
 import {DatabaseContent} from "@/components/wrappers/dashboard/projects/database/database-content";
+import {getHealthLast12hLogs} from "@/db/services/healthcheck";
 
 export default async function RoutePage(props: PageParams<{
     projectId: string;
@@ -93,11 +84,7 @@ export default async function RoutePage(props: PageParams<{
         notFound();
     }
 
-    const organizationChannels = await getOrganizationChannels(organization.id);
+    const databaseHealthLogs = dbItem ? await getHealthLast12hLogs({ id: dbItem.id }) : []
-    const activeOrganizationChannels = organizationChannels.filter(channel => channel.enabled);
-
-    const organizationStorageChannels = await getOrganizationStorageChannels(organization.id);
-    const activeOrganizationStorageChannels = organizationStorageChannels.filter(channel => channel.enabled);
 
 
     const successRate = totalBackups > 0 ? (successfulBackups / totalBackups) * 100 : null;
@@ -106,60 +93,23 @@ export default async function RoutePage(props: PageParams<{
 
     return (
         <Page>
-
+            <BackupModalProvider>
-            <div className="justify-between gap-2 sm:flex">
+                <DatabaseContent
-                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+                    activeMember={activeMember}
-                    <div className="min-w-full md:min-w-fit ">
+                    settings={settings}
-                        {capitalizeFirstLetter(dbItem.name)}
+                    database={dbItem}
-                    </div>
+                    databaseHealthLogs={databaseHealthLogs}
-                    {!isMember && (
+                    isAlreadyRestore={isAlreadyRestore}
-                        <div className="flex items-center gap-2 md:justify-between w-full ">
+                    restorations={restorations}
-                            <div className="flex items-center gap-2">
+                    backups={backups}
-                                <RetentionPolicySheet database={dbItem}/>
+                    totalBackups={totalBackups}
-                                <CronButton database={dbItem}/>
+                    availableBackups={availableBackups}
-                                <ChannelPoliciesModal
+                    successRate={successRate}
-                                    database={dbItem}
+                    organizationId={organization.id}
-                                    kind={"notification"}
+                    activeOrganizationChannels={[]}
-                                    icon={<Megaphone/>}
+                    activeOrganizationStorageChannels={[]}
-                                    channels={activeOrganizationChannels}
+                />
-                                    organizationId={organization.id}
+            </BackupModalProvider>
-                                />
-                                <ChannelPoliciesModal
-                                    database={dbItem}
-                                    icon={<HardDrive/>}
-                                    kind={"storage"}
-                                    channels={activeOrganizationStorageChannels}
-                                    organizationId={organization.id}
-                                />
-                                <ImportModal database={dbItem}/>
-                            </div>
-                            <div className="flex items-center gap-2">
-                                <BackupButton disable={isAlreadyBackup} databaseId={databaseId}/>
-                            </div>
-                        </div>
-                    )}
-                </PageTitle>
-
-
-            </div>
-
-            {dbItem.description && (
-                <PageDescription className="mt-5 sm:mt-0">{dbItem.description}</PageDescription>
-            )}
-            <PageContent className="flex flex-col w-full h-full">
-                <DatabaseKpi successRate={successRate} database={dbItem} availableBackups={availableBackups}
-                             totalBackups={totalBackups}/>
-                <BackupModalProvider>
-                    <DatabaseContent
-                        activeMember={activeMember}
-                        settings={settings}
-                        database={dbItem}
-                        isAlreadyRestore={isAlreadyRestore}
-                        restorations={restorations}
-                        backups={backups}
-                    />
-                </BackupModalProvider>
-            </PageContent>
         </Page>
     );
-}
+}

app/(customer)/dashboard/(organization)/projects/page.tsx

@@ -66,7 +66,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                         organizationSlug={organization.slug}
                         data={projects}
                         cardItem={ProjectCard}
-                        cardsPerPage={6}
+                        cardsPerPage={9}
                         numberOfColumns={3}
                     />
                 ) : isMember ? (

app/(customer)/dashboard/(organization)/settings/page.tsx

@@ -1,89 +1,95 @@
-import {PageParams} from "@/types/next";
+import { PageParams } from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {
-import {currentUser} from "@/lib/auth/current-user";
+  Page,
-import {getActiveMember, getOrganization} from "@/lib/auth/auth";
+  PageActions,
-import {notFound} from "next/navigation";
+  PageContent,
-import {Metadata} from "next";
+  PageHeader,
-import {OrganizationTabs} from "@/components/wrappers/dashboard/organization/tabs/organization-tabs";
+  PageTitle,
-import {getOrganizationChannels} from "@/db/services/notification-channel";
+} from "@/features/layout/page";
-import {computeOrganizationPermissions} from "@/lib/acl/organization-acl";
+import { currentUser } from "@/lib/auth/current-user";
-import {getOrganizationStorageChannels} from "@/db/services/storage-channel";
+import { getActiveMember, getOrganization } from "@/lib/auth/auth";
-import {DeleteOrganizationButton} from "@/components/wrappers/dashboard/organization/delete-organization-button";
+import { notFound } from "next/navigation";
-import {EditOrganizationDialog} from "@/features/organization/components/edit-organization.dialog";
+import { Metadata } from "next";
-import {Button} from "@/components/ui/button";
+import { OrganizationTabs } from "@/components/wrappers/dashboard/organization/tabs/organization-tabs";
-import {GearIcon} from "@radix-ui/react-icons";
+import { getOrganizationChannels } from "@/db/services/notification-channel";
-import {db} from "@/db";
+import { computeOrganizationPermissions } from "@/lib/acl/organization-acl";
-import {isNull} from "drizzle-orm";
+import { getOrganizationStorageChannels } from "@/db/services/storage-channel";
+import { DeleteOrganizationButton } from "@/components/wrappers/dashboard/organization/delete-organization-button";
+import { EditOrganizationDialog } from "@/features/organization/components/edit-organization.dialog";
+import { db } from "@/db";
+import { isNull } from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import {eq} from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 export const metadata: Metadata = {
-    title: "Settings",
+  title: "Settings",
 };
 
 export default async function RoutePage(props: PageParams<{ slug: string }>) {
-    const organization = await getOrganization({});
+  const organization = await getOrganization({});
-    const user = await currentUser();
+  const user = await currentUser();
-    const activeMember = await getActiveMember()
+  const activeMember = await getActiveMember();
 
-    if (!organization || !activeMember || !user) {
+  if (!organization || !activeMember || !user) {
-        notFound();
+    notFound();
-    }
+  }
 
-    const notificationChannels = await getOrganizationChannels(organization.id)
+  const notificationChannels = await getOrganizationChannels(organization.id);
-    const storageChannels = await getOrganizationStorageChannels(organization.id)
+  const storageChannels = await getOrganizationStorageChannels(organization.id);
-    const permissions = computeOrganizationPermissions(activeMember);
+  const permissions = computeOrganizationPermissions(activeMember);
 
-    const users = await db.query.user.findMany({
+  const users = await db.query.user.findMany({
-        where: (fields) => isNull(fields.deletedAt)
+    where: (fields) => isNull(fields.deletedAt),
-    });
+  });
 
-    const organizationWithMembers = await db.query.organization.findFirst({
+  const organizationWithMembers = await db.query.organization.findFirst({
-        where: eq(drizzleDb.schemas.organization.id, organization.id),
+    where: eq(drizzleDb.schemas.organization.id, organization.id),
+    with: {
+      members: {
         with: {
-            members: {
+          user: true,
-                with: {
+        },
-                    user: true
+      },
-                }
+    },
-            }
+  });
-        }
-    });
 
-    if (!organizationWithMembers) notFound();
+  if (!organizationWithMembers) notFound();
 
-    return (
+  return (
-        <Page>
+    <Page>
-            <PageHeader>
+      <PageHeader>
-                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
-                    <div className="min-w-full md:min-w-fit ">
+          <div className="min-w-full md:min-w-fit ">Organization settings</div>
-                        Organization settings
+          <div className="flex items-center gap-2 md:justify-between w-full ">
-                    </div>
+            <div className="flex items-center gap-2">
-                        <div className="flex items-center gap-2 md:justify-between w-full ">
+              {permissions.canManageSettings &&
-                            <div className="flex items-center gap-2">
+                organization.slug !== "default" && (
-                                {permissions.canManageSettings && organization.slug !== "default" && (
+                  <EditOrganizationDialog
-                                    <EditOrganizationDialog 
+                    organization={organizationWithMembers}
-                                        organization={organizationWithMembers} 
+                    users={users}
-                                        users={users} 
+                    currentUser={user}
-                                        currentUser={user}
+                  />
-                                    />
+                )}
-                                )}
+            </div>
-                            </div>
+            <div className="flex items-center gap-2">
-                            <div className="flex items-center gap-2">
+              {permissions.canManageDangerZone &&
-                                {permissions.canManageDangerZone && organization.slug !== "default" && (
+                organization.slug !== "default" && (
-                                    <DeleteOrganizationButton organizationSlug={organization.slug}/>
+                  <DeleteOrganizationButton
-                                )}
+                    organizationSlug={organization.slug}
-                            </div>
+                  />
-                        </div>
+                )}
-                </PageTitle>
+            </div>
-            </PageHeader>
+          </div>
-            <PageContent>
+        </PageTitle>
-                <OrganizationTabs
+      </PageHeader>
-                    activeMember={activeMember}
+      <PageContent>
-                    organization={organization}
+        <OrganizationTabs
-                    notificationChannels={notificationChannels}
+          activeMember={activeMember}
-                    storageChannels={storageChannels}
+          organization={organization}
-                />
+          notificationChannels={notificationChannels}
-            </PageContent>
+          storageChannels={storageChannels}
-        </Page>
+        />
-    )
+      </PageContent>
+    </Page>
+  );
 }

app/(customer)/dashboard/layout.tsx

@@ -1,27 +1,26 @@
-import React, {ReactNode} from "react";
+import { ReactNode } from "react";
-import {redirect} from "next/navigation";
+import { redirect } from "next/navigation";
 
-import {SidebarInset, SidebarProvider} from "@/components/ui/sidebar";
+import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
-import {AppSidebar} from "@/components/wrappers/dashboard/common/sidebar/app-sidebar";
+import { AppSidebar } from "@/components/wrappers/dashboard/common/sidebar/app-sidebar";
-import {Header} from "@/features/layout/Header";
+import { Header } from "@/features/layout/Header";
-import {currentUser} from "@/lib/auth/current-user";
+import { currentUser } from "@/lib/auth/current-user";
-import {ThemeMetaUpdater} from "@/features/browser/theme-meta-updater";
+import { ThemeMetaUpdater } from "@/features/browser/theme-meta-updater";
-import {BackupModalProvider} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
 
-export default async function Layout({children}: { children: ReactNode }) {
+export default async function Layout({ children }: { children: ReactNode }) {
-    const user = await currentUser();
+  const user = await currentUser();
-    if (!user) redirect("/login");
+  if (!user) redirect("/login");
 
-    return (
+  return (
-        <SidebarProvider>
+    <SidebarProvider>
-            <div className="flex flex-col lg:flex-row w-full">
+      <div className="flex flex-col lg:flex-row w-full">
-                <ThemeMetaUpdater/>
+        <ThemeMetaUpdater />
-                <AppSidebar/>
+        <AppSidebar />
-                <SidebarInset>
+        <SidebarInset>
-                    <Header/>
+          <Header />
-                    <main className="h-full">{children}</main>
+          <main className="h-full">{children}</main>
-                </SidebarInset>
+        </SidebarInset>
-            </div>
+      </div>
-        </SidebarProvider>
+    </SidebarProvider>
-    );
+  );
 }

app/api/agent/[agentId]/backup/route.ts

@@ -102,6 +102,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
 }) => {
     try {
         const body: BodyPatch = await request.json();
+        console.log("body", body);
 
         const status = body.status
         const backupId = body.backupId
@@ -131,7 +132,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
 
 
         eventEmitter.emit('modification', {update: true});
-        await sendNotificationsBackupRestore(database, `${status}_backup` as EventKind);
+        await sendNotificationsBackupRestore(database, status == "failed" ? "error_backup" : "success_backup" as EventKind);
 
         return NextResponse.json(
             {

app/api/agent/[agentId]/restore/route.ts

@@ -19,7 +19,6 @@ export async function POST(
 ) {
 
     try {
-        eventEmitter.emit('modification', {update: true});
 
         const agentId = (await params).agentId
         const body: BodyResultRestore = await request.json();
@@ -64,15 +63,13 @@ export async function POST(
             .set({status: body.status as RestorationStatus})
             .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
 
-
+        await sendNotificationsBackupRestore(database, body.status == "failed" ? "error_restore" : "success_restore");
-        await sendNotificationsBackupRestore(database, body.status == "error" ? "error_restore" : "success_restore");
 
         const response = {
-            message: true,
+            status: true,
-            details: "Restoration successfully updated"
+            message: "Restoration successfully updated"
         }
 
-        eventEmitter.emit('modification', {update: true});
 
         return Response.json(response, {status: 200})
     } catch (error) {

app/api/agent/[agentId]/status/helpers.ts

@@ -10,15 +10,16 @@ import {dbmsEnumSchema, EDbmsSchema} from "@/db/schema/types";
 import {withUpdatedAt} from "@/db/utils";
 import type {StorageInput} from "@/features/storages/types";
 import {dispatchStorage} from "@/features/storages/dispatch";
+import {Setting} from "@/db/schema/01_setting";
 
-export async function handleDatabases(body: Body, agent: Agent, lastContact: Date) {
+export async function handleDatabases(body: Body, agent: Agent, lastContact: Date, settings: Setting) {
     const databasesResponse = [];
 
     const formatDatabase = (database: DatabaseWith, backupAction: boolean, restoreAction: boolean, UrlBackup: string | null, storages: PingDatabaseStorageChannels[], urlMeta: string | null) => ({
         generatedId: database.agentDatabaseId,
         dbms: database.dbms,
         storages: storages,
-        encrypt: false,
+        encrypt: settings.encryption,
         data: {
             backup: {
                 action: backupAction,
@@ -66,12 +67,25 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                     name: db.name,
                     dbms: db.dbms as EDbmsSchema,
                     agentDatabaseId: db.generatedId,
-                    lastContact: lastContact,
+                    lastContact: db.pingStatus ? lastContact : null,
+                    healthErrorCount: null
                 })
                 .returning();
 
 
             if (databaseCreated) {
+
+
+                await dbClient
+                    .insert(drizzleDb.schemas.healthcheckLog)
+                    .values({
+                        kind: "database",
+                        status: db.pingStatus ? "success" : "failed",
+                        objectId: databaseCreated.id,
+                        date: lastContact
+                    })
+
+
                 const storages = await getDatabaseStorageChannels(databaseCreated.id)
 
                 databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup, storages, null));
@@ -83,11 +97,24 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 .set(withUpdatedAt({
                     name: db.name,
                     agentId: agent.id,
-                    lastContact: lastContact
+                    dbms: db.dbms as EDbmsSchema,
+                    lastContact: db.pingStatus ? lastContact : existingDatabase.lastContact,
+                    healthErrorCount: db.pingStatus ? null : existingDatabase.healthErrorCount,
                 }))
                 .where(eq(drizzleDb.schemas.database.id, existingDatabase.id))
                 .returning();
 
+
+            await dbClient
+                .insert(drizzleDb.schemas.healthcheckLog)
+                .values({
+                    kind: "database",
+                    status: db.pingStatus ? "success" : "failed",
+                    objectId: databaseUpdated.id,
+                    date: lastContact
+                })
+
+
             const activeBackup = await dbClient.query.backup.findFirst({
                 where: and(
                     eq(drizzleDb.schemas.backup.databaseId, databaseUpdated.id),
@@ -179,7 +206,6 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
             databasesResponse.push(formatDatabase(databaseUpdated, backupAction, restoreAction, urlBackup, storages, urlMeta));
         }
     }
-
     return databasesResponse;
 }
 

app/api/agent/[agentId]/status/route.ts

@@ -7,11 +7,13 @@ import {eq} from "drizzle-orm";
 import {isUuidv4} from "@/utils/verify-uuid";
 import {withUpdatedAt} from "@/db/utils";
 import {eventEmitter} from "@/features/shared/event";
+import {notFound} from "next/navigation";
 
 export type databaseAgent = {
     name: string,
     dbms: EDbmsSchema,
     generatedId: string
+    pingStatus: boolean
 }
 
 export type Body = {
@@ -48,17 +50,32 @@ export async function POST(
             message = "Agent not found"
             return NextResponse.json({error: message}, {status: 404})
         }
-        const databasesResponse = await handleDatabases(body, agent, lastContact)
+
+        const [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
+        if (!settings) {
+            return NextResponse.json({error: "An error occured"}, {status: 404})
+        }
+
+
+        const databasesResponse = await handleDatabases(body, agent, lastContact, settings)
 
         await db
             .update(drizzleDb.schemas.agent)
             .set(withUpdatedAt({
                 version: body.version,
-                lastContact: lastContact
+                lastContact: lastContact,
+                healthErrorCount: null
             }))
             .where(eq(drizzleDb.schemas.agent.id, agentId));
 
-        eventEmitter.emit('modification', {update: true});
+        await db
+            .insert(drizzleDb.schemas.healthcheckLog)
+            .values({
+                kind: "agent",
+                status: "success",
+                objectId: agentId,
+                date: lastContact
+            })
 
         const response = {
             agent: {

app/api/config/route.ts

@@ -1,9 +1,9 @@
-import {NextResponse} from "next/server";
+import { NextResponse } from "next/server";
 
 export async function GET() {
-    return NextResponse.json({
+  return NextResponse.json({
-        PROJECT_URL: process.env.PROJECT_URL,
+    PROJECT_URL: process.env.PROJECT_URL,
-        PROJECT_NAME: process.env.PROJECT_NAME,
+    PROJECT_NAME: process.env.PROJECT_NAME,
-        PROJECT_DESCRIPTION: process.env.PROJECT_DESCRIPTION,
+    PROJECT_DESCRIPTION: process.env.PROJECT_DESCRIPTION,
-    });
+  });
 }

app/api/events/route.ts

@@ -1,11 +1,8 @@
-import {EventEmitter} from 'events';
 import {auth} from "@/lib/auth/auth";
 import {headers} from "next/headers";
 import {NextResponse} from "next/server";
 import {eventEmitter} from "@/features/shared/event";
 
-// export const eventEmitter = new EventEmitter();
-
 export async function GET(request: Request) {
 
     const session = await auth.api.getSession({
@@ -28,7 +25,6 @@ export async function GET(request: Request) {
 
                 eventEmitter.on('modification', handleModification);
 
-                // Handle client disconnect
                 request.signal.addEventListener('abort', () => {
                     console.log('Client disconnected');
                     controller.close();

app/api/tus/hooks/route.ts

@@ -1,6 +1,7 @@
 import {NextResponse} from "next/server";
 import fs from "fs";
 import path from "path";
+import {env} from "@/env.mjs";
 
 
 export async function POST(request: Request) {
@@ -29,7 +30,8 @@ export async function POST(request: Request) {
                 }
 
 
-                const uploadDir = path.join(process.cwd(), "/private/uploads/");
+                // const uploadDir = path.join(process.cwd(), "/private/uploads/");
+                const uploadDir = path.join(env.PRIVATE_PATH, "/uploads/");
 
                 const oldFilePath = path.join(uploadDir, "tmp", id);
                 const newFilePath = path.join(uploadDir, filePath);

app/error/page.tsx

@@ -1,85 +1,33 @@
-// "use client"
+"use client";
-//
-// import {useSearchParams} from "next/navigation"
-//
-// enum Error {
-//     Configuration = "Configuration",
-// }
-//
-// const errorMap = {
-//     [Error.Configuration]: (
-//         <p>
-//             There was a problem when trying to authenticate. Please contact us if this
-//             error persists. Unique error code:{" "}
-//             <code className="rounded-sm bg-slate-100 p-1 text-xs">Configuration</code>
-//         </p>
-//     ),
-// }
-//
-// export default function AuthErrorPage() {
-//     const search = useSearchParams()
-//     const error = search.get("error") as Error
-//
-//     return (
-//         <div className="flex h-screen w-full flex-col items-center justify-center">
-//             <a
-//                 href="#"
-//                 className="block max-w-sm rounded-lg border border-gray-200 bg-white p-6 text-center shadow-sm hover:bg-gray-100 dark:border-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700"
-//             >
-//                 <h5 className="mb-2 flex flex-row items-center justify-center gap-2 text-xl font-bold tracking-tight text-gray-900 dark:text-white">
-//                     Something went wrong
-//                 </h5>
-//                 <div className="font-normal text-gray-700 dark:text-gray-400">
-//                     {errorMap[error] || "Please contact us if this error persists."}
-//                 </div>
-//             </a>
-//         </div>
-//     )
-// }
-"use client"
 
-import { useSearchParams } from "next/navigation"
+import { Loader2 } from "lucide-react";
-import React, { Suspense } from "react"
+import { useRouter, useSearchParams } from "next/navigation";
+import { useEffect } from "react";
+import { useSession } from "@/lib/auth/auth-client";
 
-enum Error {
+export default function ErrorPage() {
-    Configuration = "Configuration",
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const { data: session, isPending } = useSession();
+
+  useEffect(() => {
+    if (isPending) {
+      return;
+    }
+
+    const error = searchParams.get("error");
+    const params = new URLSearchParams();
+    if (error) {
+      params.set("error", error);
+    }
+
+    const destination = session ? "/dashboard/home" : "/login";
+    router.replace(`${destination}?${params.toString()}`);
+  }, [isPending, session, router, searchParams]);
+
+  return (
+    <div className="flex h-screen w-full items-center justify-center">
+      <Loader2 className="h-8 w-8 animate-spin" />
+    </div>
+  );
 }
-
-const errorMap = {
-    [Error.Configuration]: (
-        <p>
-            There was a problem when trying to authenticate. Please contact us if this
-            error persists. Unique error code:{" "}
-            <code className="rounded-sm bg-slate-100 p-1 text-xs">Configuration</code>
-        </p>
-    ),
-}
-
-function AuthErrorPageContent() {
-    const search = useSearchParams()
-    const error = search.get("error") as Error
-
-    return (
-        <div className="flex h-screen w-full flex-col items-center justify-center">
-            <a
-                href="#"
-                className="block max-w-sm rounded-lg border border-gray-200 bg-white p-6 text-center shadow-sm hover:bg-gray-100 dark:border-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700"
-            >
-                <h5 className="mb-2 flex flex-row items-center justify-center gap-2 text-xl font-bold tracking-tight text-gray-900 dark:text-white">
-                    Something went wrong
-                </h5>
-                <div className="font-normal text-gray-700 dark:text-gray-400">
-                    {errorMap[error] || "Please contact us if this error persists."}
-                </div>
-            </a>
-        </div>
-    )
-}
-
-export default function AuthErrorPage() {
-    return (
-        <Suspense fallback={<div>Loading...</div>}>
-            <AuthErrorPageContent />
-        </Suspense>
-    )
-}

app/globals.css

@@ -6,8 +6,11 @@
 @theme inline {
     --color-background: var(--background);
     --color-foreground: var(--foreground);
-    --font-sans: var(--font-geist-sans);
+    --font-sans: var(--font-poppins), ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    --font-title: var(--font-poppins), var(--font-poppins), sans-serif;
     --font-mono: var(--font-geist-mono);
+    --font-author: var(--font-author);
+    --font-poppins: var(--font-poppins);
     --color-sidebar-ring: var(--sidebar-ring);
     --color-sidebar-border: var(--sidebar-border);
     --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
@@ -71,7 +74,7 @@
     --card-foreground: oklch(0.145 0 0);
     --popover: oklch(1 0 0);
     --popover-foreground: oklch(0.145 0 0);
-    --primary: oklch(0.205 0 0);
+    --primary: oklch(0.611 0.204 42.149);
     --primary-foreground: oklch(0.985 0 0);
     --secondary: oklch(0.97 0 0);
     --secondary-foreground: oklch(0.205 0 0);
@@ -82,7 +85,7 @@
     --destructive: oklch(0.577 0.245 27.325);
     --border: oklch(0.922 0 0);
     --input: oklch(0.922 0 0);
-    --ring: oklch(0.708 0 0);
+    --ring: oklch(0.611 0.204 42.149);
     --chart-1: oklch(0.646 0.222 41.116);
     --chart-2: oklch(0.6 0.118 184.704);
     --chart-3: oklch(0.398 0.07 227.392);
@@ -90,12 +93,12 @@
     --chart-5: oklch(0.769 0.188 70.08);
     --sidebar: oklch(0.985 0 0);
     --sidebar-foreground: oklch(0.145 0 0);
-    --sidebar-primary: oklch(0.205 0 0);
+    --sidebar-primary: oklch(0.611 0.204 42.149);
     --sidebar-primary-foreground: oklch(0.985 0 0);
     --sidebar-accent: oklch(0.97 0 0);
     --sidebar-accent-foreground: oklch(0.205 0 0);
     --sidebar-border: oklch(0.922 0 0);
-    --sidebar-ring: oklch(0.708 0 0);
+    --sidebar-ring: oklch(0.611 0.204 42.149);
 }
 
 .dark {
@@ -105,8 +108,8 @@
     --card-foreground: oklch(0.985 0 0);
     --popover: oklch(0.205 0 0);
     --popover-foreground: oklch(0.985 0 0);
-    --primary: oklch(0.922 0 0);
+    --primary: oklch(0.704 0.191 47.132);
-    --primary-foreground: oklch(0.205 0 0);
+    --primary-foreground: oklch(0.985 0 0);
     --secondary: oklch(0.269 0 0);
     --secondary-foreground: oklch(0.985 0 0);
     --muted: oklch(0.269 0 0);
@@ -116,7 +119,7 @@
     --destructive: oklch(0.704 0.191 22.216);
     --border: oklch(1 0 0 / 10%);
     --input: oklch(1 0 0 / 15%);
-    --ring: oklch(0.556 0 0);
+    --ring: oklch(0.704 0.191 47.132);
     --chart-1: oklch(0.488 0.243 264.376);
     --chart-2: oklch(0.696 0.17 162.48);
     --chart-3: oklch(0.769 0.188 70.08);
@@ -124,12 +127,12 @@
     --chart-5: oklch(0.645 0.246 16.439);
     --sidebar: oklch(0.205 0 0);
     --sidebar-foreground: oklch(0.985 0 0);
-    --sidebar-primary: oklch(0.488 0.243 264.376);
+    --sidebar-primary: oklch(0.704 0.191 47.132);
     --sidebar-primary-foreground: oklch(0.985 0 0);
     --sidebar-accent: oklch(0.269 0 0);
     --sidebar-accent-foreground: oklch(0.985 0 0);
     --sidebar-border: oklch(1 0 0 / 10%);
-    --sidebar-ring: oklch(0.556 0 0);
+    --sidebar-ring: oklch(0.704 0.191 47.132);
 }
 
 @layer base {
@@ -137,6 +140,18 @@
         @apply border-border outline-ring/50;
     }
     body {
-        @apply bg-background text-foreground;
+        @apply bg-background text-foreground font-sans;
+    }
+    h1, h2, h3, h4, h5, h6 {
+        @apply font-title;
+    }
+
+    .scrollbar-hide {
+        -ms-overflow-style: none;
+        scrollbar-width: none;
+    }
+
+    .scrollbar-hide::-webkit-scrollbar {
+        display: none;
     }
 }

app/layout.tsx

@@ -1,38 +1,42 @@
-import React from "react";
+import type { Metadata } from "next";
-import type {Metadata} from "next";
+import type React from "react";
 import "./globals.css";
-import {Providers} from "./providers";
+import { ConsoleSilencer } from "@/components/wrappers/common/console-silencer";
-import {cn} from "@/lib/utils";
+import { author, geistMono, poppins } from "@/fonts/fonts";
-import {ConsoleSilencer} from "@/components/wrappers/common/console-silencer";
+import { cn } from "@/lib/utils";
-import {inter} from "@/fonts/fonts";
+import { Providers } from "./providers";
 
-const title = process.env.PROJECT_NAME ?? "App Title";
+const title = process.env.PROJECT_NAME ?? "Portabase";
 
 export const metadata: Metadata = {
-    title: {
+  title: {
-        default: title,
+    default: title,
-        template: `%s - ${title}`
+    template: `%s - ${title}`,
-    },
+  },
-    description: process.env.PROJECT_DESCRIPTION ?? undefined,
+  description: process.env.PROJECT_DESCRIPTION ?? undefined,
 };
 
 export default async function RootLayout({
-                                             children,
+  children,
-                                         }: Readonly<{
+}: Readonly<{
-    children: React.ReactNode;
+  children: React.ReactNode;
 }>) {
-
+  return (
-    return (
+    <html lang="en" suppressHydrationWarning>
-        <html lang="en" suppressHydrationWarning>
+      <head>
-        <head>
+        <meta name="apple-mobile-web-app-title" content={title} />
-            <meta name="apple-mobile-web-app-title" content={title}/>
+      </head>
-        </head>
+      <body
-        <body className={cn(inter.className, "h-full")}>
+        className={cn(
-        <ConsoleSilencer/>
+          poppins.variable,
-        <Providers>
+          author.variable,
-            {children}
+          geistMono.variable,
-        </Providers>
+          "font-sans h-full",
-        </body>
+        )}
-        </html>
+      >
-    );
+        <ConsoleSilencer />
+        <Providers>{children}</Providers>
+      </body>
+    </html>
+  );
 }

app/not-found.tsx

@@ -1,15 +1,19 @@
 import BackButton from "@/components/wrappers/common/button/back-button";
 
 export default async function NotFound() {
-    return(
+  return (
-        <div className="flex items-center min-h-screen px-4 py-12 sm:px-6 md:px-8 lg:px-12 xl:px-16">
+    <div className="flex items-center min-h-screen px-4 py-12 sm:px-6 md:px-8 lg:px-12 xl:px-16">
-            <div className="w-full space-y-6 text-center">
+      <div className="w-full space-y-6 text-center">
-                <div className="space-y-3">
+        <div className="space-y-3">
-                    <h1 className="scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl">Not found</h1>
+          <h1 className="scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl">
-                    <p className="leading-7 [&:not(:first-child)]:mt-6">The content you are trying to view is not available.</p>
+            Not found
-                </div>
+          </h1>
-                <BackButton>Go home</BackButton>
+          <p className="leading-7 not-first:mt-6">
-            </div>
+            The content you are trying to view is not available.
+          </p>
         </div>
-    )
+        <BackButton>Go home</BackButton>
+      </div>
+    </div>
+  );
 }

app/providers.tsx

@@ -1,31 +1,28 @@
 "use client";
 
-import {PropsWithChildren, Suspense} from "react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import {ThemeProvider} from "@/features/theme/theme-provider";
+import { type PropsWithChildren, Suspense } from "react";
-
-import {Toaster} from "@/components/ui/sonner";
-import {QueryClient, QueryClientProvider} from "@tanstack/react-query";
-import {ThemeMetaUpdaterRoot} from "@/features/browser/theme-meta-updater-root";
-import {BackupModalProvider} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
 
+import { Toaster } from "@/components/ui/sonner";
+import { ErrorLayout } from "@/components/wrappers/common/error-layout";
+import { ThemeMetaUpdaterRoot } from "@/features/browser/theme-meta-updater-root";
+import { ThemeProvider } from "@/features/theme/theme-provider";
 
 export type ProviderProps = PropsWithChildren<{}>;
 const queryClient = new QueryClient();
 
 export const Providers = (props: ProviderProps) => {
-    return (
+  return (
-        <Suspense fallback={null}>
+    <Suspense fallback={null}>
-            <ThemeProvider
+      <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-                attribute="class"
+        <ThemeMetaUpdaterRoot />
-                defaultTheme="system"
+        <QueryClientProvider client={queryClient}>
-                enableSystem
+          <ErrorLayout>
-            >
+            <Toaster />
-                <ThemeMetaUpdaterRoot/>
+            {props.children}
-                <QueryClientProvider client={queryClient}>
+          </ErrorLayout>
-                        <Toaster/>
+        </QueryClientProvider>
-                        {props.children}
+      </ThemeProvider>
-                </QueryClientProvider>
+    </Suspense>
-            </ThemeProvider>
+  );
-        </Suspense>
-    );
 };

docker-compose.func.yml

@@ -0,0 +1,35 @@
+name: portabase-dev-func
+
+services:
+  keycloak:
+    image: quay.io/keycloak/keycloak:latest
+    command: start-dev --import-realm
+    # environment:
+    #   KC_BOOTSTRAP_ADMIN_USERNAME: admin
+    #   KC_BOOTSTRAP_ADMIN_PASSWORD: admin
+    ports:
+      - "3056:8080"
+    volumes:
+      - keycloak-data:/opt/keycloak/data
+      - ./seeds/keycloak:/opt/keycloak/data/import:ro
+      - ./export:/tmp/export
+  pocket-id:
+    image: ghcr.io/pocket-id/pocket-id
+    restart: unless-stopped
+    environment:
+      - APP_URL=http://localhost:3055
+      - ENCRYPTION_KEY=QwHyjbZvSsDUAcjpdmSPsuYxaH6vET6OeBaeLwXccCb43L6Om3W1AoU5pKIJTzYr
+    ports:
+      - 3055:1411
+    volumes:
+      - pocket-id-data:/app/data
+      - ./seeds/pocket-id:/seed:ro
+    healthcheck:
+      test: "curl -f http://localhost:1411/healthz"
+      interval: 1m30s
+      timeout: 5s
+      retries: 2
+      start_period: 10s
+volumes:
+  keycloak-data:
+  pocket-id-data:

docker-compose.prod.yml

@@ -1,19 +1,18 @@
-name: portabase-prod
-
 services:
-
   app:
-    build:
+#        build:
-      context: .
+#          context: .
-      dockerfile: docker/dockerfile/Dockerfile
+#          dockerfile: docker/dockerfile/Dockerfile
-      target: prod
+#          target: prod
-    image: portabase/portabase:1.2.5-rc.9
+    image: portabase/portabase:1.7.1
     ports:
       - '8887:80'
     environment:
       TZ: "Europe/Paris"
     env_file:
       - .env
+    volumes:
+      - portabase-data:/data
     depends_on:
       db:
         condition: service_healthy
@@ -36,4 +35,5 @@ services:
       retries: 5
 
 volumes:
+  portabase-data:
   postgres-data:

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - POSTGRES_USER=devuser
       - POSTGRES_PASSWORD=changeme
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U devuser -d devdb" ]
+      test: ["CMD-SHELL", "pg_isready -U devuser -d devdb"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -30,6 +30,7 @@ services:
       - "localhost:host-gateway"
     volumes:
       - ./private/uploads/tmp:/data/uploads/tmp
+    user: "1000:1000"
 
 volumes:
   postgres-data:

docker/dockerfile/Dockerfile

@@ -1,4 +1,3 @@
-#FROM node:22-bullseye AS base
 FROM --platform=$BUILDPLATFORM node:22-bullseye AS base
 
 RUN apt-get update && apt-get install -y \
@@ -18,6 +17,21 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 
+RUN mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    | gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" \
+    > /etc/apt/sources.list.d/pgdg.list
+
+RUN apt-get update && apt-get install -y \
+    postgresql-18 \
+    postgresql-client-18 \
+    postgresql-contrib-18 \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV PATH="/usr/lib/postgresql/18/bin:${PATH}"
+
+
 FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS tusd-base
 
 ARG TUSD_VERSION=2.8.0
@@ -76,6 +90,9 @@ ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV PORT=80
 ENV HOSTNAME="0.0.0.0"
+ENV PGDATA=/data/postgres
+ENV PRIVATE_PATH=/data/private
+
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
@@ -95,13 +112,13 @@ RUN chmod +x /usr/local/bin/tusd
 COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
 
 
-RUN mkdir -p .next /app/private/uploads \
+RUN mkdir -p .next /data/private/uploads \
-    && chown -R nextjs:nodejs .next /app/private /app/public
+    && chown -R nextjs:nodejs .next /data/private /app/public
+
 
 USER root
 COPY ./docker/entrypoints/app-prod-entrypoint.sh /app/app-prod-entrypoint.sh
 RUN chmod +x /app/app-prod-entrypoint.sh
 
 EXPOSE 80
-#USER nextjs
 ENTRYPOINT ["sh","/app/app-prod-entrypoint.sh"]

docker/entrypoints/app-prod-entrypoint.sh

@@ -7,9 +7,72 @@ else
     echo "[WARN] No TZ provided, using default container timezone"
 fi
 
-mkdir -p /app/private/uploads/tmp
+POSTGRES_BIN=$(ls -d /usr/lib/postgresql/*/bin | head -n 1)
+
+if [ -z "$POSTGRES_BIN" ]; then
+    echo "PostgreSQL binaries not found"
+    exit 1
+fi
+
+export PATH="$POSTGRES_BIN:$PATH"
+
+if [ -z "$DATABASE_URL" ]; then
+    echo "[INFO] No DATABASE_URL provided, starting internal Postgres..."
+
+    mkdir -p "$PGDATA"
+    chown -R postgres:postgres "$PGDATA"
+
+    if [ ! -f "$PGDATA/PG_VERSION" ]; then
+        echo "[INFO] Initializing database cluster..."
+        if ! su postgres -c "initdb -D '$PGDATA'" > /dev/null 2>&1; then
+            echo "[ERROR] initdb failed"
+            exit 1
+        fi
+    fi
+
+    if ! su postgres -c "pg_ctl -D '$PGDATA' \
+        -o \"-c listen_addresses='localhost' -c logging_collector=on\" \
+        -l $PGDATA/postgres.log -w start" > /dev/null 2>&1; then
+        echo "[ERROR] PostgreSQL failed to start"
+        exit 1
+    fi
+
+    until su postgres -c "pg_isready -h 127.0.0.1 -p 5432" > /dev/null 2>&1; do
+        sleep 1
+    done
+
+    echo "[INFO] PostgreSQL server is up and accepting connections"
+
+    DB_USER="${POSTGRES_USER:-portabase_user}"
+    DB_PASS="${POSTGRES_PASSWORD:-JaB6b1SUtIWYvt7srnOt}"
+    DB_NAME="${POSTGRES_DB:-portabase_db}"
+
+    USER_EXISTS=$(su postgres -c "psql -tAc \"SELECT 1 FROM pg_roles WHERE rolname='$DB_USER'\"" 2>/dev/null)
+    if [ "$USER_EXISTS" != "1" ]; then
+        if ! su postgres -c "psql -c \"CREATE USER $DB_USER WITH PASSWORD '$DB_PASS';\"" > /dev/null 2>&1; then
+            echo "[ERROR] Failed creating user"
+            exit 1
+        fi
+    fi
+
+    DB_EXISTS=$(su postgres -c "psql -tAc \"SELECT 1 FROM pg_database WHERE datname='$DB_NAME'\"" 2>/dev/null)
+    if [ "$DB_EXISTS" != "1" ]; then
+        if ! su postgres -c "psql -c \"CREATE DATABASE $DB_NAME OWNER $DB_USER;\"" > /dev/null 2>&1; then
+            echo "[ERROR] Failed creating database"
+            exit 1
+        fi
+    fi
+
+    export DATABASE_URL="postgres://$DB_USER:$DB_PASS@127.0.0.1:5432/$DB_NAME"
+
+    echo "[SUCCESS] Internal PostgreSQL started successfully"
+    echo "[SUCCESS] Database: $DB_NAME | User: $DB_USER | Host: 127.0.0.1:5432"
+fi
+
+
+mkdir -p /data/private/uploads/tmp
 echo "▶ Starting tusd server..."
-tusd --base-path /tus/files/ --upload-dir /app/private/uploads/tmp --hooks-http http://127.0.0.1:3000/api/tus/hooks --port 1080 --max-size 21474836480 &
+tusd --base-path /tus/files/ --upload-dir /data/private/uploads/tmp --hooks-http http://127.0.0.1:3000/api/tus/hooks --port 1080 --max-size 21474836480 &
 
 echo "▶ Starting Next.js server..."
 PORT=3000 node server.js &

e2e/auth.spec.ts

@@ -0,0 +1,135 @@
+import {test, expect, Page} from '@playwright/test';
+
+
+type UserCredentials = {
+    username: string
+    email: string
+    password: string
+}
+
+
+const users: Record<string, UserCredentials> = {
+    admin: {username: 'Admin', email: 'admin@example.com', password: 'testPASS123456!'},
+    normal: {username: 'John Doe', email: 'john.doe@example.com', password: 'testPASS123456!'},
+}
+
+async function register(page: Page, name: string, email: string, password: string, confirmPassword: string) {
+    await page.locator('input[name="name"]').fill(name)
+    await page.locator('input[name="email"]').fill(email)
+    await page.locator('input[name="password"]').fill(password)
+    await page.locator('input[name="confirmPassword"]').fill(confirmPassword)
+
+    await page.click('button[type="submit"]')
+}
+
+async function login(page: Page, email: string, password: string) {
+    await page.locator('input[name="email"]').fill(email)
+    await page.locator('input[name="password"]').fill(password)
+
+    await page.locator('button:has-text("Login")').click()
+}
+
+async function logout() {
+    //TODO
+}
+
+test.describe.serial('User signup and login flows', () => {
+
+    test('Redirect to login if not connected', async ({page}) => {
+        await page.goto('/dashboard/projects');
+        await expect(page).toHaveURL("login?redirect=%2Fdashboard%2Fprojects");
+    });
+
+    test('Password too short', async ({page}) => {
+        await page.goto('')
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        let password = '123456'
+        await register(page, users["admin"].username, users["admin"].email, password, password)
+
+        const toast = page.locator('text=Must have at least 8 character')
+        await expect(toast).toBeVisible()
+    })
+
+    test('Password too simple', async ({page}) => {
+        await page.goto('')
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        let password = '12345678'
+        await register(page, users["admin"].username, users["admin"].email, password, password)
+
+        const toast = page.locator('text=Your password must contain at least one uppercase letter, one lowercase letter, one number, and one special character.')
+        await expect(toast).toBeVisible()
+    })
+
+    test('Password and confirm password mismatch', async ({page}) => {
+        await page.goto('/')
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        let password = 'testPASS123456!'
+        let confirmPassword = 'testPASS123456!!'
+        await register(page, users["admin"].username, users["admin"].email, password, confirmPassword)
+
+        const toast = page.locator('text=The passwords did not match')
+        await expect(toast).toBeVisible()
+    })
+
+    test('Successful register for admin', async ({page}) => {
+        await page.goto('/')
+
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        await register(page, users["admin"].username, users["admin"].email, users["admin"].password, users["admin"].password)
+
+        await expect(page).toHaveURL('/login')
+    })
+
+    test('User already exists.', async ({page}) => {
+        await page.goto('/')
+
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        await register(page, users["admin"].username, users["admin"].email, users["admin"].password, users["admin"].password)
+
+        const toast = page.locator('text=User already exists. Use another email.')
+        await expect(toast).toBeVisible()
+    })
+
+    test('Successful register for normal', async ({page}) => {
+        await page.goto('/')
+
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        await register(page, users["normal"].username, users["normal"].email, users["normal"].password, users["normal"].password)
+
+        await expect(page).toHaveURL('login')
+    })
+
+    test('Failed login because account not active', async ({page}) => {
+        await page.goto('/login')
+        await login(page, users["normal"].email, users["normal"].password)
+
+        const toast = page.locator('text=Your account is not active.')
+        await expect(toast).toBeVisible()
+    })
+
+    test('Successful login', async ({page}) => {
+        await page.goto('login')
+        await login(page, users["admin"].email, users["admin"].password)
+
+        await expect(page).toHaveURL('/dashboard/home')
+    })
+
+})
+
+
+// test('Successful logout', async ({page}) => {
+//     await logout()
+//     await expect(page).toHaveURL('/login')
+// })

helm/.helmignore

@@ -0,0 +1,17 @@
+.DS_Store
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+.project
+.idea/
+*.tmproj
+.vscode/

helm/Chart.yaml

@@ -0,0 +1,28 @@
+apiVersion: v2
+name: portabase
+description: Helm chart for Portabase
+type: application
+version: 0.0.0
+appVersion: "latest"
+keywords:
+  - postgresql
+  - mariadb
+  - mongodb
+  - mysql
+  - sqlite
+  - backup
+  - database
+  - restore
+home: https://github.com/Portabase/portabase
+
+sources:
+  - https://github.com/Portabase/portabase
+  - https://github.com/Portabase/portabase/tree/main/helm
+
+maintainers:
+  - name: Charles Gauthereau
+    url: https://github.com/RambokDev
+  - name: Killian Larcher
+    url: https://github.com/KillianLarcher
+
+icon: https://raw.githubusercontent.com/Portabase/portabase/main/.github/assets/logo.png

helm/README.md

@@ -0,0 +1,32 @@
+# Development Notes
+
+## Check that Kubernetes is reachable locally
+
+```bash
+kubectl get nodes
+```
+
+## Install the local Portabase Helm chart
+
+```bash
+helm install portabase . \
+--set project.secret=$(openssl rand -hex 32)
+```
+
+## Check the pods
+
+```bash
+kubectl get pods
+```
+
+## Check the services
+
+```bash
+kubectl get svc
+```
+
+## If the service type is ClusterIP, expose it locally using port forwarding:
+
+```bash
+kubectl port-forward svc/portabase 8887:80
+```

helm/templates/deployment.yaml

@@ -0,0 +1,33 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: portabase
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: portabase
+  template:
+    metadata:
+      labels:
+        app: portabase
+    spec:
+      containers:
+        - name: portabase
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          ports:
+            - containerPort: 80
+          env:
+            - name: TZ
+              value: {{ .Values.timezone }}
+            - name: PROJECT_URL
+              value: {{ .Values.project.url }}
+            - name: PROJECT_SECRET
+              value: {{ .Values.project.secret }}
+          volumeMounts:
+            - name: data
+              mountPath: /data
+      volumes:
+        - name: data
+          persistentVolumeClaim:
+            claimName: portabase-data

helm/templates/pvc.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: portabase-data
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size }}

helm/templates/service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: portabase
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    app: portabase
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: 80
+      nodePort: {{ .Values.service.nodePort }}

helm/values.yaml

@@ -0,0 +1,47 @@
+image:
+  repository: portabase/portabase
+  tag: latest
+  pullPolicy: Always
+
+replicaCount: 1
+
+service:
+  type: ClusterIP
+  port: 80
+  targetPort: 80
+
+resources:
+  requests:
+    memory: "1Gi"
+    cpu: "1"
+  limits:
+    memory: "1Gi"
+    cpu: "1"
+
+timezone: Europe/Paris
+
+project:
+  url: http://localhost:8887
+  secret: "change_me_generate_secure_secret"
+
+persistence:
+  enabled: true
+  storageClassName: ""
+  accessMode: ReadWriteOnce
+  size: 10Gi
+  mountPath: /data
+
+ingress:
+  enabled: false
+  className: nginx
+  hosts:
+    - host: portabase.example.com
+      paths:
+        - path: /
+          pathType: Prefix
+  tls: []
+
+updateStrategy:
+  type: RollingUpdate
+  rollingUpdate:
+    partition: 0

next.config.ts

@@ -43,6 +43,9 @@ const nextConfig: NextConfig = {
     typescript: {
         ignoreBuildErrors: true,
     },
+    logging: {
+        browserToTerminal: false,
+    },
     experimental: {
         serverActions: {
             bodySizeLimit: "10gb",

package.json

@@ -1,133 +1,136 @@
 {
   "name": "portabase",
-  "version": "1.2.5-rc.11",
+  "version": "1.9.2",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack -p 8887",
     "build": "next build --experimental-build-mode compile",
     "start": "next start",
-
-
     "lint": "next lint",
     "email": "email dev --dir ./src/components/emails",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "drizzle-kit migrate",
     "db:drop": "drizzle-kit drop",
-    "auth:generate": "npx @better-auth/cli generate --config ./src/lib/auth/auth.ts"
+    "auth:generate": "npx @better-auth/cli generate --config ./src/lib/auth/auth.ts",
+    "release": "release-it"
   },
   "dependencies": {
-    "@hookform/resolvers": "^5.0.1",
+    "@better-auth/passkey": "^1.5.6",
-    "@radix-ui/react-accordion": "^1.2.10",
+    "@better-auth/sso": "^1.5.6",
-    "@radix-ui/react-alert-dialog": "^1.1.13",
+    "@hookform/resolvers": "^5.2.2",
-    "@radix-ui/react-aspect-ratio": "^1.1.6",
+    "@radix-ui/react-accordion": "^1.2.12",
-    "@radix-ui/react-avatar": "^1.1.9",
+    "@radix-ui/react-alert-dialog": "^1.1.15",
-    "@radix-ui/react-checkbox": "^1.3.1",
+    "@radix-ui/react-aspect-ratio": "^1.1.8",
-    "@radix-ui/react-collapsible": "^1.1.10",
+    "@radix-ui/react-avatar": "^1.1.11",
-    "@radix-ui/react-context-menu": "^2.2.14",
+    "@radix-ui/react-checkbox": "^1.3.3",
-    "@radix-ui/react-dialog": "^1.1.13",
+    "@radix-ui/react-collapsible": "^1.1.12",
-    "@radix-ui/react-dropdown-menu": "^2.1.14",
+    "@radix-ui/react-context-menu": "^2.2.16",
-    "@radix-ui/react-hover-card": "^1.1.13",
+    "@radix-ui/react-dialog": "^1.1.15",
+    "@radix-ui/react-dropdown-menu": "^2.1.16",
+    "@radix-ui/react-hover-card": "^1.1.15",
     "@radix-ui/react-icons": "^1.3.2",
-    "@radix-ui/react-label": "^2.1.6",
+    "@radix-ui/react-label": "^2.1.8",
-    "@radix-ui/react-menubar": "^1.1.14",
+    "@radix-ui/react-menubar": "^1.1.16",
-    "@radix-ui/react-navigation-menu": "^1.2.12",
+    "@radix-ui/react-navigation-menu": "^1.2.14",
-    "@radix-ui/react-popover": "^1.1.13",
+    "@radix-ui/react-popover": "^1.1.15",
-    "@radix-ui/react-progress": "^1.1.6",
+    "@radix-ui/react-progress": "^1.1.8",
-    "@radix-ui/react-radio-group": "^1.3.6",
+    "@radix-ui/react-radio-group": "^1.3.8",
-    "@radix-ui/react-scroll-area": "^1.2.8",
+    "@radix-ui/react-scroll-area": "^1.2.10",
-    "@radix-ui/react-select": "^2.2.4",
+    "@radix-ui/react-select": "^2.2.6",
-    "@radix-ui/react-separator": "^1.1.6",
+    "@radix-ui/react-separator": "^1.1.8",
-    "@radix-ui/react-slider": "^1.3.4",
+    "@radix-ui/react-slider": "^1.3.6",
-    "@radix-ui/react-slot": "^1.2.2",
+    "@radix-ui/react-slot": "^1.2.4",
-    "@radix-ui/react-switch": "^1.2.4",
+    "@radix-ui/react-switch": "^1.2.6",
-    "@radix-ui/react-tabs": "^1.1.11",
+    "@radix-ui/react-tabs": "^1.1.13",
-    "@radix-ui/react-toast": "^1.2.13",
+    "@radix-ui/react-toast": "^1.2.15",
-    "@radix-ui/react-toggle": "^1.1.8",
+    "@radix-ui/react-toggle": "^1.1.10",
-    "@radix-ui/react-toggle-group": "^1.1.9",
+    "@radix-ui/react-toggle-group": "^1.1.11",
-    "@radix-ui/react-tooltip": "^1.2.6",
+    "@radix-ui/react-tooltip": "^1.2.8",
     "@react-email/components": "^0.0.41",
-    "@t3-oss/env-nextjs": "^0.13.4",
+    "@t3-oss/env-nextjs": "^0.13.11",
-    "@tanstack/react-query": "^5.76.1",
+    "@tanstack/react-query": "^5.95.2",
     "@tanstack/react-table": "^8.21.3",
-    "@types/express": "^5.0.6",
+    "@types/nodemailer": "^6.4.23",
-    "@types/nodemailer": "^6.4.17",
     "@types/ws": "^8.18.1",
     "@zenstackhq/runtime": "2.14.2",
-    "argon2": "^0.43.0",
+    "argon2": "^0.43.1",
     "bcrypt": "^6.0.0",
-    "better-auth": "1.4.5",
+    "better-auth": "1.5.6",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
-    "dockerode": "^4.0.6",
+    "dockerode": "^4.0.10",
-    "dotenv": "^16.5.0",
+    "dotenv": "^16.6.1",
     "drizzle-orm": "^0.43.1",
     "drizzle-zod": "^0.7.1",
     "embla-carousel-react": "^8.6.0",
-    "express": "^5.2.1",
     "googleapis": "^170.1.0",
     "input-otp": "^1.4.2",
     "lucide-react": "^0.553.0",
-    "minio": "^8.0.5",
+    "minio": "^8.0.7",
-    "motion": "^12.23.24",
+    "motion": "^12.38.0",
-    "next": "16.1.5",
+    "next": "16.2.1",
     "next-safe-action": "^7.10.8",
     "next-themes": "^0.4.6",
     "node-cron": "^4.2.1",
-    "node-forge": "^1.3.1",
+    "node-forge": "^1.4.0",
-    "nodemailer": "^7.0.3",
+    "nodemailer": "^7.0.13",
-    "npm-check-updates": "^18.0.1",
+    "npm-check-updates": "^18.3.1",
-    "pg": "^8.16.0",
+    "pg": "^8.20.0",
-    "prettier": "^3.8.0",
+    "prettier": "^3.8.1",
-    "react": "^19.2.0",
+    "react": "^19.2.4",
     "react-day-picker": "9.7.0",
-    "react-dom": "^19.2.0",
+    "react-dom": "^19.2.4",
-    "react-dropzone": "^14.3.8",
+    "react-dropzone": "^14.4.1",
-    "react-email": "^4.0.13",
+    "react-email": "^4.3.2",
-    "react-hook-form": "^7.56.3",
+    "react-hook-form": "^7.72.0",
     "react-qr-code": "^2.0.18",
-    "react-resizable-panels": "^3.0.2",
+    "react-resizable-panels": "^3.0.6",
-    "react-twc": "^1.4.2",
+    "react-twc": "^1.5.1",
     "react-use-measure": "^2.1.7",
-    "recharts": "^2.15.3",
+    "recharts": "^2.15.4",
     "sharp": "^0.34.5",
-    "socket.io": "^4.8.1",
+    "socket.io": "^4.8.3",
-    "socket.io-client": "^4.8.1",
+    "socket.io-client": "^4.8.3",
-    "sonner": "^2.0.3",
+    "sonner": "^2.0.7",
-    "swiper": "^12.0.3",
+    "swiper": "^12.1.3",
-    "tailwind-merge": "^3.3.0",
+    "tailwind-merge": "^3.5.0",
     "uuid": "^11.1.0",
     "vaul": "^1.1.2",
-    "ws": "^8.18.2",
+    "ws": "^8.20.0",
-    "zod": "^3.24.4"
+    "zod": "^3.25.76"
   },
   "devDependencies": {
-    "@iconify/react": "^6.0.0",
+    "@iconify/react": "^6.0.2",
+    "@playwright/test": "1.58.2",
     "@react-email/preview-server": "4.3.2",
-    "@react-email/render": "^2.0.1",
+    "@react-email/render": "^2.0.4",
-    "@tailwindcss/postcss": "^4.1.7",
+    "@release-it/bumper": "^7.0.5",
+    "@release-it/conventional-changelog": "^10.0.6",
+    "@tailwindcss/postcss": "^4.2.2",
     "@types/eslint-plugin-tailwindcss": "^3.17.0",
-    "@types/node": "^22.15.18",
+    "@types/node": "^22.19.15",
-    "@types/node-forge": "^1",
+    "@types/node-forge": "^1.3.14",
-    "@types/pg": "^8.15.2",
+    "@types/pg": "^8.20.0",
-    "@types/react": "^19.1.4",
+    "@types/react": "^19.2.14",
-    "@types/react-dom": "^19.1.5",
+    "@types/react-dom": "^19.2.3",
-    "@zenstackhq/openapi": "^2.14.2",
+    "@zenstackhq/openapi": "^2.22.1",
-    "@zenstackhq/tanstack-query": "^2.14.2",
+    "@zenstackhq/tanstack-query": "^2.22.2",
-    "baseline-browser-mapping": "^2.9.19",
+    "baseline-browser-mapping": "^2.10.12",
-    "drizzle-kit": "^0.31.1",
+    "drizzle-kit": "^0.31.10",
-    "esbuild": "^0.27.2",
+    "esbuild": "^0.27.4",
-    "eslint": "^9.39.0",
+    "eslint": "^9.39.4",
-    "eslint-config-next": "^16.0.1",
+    "eslint-config-next": "^16.2.1",
-    "eslint-plugin-tailwindcss": "^3.18.0",
+    "eslint-plugin-tailwindcss": "^3.18.2",
-    "framer-motion": "^12.24.7",
+    "framer-motion": "^12.38.0",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.8",
-    "tailwindcss": "^4.1.7",
+    "release-it": "^19.2.4",
-    "tsx": "^4.19.4",
+    "tailwindcss": "^4.2.2",
-    "tw-animate-css": "^1.2.9",
+    "tsx": "^4.21.0",
-    "typescript": "^5.8.3",
+    "tw-animate-css": "^1.4.0",
+    "typescript": "^5.9.3",
     "zenstack": "2.14.2"
   },
-  "packageManager": "pnpm@10.28.1+sha512.7d7dbbca9e99447b7c3bf7a73286afaaf6be99251eb9498baefa7d406892f67b879adb3a1d7e687fc4ccc1a388c7175fbaae567a26ab44d1067b54fcb0d6a316"
+  "packageManager": "pnpm@10.33.0"
 }

playwright.config.ts

@@ -0,0 +1,79 @@
+import { defineConfig, devices } from '@playwright/test';
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// import dotenv from 'dotenv';
+// import path from 'path';
+// dotenv.config({ path: path.resolve(__dirname, '.env') });
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  testDir: './e2e',
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: 'html',
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('')`. */
+    baseURL: process.env.PROJECT_URL,
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry',
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
+
+    /* Test against mobile viewports. */
+    {
+      name: 'Mobile Chrome',
+      use: { ...devices['Pixel 5'] },
+    },
+    {
+      name: 'Mobile Safari',
+      use: { ...devices['iPhone 12'] },
+    },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  // webServer: {
+  //   command: 'docker compose up -d && make up',
+  //   url: 'http://localhost:8887',
+  //   reuseExistingServer: !process.env.CI,
+  // },
+});

portabase.config.ts

@@ -1,17 +1,5 @@
 
 
-export interface AuthProviderConfig {
-    id: "google" | "github" | "credential";
-    isActive: boolean;
-    icon: string;
-    isManual?: boolean;
-    credentials?: {
-        clientId: string;
-        clientSecret: string;
-    };
-}
-
-
 export const PORTABASE_DEFAULT_SETTINGS = {
     SECURITY: {
         CSP: {
@@ -64,7 +52,7 @@ export const PORTABASE_DEFAULT_SETTINGS = {
             FORM_ACTION: ["'self'"],
             FRAME_ANCESTORS: ["'none'"],
             BLOCK_ALL_MIXED_CONTENT: false,
-            UPGRADE_INSECURE_REQUESTS: true,
+            UPGRADE_INSECURE_REQUESTS: process.env.PROJECT_URL?.startsWith("https://") || false,
         },
         PERMISSIONS_POLICY: {
             CAMERA: ["()"],
@@ -76,35 +64,3 @@ export const PORTABASE_DEFAULT_SETTINGS = {
     },
 };
 
-
-export const SUPPORTED_PROVIDERS: AuthProviderConfig[] = [
-    {
-        id: "google",
-        icon: "hugeicons:chrome",
-        isActive: Boolean(process.env.AUTH_GOOGLE_METHOD),
-        // isManual: true,
-        credentials: {
-            clientId: process.env.AUTH_GOOGLE_ID || "",
-            clientSecret: process.env.AUTH_GOOGLE_SECRET || "",
-        },
-    },
-    {
-        id: "github",
-        icon: "iconoir:github",
-        isActive: Boolean(process.env.AUTH_GITHUB_METHOD),
-        credentials: {
-            clientId: process.env.AUTH_GITHUB_ID || "",
-            clientSecret: process.env.AUTH_GITHUB_SECRET || "",
-        },
-    },
-    {
-        id: "credential",
-        isActive: true,
-        icon: "proicons:key",
-        isManual: true,
-        credentials: {
-            clientId: "",
-            clientSecret: "",
-        },
-    },
-];

proxy.ts

@@ -1,75 +1,81 @@
-import {NextRequest, NextResponse} from "next/server";
+import { NextRequest, NextResponse } from "next/server";
-import {loggingMiddleware} from "@/middleware/loggingMiddleware";
+import { loggingMiddleware } from "@/middleware/loggingMiddleware";
-import {errorHandler} from "@/middleware/errorHandler";
+import { errorHandler } from "@/middleware/errorHandler";
-import {auth} from "@/lib/auth/auth";
+import { auth } from "@/lib/auth/auth";
-import {headers} from "next/headers";
+import { headers } from "next/headers";
 
 export async function proxy(request: NextRequest) {
-    const url = request.nextUrl.clone();
+  const url = request.nextUrl.clone();
-    const redirectUrl = encodeURIComponent(request.nextUrl.pathname)
+  const redirectUrl = encodeURIComponent(request.nextUrl.pathname);
 
-    if (url.pathname.startsWith("/dashboard")) {
+  if (url.pathname.startsWith("/dashboard")) {
-        const session = await auth.api.getSession({
+    const session = await auth.api.getSession({
-            headers: await headers(),
+      headers: await headers(),
-        });
+    });
-        if (!session) {
+    if (!session) {
-            return NextResponse.redirect(new URL(`/login?redirect=${redirectUrl}`, request.url));
+      return NextResponse.redirect(
-        }
+        new URL(`/login?redirect=${redirectUrl}`, request.url),
-        if (session.user.banned) {
+      );
-            await auth.api.signOut({headers: await headers()});
-            return NextResponse.redirect(new URL("/login?error=banned", request.url));
-        }
-        if (session.user.role === "pending") {
-            await auth.api.signOut({headers: await headers()});
-            return NextResponse.redirect(new URL(`/login?error=pending?redirect=${redirectUrl}`, request.url));
-        }
-        if (url.pathname === "/dashboard") {
-            return NextResponse.redirect(new URL(`/dashboard/home`, request.url));
-        }
-        return NextResponse.next();
     }
+    if (session.user.banned) {
+      await auth.api.signOut({ headers: await headers() });
+      return NextResponse.redirect(new URL("/login?error=banned", request.url));
+    }
+    if (session.user.role === "pending") {
+      await auth.api.signOut({ headers: await headers() });
+      return NextResponse.redirect(
+        new URL(`/login?error=pending?redirect=${redirectUrl}`, request.url),
+      );
+    }
+    if (url.pathname === "/dashboard") {
+      return NextResponse.redirect(new URL(`/dashboard/home`, request.url));
+    }
+    return NextResponse.next();
+  }
 
-    if (url.pathname.startsWith("/api/auth")) {
+  if (url.pathname.startsWith("/api/auth")) {
-        return NextResponse.next();
+    return NextResponse.next();
-    }
+  }
 
-    if (url.pathname.startsWith("/api")) {
+  if (url.pathname.startsWith("/api")) {
-        const routeExists = checkRouteExists(url.pathname);
+    const routeExists = checkRouteExists(url.pathname);
-        if (!routeExists) {
+    if (!routeExists) {
-            return new NextResponse(JSON.stringify({message: "This API route does not exist.", status: 404}), {
+      return new NextResponse(
-                status: 404,
+        JSON.stringify({
-                headers: {"Content-Type": "application/json"},
+          message: "This API route does not exist.",
-            });
+          status: 404,
-        }
+        }),
-    }
+        {
-    try {
+          status: 404,
-        loggingMiddleware(request);
+          headers: { "Content-Type": "application/json" },
-    } catch (err) {
+        },
-        errorHandler(err);
+      );
     }
+  }
+  try {
+    loggingMiddleware(request);
+  } catch (err) {
+    errorHandler(err);
+  }
 }
 
 function checkRouteExists(pathname: string) {
-    const routePatterns = [
+  const routePatterns = [
-        /^\/api\/agent\/[^/]+\/status\/?$/,
+    /^\/api\/agent\/[^/]+\/status\/?$/,
-        /^\/api\/agent\/[^/]+\/backup\/?$/,
+    /^\/api\/agent\/[^/]+\/backup\/?$/,
-        /^\/api\/agent\/[^/]+\/backup\/upload\/init\/?$/,
+    /^\/api\/agent\/[^/]+\/backup\/upload\/init\/?$/,
-        /^\/api\/agent\/[^/]+\/backup\/upload\/status\/?$/,
+    /^\/api\/agent\/[^/]+\/backup\/upload\/status\/?$/,
-        /^\/api\/agent\/[^/]+\/restore\/?$/,
+    /^\/api\/agent\/[^/]+\/restore\/?$/,
-        /^\/api\/files\/images\/[^/]+\/?$/,
+    /^\/api\/files\/images\/[^/]+\/?$/,
-        /^\/api\/files\/backups\/?$/,
+    /^\/api\/files\/backups\/?$/,
-        /^\/api\/tus\/hooks\/?$/,
+    /^\/api\/tus\/hooks\/?$/,
-        /^\/api\/events\/?$/,
+    /^\/api\/events\/?$/,
-        /^\/api\/config\/?$/,
+    /^\/api\/config\/?$/,
-        /^\/api\/google\/drive\/callback\/?$/,
+    /^\/api\/google\/drive\/callback\/?$/,
-    ];
+  ];
-    return routePatterns.some((pattern) => pattern.test(pathname));
+  return routePatterns.some((pattern) => pattern.test(pathname));
 }
 
 export const config = {
-    matcher: [
+  matcher: ["/api/:path*", "/dashboard/:path*", "/dashboard"],
-        "/api/:path*",
-        "/dashboard/:path*",
-        "/dashboard",
-    ]
 };

release

@@ -1,95 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ -z "$1" ]; then
-  echo "Usage: ./release <version>"
-  echo "Example: ./release v1.0.0"
-  exit 1
-fi
-
-VERSION=$1
-CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-
-if [ "$CURRENT_BRANCH" = "main" ]; then
-  if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    echo "Error: On 'main' branch, only release tags (X.Y.Z) are allowed."
-    exit 1
-  fi
-else
-  if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ ]]; then
-    echo "Error: On branch '$CURRENT_BRANCH', only RC tags matching X.Y.Z-rc.W are allowed (e.g., 1.0.0-rc.1)."
-    exit 1
-  fi
-fi
-
-CLEAN_VERSION=${VERSION#v}
-CURRENT_DATE=$(date +%Y-%m-%d)
-
-echo "Preparing release $VERSION..."
-
-
-# package.json
-if [ -f package.json ]; then
-  echo "Updating package.json..."
-  if sed --version >/dev/null 2>&1; then
-    sed -i "s/\"version\": \".*\"/\"version\": \"$CLEAN_VERSION\"/" package.json
-  else
-    sed -i '' "s/\"version\": \".*\"/\"version\": \"$CLEAN_VERSION\"/" package.json
-  fi
-fi
-
-# pyproject.toml
-if [ -f pyproject.toml ]; then
-  echo "Updating pyproject.toml..."
-  if sed --version >/dev/null 2>&1; then
-    sed -i "s/^version = \".*\"/version = \"$CLEAN_VERSION\"/" pyproject.toml
-  else
-    sed -i '' "s/^version = \".*\"/version = \"$CLEAN_VERSION\"/" pyproject.toml
-  fi
-fi
-
-# Cargo.toml
-if [ -f Cargo.toml ]; then
-  echo "Updating Cargo.toml..."
-  if sed --version >/dev/null 2>&1; then
-    sed -i "s/^version = \".*\"/version = \"$CLEAN_VERSION\"/" Cargo.toml
-  else
-    sed -i '' "s/^version = \".*\"/version = \"$CLEAN_VERSION\"/" Cargo.toml
-  fi
-fi
-
-# CITATION.cff
-if [ -f CITATION.cff ]; then
-  echo "Updating CITATION.cff..."
-  if sed --version >/dev/null 2>&1; then
-    sed -i "s/^version: .*/version: $CLEAN_VERSION/" CITATION.cff
-    sed -i "s/^date-released: .*/date-released: \"$CURRENT_DATE\"/" CITATION.cff
-  else
-    sed -i '' "s/^version: .*/version: $CLEAN_VERSION/" CITATION.cff
-    sed -i '' "s/^date-released: .*/date-released: \"$CURRENT_DATE\"/" CITATION.cff
-  fi
-fi
-
-git add .
-
-if ! git diff-index --quiet HEAD --; then
-  echo "Committing changes..."
-  git commit -m "chore(release): $VERSION"
-else
-  echo "No changes to commit. Proceeding to tag..."
-fi
-
-if git rev-parse "$VERSION" >/dev/null 2>&1; then
-    echo "Tag $VERSION already exists. Aborting."
-    exit 1
-fi
-
-echo "Creating tag $VERSION..."
-git tag -a "$VERSION" -m "Release $VERSION"
-
-echo "Pushing changes and tags to remote..."
-git push
-git push origin "$VERSION"
-
-echo "Successfully released $VERSION!"

server/api.ts

@@ -1,6 +0,0 @@
-import express from "express";
-import router from "../src/features/api/router";
-
-export function mountApi(app: express.Express) {
-    app.use("/services/v1", router);
-}

server/server.ts

@@ -1,52 +0,0 @@
-import next from "next";
-import express from "express";
-import {mountApi} from "./api";
-import http from "http";
-
-const port = Number(process.env.PORT) || 8887;
-const dev = process.env.NODE_ENV !== "production";
-
-async function start() {
-    const nextApp = next({
-        dev,
-        hostname: "0.0.0.0",
-        turbopack: dev,
-        port
-    });
-
-    const handle = nextApp.getRequestHandler();
-
-    await nextApp.prepare();
-
-    const app = express();
-
-    app.use((req, res, next) => {
-        req.setTimeout(0);
-        res.setTimeout(0);
-        next();
-    });
-
-    mountApi(app);
-
-    app.use((req, res, next) => {
-        if (req.path.startsWith('/services/v1')) return next();
-        handle(req, res).catch((err) => {
-            console.error('Next.js App Router error:', err);
-            res.status(500).send('Internal Server Error');
-        });
-    });
-
-    const server = http.createServer(app);
-
-    server.setTimeout(0);
-    server.headersTimeout = 0;
-    server.requestTimeout = 0;
-    server.keepAliveTimeout = 0;
-
-    server.listen(port, "0.0.0.0", () => {
-        console.log(`NEXT APP → http://localhost:${port}`);
-        console.log(`API → http://localhost:${port}/services/v1`);
-    });
-}
-
-start();

src/components/emails/email-create-user.tsx

@@ -6,7 +6,7 @@ import {env} from "@/env.mjs";
 
 interface EmailCreateUserProps {
     email: string;
-    password: string;
+    password?: string;
 }
 
 export const EmailCreateUser = ({email, password}: EmailCreateUserProps) => {
@@ -23,9 +23,15 @@ export const EmailCreateUser = ({email, password}: EmailCreateUserProps) => {
                 <strong>Email: </strong>{email}
             </Text>
 
-            <Text className="text-[14px] text-black leading-[24px]">
+            {password ? (
-                <strong>Default password: </strong>{password}
+                <Text className="text-[14px] text-black leading-[24px]">
-            </Text>
+                    <strong>Default password: </strong>{password}
+                </Text>
+            ) : (
+                <Text className="text-[14px] text-black leading-[24px]">
+                    You can log in using one of the single sign-on (SSO) providers configured by your administrator.
+                </Text>
+            )}
 
             <Section className="mt-[32px] mb-[32px] text-center">
                 <Button

src/components/ui/form.tsx

@@ -208,13 +208,26 @@ type UseZodFormProps<Z extends ZodSchema> = Exclude<
   schema: Z;
 };
 
+
+// const useZodForm = <Z extends ZodSchema>({
+//                                            schema,
+//                                            ...formProps
+//                                          }: UseZodFormProps<Z>) =>
+//     useForm({
+//       ...formProps,
+//         // @ts-ignore
+//       resolver: zodResolver(schema),
+//     });
+
+
 const useZodForm = <Z extends ZodSchema>({
-                                           schema,
+                                             schema,
-                                           ...formProps
+                                             ...formProps
-                                         }: UseZodFormProps<Z>) =>
+                                         }: UseZodFormProps<Z>): UseFormReturn<TypeOf<Z>> =>
-    useForm({
+    useForm<TypeOf<Z>>({
-      ...formProps,
+        ...formProps,
-      resolver: zodResolver(schema),
+        // @ts-ignore
+        resolver: zodResolver(schema),
     });
 
 export {

src/components/ui/github-button.tsx

@@ -7,7 +7,7 @@ import { motion, useInView, type SpringOptions, type UseInViewOptions } from 'mo
 import { cn } from '@/lib/utils';
 
 const githubButtonVariants = cva(
-  'cursor-pointer relative overflow-hidden will-change-transform backface-visibility-hidden transform-gpu transition-transform duration-200 ease-out hover:scale-105 group whitespace-nowrap focus-visible:outline-hidden inline-flex items-center justify-center whitespace-nowrap font-medium ring-offset-background disabled:pointer-events-none disabled:opacity-60 [&_svg]:shrink-0',
+  'cursor-pointer relative overflow-hidden will-change-transform backface-visibility-hidden transform-gpu group whitespace-nowrap focus-visible:outline-hidden inline-flex items-center justify-center whitespace-nowrap font-medium ring-offset-background disabled:pointer-events-none disabled:opacity-60 [&_svg]:shrink-0',
   {
     variants: {
       variant: {

src/components/ui/input.tsx

@@ -8,7 +8,7 @@ function Input({ className, type, ...props }: React.ComponentProps<"input">) {
       type={type}
       data-slot="input"
       className={cn(
-        "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+        "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex w-full min-w-0 rounded-md border bg-transparent px-4 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
         "focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
         "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
         className

src/components/ui/sidebar.tsx

@@ -374,7 +374,7 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
       data-slot="sidebar-content"
       data-sidebar="content"
       className={cn(
-        "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+        "flex min-h-0 flex-1 flex-col gap-2 overflow-auto scrollbar-hide group-data-[collapsible=icon]:overflow-hidden",
         className
       )}
       {...props}

src/components/wrappers/auth/auth-logo-section.tsx

@@ -41,9 +41,6 @@ export const AuthLogoSection = () => {
 
                 />
             )}
-            <span className="absolute bottom-8 right-5 text-sm text-muted-foreground" style={style}>
-                v{env.NEXT_PUBLIC_PROJECT_VERSION}
-            </span>
         </div>
     );
 };

src/components/wrappers/auth/login/forgot-password-form/forgot-password-form.tsx

@@ -68,7 +68,7 @@ export const ForgotPasswordForm = (props: ForgotPasswordFormProps) => {
             />
 
             <div className="flex flex-col items-center gap-y-6 w-full">
-                <ButtonWithLoading className="mt-2 w-full" isPending={mutation.isPending}>
+                <ButtonWithLoading className="mt-2 w-full h-11" isPending={mutation.isPending}>
                     Send reset link
                 </ButtonWithLoading>
                 <Link href="/login" className="group flex items-center text-sm hover:underline">

src/components/wrappers/auth/login/login-form/login-form.tsx

@@ -1,121 +1,133 @@
 "use client";
 
-import {useEffect, useState} from "react";
+import { useMutation } from "@tanstack/react-query";
-import {useMutation} from "@tanstack/react-query";
-import {toast} from "sonner";
-import {FormControl, FormField, FormItem, FormLabel, FormMessage, useZodForm} from "@/components/ui/form";
-import {Input} from "@/components/ui/input";
-import {Form} from "@/components/ui/form";
-import {LoginSchema, LoginType} from "@/components/wrappers/auth/login/login-form/login-form.schema";
-import {signIn} from "@/lib/auth/auth-client";
-import {ButtonWithLoading} from "@/components/wrappers/common/button/button-with-loading";
 import Link from "next/link";
-import {useRouter} from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
-import {PasswordInput} from "@/components/ui/password-input";
+import { useEffect } from "react";
+import { toast } from "sonner";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useZodForm,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { PasswordInput } from "@/components/ui/password-input";
+import {
+  LoginSchema,
+  type LoginType,
+} from "@/components/wrappers/auth/login/login-form/login-form.schema";
+import { ButtonWithLoading } from "@/components/wrappers/common/button/button-with-loading";
+import { signIn } from "@/lib/auth/auth-client";
 
 export type loginFormProps = {
-    defaultValues?: LoginType;
+  defaultValues?: LoginType;
+  isPasskeyEnabled?: boolean;
 };
 
 export const LoginForm = (props: loginFormProps) => {
+  const { isPasskeyEnabled = false } = props;
 
+  const url = useSearchParams();
 
-    const [urlParams, setUrlParams] = useState<URLSearchParams>();
+  const form = useZodForm({
+    schema: LoginSchema,
+  });
 
-    useEffect(() => {
+  const router = useRouter();
-        const urlParams = new URLSearchParams(window.location.search);
-        setUrlParams(urlParams);
-        const error = urlParams.get("error");
-        if (error?.includes("pending")) {
-            toast.error("Your account is not active.");
-            urlParams.delete("error");
-            window.history.replaceState({}, document.title, window.location.pathname + "?" + urlParams.toString());
-        }
-        if (error?.includes("invalid_or_expired_token")) {
-            toast.error("Password reset invalid token.");
-            urlParams.delete("error");
-            window.history.replaceState({}, document.title, window.location.pathname + "?" + urlParams.toString());
-        }
-    }, []);
 
-    const form = useZodForm({
+  const mutation = useMutation({
-        schema: LoginSchema,
+    mutationFn: async (values: LoginType) => {
-    });
+      await signIn.email(
-
+        {
-    const router = useRouter();
+          password: values.password,
-
+          email: values.email,
-    const mutation = useMutation({
+          callbackURL: url?.get("redirect") ?? "/dashboard",
-        mutationFn: async (values: LoginType) => {
-            await signIn.email(
-                {
-                    password: values.password,
-                    email: values.email,
-                    callbackURL: urlParams?.get("redirect") ?? "/dashboard",
-                },
-                {
-                    onSuccess: (context) => {
-                        if (context.data.twoFactorRedirect) {
-                            //@ts-ignore
-                            router.push("/guard?redirect=" + encodeURIComponent(context.data.callbackURL || "/dashboard"));
-                        }
-
-                        toast.success("Login success");
-                    },
-                    onError: (error) => {
-                        toast.error(error.error.message);
-                    },
-                }
-            );
         },
-    });
+        {
+          onSuccess: (context) => {
+            if (context.data.twoFactorRedirect) {
+              router.push(
+                "/guard?redirect=" +
+                  encodeURIComponent(context.data.callbackURL || "/dashboard"),
+              );
+            }
 
-    return (
+            toast.success("Login success");
-        <Form
+          },
-            form={form}
+          onError: (error) => {
-            className="flex flex-col gap-4 mb-1"
+            toast.error(error.error.message);
-            onSubmit={async (values) => {
+          },
-                await mutation.mutateAsync(values);
+        },
-            }}
+      );
-        >
+    },
-            <FormField
+  });
-                control={form.control}
+
-                name="email"
+  return (
-                defaultValue=""
+    <Form
-                render={({field}) => (
+      form={form}
-                    <FormItem>
+      className="flex flex-col gap-4 mb-1"
-                        <FormLabel>Email Address</FormLabel>
+      onSubmit={async (values) => {
-                        <FormControl>
+        await mutation.mutateAsync(values);
-                            <Input autoComplete="email" autoFocus placeholder="exemple@portabase.io" {...field} />
+      }}
-                        </FormControl>
+    >
-                        <FormMessage/>
+      <FormField
-                    </FormItem>
+        control={form.control}
-                )}
+        name="email"
-            />
+        defaultValue=""
-            <FormField
+        render={({ field }) => (
-                control={form.control}
+          <FormItem>
-                name="password"
+            <FormLabel>Email Address</FormLabel>
-                defaultValue=""
+            <FormControl>
-                render={({field}) => (
+              <Input
-                    <FormItem>
+                autoComplete="email"
-                        <div className="flex items-center justify-between">
+                autoFocus
-                            <FormLabel>Password</FormLabel>
+                placeholder="example@portabase.io"
-                            <div className="text-center text-sm">
+                {...field}
-                                <Link href={"/forgot-password"} className="hover:underline ml-1">
+              />
-                                    Forgot your password ?
+            </FormControl>
-                                </Link>
+            <FormMessage />
-                            </div>
+          </FormItem>
-                        </div>
+        )}
-                        <FormControl>
+      />
-                            <PasswordInput autoComplete="current-password webauthn"
+      <FormField
-                                           placeholder={"Enter your password"} {...field} />
+        control={form.control}
-                        </FormControl>
+        name="password"
-                        <FormMessage/>
+        defaultValue=""
-                    </FormItem>
+        render={({ field }) => (
-                )}
+          <FormItem>
-            />
+            <div className="flex items-center justify-between">
-            <ButtonWithLoading className="mt-2" isPending={mutation.isPending}>
+              <FormLabel>Password</FormLabel>
-                Login
+              <div className="text-center text-sm">
-            </ButtonWithLoading>
+                <Link
-        </Form>
+                  href={"/forgot-password"}
-    );
+                  className="hover:underline ml-1"
+                >
+                  Forgot your password ?
+                </Link>
+              </div>
+            </div>
+            <FormControl>
+              <PasswordInput
+                autoComplete={
+                  isPasskeyEnabled
+                    ? "current-password webauthn"
+                    : "current-password"
+                }
+                placeholder={"Enter your password"}
+                {...field}
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+      <ButtonWithLoading className="mt-2 h-11" isPending={mutation.isPending}>
+        Login
+      </ButtonWithLoading>
+    </Form>
+  );
 };

src/components/wrappers/auth/login/reset-password-form/reset-password-form.tsx

@@ -82,7 +82,7 @@ export const ResetPasswordForm = (props: ResetPasswordFormProps) => {
             />
 
             <div className="flex flex-col items-center gap-y-6 w-full">
-                <ButtonWithLoading className="mt-2 w-full" isPending={mutation.isPending}>
+                <ButtonWithLoading className="mt-2 w-full h-11" isPending={mutation.isPending}>
                     Reset
                 </ButtonWithLoading>
                 <Link href="/login" className="group flex items-center text-sm hover:underline">

src/components/wrappers/auth/register/register-form/register-form.tsx

@@ -1,156 +1,169 @@
 "use client";
 
-import {useRouter} from "next/navigation";
+import { useRouter } from "next/navigation";
-import {useMutation} from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
-import {toast} from "sonner";
+import { toast } from "sonner";
-import {CardContent, CardHeader} from "@/components/ui/card";
+import { CardContent, CardHeader } from "@/components/ui/card";
-import {Form} from "@/components/ui/form";
+import { Form } from "@/components/ui/form";
-import {TooltipProvider, TooltipTrigger, Tooltip, TooltipContent} from "@/components/ui/tooltip";
+import {
-import {RegisterSchema, RegisterType} from "@/components/wrappers/auth/register/register-form/register-form.schema";
+  TooltipProvider,
-import {signUp} from "@/lib/auth/auth-client";
+  TooltipTrigger,
-import {useZodForm} from "@/components/ui/form";
+  Tooltip,
-import {CardAuth} from "@/features/layout/card-auth";
+  TooltipContent,
-import {FormField} from "@/components/ui/form";
+} from "@/components/ui/tooltip";
-import {FormItem} from "@/components/ui/form";
+import {
-import {FormLabel} from "@/components/ui/form";
+  RegisterSchema,
-import {FormControl} from "@/components/ui/form";
+  RegisterType,
-import {FormMessage} from "@/components/ui/form";
+} from "@/components/wrappers/auth/register/register-form/register-form.schema";
-import {Input} from "@/components/ui/input";
+import { signUp } from "@/lib/auth/auth-client";
-import {PasswordInput} from "@/components/ui/password-input";
+import { useZodForm } from "@/components/ui/form";
-import {Button} from "@/components/ui/button";
+import { CardAuth } from "@/features/layout/card-auth";
+import { FormField } from "@/components/ui/form";
+import { FormItem } from "@/components/ui/form";
+import { FormLabel } from "@/components/ui/form";
+import { FormControl } from "@/components/ui/form";
+import { FormMessage } from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { PasswordInput } from "@/components/ui/password-input";
+import { Button } from "@/components/ui/button";
 import Link from "next/link";
-import {Info} from "lucide-react";
+import { Info } from "lucide-react";
 
 export type registerFormProps = {
-    defaultValues?: RegisterType;
+  defaultValues?: RegisterType;
 };
 
 export const RegisterForm = (props: registerFormProps) => {
+  const form = useZodForm({
+    schema: RegisterSchema,
+  });
 
-    const form = useZodForm({
+  const router = useRouter();
-        schema: RegisterSchema,
+  const mutation = useMutation({
-    });
+    mutationFn: async (values: RegisterType) => {
-
+      await signUp.email(values, {
-    const router = useRouter();
+        onSuccess: () => {
-    const mutation = useMutation({
+          toast.success(`Account successfully created`);
-        mutationFn: async (values: RegisterType) => {
+          router.refresh();
-            // @ts-ignore
+          router.push(`/login`);
-            await signUp.email(values, {
-                onSuccess: () => {
-                    toast.success(`Account successfully created`);
-                    router.refresh();
-                    router.push(`/login`);
-                },
-                onError: (error) => {
-                    toast.error(error.error.message);
-                },
-            });
         },
-    });
+        onError: (error) => {
+          toast.error(error.error.message);
+        },
+      });
+    },
+  });
 
-
+  return (
-    return (
+    <TooltipProvider>
-        <TooltipProvider>
+      <CardAuth>
-            <CardAuth>
+        <CardHeader>
-                <CardHeader>
+          <div className="grid gap-2 text-center mb-2">
-                    <div className="grid gap-2 text-center mb-2">
+            <h1 className="text-3xl font-bold">Create an account</h1>
-                        <h1 className="text-3xl font-bold">Create an account</h1>
+            <p className="text-balance text-muted-foreground">
-                        <p className="text-balance text-muted-foreground">Enter your informations bellow to register</p>
+              Enter your informations below to register
-                    </div>
+            </p>
-                </CardHeader>
+          </div>
-                <CardContent>
+        </CardHeader>
-                    <Form
+        <CardContent>
-                        form={form}
+          <Form
-                        className="flex flex-col gap-4"
+            form={form}
-                        onSubmit={async (values) => {
+            className="flex flex-col gap-4"
-                            await mutation.mutateAsync(values);
+            onSubmit={async (values) => {
-                        }}
+              await mutation.mutateAsync(values);
-                    >
+            }}
-                        <FormField
+          >
-                            control={form.control}
+            <FormField
-                            name="name"
+              control={form.control}
-                            defaultValue=""
+              name="name"
-                            render={({field}) => (
+              defaultValue=""
-                                <FormItem>
+              render={({ field }) => (
-                                    <FormLabel>Name</FormLabel>
+                <FormItem>
-                                    <FormControl>
+                  <FormLabel>Name</FormLabel>
-                                        <Input placeholder="Your name" {...field} />
+                  <FormControl>
-                                    </FormControl>
+                    <Input placeholder="Your name" {...field} />
-                                    <FormMessage/>
+                  </FormControl>
-                                </FormItem>
+                  <FormMessage />
-                            )}
+                </FormItem>
-                        />
+              )}
-                        <FormField
+            />
-                            control={form.control}
+            <FormField
-                            name="email"
+              control={form.control}
-                            defaultValue=""
+              name="email"
-                            render={({field}) => (
+              defaultValue=""
-                                <FormItem>
+              render={({ field }) => (
-                                    <FormLabel>Email</FormLabel>
+                <FormItem>
-                                    <FormControl>
+                  <FormLabel>Email</FormLabel>
-                                        <Input placeholder="exemple@portabase.io" {...field} />
+                  <FormControl>
-                                    </FormControl>
+                    <Input placeholder="example@portabase.io" {...field} />
-                                    <FormMessage/>
+                  </FormControl>
-                                </FormItem>
+                  <FormMessage />
-                            )}
+                </FormItem>
-                        />
+              )}
-                        <FormField
+            />
-                            control={form.control}
+            <FormField
-                            name="password"
+              control={form.control}
-                            defaultValue=""
+              name="password"
-                            render={({field}) => (
+              defaultValue=""
-                                <FormItem>
+              render={({ field }) => (
-                                    <FormLabel className="flex">
+                <FormItem>
-                                        Password
+                  <FormLabel className="flex">
-                                        <TooltipProvider>
+                    Password
-                                            <Tooltip>
+                    <TooltipProvider>
-                                                <TooltipTrigger asChild>
+                      <Tooltip>
-                                                    <Info className="ml-3" size="15"/>
+                        <TooltipTrigger asChild>
-                                                </TooltipTrigger>
+                          <Info size="15" />
-                                                <TooltipContent>
+                        </TooltipTrigger>
-                                                    <p>
+                        <TooltipContent>
-                                                        Min. 8 characters, 1 uppercase (A-Z), 1 lowercase (a-z), 1
+                          <p>
-                                                        number (0-9), 1 special character (!, @,
+                            Min. 8 characters, 1 uppercase (A-Z), 1 lowercase
-                                                        etc.)
+                            (a-z), 1 number (0-9), 1 special character (!, @,
-                                                    </p>
+                            etc.)
-                                                </TooltipContent>
+                          </p>
-                                            </Tooltip>
+                        </TooltipContent>
-                                        </TooltipProvider>
+                      </Tooltip>
-                                    </FormLabel>
+                    </TooltipProvider>
-                                    <FormControl>
+                  </FormLabel>
-                                        <PasswordInput placeholder="Your password" {...field} />
+                  <FormControl>
-                                    </FormControl>
+                    <PasswordInput placeholder="Your password" {...field} />
-                                    <FormMessage/>
+                  </FormControl>
-                                </FormItem>
+                  <FormMessage />
-                            )}
+                </FormItem>
-                        />
+              )}
-                        <FormField
+            />
-                            control={form.control}
+            <FormField
-                            name="confirmPassword"
+              control={form.control}
-                            defaultValue=""
+              name="confirmPassword"
-                            render={({field}) => (
+              defaultValue=""
-                                <FormItem>
+              render={({ field }) => (
-                                    <FormLabel>Password Confirmation</FormLabel>
+                <FormItem>
-                                    <FormControl>
+                  <FormLabel>Password Confirmation</FormLabel>
-                                        <PasswordInput placeholder="Conform your password" {...field} />
+                  <FormControl>
-                                    </FormControl>
+                    <PasswordInput
-                                    <FormMessage/>
+                      placeholder="Conform your password"
-                                </FormItem>
+                      {...field}
-                            )}
+                    />
-                        />
+                  </FormControl>
-                        <Button type="submit" disabled={mutation.isPending}>
+                  <FormMessage />
-                            Sign up
+                </FormItem>
-                        </Button>
+              )}
-                        <div className="mt-4 text-center text-sm">
+            />
-                            Already have an account ?{" "}
+            <Button
-                            <Link href="/login" className="underline">
+              type="submit"
-                                Sign in
+              className="h-11"
-                            </Link>
+              disabled={mutation.isPending}
-                        </div>
+            >
-
+              Sign up
-                    </Form>
+            </Button>
-                </CardContent>
+            <div className="mt-4 text-center text-sm">
-            </CardAuth>
+              Already have an account ?{" "}
-        </TooltipProvider>
+              <Link href="/login" className="underline">
-    );
+                Sign in
+              </Link>
+            </div>
+          </Form>
+        </CardContent>
+      </CardAuth>
+    </TooltipProvider>
+  );
 };

src/components/wrappers/auth/reset-password/reset-password-form.tsx

@@ -47,7 +47,7 @@ export const ResetPasswordForm = ({token}: ResetPasswordFormProps) => {
             <CardHeader>
                 <div className="grid gap-2 text-center mb-2">
                     <h1 className="text-3xl font-bold">Reset Password</h1>
-                    <p className="text-balance text-muted-foreground">Fill information bellow to change your
+                    <p className="text-balance text-muted-foreground">Fill information below to change your
                         password</p>
                 </div>
             </CardHeader>

src/components/wrappers/auth/social-buttons.tsx

@@ -1,29 +1,53 @@
 "use client";
 
-import React, { useState } from "react";
+import { useState } from "react";
 import { Button } from "@/components/ui/button";
-import { authClient } from "@/lib/auth/auth-client";
+import { authClient, passkey } from "@/lib/auth/auth-client";
 import { Loader2 } from "lucide-react";
 import { toast } from "sonner";
-import {AuthProviderConfig} from "../../../../portabase.config";
+import { Icon } from "@iconify/react";
-import {Icon} from "@iconify/react";
+import { AuthProviderConfig } from "@/lib/auth/config";
+import Image from "next/image";
+import { useRouter } from "next/navigation";
 
 export function SocialAuthButtons({ providers }: { providers: AuthProviderConfig[] }) {
-    const socialProviders = providers.filter(p => p.isActive && !p.isManual);
+    const socialProviders = providers.filter((p) => p.isActive && p.type !== "credential");
+    const router = useRouter();
 
     const [isLoading, setIsLoading] = useState<string | null>(null);
 
-    const handleSocialSignIn = async (providerId: string) => {
+    const handleSocialSignIn = async (provider: AuthProviderConfig) => {
-        setIsLoading(providerId);
+        setIsLoading(provider.id);
         try {
-            const { error } = await authClient.signIn.social({
+            let result;
-                provider: providerId as "google" | "github",
+            if (provider.id === "passkey") {
-                callbackURL: "/dashboard",
+                result = await authClient.signIn.passkey({
-            });
+                    fetchOptions: {
-
+                        onSuccess() {
-            if (error) {
+                            router.push("/dashboard");
-                toast.error("An error occurred while signing in with the provider. Please try again.");
+                        },
+                        onError() {
+                            toast.error("An error occurred during passkey authentication. Please try again.");
+                        },
+                    },
+                });
+            } else if (provider.type === "sso") {
+                result = await authClient.signIn.sso({
+                    providerId: provider.id,
+                    providerType: "oidc",
+                    callbackURL: "/dashboard",
+                });
             } else {
+                result = await authClient.signIn.social({
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    provider: provider.id as any,
+                    callbackURL: "/dashboard",
+                });
+            }
+
+            if (result?.error) {
+                toast.error("An error occurred while signing in with the provider. Please try again.");
+            } else if (provider.id !== "passkey") {
                 toast.success("Redirecting to provider...");
             }
         } catch (err) {
@@ -38,29 +62,24 @@ export function SocialAuthButtons({ providers }: { providers: AuthProviderConfig
     return (
         <div className="flex flex-col gap-2 w-full">
             {socialProviders.map((provider) => (
-                <Button key={provider.id} variant="outline" className="w-full gap-2" onClick={() => handleSocialSignIn(provider.id)} disabled={!!isLoading}>
+                <Button key={provider.id} variant="outline" className="w-full gap-2" onClick={() => handleSocialSignIn(provider)} disabled={!!isLoading}>
-                    {isLoading === provider.id ? <Loader2 className="h-4 w-4 animate-spin" /> :
+                    {isLoading === provider.id ? (
-                        <Icon icon={provider.icon} className="h-4 w-4"/>
+                        <Loader2 className="h-4 w-4 animate-spin" />
-                     }
+                    ) : provider.icon.startsWith("/") || provider.icon.startsWith("http") ? (
-                    <span>{PROVIDERS_TEXT[provider.id].title}</span>
+                        <Image
+                            src={provider.icon}
+                            alt={provider.id || "icon"}
+                            width={16}
+                            height={16}
+                            className="h-4 w-4"
+                            unoptimized={provider.icon.startsWith("http")}
+                        />
+                    ) : (
+                        <Icon icon={provider.icon} className="h-4 w-4" />
+                    )}
+                    <span>{provider.title || provider.name}</span>
                 </Button>
             ))}
         </div>
     );
 }
-
-
-const PROVIDERS_TEXT = {
-    credential: {
-        title: "Password",
-        description: "Use your email address and password to sign in."
-    },
-    google: {
-        title: "Google",
-        description: "Sign in with your Google account."
-    },
-    github: {
-        title: "GitHub",
-        description: "Sign in with your GitHub account."
-    }
-}

src/components/wrappers/common/button/button-with-confirm.tsx

@@ -1,119 +1,198 @@
-"use client"
+"use client";
-import {Button, ButtonVariantsProps} from "@/components/ui/button";
+import { Button, ButtonVariantsProps } from "@/components/ui/button";
-import {useState} from "react";
+import { ReactNode, useState } from "react";
-import {Loader2} from "lucide-react";
+import { Loader2 } from "lucide-react";
-import {Popover, PopoverContent, PopoverTrigger} from "@/components/ui/popover";
+import {
-import {cn} from "@/lib/utils";
+  Popover,
-import {Tooltip, TooltipContent, TooltipTrigger} from "@/components/ui/tooltip";
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { cn } from "@/lib/utils";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 
 export type ButtonWithConfirmProps = {
-    title: string;
+  title: string;
-    description: string;
+  description: string;
-    button: {
+  button?: {
-        main: {
+    main: {
-            className?: string;
+      className?: string;
-            type?: "button" | "submit" | "reset" | undefined;
+      type?: "button" | "submit" | "reset" | undefined;
-            text?: string;
+      text?: string;
-            icon?: any;
+      icon?: any;
-            variant?: ButtonVariantsProps["variant"];
+      variant?: ButtonVariantsProps["variant"];
-            size?: ButtonVariantsProps["size"];
+      size?: ButtonVariantsProps["size"];
-            disabled?: boolean;
+      disabled?: boolean;
-            tooltipText?: string;
+      tooltipText?: string;
-        };
-        confirm: {
-            className?: string;
-            text: string;
-            icon?: any;
-            variant?: ButtonVariantsProps["variant"];
-            size?: ButtonVariantsProps["size"];
-            onClick?: () => void;
-        };
-        cancel: {
-            className?: string;
-            text: string;
-            icon?: any;
-            variant?: ButtonVariantsProps["variant"];
-            size?: ButtonVariantsProps["size"];
-            onClick?: () => void;
-        };
     };
-    isPending?: boolean;
+    confirm: {
+      className?: string;
+      text: string;
+      icon?: any;
+      variant?: ButtonVariantsProps["variant"];
+      size?: ButtonVariantsProps["size"];
+      onClick?: () => void;
+    };
+    cancel: {
+      className?: string;
+      text: string;
+      icon?: any;
+      variant?: ButtonVariantsProps["variant"];
+      size?: ButtonVariantsProps["size"];
+      onClick?: () => void;
+    };
+  };
+  children?: ReactNode;
+  onConfirm?: (e: React.MouseEvent) => void;
+  onCancel?: (e: React.MouseEvent) => void;
+  confirmButtonText?: string;
+  cancelButtonText?: string;
+  isPending?: boolean;
 };
 
-
 export const ButtonWithConfirm = (props: ButtonWithConfirmProps) => {
-    const [isConfirming, setIsConfirming] = useState(false);
+  const [isConfirming, setIsConfirming] = useState(false);
 
-    return (
+  const isLegacy = !!props.button;
-        <Popover open={isConfirming} onOpenChange={!props.button.main.disabled ? setIsConfirming : undefined}>
+  const isDisabled = isLegacy ? !!props.button?.main.disabled : false;
-            <Tooltip>
+
-                <TooltipTrigger asChild>
+  const handleConfirm = (e: React.MouseEvent) => {
-                    <PopoverTrigger asChild>
+    e.preventDefault();
-                        <span
+    e.stopPropagation();
-                            className={cn(
+    if (isLegacy) {
-                                "inline-flex",
+      props.button?.confirm.onClick?.();
-                                props.button.main.disabled ? "cursor-not-allowed" : ""
+    } else {
-                            )}
+      props.onConfirm?.(e);
-                            role="button">
+    }
-                          <Button
+    setIsConfirming(false);
-                              type={props.button.main.type}
+  };
-                              disabled={!!props.button.main.disabled}
+
-                              variant={props.button.main.variant ?? "default"}
+  const handleCancel = (e: React.MouseEvent) => {
-                              size={props.button.main.size ?? "default"}
+    e.preventDefault();
-                              className={props.button.main.className}
+    e.stopPropagation();
-                              onClick={() => {
+    if (isLegacy) {
-                                  if (!props.button.main.disabled) setIsConfirming(true);
+      props.button?.cancel.onClick?.();
-                              }}
+    } else {
-                          >
+      props.onCancel?.(e);
-                              {props.isPending && <Loader2 className="animate-spin mr-4" size={16}/>}
+    }
-                              {props.button.main.icon}
+    setIsConfirming(false);
-                              {props.button.main.text && <span>{props.button.main.text}</span>}
+  };
-                          </Button>
+
-                        </span>
+  const triggerContent = isLegacy ? (
-                    </PopoverTrigger>
+    <Button
-                </TooltipTrigger>
+      type={props.button?.main.type}
-                {props.button.main.tooltipText && props.button.main.disabled && (
+      disabled={isDisabled}
-                    <TooltipContent>
+      variant={props.button?.main.variant ?? "default"}
-                        <p>{props.button.main.tooltipText}</p>
+      size={props.button?.main.size ?? "default"}
-                    </TooltipContent>
+      className={props.button?.main.className}
-                )}
+      onClick={(e) => {
-            </Tooltip>
+        e.preventDefault();
-            <PopoverContent className="w-80">
+        e.stopPropagation();
-                <div className="grid gap-4">
+        if (!isDisabled) setIsConfirming(true);
-                    <div className="space-y-2">
+      }}
-                        <h4 className="font-medium leading-none">{props.title}</h4>
+    >
-                        <p className="text-sm text-muted-foreground">{props.description}</p>
+      {props.isPending && <Loader2 className="animate-spin mr-4" size={16} />}
-                    </div>
+      {props.button?.main.icon}
-                    <div className="grid gap-2">
+      {props.button?.main.text && <span>{props.button.main.text}</span>}
-                        <Button
+    </Button>
-                            onClick={() => {
+  ) : (
-                                if (isConfirming && props.button.confirm.onClick) {
+    <div
-                                    props.button.confirm.onClick();
+      onClick={(e) => {
-                                    setIsConfirming(false);
+        e.preventDefault();
-                                } else {
+        e.stopPropagation();
-                                    setIsConfirming(true);
+        setIsConfirming(true);
-                                }
+      }}
-                            }}
+    >
-                            variant={props.button.confirm.variant ? props.button.confirm.variant : "default"}
+      {props.children}
-                            size={props.button.main.size ?? "default"}
+    </div>
-                            className={cn(props.button.main.className, "w-full")}
+  );
-                        >
+
-                            {props.isPending && <Loader2 className="animate-spin mr-4" size={16}/>}
+  const withTooltip =
-                            {props.button.confirm.icon ? props.button.confirm.icon : null}
+    isLegacy && props.button?.main.tooltipText && isDisabled ? (
-                            <span>{props.button.confirm.text}</span>
+      <TooltipProvider>
-                        </Button>
+        <Tooltip>
-                        <Button
+          <TooltipTrigger asChild>
-                            variant={props.button.cancel.variant ? props.button.cancel.variant : "default"}
+            <div>{triggerContent}</div>
-                            onClick={props.button.cancel.onClick ? () => props.button.cancel.onClick!() : () => setIsConfirming(false)}
+          </TooltipTrigger>
-                            className={cn(props.button.main.className, "w-full")}
+          <TooltipContent>
-                            size={props.button.main.size ?? "default"}
+            <p>{props.button?.main.tooltipText}</p>
-                        >
+          </TooltipContent>
-                            Cancel
+        </Tooltip>
-                        </Button>
+      </TooltipProvider>
-                    </div>
+    ) : (
-                </div>
+      triggerContent
-            </PopoverContent>
-        </Popover>
     );
-};
 
+  return (
+    <Popover open={isConfirming} onOpenChange={setIsConfirming}>
+      <PopoverTrigger asChild>{withTooltip}</PopoverTrigger>
+      <PopoverContent
+        className="w-80"
+        onPointerDownOutside={(e) => e.preventDefault()}
+        onInteractOutside={(e) => e.preventDefault()}
+        onClick={(e) => e.stopPropagation()}
+        onMouseMove={(e) => e.stopPropagation()}
+        onMouseEnter={(e) => e.stopPropagation()}
+        onMouseLeave={(e) => e.stopPropagation()}
+        onOpenAutoFocus={(e) => e.preventDefault()}
+      >
+        <div className="grid gap-4">
+          <div className="space-y-2">
+            <h4 className="font-medium leading-none">{props.title}</h4>
+            <p className="text-sm text-muted-foreground">{props.description}</p>
+          </div>
+          <div className="grid gap-2">
+            <Button
+              onClick={handleConfirm}
+              variant={
+                isLegacy
+                  ? (props.button?.confirm.variant ?? "default")
+                  : "default"
+              }
+              size={
+                isLegacy ? (props.button?.confirm.size ?? "default") : "default"
+              }
+              className={cn(
+                isLegacy ? props.button?.confirm.className : "",
+                "w-full",
+              )}
+            >
+              {props.isPending && (
+                <Loader2 className="animate-spin mr-4" size={16} />
+              )}
+              {isLegacy && props.button?.confirm.icon}
+              <span>
+                {isLegacy
+                  ? props.button?.confirm.text
+                  : (props.confirmButtonText ?? "Confirm")}
+              </span>
+            </Button>
+            <Button
+              variant={
+                isLegacy
+                  ? (props.button?.cancel.variant ?? "outline")
+                  : "outline"
+              }
+              onClick={handleCancel}
+              className={cn(
+                isLegacy ? props.button?.cancel.className : "",
+                "w-full",
+              )}
+              size={
+                isLegacy ? (props.button?.cancel.size ?? "default") : "default"
+              }
+            >
+              {isLegacy
+                ? (props.button?.cancel.text ?? "Cancel")
+                : (props.cancelButtonText ?? "Cancel")}
+            </Button>
+          </div>
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+};

src/components/wrappers/common/button/button-with-loading.tsx

@@ -83,7 +83,7 @@ export type ButtonWithLoadingProps = {
     icon?: ReactNode;
     variant?: keyof VariantButton;
     className?: string;
-    onClick?: () => void;
+    onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;
     isPending?: boolean;
     size?: keyof SizeButton;
 } & ButtonHTMLAttributes<HTMLButtonElement>;
@@ -100,7 +100,7 @@ export const ButtonWithLoading = ({
                                   }: ButtonWithLoadingProps) => {
     return (
         <Button
-            onClick={() => onClick?.()}
+            onClick={(e) => onClick?.(e)}
             variant={variant}
             className={className}
             size={size}

src/components/wrappers/common/button/copy-button.tsx

@@ -26,7 +26,6 @@ export const CopyButton = (props: CopyButtonProps) => {
 
     return (
         <Button
-            // className={cn(buttonVariants({size: "sm"}))}
             onClick={() => {
                 copyToClipboardWithMeta(value);
                 setHasCopied(true);

src/components/wrappers/common/code-snippet.tsx

@@ -1,21 +1,46 @@
-import { PropsWithChildren } from "react";
+"use client";
-import { Button } from "@/components/ui/button";
+
+import {PropsWithChildren, useState} from "react";
+import {Button} from "@/components/ui/button";
+import {Check, Copy, Terminal} from "lucide-react";
+import {copyToClipboardWithMeta} from "@/components/wrappers/common/button/copy-button";
+import {cn} from "@/lib/utils";
 
 export type CodeSnippetProps = PropsWithChildren<{
     code: string;
+    title?: string;
+    className?: string;
 }>;
 
 export const CodeSnippet = (props: CodeSnippetProps) => {
+    const [isCopied, setIsCopied] = useState(false);
+
+    const handleCopy = async () => {
+        await copyToClipboardWithMeta(props.code);
+        setIsCopied(true);
+        setTimeout(() => setIsCopied(false), 2000);
+    };
+
     return (
-        <div className="rounded-lg border bg-background">
+        <div className={cn("relative group rounded-md bg-muted/50 border overflow-hidden", props.className)}>
-            <div className="flex items-center justify-between border-b bg-muted px-4 py-2">
+            {props.title && (
-                <div className="text-sm font-medium">.env</div>
+                <div className="flex items-center px-4 py-2 text-xs font-medium text-muted-foreground border-b bg-muted/30">
-                <Button variant="ghost" size="icon" className="hover:bg-muted/50 text-muted-foreground"></Button>
+                    {props.title}
-            </div>
+                </div>
-            <div className="p-4 font-mono text-sm leading-6 text-foreground truncate">
+            )}
-                <pre className="language-javascript overflow-x-auto">
+            <div className="flex items-center p-4">
-                    <code className="mb-6">{props.code}</code>
+                 <pre className="flex-1 overflow-x-auto font-mono text-sm leading-relaxed">
+                    <code className="break-all whitespace-pre-wrap">{props.code}</code>
                 </pre>
+                <Button
+                    variant="ghost"
+                    size="icon"
+                    className="ml-2 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground opacity-100 sm:opacity-0 sm:group-hover:opacity-100 transition-opacity"
+                    onClick={handleCopy}
+                >
+                    {isCopied ? <Check size={14} className="text-green-500" /> : <Copy size={14} />}
+                    <span className="sr-only">Copy code</span>
+                </Button>
             </div>
         </div>
     );

src/components/wrappers/common/dialog.tsx

@@ -23,7 +23,7 @@ export const AgentRegistrationDialog = (props: agentRegistrationDialogProps) =>
                 <div className="grid gap-4 py-4">
                     <div className="grid grid-cols-4 items-center gap-4">
                         <Label htmlFor="name" className="text-right">
-                            EDGE KEY
+                            CONNECTION KEY
                         </Label>
                         <Input id="name" value="Pedro Duarte" readOnly className="col-span-3" />
                     </div>

src/components/wrappers/common/error-layout.tsx

@@ -0,0 +1,94 @@
+"use client";
+
+import { useSearchParams } from "next/navigation";
+import type React from "react";
+import { useEffect } from "react";
+import { toast } from "sonner";
+export const ErrorLayout = ({ children }: { children: React.ReactNode }) => {
+  const url = useSearchParams();
+
+  useEffect(() => {
+    const error = url.get("error");
+
+    if (!error) return;
+
+    const errorMessages: Record<string, string> = {
+      pending: "Your account is not active.",
+      invalid_or_expired_token: "Password reset invalid token.",
+      account_already_linked_to_different_user:
+        "An account already exists with the same email address but different sign-in credentials. Sign in using a provider associated with this email address.",
+      USER_NOT_FOUND: "User not found",
+      FAILED_TO_CREATE_USER: "Failed to create user",
+      FAILED_TO_CREATE_SESSION: "Failed to create session",
+      FAILED_TO_UPDATE_USER: "Failed to update user",
+      FAILED_TO_GET_SESSION: "Failed to get session",
+      INVALID_PASSWORD: "Invalid password",
+      INVALID_EMAIL: "Invalid email",
+      INVALID_EMAIL_OR_PASSWORD: "Invalid email or password",
+      INVALID_USER: "Invalid user",
+      SOCIAL_ACCOUNT_ALREADY_LINKED: "Social account already linked",
+      PROVIDER_NOT_FOUND: "Provider not found",
+      INVALID_TOKEN: "Invalid token",
+      TOKEN_EXPIRED: "Token expired",
+      ID_TOKEN_NOT_SUPPORTED: "id_token not supported",
+      FAILED_TO_GET_USER_INFO: "Failed to get user info",
+      USER_EMAIL_NOT_FOUND: "User email not found",
+      EMAIL_NOT_VERIFIED: "Email not verified",
+      PASSWORD_TOO_SHORT: "Password too short",
+      PASSWORD_TOO_LONG: "Password too long",
+      USER_ALREADY_EXISTS: "User already exists.",
+      USER_ALREADY_EXISTS_USE_ANOTHER_EMAIL:
+        "User already exists. Use another email.",
+      EMAIL_CAN_NOT_BE_UPDATED: "Email can not be updated",
+      CREDENTIAL_ACCOUNT_NOT_FOUND: "Credential account not found",
+      SESSION_EXPIRED:
+        "Session expired. Re-authenticate to perform this action.",
+      FAILED_TO_UNLINK_LAST_ACCOUNT: "You can't unlink your last account",
+      ACCOUNT_NOT_FOUND: "Account not found",
+      USER_ALREADY_HAS_PASSWORD:
+        "User already has a password. Provide that to delete the account.",
+      CROSS_SITE_NAVIGATION_LOGIN_BLOCKED:
+        "Cross-site navigation login blocked. This request appears to be a CSRF attack.",
+      VERIFICATION_EMAIL_NOT_ENABLED: "Verification email isn't enabled",
+      EMAIL_ALREADY_VERIFIED: "Email is already verified",
+      EMAIL_MISMATCH: "Email mismatch",
+      SESSION_NOT_FRESH: "Session is not fresh",
+      LINKED_ACCOUNT_ALREADY_EXISTS: "Linked account already exists",
+      INVALID_ORIGIN: "Invalid origin",
+      INVALID_CALLBACK_URL: "Invalid callbackURL",
+      INVALID_REDIRECT_URL: "Invalid redirectURL",
+      INVALID_ERROR_CALLBACK_URL: "Invalid errorCallbackURL",
+      INVALID_NEW_USER_CALLBACK_URL: "Invalid newUserCallbackURL",
+      MISSING_OR_NULL_ORIGIN: "Missing or null Origin",
+      CALLBACK_URL_REQUIRED: "callbackURL is required",
+      FAILED_TO_CREATE_VERIFICATION: "Unable to create verification",
+      FIELD_NOT_ALLOWED: "Field not allowed to be set",
+      ASYNC_VALIDATION_NOT_SUPPORTED: "Async validation is not supported",
+      VALIDATION_ERROR: "Validation Error",
+      MISSING_FIELD: "Field is required",
+      METHOD_NOT_ALLOWED_DEFER_SESSION_REQUIRED:
+        "POST method requires deferSessionRefresh to be enabled in session config",
+      BODY_MUST_BE_AN_OBJECT: "Body must be an object",
+      PASSWORD_ALREADY_SET: "User already has a password set",
+      Sign_up_is_disabled: "Sign up is disabled by the administrator",
+    };
+
+    const match = Object.entries(errorMessages).find(([key]) =>
+      error.includes(key),
+    );
+
+    if (!match) return;
+
+    toast.error(match[1]);
+
+    const params = new URLSearchParams(url.toString());
+    params.delete("error");
+    const newUrl =
+      window.location.pathname +
+      (params.toString() ? `?${params.toString()}` : "");
+
+    window.history.replaceState({}, document.title, newUrl);
+  }, [url]);
+
+  return <>{children}</>;
+};

src/components/wrappers/common/github/github-button.tsx

@@ -34,7 +34,7 @@ export const GitHubStarsButtonCustom = () => {
             <GithubButton
                 initialStars={0}
                 targetStars={stars}
-                label="Github Stars"
+                label=""
                 size="sm"
                 separator={true}
                 roundStars={true}

src/components/wrappers/common/pagination/pagination-navigation.tsx

@@ -15,6 +15,8 @@ export type paginationNavigationProps = {
 export const PaginationNavigation = (props: paginationNavigationProps) => {
     const { className, totalPages, currentPage, goToPage, goToPrevPage, goToNextPage, maxVisiblePages = 3 } = props;
 
+    if (totalPages <= 1) return null;
+
     return (
         <Pagination className={cn("", className)}>
             <PaginationContent>

src/components/wrappers/common/table/data-table.tsx

@@ -14,7 +14,7 @@ import {
 import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
 import {Input} from "@/components/ui/input";
 
-import {ReactNode, useEffect, useState} from "react";
+import {ReactNode, useMemo, useState} from "react";
 import {TablePagination} from "./table-pagination";
 import {Checkbox} from "@/components/ui/checkbox";
 import {Button} from "@/components/ui/button";
@@ -63,35 +63,38 @@ export function DataTable<TData, TValue>({
     const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
     const [rowSelection, setRowSelection] = useState({});
 
-    useEffect(() => {
+    const finalColumns = useMemo(() => {
-        setRowSelection({});
-    }, [data]);
-
-    if (enableSelect && data.length > 0) {
         const selectColumnExists = columns.some((column) => column.id === "select");
-
+        if (enableSelect && data.length > 0 && !selectColumnExists) {
-        if (!selectColumnExists) {
+            return [
-            columns.unshift({
+                {
-                id: "select",
+                    id: "select",
-                header: ({table}) => (
+                    header: ({table}: {table: any}) => (
-                    <Checkbox
+                        <Checkbox
-                        checked={table.getIsAllPageRowsSelected() || (table.getIsSomePageRowsSelected() && "indeterminate")}
+                            checked={table.getIsAllPageRowsSelected() || (table.getIsSomePageRowsSelected() && "indeterminate")}
-                        onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
+                            onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-                        aria-label="Select all"
+                            aria-label="Select all"
-                    />
+                        />
-                ),
+                    ),
-                cell: ({row}) => <Checkbox checked={row.getIsSelected()}
+                    cell: ({row}: {row: any}) => (
-                                           onCheckedChange={(value) => row.toggleSelected(!!value)}
+                        <Checkbox
-                                           aria-label="Select row"/>,
+                            checked={row.getIsSelected()}
-                enableSorting: false,
+                            onCheckedChange={(value) => row.toggleSelected(!!value)}
-                enableHiding: false,
+                            aria-label="Select row"
-            });
+                        />
+                    ),
+                    enableSorting: false,
+                    enableHiding: false,
+                },
+                ...columns,
+            ];
         }
-    }
+        return columns;
+    }, [columns, enableSelect, data.length]);
 
     const table = useReactTable({
         data,
-        columns,
+        columns: finalColumns,
         getCoreRowModel: getCoreRowModel(),
         getPaginationRowModel: getPaginationRowModel(),
         onSortingChange: setSorting,
@@ -99,6 +102,10 @@ export function DataTable<TData, TValue>({
         onColumnFiltersChange: setColumnFilters,
         getFilteredRowModel: getFilteredRowModel(),
         onRowSelectionChange: setRowSelection,
+        getRowId: (row: any) => row.id || row.uuid,
+        autoResetPageIndex: false,
+        autoResetExpanded: false,
+        enableRowSelection: true,
         state: {
             sorting,
             columnFilters,

src/components/wrappers/common/table/table-pagination.tsx

@@ -14,6 +14,10 @@ interface tablePaginationProps {
 export function TablePagination(props: tablePaginationProps) {
     const {className, table, maxVisiblePages = 3, pageSizeOptions = [10, 20, 30, 40, 50]} = props;
 
+    const totalPages = table.getPageCount();
+
+    if (totalPages <= 1) return null;
+
     return (
         <div
             className={cn("flex gap-x-4", className)}

src/components/wrappers/dashboard/admin/channels/channel/channel-add-edit-modal.tsx

@@ -18,6 +18,7 @@ import {
     ChannelOrganisationForm
 } from "@/components/wrappers/dashboard/admin/channels/organization/channels-organization-form";
 
+
 type ChannelAddModalProps = {
     channel?: NotificationChannelWith | StorageChannelWith
     organization?: OrganizationWithMembers;

src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-form.schema.ts

@@ -1,26 +1,69 @@
 import {z} from "zod";
+import {SlackChannelConfigSchema} from "./providers/notifications/forms/slack.schema";
+import {SmtpChannelConfigSchema} from "./providers/notifications/forms/smtp.schema";
+import {DiscordChannelConfigSchema} from "./providers/notifications/forms/discord.schema";
+import {TelegramChannelConfigSchema} from "./providers/notifications/forms/telegram.schema";
+import {GotifyChannelConfigSchema} from "./providers/notifications/forms/gotify.schema";
+import {NtfyChannelConfigSchema} from "./providers/notifications/forms/ntfy.schema";
+import {WebhookChannelConfigSchema} from "./providers/notifications/forms/webhook.schema";
+import {S3ChannelConfigSchema} from "./providers/storages/forms/s3.schema";
+import {GoogleDriveChannelConfigSchema} from "./providers/storages/forms/google-drive.schema";
+import {LocalChannelConfigSchema} from "./providers/storages/forms/local.schema";
 
 
-export const ChannelFormSchema = z.object({
+const BaseChannelFormSchema = z.object({
     name: z
         .string()
         .min(5, "Name must be at least 5 characters long")
         .max(40, "Name must be at most 40 characters long"),
-    config: z.record(z.union([z.string(), z.number(), z.boolean(), z.null(), z.undefined()])).optional(),
     enabled: z.boolean().default(true),
 });
 
+export const NotificationChannelFormSchema = z.discriminatedUnion("provider", [
+    BaseChannelFormSchema.extend({
+        provider: z.literal("slack"),
+        config: SlackChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("smtp"),
+        config: SmtpChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("discord"),
+        config: DiscordChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("telegram"),
+        config: TelegramChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("gotify"),
+        config: GotifyChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("ntfy"),
+        config: NtfyChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("webhook"),
+        config: WebhookChannelConfigSchema,
+    }),
+]);
 
-export const NotificationChannelFormSchema = ChannelFormSchema.extend({
+export const StorageChannelFormSchema = z.discriminatedUnion("provider", [
-    provider: z.enum(
+    BaseChannelFormSchema.extend({
-        ["slack", "smtp", "discord", "telegram", "gotify", "ntfy", "webhook"],
+        provider: z.literal("s3"),
-        {required_error: "Provider is required"}
+        config: S3ChannelConfigSchema,
-    ),
+    }),
-});
+    BaseChannelFormSchema.extend({
-
+        provider: z.literal("google-drive"),
-export const StorageChannelFormSchema = ChannelFormSchema.extend({
+        config: GoogleDriveChannelConfigSchema,
-    provider: z.enum(["local", "s3", "google-drive"], {required_error: "Provider is required"}),
+    }),
-});
+    BaseChannelFormSchema.extend({
+        provider: z.literal("local"),
+        config: LocalChannelConfigSchema
+    })
+]);
 
 
 export type NotificationChannelFormType = z.infer<typeof NotificationChannelFormSchema>;