putting a pin in it

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.74
+FROM rust:1.72
 
 ARG USERNAME=lldapdev
 # We need to keep the user as 1001 to match the GitHub runner's UID.

.github/codecov.yml

@@ -1,19 +1,10 @@
 codecov:
   require_ci_to_pass: yes
 comment:
-  layout: "header,diff,files"
+  layout: "diff,flags"
   require_changes: true
   require_base: true
   require_head: true
-coverage:
-  status:
-    project:
-      default:
-        target: "75%"
-        threshold: "0.1%"
-        removed_code_behavior: adjust_base
-github_checks:
-  annotations: true
 ignore:
   - "app"
   - "docs"

.github/workflows/Dockerfile.ci.alpine-base

@@ -59,12 +59,12 @@ RUN set -x \
     && for file in $(cat /lldap/app/static/fonts/fonts.txt); do wget -P app/static/fonts "$file"; done \
     && chmod a+r -R .
 
-FROM alpine:3.19
+FROM alpine:3.16
 WORKDIR /app
 ENV UID=1000
 ENV GID=1000
 ENV USER=lldap
-RUN apk add --no-cache tini ca-certificates bash tzdata jq curl jo && \
+RUN apk add --no-cache tini ca-certificates bash tzdata && \
     addgroup -g $GID $USER && \
     adduser \
     --disabled-password \
@@ -80,6 +80,5 @@ COPY --from=lldap --chown=$USER:$USER /lldap /app
 VOLUME ["/data"]
 HEALTHCHECK CMD ["/app/lldap", "healthcheck", "--config-file", "/data/lldap_config.toml"]
 WORKDIR /app
-COPY scripts/bootstrap.sh ./
 ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
 CMD ["run", "--config-file", "/data/lldap_config.toml"]

.github/workflows/Dockerfile.ci.debian-base

@@ -65,7 +65,7 @@ ENV UID=1000
 ENV GID=1000
 ENV USER=lldap
 RUN apt update && \
-    apt install -y --no-install-recommends tini openssl ca-certificates tzdata jq curl jo && \
+    apt install -y --no-install-recommends tini openssl ca-certificates tzdata && \
     apt clean && \
     rm -rf /var/lib/apt/lists/* && \
     groupadd -g $GID $USER && useradd --system -m -g $USER --uid $UID $USER && \
@@ -74,7 +74,6 @@ COPY --from=lldap --chown=$USER:$USER /lldap /app
 COPY --from=lldap --chown=$USER:$USER /docker-entrypoint.sh /docker-entrypoint.sh
 VOLUME ["/data"]
 WORKDIR /app
-COPY scripts/bootstrap.sh ./
 ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
 CMD ["run", "--config-file", "/data/lldap_config.toml"]
 HEALTHCHECK CMD ["/app/lldap", "healthcheck", "--config-file", "/data/lldap_config.toml"]

.github/workflows/Dockerfile.dev

@@ -1,5 +1,5 @@
 # Keep tracking base image
-FROM rust:1.81-slim-bookworm
+FROM rust:1.74-slim-bookworm
 
 # Set needed env path
 ENV PATH="/opt/armv7l-linux-musleabihf-cross/:/opt/armv7l-linux-musleabihf-cross/bin/:/opt/aarch64-linux-musl-cross/:/opt/aarch64-linux-musl-cross/bin/:/opt/x86_64-linux-musl-cross/:/opt/x86_64-linux-musl-cross/bin/:$PATH"
@@ -34,8 +34,7 @@ RUN wget -c https://musl.cc/x86_64-linux-musl-cross.tgz && \
 ### Add musl target
 RUN rustup target add x86_64-unknown-linux-musl && \
     rustup target add aarch64-unknown-linux-musl && \
-    rustup target add armv7-unknown-linux-musleabihf && \
+    rustup target add armv7-unknown-linux-musleabihf
-    rustup target add x86_64-unknown-freebsd
 
 
 CMD ["bash"]

.github/workflows/docker-build-static.yml

@@ -39,7 +39,7 @@ env:
 # GitHub actions randomly timeout when downloading musl-gcc, using custom dev image   #
 # Look into .github/workflows/Dockerfile.dev for development image details            #
 # Using lldap dev image based on https://hub.docker.com/_/rust and musl-gcc bundled   #
-# lldap/rust-dev                                                                      #
+# lldap/rust-dev:latest                                                               #
 #######################################################################################
 # Cargo build
 ### armv7, aarch64 and amd64 is musl based
@@ -84,10 +84,10 @@ jobs:
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.event_name == 'release' }}
     container:
-      image: lldap/rust-dev:v81
+      image: lldap/rust-dev:latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.1
       - uses: actions/cache@v4
         with:
           path: |
@@ -125,14 +125,14 @@ jobs:
       matrix:
         target: [armv7-unknown-linux-musleabihf, aarch64-unknown-linux-musl, x86_64-unknown-linux-musl]
     container:
-      image: lldap/rust-dev:v81
+      image: lldap/rust-dev:latest
       env:
         CARGO_TERM_COLOR: always
         RUSTFLAGS: -Ctarget-feature=+crt-static
         CARGO_HOME: ${GITHUB_WORKSPACE}/.cargo
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.1
       - uses: actions/cache@v4
         with:
           path: |
@@ -216,8 +216,6 @@ jobs:
            LLDAP_database_url: postgres://lldapuser:lldappass@localhost/lldap
            LLDAP_ldap_port: 3890
            LLDAP_http_port: 17170
-           LLDAP_JWT_SECRET: verysecret
-           LLDAP_LDAP_USER_PASS: password
 
 
        - name: Run lldap with mariadb DB (MySQL Compatible) and healthcheck
@@ -229,8 +227,6 @@ jobs:
            LLDAP_database_url: mysql://lldapuser:lldappass@localhost/lldap
            LLDAP_ldap_port: 3891
            LLDAP_http_port: 17171
-           LLDAP_JWT_SECRET: verysecret
-           LLDAP_LDAP_USER_PASS: password
 
 
        - name: Run lldap with sqlite DB and healthcheck
@@ -242,8 +238,6 @@ jobs:
            LLDAP_database_url: sqlite://users.db?mode=rwc
            LLDAP_ldap_port: 3892
            LLDAP_http_port: 17172
-           LLDAP_JWT_SECRET: verysecret
-           LLDAP_LDAP_USER_PASS: password
 
        - name: Check DB container logs
          run: |
@@ -300,7 +294,7 @@ jobs:
 
     steps:
        - name: Checkout scripts
-         uses: actions/checkout@v4.2.2
+         uses: actions/checkout@v4.1.1
          with:
            sparse-checkout: 'scripts'
 
@@ -330,9 +324,9 @@ jobs:
               sleep 10s
               bin/lldap healthcheck
          env:
-           LLDAP_DATABASE_URL: sqlite://users.db?mode=rwc
+           LLDAP_database_url: sqlite://users.db?mode=rwc
-           LLDAP_LDAP_PORT: 3890
+           LLDAP_ldap_port: 3890
-           LLDAP_HTTP_PORT: 17170
+           LLDAP_http_port: 17170
            LLDAP_LDAP_USER_PASS: ldappass
            LLDAP_JWT_SECRET: somejwtsecret
 
@@ -356,11 +350,8 @@ jobs:
               sed -i -r -e "s/X'([[:xdigit:]]+'[^'])/'\\\x\\1/g" -e ":a; s/(INSERT INTO (user_attribute_schema|jwt_storage)\(.*\) VALUES\(.*),1([^']*\);)$/\1,true\3/; s/(INSERT INTO (user_attribute_schema|jwt_storage)\(.*\) VALUES\(.*),0([^']*\);)$/\1,false\3/; ta" -e '1s/^/BEGIN;\n/' -e '$aCOMMIT;' ./dump.sql
 
        - name: Create schema on postgres
-         env:
-           LLDAP_DATABASE_URL: postgres://lldapuser:lldappass@localhost:5432/lldap
-           LLDAP_JWT_SECRET: somejwtsecret
          run: |
-              bin/lldap create_schema
+              bin/lldap create_schema -d postgres://lldapuser:lldappass@localhost:5432/lldap
 
        - name: Copy converted db to postgress and import
          run: |
@@ -377,10 +368,7 @@ jobs:
               sed  -i '1 i\SET FOREIGN_KEY_CHECKS = 0;' ./dump.sql
 
        - name: Create schema on mariadb
-         env:
+         run: bin/lldap create_schema -d mysql://lldapuser:lldappass@localhost:3306/lldap
-           LLDAP_DATABASE_URL: mysql://lldapuser:lldappass@localhost:3306/lldap
-           LLDAP_JWT_SECRET: somejwtsecret
-         run: bin/lldap create_schema
 
        - name: Copy converted db to mariadb and import
          run: |
@@ -396,10 +384,7 @@ jobs:
               sed  -i '1 i\SET FOREIGN_KEY_CHECKS = 0;' ./dump.sql
 
        - name: Create schema on mysql
-         env:
+         run: bin/lldap create_schema -d mysql://lldapuser:lldappass@localhost:3307/lldap
-           LLDAP_DATABASE_URL: mysql://lldapuser:lldappass@localhost:3307/lldap
-           LLDAP_JWT_SECRET: somejwtsecret
-         run: bin/lldap create_schema
 
        - name: Copy converted db to mysql and import
          run: |
@@ -414,9 +399,10 @@ jobs:
               sleep 10s
               bin/lldap healthcheck
          env:
-           LLDAP_DATABASE_URL: postgres://lldapuser:lldappass@localhost:5432/lldap
+           LLDAP_database_url: postgres://lldapuser:lldappass@localhost:5432/lldap
-           LLDAP_LDAP_PORT: 3891
+           LLDAP_ldap_port: 3891
-           LLDAP_HTTP_PORT: 17171
+           LLDAP_http_port: 17171
+           LLDAP_LDAP_USER_PASS: ldappass
            LLDAP_JWT_SECRET: somejwtsecret
 
        - name: Run lldap with mariaDB and healthcheck again
@@ -425,9 +411,9 @@ jobs:
               sleep 10s
               bin/lldap healthcheck
          env:
-           LLDAP_DATABASE_URL: mysql://lldapuser:lldappass@localhost:3306/lldap
+           LLDAP_database_url: mysql://lldapuser:lldappass@localhost:3306/lldap
-           LLDAP_LDAP_PORT: 3892
+           LLDAP_ldap_port: 3892
-           LLDAP_HTTP_PORT: 17172
+           LLDAP_http_port: 17172
            LLDAP_JWT_SECRET: somejwtsecret
 
        - name: Run lldap with mysql and healthcheck again
@@ -436,9 +422,9 @@ jobs:
               sleep 10s
               bin/lldap healthcheck
          env:
-           LLDAP_DATABASE_URL: mysql://lldapuser:lldappass@localhost:3307/lldap
+           LLDAP_database_url: mysql://lldapuser:lldappass@localhost:3307/lldap
-           LLDAP_LDAP_PORT: 3893
+           LLDAP_ldap_port: 3893
-           LLDAP_HTTP_PORT: 17173
+           LLDAP_http_port: 17173
            LLDAP_JWT_SECRET: somejwtsecret
 
        - name: Test Dummy User Postgres
@@ -496,7 +482,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.1
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -526,7 +512,7 @@ jobs:
           tags: ${{ matrix.container }}-base
 
       - name: Build ${{ matrix.container }} Base Docker Image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
           # On PR will fail, force fully uncomment push: true, or docker image will fail for next steps
@@ -627,7 +613,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build ${{ matrix.container }}-rootless Docker Image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
@@ -641,7 +627,7 @@ jobs:
 
 ### This docker build always the last, due :latest tag pushed multiple times, for whatever variants may added in future add docker build above this
       - name: Build ${{ matrix.container }} Docker Image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
@@ -655,7 +641,7 @@ jobs:
 
       - name: Update repo description
         if: github.event_name != 'pull_request'
-        uses: peter-evans/dockerhub-description@v4
+        uses: peter-evans/dockerhub-description@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -663,7 +649,7 @@ jobs:
 
       - name: Update lldap repo description
         if: github.event_name != 'pull_request'
-        uses: peter-evans/dockerhub-description@v4
+        uses: peter-evans/dockerhub-description@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -752,9 +738,5 @@ jobs:
           artifacts:  aarch64-lldap.tar.gz,
                       amd64-lldap.tar.gz,
                       armhf-lldap.tar.gz
-          draft: true
-          omitBodyDuringUpdate: true
-          omitDraftDuringUpdate: true
-          omitNameDuringUpdate: true
         env:
          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/release-bot.yml

@@ -0,0 +1,20 @@
+name: Release Bot
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: nflaig/release-comment-on-pr@master
+        with:
+          token: ${{ secrets.RELEASE_BOT_TOKEN }}
+          message: |
+            Thank you everyone for the contribution!
+            This feature is now available in the latest release, [${releaseTag}](${releaseUrl}).
+            You can support LLDAP by starring our repo, contributing some configuration examples and becoming a sponsor.

.github/workflows/rust.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.1
       - uses: Swatinem/rust-cache@v2
       - name: Build
         run: cargo build --verbose --workspace
@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.1
 
       - uses: Swatinem/rust-cache@v2
 
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.1
 
       - uses: Swatinem/rust-cache@v2
 
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.1
 
       - name: Install Rust
         run: rustup toolchain install nightly --component llvm-tools-preview && rustup component add llvm-tools-preview --toolchain stable-x86_64-unknown-linux-gnu
@@ -101,10 +101,16 @@ jobs:
         run: cargo llvm-cov  --workspace --no-report
       - name: Aggregate reports
         run: cargo llvm-cov --no-run --lcov --output-path lcov.info
-      - name: Upload coverage to Codecov (main)
+      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v3
+        if: github.ref != 'refs/heads/main' || github.event_name != 'push'
+        with:
+          files: lcov.info
+          fail_ci_if_error: true
+      - name: Upload coverage to Codecov (main)
+        uses: codecov/codecov-action@v3
+        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         with:
           files: lcov.info
           fail_ci_if_error: true
-          codecov_yml_path: .github/codecov.yml
           token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.md

@@ -5,107 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.6.1] 2024-11-22
-
-Small release, mainly to fix a migration issue with Sqlite and Postgresql.
-
-### Added
-
- - Added a link to a community terraform provider (#1035)
-
-### Changed
-
- - The opaque dependency now points to the official crate rather than a fork (#1040)
-
-### Fixed
-
- - Migration of the DB schema from 7 to 8 is now automatic for sqlite, and fixed for postgres (#1045)
- - The startup warning about `key_seed` applying instead of `key_file` now has instructions on how to silence it (#1032)
-
-### New services
-
-- OneDev
-
-## [0.6.0] 2024-11-09
-
-### Breaking
-
-- The endpoint `/auth/reset/step1` is now `POST` instead of `GET` (#704)
-
-### Added
-
-- Custom attributes are now supported (#67) ! You can add new fields (string, integers, JPEG or dates) to users and query them. That unlocks many integrations with other services, and allows for a deeper/more customized integration. Special thanks to @pixelrazor and @bojidar-bg for their help with the UI.
-- Custom object classes (for all users/groups) can now be added (#833)
-- Barebones support for Paged Results Control (no paging, no respect for windows, but a correct response with all the results) (#698)
-- A daily docker image is tagged and released. (#613)
-- A bootstrap script allows reading the list of users/groups from a file and making sure the server contains exactly the same thing. (#654)
-- Make it possible to serve lldap behind a sub-path in (#752)
-- LLDAP can now be found on a custom package repository for opensuse, fedora, ubuntu, debian and centos ([Repository link](https://software.opensuse.org//download.html?project=home%3AMasgalor%3ALLDAP&package=lldap)). Thanks @Masgalor for setting it up and maintaining it.
-- There's now an option to force reset the admin password (#748) optionally on every restart (#959)
-- There's a rootless docker container (#755)
-- entryDN is now supported (#780)
-- Unknown LDAP controls are now detected and ignored (#787, #799)
-- A community-developed CLI for scripting (#793)
-- Added a way to print raw logs to debug long-running sessions (#992)
-
-
-### Changed
-
-- The official docker repository is now `lldap/lldap`
-- Removed password length limitation in lldap_set_password tool
-- Group names and emails are now case insensitive, but keep their casing (#666)
-- Better error messages (and exit code (#745)) when changing the private key (#778, #1008), using the wrong SMTP port (#970), using the wrong env variables (#972)
-- Allow `member=` filters with plain user names (not full DNs) (#949)
-- Correctly detect and refuse anonymous binds (#974)
-- Clearer logging (#971, #981, #982)
-
-### Fixed
-
-- Logging out applies globally, not just in the local browser. (#721)
-- It's no longer possible to create the same user twice (#745)
-- Fix wide substring filters (#738)
-- Don't log the database password if provided in the connection URL (#735)
-- Fix a panic when postgres uses a different collation (#821)
-- The UI now defaults to the user ID for users with no display names (#843)
-- Fix searching for users with more than one `memberOf` filter (#872)
-- Fix compilation on Windows (#932) and Illumos (#964)
-- The UI now correctly detects whether password resets are enabled. (#753)
-- Fix a missing lowercasing of username when changing passwords through LDAP (#1012)
-- Fix SQLite writers erroring when racing (#1021)
-- LDAP sessions no longer buffer their logs until unbind, causing memory leaks (#1025)
-
-### Performance
-
-- Only expand attributes once per query, not per result (#687)
-
-### Security
-
-- When asked to send a password reset to an unknown email, sleep for 3 seconds and don't print the email in the error (#887)
-
-### New services
-
-Linux user accounts can now be managed by LLDAP, using PAM and nslcd.
-
-- Apereo CAS server
-- Carpal
-- Gitlab
-- Grocy
-- Harbor
-- Home Assistant
-- Jenkins
-- Kasm
-- Maddy
-- Mastodon
-- Metabase
-- MegaRAC-BMC
-- Netbox
-- OCIS
-- Prosody
-- Radicale
-- SonarQube
-- Traccar
-- Zitadel
-
 ## [0.5.0] 2023-09-14
 
 ### Breaking
@@ -172,7 +71,7 @@ systems, including PAM authentication.
 ## [0.4.3] 2023-04-11
 
 The repository has changed from `nitnelave/lldap` to `lldap/lldap`, both on GitHub
-and on DockerHub (although we will keep publishing the images to
+and on DockerHub (although we will keep publishing the images to 
 `nitnelave/lldap` for the foreseeable future). All data on GitHub has been
 migrated, and the new docker images are available both on DockerHub and on the
 GHCR under `lldap/lldap`.

Cargo.toml

@@ -17,5 +17,9 @@ lto = true
 [profile.release.package.lldap_app]
 opt-level = 's'
 
+[patch.crates-io.opaque-ke]
+git = 'https://github.com/nitnelave/opaque-ke/'
+branch = 'zeroize_1.5'
+
 [patch.crates-io.lber]
 git = 'https://github.com/inejge/ldap3/'

Dockerfile

@@ -41,7 +41,7 @@ RUN cargo build --release -p lldap -p lldap_migration_tool -p lldap_set_password
     && ./app/build.sh
 
 # Final image
-FROM alpine:3.19
+FROM alpine:3.16
 
 ENV GOSU_VERSION 1.14
 # Fetch gosu from git
@@ -80,7 +80,6 @@ COPY --from=builder /app/app/static app/static
 COPY --from=builder /app/app/pkg app/pkg
 COPY --from=builder /app/target/release/lldap /app/target/release/lldap_migration_tool /app/target/release/lldap_set_password ./
 COPY docker-entrypoint.sh lldap_config.docker_template.toml ./
-COPY scripts/bootstrap.sh ./
 
 RUN set -x \
     && apk add --no-cache bash tzdata \

README.md

@@ -38,7 +38,6 @@
   - [With Docker](#with-docker)
   - [With Kubernetes](#with-kubernetes)
   - [From a package repository](#from-a-package-repository)
-  - [With FreeBSD](#with-freebsd)
   - [From source](#from-source)
     - [Backend](#backend)
     - [Frontend](#frontend)
@@ -48,7 +47,6 @@
 - [Client configuration](#client-configuration)
   - [Compatible services](#compatible-services)
   - [General configuration guide](#general-configuration-guide)
-  - [Integration with OS's](#integration-with-oss)
   - [Sample client configurations](#sample-client-configurations)
   - [Incompatible services](#incompatible-services)
 - [Migrating from SQLite](#migrating-from-sqlite)
@@ -156,7 +154,6 @@ services:
       - LLDAP_JWT_SECRET=REPLACE_WITH_RANDOM
       - LLDAP_KEY_SEED=REPLACE_WITH_RANDOM
       - LLDAP_LDAP_BASE_DN=dc=example,dc=com
-      - LLDAP_LDAP_USER_PASS=adminPas$word
       # If using LDAPS, set enabled true and configure cert and key path
       # - LLDAP_LDAPS_OPTIONS__ENABLED=true
       # - LLDAP_LDAPS_OPTIONS__CERT_FILE=/path/to/certfile.crt
@@ -164,15 +161,6 @@ services:
       # You can also set a different database:
       # - LLDAP_DATABASE_URL=mysql://mysql-user:password@mysql-server/my-database
       # - LLDAP_DATABASE_URL=postgres://postgres-user:password@postgres-server/my-database
-      # If using SMTP, set the following variables
-      # - LLDAP_SMTP_OPTIONS__ENABLE_PASSWORD_RESET=true
-      # - LLDAP_SMTP_OPTIONS__SERVER=smtp.example.com
-      # - LLDAP_SMTP_OPTIONS__PORT=465 # Check your smtp providor's documentation for this setting
-      # - LLDAP_SMTP_OPTIONS__SMTP_ENCRYPTION=TLS # How the connection is encrypted, either "NONE" (no encryption, port 25), "TLS" (sometimes called SSL, port 465) or "STARTTLS" (sometimes called TLS, port 587).
-      # - LLDAP_SMTP_OPTIONS__USER=no-reply@example.com # The SMTP user, usually your email address
-      # - LLDAP_SMTP_OPTIONS__PASSWORD=PasswordGoesHere # The SMTP password
-      # - LLDAP_SMTP_OPTIONS__FROM=no-reply <no-reply@example.com> # The header field, optional: how the sender appears in the email. The first is a free-form name, followed by an email between <>.
-      # - LLDAP_SMTP_OPTIONS__TO=admin <admin@example.com> # Same for reply-to, optional.
 ```
 
 Then the service will listen on two ports, one for LDAP and one for the web
@@ -195,229 +183,30 @@ Depending on the distribution you use, it might be possible to install lldap
 from a package repository, officially supported by the distribution or
 community contributed.
 
-Each package offers a [systemd service](https://wiki.archlinux.org/title/systemd#Using_units) `lldap.service` to (auto-)start and stop lldap.<br>
+#### Debian, CentOS Fedora, OpenSUSE, Ubuntu
-When using the distributed packages, the default login is `admin/password`. You can change that from the web UI after starting the service.
 
-<details>
+The package for these distributions can be found at [LLDAP OBS](https://software.opensuse.org//download.html?project=home%3AMasgalor%3ALLDAP&package=lldap).
-<summary><b>Arch Linux</b></summary>
+- When using the distributed package, the default login is `admin/password`. You can change that from the web UI after starting the service.
-<br>
-  Arch Linux offers unofficial support through the <a href="https://wiki.archlinux.org/title/Arch_User_Repository">Arch User Repository (AUR)</a>.<br>
-  The package descriptions can be used <a href="https://wiki.archlinux.org/title/Arch_User_Repository#Getting_started">to create and install packages</a>.<br><br>
-  Support: <a href="https://github.com/lldap/lldap/discussions/1044">Discussions</a><br>
-  Package repository: <a href="https://aur.archlinux.org/packages">Arch User Repository</a><br><br>
-<table>
-  <tr>
-    <td>Package name</td>
-    <td>Maintainer</td>
-    <td>Description</td>
-  </tr>
-  <tr>
-    <td><a href="https://aur.archlinux.org/packages/lldap">lldap</a></td>
-    <td><a href="https://github.com/Zepmann">@Zepmann</a></td>
-    <td>Builds the latest stable version.</td>
-  </tr>
-  <tr>
-    <td><a href="https://aur.archlinux.org/packages/lldap-bin">lldap-bin</a></td>
-    <td><a href="https://github.com/Zepmann">@Zepmann</a></td>
-    <td>Uses the latest pre-compiled binaries from the <a href="https://github.com/lldap/lldap/releases">releases in this repository</a>.<br>
-        This package is recommended if you want to run LLDAP on a system with limited resources.</td>
-  </tr>
-  <tr>
-    <td><a href="https://aur.archlinux.org/packages/lldap-git">lldap-git</a></td>
-    <td></td>
-    <td>Builds the latest main branch code.</td>
-  </tr>
-</table>
-LLDAP configuration file: /etc/lldap.toml<br>
-</details>
-<details>
-<summary><b>Debian</b></summary>
-<br>
-  Unofficial Debian support is offered through the <a href="https://build.opensuse.org/">openSUSE Build Service</a>.<br><br>
-  Maintainer: <a href="https://github.com/Masgalor">@Masgalor</a><br>
-  Support: <a href="https://codeberg.org/Masgalor/LLDAP-Packaging/issues">Codeberg</a>, <a href="https://github.com/lldap/lldap/discussions">Discussions</a><br>
-  Package repository: <a href="https://software.opensuse.org//download.html?project=home%3AMasgalor%3ALLDAP&package=lldap">SUSE openBuildService</a><br>
-<table>
-  <tr>
-    <td>Available packages:</td>
-    <td>lldap</td>
-    <td>Light LDAP server for authentication.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-extras</td>
-    <td>Meta-Package for LLDAP and its tools and extensions.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-migration-tool</td>
-    <td>CLI migration tool to go from OpenLDAP to LLDAP.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-set-password</td>
-    <td>CLI tool to set a user password in LLDAP.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-cli</td>
-    <td>LLDAP-CLI is an unofficial command line interface for LLDAP.</td>
-  </tr>
-</table>
-LLDPA configuration file: /etc/lldap/lldap_config.toml<br>
-</details>
-<details>
-<summary><b>CentOS</b></summary>
-<br>
-  Unofficial CentOS support is offered through the <a href="https://build.opensuse.org/">openSUSE Build Service</a>.<br><br>
-  Maintainer: <a href="https://github.com/Masgalor">@Masgalor</a><br>
-  Support: <a href="https://codeberg.org/Masgalor/LLDAP-Packaging/issues">Codeberg</a>, <a href="https://github.com/lldap/lldap/discussions">Discussions</a><br>
-  Package repository: <a href="https://software.opensuse.org//download.html?project=home%3AMasgalor%3ALLDAP&package=lldap">SUSE openBuildService</a><br>
-<table>
-  <tr>
-    <td>Available packages:</td>
-    <td>lldap</td>
-    <td>Light LDAP server for authentication.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-extras</td>
-    <td>Meta-Package for LLDAP and its tools and extensions.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-migration-tool</td>
-    <td>CLI migration tool to go from OpenLDAP to LLDAP.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-set-password</td>
-    <td>CLI tool to set a user password in LLDAP.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-cli</td>
-    <td>LLDAP-CLI is an unofficial command line interface for LLDAP.</td>
-  </tr>
-</table>
-LLDPA configuration file: /etc/lldap/lldap_config.toml<br>
-</details>
-<details>
-<summary><b>Fedora</b></summary>
-<br>
-  Unofficial Fedora support is offered through the <a href="https://build.opensuse.org/">openSUSE Build Service</a>.<br><br>
-  Maintainer: <a href="https://github.com/Masgalor">@Masgalor</a><br>
-  Support: <a href="https://codeberg.org/Masgalor/LLDAP-Packaging/issues">Codeberg</a>, <a href="https://github.com/lldap/lldap/discussions">Discussions</a><br>
-  Package repository: <a href="https://software.opensuse.org//download.html?project=home%3AMasgalor%3ALLDAP&package=lldap">SUSE openBuildService</a><br>
-<table>
-  <tr>
-    <td>Available packages:</td>
-    <td>lldap</td>
-    <td>Light LDAP server for authentication.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-extras</td>
-    <td>Meta-Package for LLDAP and its tools and extensions.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-migration-tool</td>
-    <td>CLI migration tool to go from OpenLDAP to LLDAP.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-set-password</td>
-    <td>CLI tool to set a user password in LLDAP.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-cli</td>
-    <td>LLDAP-CLI is an unofficial command line interface for LLDAP.</td>
-  </tr>
-</table>
-LLDPA configuration file: /etc/lldap/lldap_config.toml<br>
-</details>
-<details>
-<summary><b>OpenSUSE</b></summary>
-<br>
-  Unofficial OpenSUSE support is offered through the <a href="https://build.opensuse.org/">openSUSE Build Service</a>.<br><br>
-  Maintainer: <a href="https://github.com/Masgalor">@Masgalor</a><br>
-  Support: <a href="https://codeberg.org/Masgalor/LLDAP-Packaging/issues">Codeberg</a>, <a href="https://github.com/lldap/lldap/discussions">Discussions</a><br>
-  Package repository: <a href="https://software.opensuse.org//download.html?project=home%3AMasgalor%3ALLDAP&package=lldap">SUSE openBuildService</a><br>
-<table>
-  <tr>
-    <td>Available packages:</td>
-    <td>lldap</td>
-    <td>Light LDAP server for authentication.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-extras</td>
-    <td>Meta-Package for LLDAP and its tools and extensions.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-migration-tool</td>
-    <td>CLI migration tool to go from OpenLDAP to LLDAP.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-set-password</td>
-    <td>CLI tool to set a user password in LLDAP.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-cli</td>
-    <td>LLDAP-CLI is an unofficial command line interface for LLDAP.</td>
-  </tr>
-</table>
-LLDPA configuration file: /etc/lldap/lldap_config.toml<br>
-</details>
-<details>
-<summary><b>Ubuntu</b></summary>
-<br>
-  Unofficial Ubuntu support is offered through the <a href="https://build.opensuse.org/">openSUSE Build Service</a>.<br><br>
-  Maintainer: <a href="https://github.com/Masgalor">@Masgalor</a><br>
-  Support: <a href="https://codeberg.org/Masgalor/LLDAP-Packaging/issues">Codeberg</a>, <a href="https://github.com/lldap/lldap/discussions">Discussions</a><br>
-  Package repository: <a href="https://software.opensuse.org//download.html?project=home%3AMasgalor%3ALLDAP&package=lldap">SUSE openBuildService</a><br>
-<table>
-  <tr>
-    <td>Available packages:</td>
-    <td>lldap</td>
-    <td>Light LDAP server for authentication.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-extras</td>
-    <td>Meta-Package for LLDAP and its tools and extensions.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-migration-tool</td>
-    <td>CLI migration tool to go from OpenLDAP to LLDAP.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-set-password</td>
-    <td>CLI tool to set a user password in LLDAP.</td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>lldap-cli</td>
-    <td>LLDAP-CLI is an unofficial command line interface for LLDAP.</td>
-  </tr>
-</table>
-LLDPA configuration file: /etc/lldap/lldap_config.toml<br>
-</details>
 
-### With FreeBSD
+#### Arch Linux
 
-You can also install it as a rc.d service in FreeBSD, see
+Arch Linux offers unofficial support through the [Arch User Repository
-[FreeBSD-install.md](example_configs/freebsd/freebsd-install.md).
+(AUR)](https://wiki.archlinux.org/title/Arch_User_Repository).
+Available package descriptions in AUR are:
 
-The rc.d script file
+- [lldap](https://aur.archlinux.org/packages/lldap) -  Builds the latest stable version.
-[rc.d_lldap](example_configs/freebsd/rc.d_lldap).
+- [lldap-bin](https://aur.archlinux.org/packages/lldap-bin) - Uses the latest
+  pre-compiled binaries from the [releases in this repository](https://github.com/lldap/lldap/releases).
+  This package is recommended if you want to run lldap on a system with
+  limited resources.
+- [lldap-git](https://aur.archlinux.org/packages/lldap-git) - Builds the
+  latest main branch code.
+
+The package descriptions can be used
+[to create and install packages](https://wiki.archlinux.org/title/Arch_User_Repository#Getting_started).
+Each package places lldap's configuration file at `/etc/lldap.toml` and offers
+[systemd service](https://wiki.archlinux.org/title/systemd#Using_units)
+`lldap.service` to (auto-)start and stop lldap.
 
 ### From source
 
@@ -488,16 +277,10 @@ create users, set passwords, add them to groups and so on. Users can also
 connect to the web UI and change their information, or request a password reset
 link (if you configured the SMTP client).
 
-You can create and manage custom attributes through the Web UI, or through the
+Creating and managing custom attributes is currently in Beta. It's not
-community-contributed CLI frontend (
+supported in the Web UI. The recommended way is to use
-[Zepmann/lldap-cli](https://github.com/Zepmann/lldap-cli)). This is necessary
+[Zepmann/lldap-cli](https://github.com/Zepmann/lldap-cli), a
-for some service integrations.
+community-contributed CLI frontend.
-
-The [bootstrap.sh](scripts/bootstrap.sh) script can enforce a list of
-users/groups/attributes from a given file, reflecting it on the server.
-
-To manage the user, group and membership lifecycle in an infrastructure-as-code
-scenario you can use the unofficial [LLDAP terraform provider in the terraform registry](https://registry.terraform.io/providers/tasansga/lldap/latest).
 
 LLDAP is also very scriptable, through its GraphQL API. See the
 [Scripting](docs/scripting.md) docs for more info.
@@ -559,13 +342,6 @@ admin rights in the Web UI. Most LDAP integrations should instead use a user in
 the `lldap_strict_readonly` or `lldap_password_manager` group, to avoid granting full
 administration access to many services.
 
-### Integration with OS's
-
-Integration with Linux accounts is possible, through PAM and nslcd. See [PAM
-configuration guide](example_configs/pam/README.md).
-
-Integration with Windows (e.g. Samba) is WIP.
-
 ### Sample client configurations
 
 Some specific clients have been tested to work and come with sample
@@ -579,7 +355,6 @@ folder for help with:
 - [Authentik](example_configs/authentik.md)
 - [Bookstack](example_configs/bookstack.env.example)
 - [Calibre-Web](example_configs/calibre_web.md)
-- [Carpal](example_configs/carpal.md)
 - [Dell iDRAC](example_configs/dell_idrac.md)
 - [Dex](example_configs/dex_config.yml)
 - [Dokuwiki](example_configs/dokuwiki.md)
@@ -591,8 +366,6 @@ folder for help with:
 - [GitLab](example_configs/gitlab.md)
 - [Grafana](example_configs/grafana_ldap_config.toml)
 - [Grocy](example_configs/grocy.md)
-- [Harbor](example_configs/harbor.md)
-- [HashiCorp Vault](example_configs/hashicorp-vault.md)
 - [Hedgedoc](example_configs/hedgedoc.md)
 - [Home Assistant](example_configs/home-assistant.md)
 - [Jellyfin](example_configs/jellyfin.md)
@@ -600,30 +373,20 @@ folder for help with:
 - [Jitsi Meet](example_configs/jitsi_meet.conf)
 - [Kasm](example_configs/kasm.md)
 - [KeyCloak](example_configs/keycloak.md)
-- [Kimai](example_configs/kimai.yaml)
 - [LibreNMS](example_configs/librenms.md)
-- [Maddy](example_configs/maddy.md)
 - [Mastodon](example_configs/mastodon.env.example)
 - [Matrix](example_configs/matrix_synapse.yml)
 - [Mealie](example_configs/mealie.md)
-- [Metabase](example_configs/metabase.md)
-- [MegaRAC-BMC](example_configs/MegaRAC-SP-X-BMC.md)
 - [MinIO](example_configs/minio.md)
-- [Netbox](example_configs/netbox.md)
 - [Nextcloud](example_configs/nextcloud.md)
 - [Nexus](example_configs/nexus.md)
-- [OCIS (OwnCloud Infinite Scale)](example_configs/ocis.md)
-- [OneDev](example_configs/onedev.md)
 - [Organizr](example_configs/Organizr.md)
 - [Portainer](example_configs/portainer.md)
 - [PowerDNS Admin](example_configs/powerdns_admin.md)
-- [Prosody](example_configs/prosody.md)
 - [Proxmox VE](example_configs/proxmox.md)
-- [Radicale](example_configs/radicale.md)
 - [Rancher](example_configs/rancher.md)
 - [Seafile](example_configs/seafile.md)
 - [Shaarli](example_configs/shaarli.md)
-- [SonarQube](example_configs/sonarqube.md)
 - [Squid](example_configs/squid.md)
 - [Syncthing](example_configs/syncthing.md)
 - [TheLounge](example_configs/thelounge.md)
@@ -714,9 +477,6 @@ modern identity protocols, check out Kanidm.
 If you just set up the server, can get to the login page but the password you
 set isn't working, try the following:
 
-- If you have changed the admin password in the config after the first run, it
-  won't be used (unless you force its use with `force_ldap_user_pass_reset`).
-  The config password is only for the initial admin creation.
 - (For docker): Make sure that the `/data` folder is persistent, either to a
   docker volume or mounted from the host filesystem.
 - Check if there is a `lldap_config.toml` file (either in `/data` for docker

app/Cargo.toml

@@ -6,7 +6,7 @@ homepage = "https://github.com/lldap/lldap"
 license = "GPL-3.0-only"
 name = "lldap_app"
 repository = "https://github.com/lldap/lldap"
-version = "0.6.2-alpha"
+version = "0.5.1-alpha"
 include = ["src/**/*", "queries/**/*", "Cargo.toml", "../schema.graphql"]
 
 [dependencies]
@@ -22,8 +22,8 @@ rand = "0.8"
 serde = "1"
 serde_json = "1"
 url-escape = "0.1.1"
-validator = "0.14"
+validator = "=0.14"
-validator_derive = "0.14"
+validator_derive = "*"
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "*"
 yew = "0.19.3"
@@ -37,16 +37,12 @@ version = "0.3"
 features = [
   "Document",
   "Element",
-  "Event",
   "FileReader",
-  "FormData",
   "HtmlDocument",
-  "HtmlFormElement",
   "HtmlInputElement",
   "HtmlOptionElement",
   "HtmlOptionsCollection",
   "HtmlSelectElement",
-  "SubmitEvent",
   "console",
 ]
 
@@ -75,10 +71,3 @@ rev = "4b9fabffb63393ec7626a4477fd36de12a07fac9"
 
 [lib]
 crate-type = ["cdylib"]
-
-[package.metadata.wasm-pack.profile.dev]
-wasm-opt = ['--enable-bulk-memory']
-[package.metadata.wasm-pack.profile.profiling]
-wasm-opt = ['--enable-bulk-memory']
-[package.metadata.wasm-pack.profile.release]
-wasm-opt = ['--enable-bulk-memory']

app/queries/create_group.graphql

@@ -1,5 +1,5 @@
-mutation CreateGroup($group: CreateGroupInput!) {
+mutation CreateGroup($name: String!) {
-  createGroupWithDetails(request: $group) {
+  createGroup(name: $name) {
     id
     displayName
   }

app/queries/create_group_attribute.graphql

@@ -1,5 +0,0 @@
-mutation CreateGroupAttribute($name: String!, $attributeType: AttributeType!, $isList: Boolean!, $isVisible: Boolean!) {
-    addGroupAttribute(name: $name, attributeType: $attributeType, isList: $isList, isVisible: $isVisible, isEditable: false) {
-        ok
-    }
-}

app/queries/create_user_attribute.graphql

@@ -1,5 +0,0 @@
-mutation CreateUserAttribute($name: String!, $attributeType: AttributeType!, $isList: Boolean!, $isVisible: Boolean!, $isEditable: Boolean!) {
-    addUserAttribute(name: $name, attributeType: $attributeType, isList: $isList, isVisible: $isVisible, isEditable: $isEditable) {
-        ok
-    }
-}

app/queries/delete_group_attribute.graphql

@@ -1,5 +0,0 @@
-mutation DeleteGroupAttributeQuery($name: String!) {
-    deleteGroupAttribute(name: $name) {
-        ok
-    }
-}

app/queries/delete_user_attribute.graphql

@@ -1,5 +0,0 @@
-mutation DeleteUserAttributeQuery($name: String!) {
-    deleteUserAttribute(name: $name) {
-        ok
-    }
-}

app/queries/get_group_attributes_schema.graphql

@@ -1,14 +0,0 @@
-query GetGroupAttributesSchema {
-  schema {
-    groupSchema {
-      attributes {
-        name
-        attributeType
-        isList
-        isVisible
-        isHardcoded
-        isReadonly
-      }
-    }
-  }
-}

app/queries/get_group_details.graphql

@@ -8,22 +8,5 @@ query GetGroupDetails($id: Int!) {
       id
       displayName
     }
-    attributes {
-      name
-      value
-    }
-  }
-  schema {
-    groupSchema {
-      attributes {
-        name
-        attributeType
-        isList
-        isVisible
-        isEditable
-        isHardcoded
-        isReadonly
-      }
-    }
   }
 }

app/queries/get_user_attributes_schema.graphql

@@ -1,15 +0,0 @@
-query GetUserAttributesSchema {
-  schema {
-    userSchema {
-      attributes {
-        name
-        attributeType
-        isList
-        isVisible
-        isEditable
-        isHardcoded
-        isReadonly
-      }
-    }
-  }
-}

app/queries/get_user_details.graphql

@@ -2,30 +2,15 @@ query GetUserDetails($id: String!) {
   user(userId: $id) {
     id
     email
-    avatar
     displayName
+    firstName
+    lastName
+    avatar
     creationDate
     uuid
     groups {
       id
       displayName
     }
-    attributes {
-      name
-      value
-    }
-  }
-  schema {
-    userSchema {
-      attributes {
-        name
-        attributeType
-        isList
-        isVisible
-        isEditable
-        isHardcoded
-        isReadonly
-      }
-    }
   }
 }

app/queries/update_group.graphql

@@ -1,6 +0,0 @@
-mutation UpdateGroup($group: UpdateGroupInput!) {
-  updateGroup(group: $group) {
-    ok
-  }
-}
-

app/src/components/add_group_member.rs

@@ -155,13 +155,8 @@ impl Component for AddGroupMemberComponent {
             let to_add_user_list = self.get_selectable_user_list(ctx, user_list);
             #[allow(unused_braces)]
             let make_select_option = |user: User| {
-                let name = if user.display_name.is_empty() {
-                    user.id.clone()
-                } else {
-                    user.display_name.clone()
-                };
                 html_nested! {
-                    <SelectOption value={user.id.clone()} text={name} key={user.id} />
+                    <SelectOption value={user.id.clone()} text={user.display_name.clone()} key={user.id} />
                 }
             };
             html! {

app/src/components/app.rs

@@ -1,26 +1,23 @@
 use crate::{
     components::{
-        banner::Banner,
         change_password::ChangePasswordForm,
         create_group::CreateGroupForm,
-        create_group_attribute::CreateGroupAttributeForm,
         create_user::CreateUserForm,
-        create_user_attribute::CreateUserAttributeForm,
         group_details::GroupDetails,
-        group_schema_table::ListGroupSchema,
         group_table::GroupTable,
         login::LoginForm,
+        logout::LogoutButton,
         reset_password_step1::ResetPasswordStep1Form,
         reset_password_step2::ResetPasswordStep2Form,
         router::{AppRoute, Link, Redirect},
         user_details::UserDetails,
-        user_schema_table::ListUserSchema,
         user_table::UserTable,
     },
     infra::{api::HostService, cookies::get_cookie},
 };
 
 use gloo_console::error;
+use wasm_bindgen::prelude::*;
 use yew::{
     function_component,
     html::Scope,
@@ -33,6 +30,25 @@ use yew_router::{
     BrowserRouter, Switch,
 };
 
+#[wasm_bindgen]
+extern "C" {
+    #[wasm_bindgen(js_namespace = darkmode)]
+    fn toggleDarkMode(doSave: bool);
+
+    #[wasm_bindgen]
+    fn inDarkMode() -> bool;
+}
+
+#[function_component(DarkModeToggle)]
+pub fn dark_mode_toggle() -> Html {
+    html! {
+      <div class="form-check form-switch">
+        <input class="form-check-input" onclick={|_| toggleDarkMode(true)} type="checkbox" id="darkModeToggle" checked={inDarkMode()}/>
+        <label class="form-check-label" for="darkModeToggle">{"Dark mode"}</label>
+      </div>
+    }
+}
+
 #[function_component(AppContainer)]
 pub fn app_container() -> Html {
     html! {
@@ -119,11 +135,10 @@ impl Component for App {
     fn view(&self, ctx: &Context<Self>) -> Html {
         let link = ctx.link().clone();
         let is_admin = self.is_admin();
-        let username = self.user_info.clone().map(|(username, _)| username);
         let password_reset_enabled = self.password_reset_enabled;
         html! {
           <div>
-            <Banner is_admin={is_admin} username={username} on_logged_out={link.callback(|_| Msg::Logout)} />
+            {self.view_banner(ctx)}
             <div class="container py-3 bg-kug">
               <div class="row justify-content-center" style="padding-bottom: 80px;">
                 <main class="py-3" style="max-width: 1000px">
@@ -212,12 +227,6 @@ impl App {
             AppRoute::CreateGroup => html! {
                 <CreateGroupForm/>
             },
-            AppRoute::CreateUserAttribute => html! {
-                <CreateUserAttributeForm/>
-            },
-            AppRoute::CreateGroupAttribute => html! {
-                <CreateGroupAttributeForm/>
-            },
             AppRoute::ListGroups => html! {
                 <div>
                   <GroupTable />
@@ -227,14 +236,8 @@ impl App {
                   </Link>
                 </div>
             },
-            AppRoute::ListUserSchema => html! {
-                <ListUserSchema />
-            },
-            AppRoute::ListGroupSchema => html! {
-                <ListGroupSchema />
-            },
             AppRoute::GroupDetails { group_id } => html! {
-                <GroupDetails group_id={*group_id} is_admin={is_admin} />
+                <GroupDetails group_id={*group_id} />
             },
             AppRoute::UserDetails { user_id } => html! {
                 <UserDetails username={user_id.clone()} is_admin={is_admin} />
@@ -260,6 +263,91 @@ impl App {
         }
     }
 
+    fn view_banner(&self, ctx: &Context<Self>) -> Html {
+        html! {
+          <header class="p-2 mb-3 border-bottom">
+            <div class="container">
+              <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start">
+                <a href={yew_router::utils::base_url().unwrap_or("/".to_string())} class="d-flex align-items-center mt-2 mb-lg-0 me-md-5 text-decoration-none">
+                  <h2>{"LLDAP"}</h2>
+                </a>
+
+                <ul class="nav col-12 col-lg-auto me-lg-auto mb-2 justify-content-center mb-md-0">
+                  {if self.is_admin() { html! {
+                    <>
+                      <li>
+                        <Link
+                          classes="nav-link px-2 h6"
+                          to={AppRoute::ListUsers}>
+                          <i class="bi-people me-2"></i>
+                          {"Users"}
+                        </Link>
+                      </li>
+                      <li>
+                        <Link
+                          classes="nav-link px-2 h6"
+                          to={AppRoute::ListGroups}>
+                          <i class="bi-collection me-2"></i>
+                          {"Groups"}
+                        </Link>
+                      </li>
+                    </>
+                  } } else { html!{} } }
+                </ul>
+                { self.view_user_menu(ctx) }
+                <DarkModeToggle />
+              </div>
+            </div>
+          </header>
+        }
+    }
+
+    fn view_user_menu(&self, ctx: &Context<Self>) -> Html {
+        if let Some((user_id, _)) = &self.user_info {
+            let link = ctx.link();
+            html! {
+              <div class="dropdown text-end">
+                <a href="#"
+                  class="d-block nav-link text-decoration-none dropdown-toggle"
+                  id="dropdownUser"
+                  data-bs-toggle="dropdown"
+                  aria-expanded="false">
+                  <svg xmlns="http://www.w3.org/2000/svg"
+                    width="32"
+                    height="32"
+                    fill="currentColor"
+                    class="bi bi-person-circle"
+                    viewBox="0 0 16 16">
+                    <path d="M11 6a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"/>
+                    <path fill-rule="evenodd" d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1z"/>
+                  </svg>
+                  <span class="ms-2">
+                    {user_id}
+                  </span>
+                </a>
+                <ul
+                  class="dropdown-menu text-small dropdown-menu-lg-end"
+                  aria-labelledby="dropdownUser1"
+                  style="">
+                  <li>
+                    <Link
+                      classes="dropdown-item"
+                      to={AppRoute::UserDetails{ user_id: user_id.clone() }}>
+                      {"View details"}
+                    </Link>
+                  </li>
+                  <li><hr class="dropdown-divider" /></li>
+                  <li>
+                    <LogoutButton on_logged_out={link.callback(|_| Msg::Logout)} />
+                  </li>
+                </ul>
+              </div>
+            }
+        } else {
+            html! {}
+        }
+    }
+
     fn view_footer(&self) -> Html {
         html! {
           <footer class="text-center fixed-bottom text-muted bg-light py-2">

app/src/components/avatar.rs

@@ -1,88 +0,0 @@
-use crate::infra::functional::{use_graphql_call, LoadableResult};
-use graphql_client::GraphQLQuery;
-use yew::{function_component, html, virtual_dom::AttrValue, Properties};
-
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "../schema.graphql",
-    query_path = "queries/get_user_details.graphql",
-    variables_derives = "Clone,PartialEq,Eq",
-    response_derives = "Debug, Hash, PartialEq, Eq, Clone",
-    custom_scalars_module = "crate::infra::graphql"
-)]
-pub struct GetUserDetails;
-
-#[derive(Properties, PartialEq)]
-pub struct Props {
-    pub user: AttrValue,
-    #[prop_or(32)]
-    pub width: i32,
-    #[prop_or(32)]
-    pub height: i32,
-}
-
-#[function_component(Avatar)]
-pub fn avatar(props: &Props) -> Html {
-    let user_details = use_graphql_call::<GetUserDetails>(get_user_details::Variables {
-        id: props.user.to_string(),
-    });
-
-    match &(*user_details) {
-        LoadableResult::Loaded(Ok(response)) => {
-            let avatar = response.user.avatar.clone();
-            match &avatar {
-                Some(data) => html! {
-                  <img
-                    id="avatarDisplay"
-                    src={format!("data:image/jpeg;base64, {}", data)}
-                    style={format!("max-height:{}px;max-width:{}px;height:auto;width:auto;", props.height, props.width)}
-                    alt="Avatar" />
-                },
-                None => html! {
-                  <BlankAvatarDisplay
-                    width={props.width}
-                    height={props.height} />
-                },
-            }
-        }
-        LoadableResult::Loaded(Err(error)) => html! {
-          <BlankAvatarDisplay
-            error={error.to_string()}
-            width={props.width}
-            height={props.height} />
-        },
-        LoadableResult::Loading => html! {
-          <BlankAvatarDisplay
-            width={props.width}
-            height={props.height} />
-        },
-    }
-}
-
-#[derive(Properties, PartialEq)]
-struct BlankAvatarDisplayProps {
-    #[prop_or(None)]
-    pub error: Option<AttrValue>,
-    pub width: i32,
-    pub height: i32,
-}
-
-#[function_component(BlankAvatarDisplay)]
-fn blank_avatar_display(props: &BlankAvatarDisplayProps) -> Html {
-    let fill = match &props.error {
-        Some(_) => "red",
-        None => "currentColor",
-    };
-    html! {
-      <svg xmlns="http://www.w3.org/2000/svg"
-        width={props.width.to_string()}
-        height={props.height.to_string()}
-        fill={fill}
-        class="bi bi-person-circle"
-        viewBox="0 0 16 16">
-        <title>{props.error.clone().unwrap_or(AttrValue::Static("Avatar"))}</title>
-        <path d="M11 6a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"/>
-        <path fill-rule="evenodd" d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1z"/>
-      </svg>
-    }
-}

app/src/components/banner.rs

@@ -1,132 +0,0 @@
-use crate::components::{
-    avatar::Avatar,
-    logout::LogoutButton,
-    router::{AppRoute, Link},
-};
-use wasm_bindgen::prelude::wasm_bindgen;
-use yew::{function_component, html, Callback, Properties};
-
-#[derive(Properties, PartialEq)]
-pub struct Props {
-    pub is_admin: bool,
-    pub username: Option<String>,
-    pub on_logged_out: Callback<()>,
-}
-
-#[function_component(Banner)]
-pub fn banner(props: &Props) -> Html {
-    html! {
-      <header class="p-2 mb-3 border-bottom">
-        <div class="container">
-          <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start">
-            <a href={yew_router::utils::base_url().unwrap_or("/".to_string())} class="d-flex align-items-center mt-2 mb-lg-0 me-md-5 text-decoration-none">
-              <h2>{"LLDAP"}</h2>
-            </a>
-
-            <ul class="nav col-12 col-lg-auto me-lg-auto mb-2 justify-content-center mb-md-0">
-              {if props.is_admin { html! {
-                <>
-                  <li>
-                    <Link
-                      classes="nav-link px-2 h6"
-                      to={AppRoute::ListUsers}>
-                      <i class="bi-people me-2"></i>
-                      {"Users"}
-                    </Link>
-                  </li>
-                  <li>
-                    <Link
-                      classes="nav-link px-2 h6"
-                      to={AppRoute::ListGroups}>
-                      <i class="bi-collection me-2"></i>
-                      {"Groups"}
-                    </Link>
-                  </li>
-                  <li>
-                    <Link
-                      classes="nav-link px-2 h6"
-                      to={AppRoute::ListUserSchema}>
-                      <i class="bi-list-ul me-2"></i>
-                      {"User schema"}
-                    </Link>
-                  </li>
-                  <li>
-                    <Link
-                      classes="nav-link px-2 h6"
-                      to={AppRoute::ListGroupSchema}>
-                      <i class="bi-list-ul me-2"></i>
-                      {"Group schema"}
-                    </Link>
-                  </li>
-                </>
-              } } else { html!{} } }
-            </ul>
-            <UserMenu username={props.username.clone()} on_logged_out={props.on_logged_out.clone()}/>
-            <DarkModeToggle />
-          </div>
-        </div>
-      </header>
-    }
-}
-
-#[derive(Properties, PartialEq)]
-struct UserMenuProps {
-    pub username: Option<String>,
-    pub on_logged_out: Callback<()>,
-}
-
-#[function_component(UserMenu)]
-fn user_menu(props: &UserMenuProps) -> Html {
-    match &props.username {
-        Some(username) => html! {
-          <div class="dropdown text-end">
-            <a href="#"
-              class="d-block nav-link text-decoration-none dropdown-toggle"
-              id="dropdownUser"
-              data-bs-toggle="dropdown"
-              aria-expanded="false">
-              <Avatar user={username.clone()} />
-              <span class="ms-2">
-                {username}
-              </span>
-            </a>
-            <ul
-              class="dropdown-menu text-small dropdown-menu-lg-end"
-              aria-labelledby="dropdownUser1"
-              style="">
-              <li>
-                <Link
-                  classes="dropdown-item"
-                  to={AppRoute::UserDetails{ user_id: username.to_string() }}>
-                  {"View details"}
-                </Link>
-              </li>
-              <li><hr class="dropdown-divider" /></li>
-              <li>
-                <LogoutButton on_logged_out={props.on_logged_out.clone()} />
-              </li>
-            </ul>
-          </div>
-        },
-        _ => html! {},
-    }
-}
-
-#[wasm_bindgen]
-extern "C" {
-    #[wasm_bindgen(js_namespace = darkmode)]
-    fn toggleDarkMode(doSave: bool);
-
-    #[wasm_bindgen]
-    fn inDarkMode() -> bool;
-}
-
-#[function_component(DarkModeToggle)]
-fn dark_mode_toggle() -> Html {
-    html! {
-      <div class="form-check form-switch">
-        <input class="form-check-input" onclick={|_| toggleDarkMode(true)} type="checkbox" id="darkModeToggle" checked={inDarkMode()}/>
-        <label class="form-check-label" for="darkModeToggle">{"Dark mode"}</label>
-      </div>
-    }
-}

app/src/components/change_password.rs

@@ -1,8 +1,5 @@
 use crate::{
-    components::{
+    components::router::{AppRoute, Link},
-        form::{field::Field, submit::Submit},
-        router::{AppRoute, Link},
-    },
     infra::{
         api::HostService,
         common_component::{CommonComponent, CommonComponentParts},
@@ -210,6 +207,7 @@ impl Component for ChangePasswordForm {
     fn view(&self, ctx: &Context<Self>) -> Html {
         let is_admin = ctx.props().is_admin;
         let link = ctx.link();
+        type Field = yew_form::Field<FormModel>;
         html! {
           <>
             <div class="mb-2 mt-2">
@@ -226,44 +224,90 @@ impl Component for ChangePasswordForm {
                 }
               } else { html! {} }
             }
-            <form class="form">
+            <form
+              class="form">
               {if !is_admin { html! {
-                <Field<FormModel>
+                <div class="form-group row">
-                  form={&self.form}
+                  <label for="old_password"
-                  required=true
+                    class="form-label col-sm-2 col-form-label">
-                  label="Current password"
+                    {"Current password*:"}
-                  field_name="old_password"
+                  </label>
-                  input_type="password"
+                  <div class="col-sm-10">
-                  autocomplete="current-password"
+                    <Field
-                  oninput={link.callback(|_| Msg::FormUpdate)} />
+                      form={&self.form}
+                      field_name="old_password"
+                      input_type="password"
+                      class="form-control"
+                      class_invalid="is-invalid has-error"
+                      class_valid="has-success"
+                      autocomplete="current-password"
+                      oninput={link.callback(|_| Msg::FormUpdate)} />
+                    <div class="invalid-feedback">
+                      {&self.form.field_message("old_password")}
+                    </div>
+                  </div>
+                </div>
               }} else { html! {} }}
-              <Field<FormModel>
+              <div class="form-group row mb-3">
-                form={&self.form}
+                <label for="new_password"
-                required=true
+                  class="form-label col-sm-2 col-form-label">
-                label="New password"
+                   {"New Password"}
-                field_name="password"
+                   <span class="text-danger">{"*"}</span>
-                input_type="password"
+                   {":"}
-                autocomplete="new-password"
+                </label>
-                oninput={link.callback(|_| Msg::FormUpdate)} />
+                <div class="col-sm-10">
-              <Field<FormModel>
+                  <Field
-                form={&self.form}
+                    form={&self.form}
-                required=true
+                    field_name="password"
-                label="Confirm password"
+                    input_type="password"
-                field_name="confirm_password"
+                    class="form-control"
-                input_type="password"
+                    class_invalid="is-invalid has-error"
-                autocomplete="new-password"
+                    class_valid="has-success"
-                oninput={link.callback(|_| Msg::FormUpdate)} />
+                    autocomplete="new-password"
-              <Submit
+                    oninput={link.callback(|_| Msg::FormUpdate)} />
-                disabled={self.common.is_task_running()}
+                  <div class="invalid-feedback">
-                onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::Submit})}
+                    {&self.form.field_message("password")}
-                text="Save changes" >
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row mb-3">
+                <label for="confirm_password"
+                  class="form-label col-sm-2 col-form-label">
+                  {"Confirm Password"}
+                  <span class="text-danger">{"*"}</span>
+                  {":"}
+                </label>
+                <div class="col-sm-10">
+                  <Field
+                    form={&self.form}
+                    field_name="confirm_password"
+                    input_type="password"
+                    class="form-control"
+                    class_invalid="is-invalid has-error"
+                    class_valid="has-success"
+                    autocomplete="new-password"
+                    oninput={link.callback(|_| Msg::FormUpdate)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("confirm_password")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row justify-content-center">
+                <button
+                  class="btn btn-primary col-auto col-form-label"
+                  type="submit"
+                  disabled={self.common.is_task_running()}
+                  onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::Submit})}>
+                  <i class="bi-save me-2"></i>
+                  {"Save changes"}
+                </button>
                 <Link
                   classes="btn btn-secondary ms-2 col-auto col-form-label"
                   to={AppRoute::UserDetails{user_id: ctx.props().username.clone()}}>
                   <i class="bi-arrow-return-left me-2"></i>
                   {"Back"}
                 </Link>
-              </Submit>
+              </div>
             </form>
           </>
         }

app/src/components/create_group.rs

@@ -1,23 +1,8 @@
 use crate::{
-    components::{
+    components::router::AppRoute,
-        form::{
+    infra::common_component::{CommonComponent, CommonComponentParts},
-            attribute_input::{ListAttributeInput, SingleAttributeInput},
-            field::Field,
-            submit::Submit,
-        },
-        router::AppRoute,
-    },
-    convert_attribute_type,
-    infra::{
-        common_component::{CommonComponent, CommonComponentParts},
-        form_utils::{
-            read_all_form_attributes, AttributeValue, EmailIsRequired, GraphQlAttributeSchema,
-            IsAdmin,
-        },
-        schema::AttributeType,
-    },
 };
-use anyhow::{ensure, Result};
+use anyhow::{bail, Result};
 use gloo_console::log;
 use graphql_client::GraphQLQuery;
 use validator_derive::Validate;
@@ -25,33 +10,6 @@ use yew::prelude::*;
 use yew_form_derive::Model;
 use yew_router::{prelude::History, scope_ext::RouterScopeExt};
 
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "../schema.graphql",
-    query_path = "queries/get_group_attributes_schema.graphql",
-    response_derives = "Debug,Clone,PartialEq,Eq",
-    custom_scalars_module = "crate::infra::graphql"
-)]
-pub struct GetGroupAttributesSchema;
-
-use get_group_attributes_schema::ResponseData;
-
-pub type Attribute =
-    get_group_attributes_schema::GetGroupAttributesSchemaSchemaGroupSchemaAttributes;
-
-convert_attribute_type!(get_group_attributes_schema::AttributeType);
-
-impl From<&Attribute> for GraphQlAttributeSchema {
-    fn from(attr: &Attribute) -> Self {
-        Self {
-            name: attr.name.clone(),
-            is_list: attr.is_list,
-            is_readonly: attr.is_readonly,
-            is_editable: false, // Need to be admin to edit it.
-        }
-    }
-}
-
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "../schema.graphql",
@@ -64,8 +22,6 @@ pub struct CreateGroup;
 pub struct CreateGroupForm {
     common: CommonComponentParts<Self>,
     form: yew_form::Form<CreateGroupModel>,
-    attributes_schema: Option<Vec<Attribute>>,
-    form_ref: NodeRef,
 }
 
 #[derive(Model, Validate, PartialEq, Eq, Clone, Default)]
@@ -76,7 +32,6 @@ pub struct CreateGroupModel {
 
 pub enum Msg {
     Update,
-    ListAttributesResponse(Result<ResponseData>),
     SubmitForm,
     CreateGroupResponse(Result<create_group::ResponseData>),
 }
@@ -90,33 +45,12 @@ impl CommonComponent<CreateGroupForm> for CreateGroupForm {
         match msg {
             Msg::Update => Ok(true),
             Msg::SubmitForm => {
-                ensure!(self.form.validate(), "Check the form for errors");
+                if !self.form.validate() {
-
+                    bail!("Check the form for errors");
-                let all_values = read_all_form_attributes(
+                }
-                    self.attributes_schema.iter().flatten(),
-                    &self.form_ref,
-                    IsAdmin(true),
-                    EmailIsRequired(false),
-                )?;
-                let attributes = Some(
-                    all_values
-                        .into_iter()
-                        .filter(|a| !a.values.is_empty())
-                        .map(
-                            |AttributeValue { name, values }| create_group::AttributeValueInput {
-                                name,
-                                value: values,
-                            },
-                        )
-                        .collect(),
-                );
-
                 let model = self.form.model();
                 let req = create_group::Variables {
-                    group: create_group::CreateGroupInput {
+                    name: model.groupname,
-                        displayName: model.groupname,
-                        attributes,
-                    },
                 };
                 self.common.call_graphql::<CreateGroup, _>(
                     ctx,
@@ -129,16 +63,11 @@ impl CommonComponent<CreateGroupForm> for CreateGroupForm {
             Msg::CreateGroupResponse(response) => {
                 log!(&format!(
                     "Created group '{}'",
-                    &response?.create_group_with_details.display_name
+                    &response?.create_group.display_name
                 ));
                 ctx.link().history().unwrap().push(AppRoute::ListGroups);
                 Ok(true)
             }
-            Msg::ListAttributesResponse(schema) => {
-                self.attributes_schema =
-                    Some(schema?.schema.group_schema.attributes.into_iter().collect());
-                Ok(true)
-            }
         }
     }
 
@@ -151,22 +80,11 @@ impl Component for CreateGroupForm {
     type Message = Msg;
     type Properties = ();
 
-    fn create(ctx: &Context<Self>) -> Self {
+    fn create(_: &Context<Self>) -> Self {
-        let mut component = Self {
+        Self {
             common: CommonComponentParts::<Self>::create(),
             form: yew_form::Form::<CreateGroupModel>::new(CreateGroupModel::default()),
-            attributes_schema: None,
+        }
-            form_ref: NodeRef::default(),
-        };
-        component
-            .common
-            .call_graphql::<GetGroupAttributesSchema, _>(
-                ctx,
-                get_group_attributes_schema::Variables {},
-                Msg::ListAttributesResponse,
-                "Error trying to fetch group schema",
-            );
-        component
     }
 
     fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
@@ -175,30 +93,44 @@ impl Component for CreateGroupForm {
 
     fn view(&self, ctx: &Context<Self>) -> Html {
         let link = ctx.link();
+        type Field = yew_form::Field<CreateGroupModel>;
         html! {
           <div class="row justify-content-center">
-            <form class="form py-3" style="max-width: 636px"
+            <form class="form py-3" style="max-width: 636px">
-              ref={self.form_ref.clone()}>
               <div class="row mb-3">
                 <h5 class="fw-bold">{"Create a group"}</h5>
               </div>
-              <Field<CreateGroupModel>
+              <div class="form-group row mb-3">
-                form={&self.form}
+                <label for="groupname"
-                required=true
+                  class="form-label col-4 col-form-label">
-                label="Group name"
+                  {"Group name"}
-                field_name="groupname"
+                  <span class="text-danger">{"*"}</span>
-                oninput={link.callback(|_| Msg::Update)} />
+                  {":"}
-              {
+                </label>
-                  self.attributes_schema
+                <div class="col-8">
-                      .iter()
+                  <Field
-                      .flatten()
+                    form={&self.form}
-                      .filter(|a| !a.is_readonly && a.name != "display_name")
+                    field_name="groupname"
-                      .map(get_custom_attribute_input)
+                    class="form-control"
-                      .collect::<Vec<_>>()
+                    class_invalid="is-invalid has-error"
-              }
+                    class_valid="has-success"
-              <Submit
+                    autocomplete="groupname"
-                disabled={self.common.is_task_running()}
+                    oninput={link.callback(|_| Msg::Update)} />
-                onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitForm})} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("groupname")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row justify-content-center">
+                <button
+                  class="btn btn-primary col-auto col-form-label"
+                  type="submit"
+                  disabled={self.common.is_task_running()}
+                  onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitForm})}>
+                  <i class="bi-save me-2"></i>
+                  {"Submit"}
+                </button>
+              </div>
             </form>
             { if let Some(e) = &self.common.error {
                 html! {
@@ -212,21 +144,3 @@ impl Component for CreateGroupForm {
         }
     }
 }
-
-fn get_custom_attribute_input(attribute_schema: &Attribute) -> Html {
-    if attribute_schema.is_list {
-        html! {
-            <ListAttributeInput
-                name={attribute_schema.name.clone()}
-                attribute_type={Into::<AttributeType>::into(attribute_schema.attribute_type.clone())}
-            />
-        }
-    } else {
-        html! {
-            <SingleAttributeInput
-                name={attribute_schema.name.clone()}
-                attribute_type={Into::<AttributeType>::into(attribute_schema.attribute_type.clone())}
-            />
-        }
-    }
-}

app/src/components/create_group_attribute.rs

@@ -1,168 +0,0 @@
-use crate::{
-    components::{
-        form::{checkbox::CheckBox, field::Field, select::Select, submit::Submit},
-        router::AppRoute,
-    },
-    convert_attribute_type,
-    infra::{
-        common_component::{CommonComponent, CommonComponentParts},
-        schema::{validate_attribute_type, AttributeType},
-    },
-};
-use anyhow::{bail, Result};
-use gloo_console::log;
-use graphql_client::GraphQLQuery;
-use validator_derive::Validate;
-use yew::prelude::*;
-use yew_form_derive::Model;
-use yew_router::{prelude::History, scope_ext::RouterScopeExt};
-
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "../schema.graphql",
-    query_path = "queries/create_group_attribute.graphql",
-    response_derives = "Debug",
-    custom_scalars_module = "crate::infra::graphql"
-)]
-pub struct CreateGroupAttribute;
-
-convert_attribute_type!(create_group_attribute::AttributeType);
-
-pub struct CreateGroupAttributeForm {
-    common: CommonComponentParts<Self>,
-    form: yew_form::Form<CreateGroupAttributeModel>,
-}
-
-#[derive(Model, Validate, PartialEq, Eq, Clone, Default, Debug)]
-pub struct CreateGroupAttributeModel {
-    #[validate(length(min = 1, message = "attribute_name is required"))]
-    attribute_name: String,
-    #[validate(custom = "validate_attribute_type")]
-    attribute_type: String,
-    is_list: bool,
-    is_visible: bool, // remove when backend doesn't return group attributes for normal users
-}
-
-pub enum Msg {
-    Update,
-    SubmitForm,
-    CreateGroupAttributeResponse(Result<create_group_attribute::ResponseData>),
-}
-
-impl CommonComponent<CreateGroupAttributeForm> for CreateGroupAttributeForm {
-    fn handle_msg(
-        &mut self,
-        ctx: &Context<Self>,
-        msg: <Self as Component>::Message,
-    ) -> Result<bool> {
-        match msg {
-            Msg::Update => Ok(true),
-            Msg::SubmitForm => {
-                if !self.form.validate() {
-                    bail!("Check the form for errors");
-                }
-                let model = self.form.model();
-                let attribute_type = model.attribute_type.parse::<AttributeType>().unwrap();
-                let req = create_group_attribute::Variables {
-                    name: model.attribute_name,
-                    attribute_type: create_group_attribute::AttributeType::from(attribute_type),
-                    is_list: model.is_list,
-                    is_visible: model.is_visible,
-                };
-                self.common.call_graphql::<CreateGroupAttribute, _>(
-                    ctx,
-                    req,
-                    Msg::CreateGroupAttributeResponse,
-                    "Error trying to create group attribute",
-                );
-                Ok(true)
-            }
-            Msg::CreateGroupAttributeResponse(response) => {
-                response?;
-                let model = self.form.model();
-                log!(&format!(
-                    "Created group attribute '{}'",
-                    model.attribute_name
-                ));
-                ctx.link()
-                    .history()
-                    .unwrap()
-                    .push(AppRoute::ListGroupSchema);
-                Ok(true)
-            }
-        }
-    }
-
-    fn mut_common(&mut self) -> &mut CommonComponentParts<Self> {
-        &mut self.common
-    }
-}
-
-impl Component for CreateGroupAttributeForm {
-    type Message = Msg;
-    type Properties = ();
-
-    fn create(_: &Context<Self>) -> Self {
-        let model = CreateGroupAttributeModel {
-            attribute_type: AttributeType::String.to_string(),
-            ..Default::default()
-        };
-        Self {
-            common: CommonComponentParts::<Self>::create(),
-            form: yew_form::Form::<CreateGroupAttributeModel>::new(model),
-        }
-    }
-
-    fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
-        CommonComponentParts::<Self>::update(self, ctx, msg)
-    }
-
-    fn view(&self, ctx: &Context<Self>) -> Html {
-        let link = ctx.link();
-        html! {
-          <div class="row justify-content-center">
-            <form class="form py-3" style="max-width: 636px">
-              <h5 class="fw-bold">{"Create a group attribute"}</h5>
-              <Field<CreateGroupAttributeModel>
-                label="Name"
-                required={true}
-                form={&self.form}
-                field_name="attribute_name"
-                oninput={link.callback(|_| Msg::Update)} />
-              <Select<CreateGroupAttributeModel>
-                label="Type"
-                required={true}
-                form={&self.form}
-                field_name="attribute_type"
-                oninput={link.callback(|_| Msg::Update)}>
-                <option selected=true value="String">{"String"}</option>
-                <option value="Integer">{"Integer"}</option>
-                <option value="Jpeg">{"Jpeg"}</option>
-                <option value="DateTime">{"DateTime"}</option>
-              </Select<CreateGroupAttributeModel>>
-              <CheckBox<CreateGroupAttributeModel>
-                label="Multiple values"
-                form={&self.form}
-                field_name="is_list"
-                ontoggle={link.callback(|_| Msg::Update)} />
-              <CheckBox<CreateGroupAttributeModel>
-                label="Visible to users"
-                form={&self.form}
-                field_name="is_visible"
-                ontoggle={link.callback(|_| Msg::Update)} />
-              <Submit
-                disabled={self.common.is_task_running()}
-                onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitForm})}/>
-            </form>
-            { if let Some(e) = &self.common.error {
-                html! {
-                  <div class="alert alert-danger">
-                    {e.to_string() }
-                  </div>
-                }
-              } else { html! {} }
-            }
-          </div>
-        }
-    }
-}

app/src/components/create_user.rs

@@ -1,24 +1,11 @@
 use crate::{
-    components::{
+    components::router::AppRoute,
-        form::{
-            attribute_input::{ListAttributeInput, SingleAttributeInput},
-            field::Field,
-            submit::Submit,
-        },
-        router::AppRoute,
-    },
-    convert_attribute_type,
     infra::{
         api::HostService,
         common_component::{CommonComponent, CommonComponentParts},
-        form_utils::{
-            read_all_form_attributes, AttributeValue, EmailIsRequired, GraphQlAttributeSchema,
-            IsAdmin,
-        },
-        schema::AttributeType,
     },
 };
-use anyhow::{ensure, Result};
+use anyhow::{bail, Result};
 use gloo_console::log;
 use graphql_client::GraphQLQuery;
 use lldap_auth::{opaque, registration};
@@ -27,32 +14,6 @@ use yew::prelude::*;
 use yew_form_derive::Model;
 use yew_router::{prelude::History, scope_ext::RouterScopeExt};
 
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "../schema.graphql",
-    query_path = "queries/get_user_attributes_schema.graphql",
-    response_derives = "Debug,Clone,PartialEq,Eq",
-    custom_scalars_module = "crate::infra::graphql"
-)]
-pub struct GetUserAttributesSchema;
-
-use get_user_attributes_schema::ResponseData;
-
-pub type Attribute = get_user_attributes_schema::GetUserAttributesSchemaSchemaUserSchemaAttributes;
-
-convert_attribute_type!(get_user_attributes_schema::AttributeType);
-
-impl From<&Attribute> for GraphQlAttributeSchema {
-    fn from(attr: &Attribute) -> Self {
-        Self {
-            name: attr.name.clone(),
-            is_list: attr.is_list,
-            is_readonly: attr.is_readonly,
-            is_editable: attr.is_editable,
-        }
-    }
-}
-
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "../schema.graphql",
@@ -65,14 +26,17 @@ pub struct CreateUser;
 pub struct CreateUserForm {
     common: CommonComponentParts<Self>,
     form: yew_form::Form<CreateUserModel>,
-    attributes_schema: Option<Vec<Attribute>>,
-    form_ref: NodeRef,
 }
 
 #[derive(Model, Validate, PartialEq, Eq, Clone, Default)]
 pub struct CreateUserModel {
     #[validate(length(min = 1, message = "Username is required"))]
     username: String,
+    #[validate(email(message = "A valid email is required"))]
+    email: String,
+    display_name: String,
+    first_name: String,
+    last_name: String,
     #[validate(custom(
         function = "empty_or_long",
         message = "Password should be longer than 8 characters (or left empty)"
@@ -92,7 +56,6 @@ fn empty_or_long(value: &str) -> Result<(), validator::ValidationError> {
 
 pub enum Msg {
     Update,
-    ListAttributesResponse(Result<ResponseData>),
     SubmitForm,
     CreateUserResponse(Result<create_user::ResponseData>),
     SuccessfulCreation,
@@ -113,43 +76,21 @@ impl CommonComponent<CreateUserForm> for CreateUserForm {
     ) -> Result<bool> {
         match msg {
             Msg::Update => Ok(true),
-            Msg::ListAttributesResponse(schema) => {
-                self.attributes_schema =
-                    Some(schema?.schema.user_schema.attributes.into_iter().collect());
-                Ok(true)
-            }
             Msg::SubmitForm => {
-                ensure!(self.form.validate(), "Check the form for errors");
+                if !self.form.validate() {
-
+                    bail!("Check the form for errors");
-                let all_values = read_all_form_attributes(
+                }
-                    self.attributes_schema.iter().flatten(),
-                    &self.form_ref,
-                    IsAdmin(true),
-                    EmailIsRequired(true),
-                )?;
-                let attributes = Some(
-                    all_values
-                        .into_iter()
-                        .filter(|a| !a.values.is_empty())
-                        .map(
-                            |AttributeValue { name, values }| create_user::AttributeValueInput {
-                                name,
-                                value: values,
-                            },
-                        )
-                        .collect(),
-                );
-
                 let model = self.form.model();
+                let to_option = |s: String| if s.is_empty() { None } else { Some(s) };
                 let req = create_user::Variables {
                     user: create_user::CreateUserInput {
                         id: model.username,
-                        email: None,
+                        email: model.email,
-                        displayName: None,
+                        displayName: to_option(model.display_name),
-                        firstName: None,
+                        firstName: to_option(model.first_name),
-                        lastName: None,
+                        lastName: to_option(model.last_name),
                         avatar: None,
-                        attributes,
+                        attributes: None,
                     },
                 };
                 self.common.call_graphql::<CreateUser, _>(
@@ -233,20 +174,11 @@ impl Component for CreateUserForm {
     type Message = Msg;
     type Properties = ();
 
-    fn create(ctx: &Context<Self>) -> Self {
+    fn create(_: &Context<Self>) -> Self {
-        let mut component = Self {
+        Self {
             common: CommonComponentParts::<Self>::create(),
             form: yew_form::Form::<CreateUserModel>::new(CreateUserModel::default()),
-            attributes_schema: None,
+        }
-            form_ref: NodeRef::default(),
-        };
-        component.common.call_graphql::<GetUserAttributesSchema, _>(
-            ctx,
-            get_user_attributes_schema::Variables {},
-            Msg::ListAttributesResponse,
-            "Error trying to fetch user schema",
-        );
-        component
     }
 
     fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
@@ -255,41 +187,163 @@ impl Component for CreateUserForm {
 
     fn view(&self, ctx: &Context<Self>) -> Html {
         let link = &ctx.link();
+        type Field = yew_form::Field<CreateUserModel>;
         html! {
           <div class="row justify-content-center">
-            <form class="form py-3"
+            <form class="form py-3" style="max-width: 636px">
-              ref={self.form_ref.clone()}>
+              <div class="row mb-3">
-              <Field<CreateUserModel>
+                <h5 class="fw-bold">{"Create a user"}</h5>
-                form={&self.form}
+              </div>
-                required=true
+              <div class="form-group row mb-3">
-                label="User name"
+                <label for="username"
-                field_name="username"
+                  class="form-label col-4 col-form-label">
-                oninput={link.callback(|_| Msg::Update)} />
+                  {"User name"}
-              {
+                  <span class="text-danger">{"*"}</span>
-                  self.attributes_schema
+                  {":"}
-                      .iter()
+                </label>
-                      .flatten()
+                <div class="col-8">
-                      .filter(|a| !a.is_readonly)
+                  <Field
-                      .map(get_custom_attribute_input)
+                    form={&self.form}
-                      .collect::<Vec<_>>()
+                    field_name="username"
-              }
+                    class="form-control"
-              <Field<CreateUserModel>
+                    class_invalid="is-invalid has-error"
-                form={&self.form}
+                    class_valid="has-success"
-                label="Password"
+                    autocomplete="username"
-                field_name="password"
+                    oninput={link.callback(|_| Msg::Update)} />
-                input_type="password"
+                  <div class="invalid-feedback">
-                autocomplete="new-password"
+                    {&self.form.field_message("username")}
-                oninput={link.callback(|_| Msg::Update)} />
+                  </div>
-              <Field<CreateUserModel>
+                </div>
-                form={&self.form}
+              </div>
-                label="Confirm password"
+              <div class="form-group row mb-3">
-                field_name="confirm_password"
+                <label for="email"
-                input_type="password"
+                  class="form-label col-4 col-form-label">
-                autocomplete="new-password"
+                  {"Email"}
-                oninput={link.callback(|_| Msg::Update)} />
+                  <span class="text-danger">{"*"}</span>
-              <Submit
+                  {":"}
-                disabled={self.common.is_task_running()}
+                </label>
-                onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitForm})} />
+                <div class="col-8">
+                  <Field
+                    form={&self.form}
+                    input_type="email"
+                    field_name="email"
+                    class="form-control"
+                    class_invalid="is-invalid has-error"
+                    class_valid="has-success"
+                    autocomplete="email"
+                    oninput={link.callback(|_| Msg::Update)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("email")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row mb-3">
+                <label for="display_name"
+                  class="form-label col-4 col-form-label">
+                  {"Display name:"}
+                </label>
+                <div class="col-8">
+                  <Field
+                    form={&self.form}
+                    autocomplete="name"
+                    class="form-control"
+                    class_invalid="is-invalid has-error"
+                    class_valid="has-success"
+                    field_name="display_name"
+                    oninput={link.callback(|_| Msg::Update)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("display_name")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row mb-3">
+                <label for="first_name"
+                  class="form-label col-4 col-form-label">
+                  {"First name:"}
+                </label>
+                <div class="col-8">
+                  <Field
+                    form={&self.form}
+                    autocomplete="given-name"
+                    class="form-control"
+                    class_invalid="is-invalid has-error"
+                    class_valid="has-success"
+                    field_name="first_name"
+                    oninput={link.callback(|_| Msg::Update)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("first_name")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row mb-3">
+                <label for="last_name"
+                  class="form-label col-4 col-form-label">
+                  {"Last name:"}
+                </label>
+                <div class="col-8">
+                  <Field
+                    form={&self.form}
+                    autocomplete="family-name"
+                    class="form-control"
+                    class_invalid="is-invalid has-error"
+                    class_valid="has-success"
+                    field_name="last_name"
+                    oninput={link.callback(|_| Msg::Update)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("last_name")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row mb-3">
+                <label for="password"
+                  class="form-label col-4 col-form-label">
+                  {"Password:"}
+                </label>
+                <div class="col-8">
+                  <Field
+                    form={&self.form}
+                    input_type="password"
+                    field_name="password"
+                    class="form-control"
+                    class_invalid="is-invalid has-error"
+                    class_valid="has-success"
+                    autocomplete="new-password"
+                    oninput={link.callback(|_| Msg::Update)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("password")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row mb-3">
+                <label for="confirm_password"
+                  class="form-label col-4 col-form-label">
+                  {"Confirm password:"}
+                </label>
+                <div class="col-8">
+                  <Field
+                    form={&self.form}
+                    input_type="password"
+                    field_name="confirm_password"
+                    class="form-control"
+                    class_invalid="is-invalid has-error"
+                    class_valid="has-success"
+                    autocomplete="new-password"
+                    oninput={link.callback(|_| Msg::Update)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("confirm_password")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row justify-content-center">
+                <button
+                  class="btn btn-primary col-auto col-form-label mt-4"
+                  disabled={self.common.is_task_running()}
+                  type="submit"
+                  onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitForm})}>
+                  <i class="bi-save me-2"></i>
+                  {"Submit"}
+                </button>
+              </div>
             </form>
             {
               if let Some(e) = &self.common.error {
@@ -304,21 +358,3 @@ impl Component for CreateUserForm {
         }
     }
 }
-
-fn get_custom_attribute_input(attribute_schema: &Attribute) -> Html {
-    if attribute_schema.is_list {
-        html! {
-            <ListAttributeInput
-                name={attribute_schema.name.clone()}
-                attribute_type={Into::<AttributeType>::into(attribute_schema.attribute_type.clone())}
-            />
-        }
-    } else {
-        html! {
-            <SingleAttributeInput
-                name={attribute_schema.name.clone()}
-                attribute_type={Into::<AttributeType>::into(attribute_schema.attribute_type.clone())}
-            />
-        }
-    }
-}

app/src/components/create_user_attribute.rs

@@ -1,175 +0,0 @@
-use crate::{
-    components::{
-        form::{checkbox::CheckBox, field::Field, select::Select, submit::Submit},
-        router::AppRoute,
-    },
-    convert_attribute_type,
-    infra::{
-        common_component::{CommonComponent, CommonComponentParts},
-        schema::{validate_attribute_type, AttributeType},
-    },
-};
-use anyhow::{bail, Result};
-use gloo_console::log;
-use graphql_client::GraphQLQuery;
-use validator_derive::Validate;
-use yew::prelude::*;
-use yew_form_derive::Model;
-use yew_router::{prelude::History, scope_ext::RouterScopeExt};
-
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "../schema.graphql",
-    query_path = "queries/create_user_attribute.graphql",
-    response_derives = "Debug",
-    custom_scalars_module = "crate::infra::graphql"
-)]
-pub struct CreateUserAttribute;
-
-convert_attribute_type!(create_user_attribute::AttributeType);
-
-pub struct CreateUserAttributeForm {
-    common: CommonComponentParts<Self>,
-    form: yew_form::Form<CreateUserAttributeModel>,
-}
-
-#[derive(Model, Validate, PartialEq, Eq, Clone, Default, Debug)]
-pub struct CreateUserAttributeModel {
-    #[validate(length(min = 1, message = "attribute_name is required"))]
-    attribute_name: String,
-    #[validate(custom = "validate_attribute_type")]
-    attribute_type: String,
-    is_editable: bool,
-    is_list: bool,
-    is_visible: bool,
-}
-
-pub enum Msg {
-    Update,
-    SubmitForm,
-    CreateUserAttributeResponse(Result<create_user_attribute::ResponseData>),
-}
-
-impl CommonComponent<CreateUserAttributeForm> for CreateUserAttributeForm {
-    fn handle_msg(
-        &mut self,
-        ctx: &Context<Self>,
-        msg: <Self as Component>::Message,
-    ) -> Result<bool> {
-        match msg {
-            Msg::Update => Ok(true),
-            Msg::SubmitForm => {
-                if !self.form.validate() {
-                    bail!("Check the form for errors");
-                }
-                let model = self.form.model();
-                if model.is_editable && !model.is_visible {
-                    bail!("Editable attributes must also be visible");
-                }
-                let attribute_type = model.attribute_type.parse::<AttributeType>().unwrap();
-                let req = create_user_attribute::Variables {
-                    name: model.attribute_name,
-                    attribute_type: create_user_attribute::AttributeType::from(attribute_type),
-                    is_editable: model.is_editable,
-                    is_list: model.is_list,
-                    is_visible: model.is_visible,
-                };
-                self.common.call_graphql::<CreateUserAttribute, _>(
-                    ctx,
-                    req,
-                    Msg::CreateUserAttributeResponse,
-                    "Error trying to create user attribute",
-                );
-                Ok(true)
-            }
-            Msg::CreateUserAttributeResponse(response) => {
-                response?;
-                let model = self.form.model();
-                log!(&format!(
-                    "Created user attribute '{}'",
-                    model.attribute_name
-                ));
-                ctx.link().history().unwrap().push(AppRoute::ListUserSchema);
-                Ok(true)
-            }
-        }
-    }
-
-    fn mut_common(&mut self) -> &mut CommonComponentParts<Self> {
-        &mut self.common
-    }
-}
-
-impl Component for CreateUserAttributeForm {
-    type Message = Msg;
-    type Properties = ();
-
-    fn create(_: &Context<Self>) -> Self {
-        let model = CreateUserAttributeModel {
-            attribute_type: AttributeType::String.to_string(),
-            ..Default::default()
-        };
-        Self {
-            common: CommonComponentParts::<Self>::create(),
-            form: yew_form::Form::<CreateUserAttributeModel>::new(model),
-        }
-    }
-
-    fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
-        CommonComponentParts::<Self>::update(self, ctx, msg)
-    }
-
-    fn view(&self, ctx: &Context<Self>) -> Html {
-        let link = ctx.link();
-        html! {
-          <div class="row justify-content-center">
-            <form class="form py-3" style="max-width: 636px">
-              <h5 class="fw-bold">{"Create a user attribute"}</h5>
-              <Field<CreateUserAttributeModel>
-                label="Name"
-                required={true}
-                form={&self.form}
-                field_name="attribute_name"
-                oninput={link.callback(|_| Msg::Update)} />
-              <Select<CreateUserAttributeModel>
-                label="Type"
-                required={true}
-                form={&self.form}
-                field_name="attribute_type"
-                oninput={link.callback(|_| Msg::Update)}>
-                <option selected=true value="String">{"String"}</option>
-                <option value="Integer">{"Integer"}</option>
-                <option value="Jpeg">{"Jpeg"}</option>
-                <option value="DateTime">{"DateTime"}</option>
-              </Select<CreateUserAttributeModel>>
-              <CheckBox<CreateUserAttributeModel>
-                label="Multiple values"
-                form={&self.form}
-                field_name="is_list"
-                ontoggle={link.callback(|_| Msg::Update)} />
-              <CheckBox<CreateUserAttributeModel>
-                label="Visible to users"
-                form={&self.form}
-                field_name="is_visible"
-                ontoggle={link.callback(|_| Msg::Update)} />
-              <CheckBox<CreateUserAttributeModel>
-                label="Editable by users"
-                form={&self.form}
-                field_name="is_editable"
-                ontoggle={link.callback(|_| Msg::Update)} />
-              <Submit
-                disabled={self.common.is_task_running()}
-                onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitForm})}/>
-            </form>
-            { if let Some(e) = &self.common.error {
-                html! {
-                  <div class="alert alert-danger">
-                    {e.to_string() }
-                  </div>
-                }
-              } else { html! {} }
-            }
-          </div>
-        }
-    }
-}

app/src/components/delete_group_attribute.rs

@@ -1,172 +0,0 @@
-use crate::infra::{
-    common_component::{CommonComponent, CommonComponentParts},
-    modal::Modal,
-};
-use anyhow::{Error, Result};
-use graphql_client::GraphQLQuery;
-use yew::prelude::*;
-
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "../schema.graphql",
-    query_path = "queries/delete_group_attribute.graphql",
-    response_derives = "Debug",
-    custom_scalars_module = "crate::infra::graphql"
-)]
-pub struct DeleteGroupAttributeQuery;
-
-pub struct DeleteGroupAttribute {
-    common: CommonComponentParts<Self>,
-    node_ref: NodeRef,
-    modal: Option<Modal>,
-}
-
-#[derive(yew::Properties, Clone, PartialEq, Debug)]
-pub struct DeleteGroupAttributeProps {
-    pub attribute_name: String,
-    pub on_attribute_deleted: Callback<String>,
-    pub on_error: Callback<Error>,
-}
-
-pub enum Msg {
-    ClickedDeleteGroupAttribute,
-    ConfirmDeleteGroupAttribute,
-    DismissModal,
-    DeleteGroupAttributeResponse(Result<delete_group_attribute_query::ResponseData>),
-}
-
-impl CommonComponent<DeleteGroupAttribute> for DeleteGroupAttribute {
-    fn handle_msg(
-        &mut self,
-        ctx: &Context<Self>,
-        msg: <Self as Component>::Message,
-    ) -> Result<bool> {
-        match msg {
-            Msg::ClickedDeleteGroupAttribute => {
-                self.modal.as_ref().expect("modal not initialized").show();
-            }
-            Msg::ConfirmDeleteGroupAttribute => {
-                self.update(ctx, Msg::DismissModal);
-                self.common.call_graphql::<DeleteGroupAttributeQuery, _>(
-                    ctx,
-                    delete_group_attribute_query::Variables {
-                        name: ctx.props().attribute_name.clone(),
-                    },
-                    Msg::DeleteGroupAttributeResponse,
-                    "Error trying to delete group attribute",
-                );
-            }
-            Msg::DismissModal => {
-                self.modal.as_ref().expect("modal not initialized").hide();
-            }
-            Msg::DeleteGroupAttributeResponse(response) => {
-                response?;
-                ctx.props()
-                    .on_attribute_deleted
-                    .emit(ctx.props().attribute_name.clone());
-            }
-        }
-        Ok(true)
-    }
-
-    fn mut_common(&mut self) -> &mut CommonComponentParts<Self> {
-        &mut self.common
-    }
-}
-
-impl Component for DeleteGroupAttribute {
-    type Message = Msg;
-    type Properties = DeleteGroupAttributeProps;
-
-    fn create(_: &Context<Self>) -> Self {
-        Self {
-            common: CommonComponentParts::<Self>::create(),
-            node_ref: NodeRef::default(),
-            modal: None,
-        }
-    }
-
-    fn rendered(&mut self, _: &Context<Self>, first_render: bool) {
-        if first_render {
-            self.modal = Some(Modal::new(
-                self.node_ref
-                    .cast::<web_sys::Element>()
-                    .expect("Modal node is not an element"),
-            ));
-        }
-    }
-
-    fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
-        CommonComponentParts::<Self>::update_and_report_error(
-            self,
-            ctx,
-            msg,
-            ctx.props().on_error.clone(),
-        )
-    }
-
-    fn view(&self, ctx: &Context<Self>) -> Html {
-        let link = &ctx.link();
-        html! {
-          <>
-          <button
-            class="btn btn-danger"
-            disabled={self.common.is_task_running()}
-            onclick={link.callback(|_| Msg::ClickedDeleteGroupAttribute)}>
-            <i class="bi-x-circle-fill" aria-label="Delete attribute" />
-          </button>
-          {self.show_modal(ctx)}
-          </>
-        }
-    }
-}
-
-impl DeleteGroupAttribute {
-    fn show_modal(&self, ctx: &Context<Self>) -> Html {
-        let link = &ctx.link();
-        html! {
-          <div
-            class="modal fade"
-            id={"deleteGroupAttributeModal".to_string() + &ctx.props().attribute_name}
-            tabindex="-1"
-            aria-labelledby="deleteGroupAttributeModalLabel"
-            aria-hidden="true"
-            ref={self.node_ref.clone()}>
-            <div class="modal-dialog">
-              <div class="modal-content">
-                <div class="modal-header">
-                  <h5 class="modal-title" id="deleteGroupAttributeModalLabel">{"Delete group attribute?"}</h5>
-                  <button
-                    type="button"
-                    class="btn-close"
-                    aria-label="Close"
-                    onclick={link.callback(|_| Msg::DismissModal)} />
-                </div>
-                <div class="modal-body">
-                <span>
-                  {"Are you sure you want to delete group attribute "}
-                  <b>{&ctx.props().attribute_name}</b>{"?"}
-                </span>
-                </div>
-                <div class="modal-footer">
-                  <button
-                    type="button"
-                    class="btn btn-secondary"
-                    onclick={link.callback(|_| Msg::DismissModal)}>
-                      <i class="bi-x-circle me-2"></i>
-                      {"Cancel"}
-                  </button>
-                  <button
-                    type="button"
-                    onclick={link.callback(|_| Msg::ConfirmDeleteGroupAttribute)}
-                    class="btn btn-danger">
-                    <i class="bi-check-circle me-2"></i>
-                    {"Yes, I'm sure"}
-                 </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        }
-    }
-}

app/src/components/delete_user_attribute.rs

@@ -1,172 +0,0 @@
-use crate::infra::{
-    common_component::{CommonComponent, CommonComponentParts},
-    modal::Modal,
-};
-use anyhow::{Error, Result};
-use graphql_client::GraphQLQuery;
-use yew::prelude::*;
-
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "../schema.graphql",
-    query_path = "queries/delete_user_attribute.graphql",
-    response_derives = "Debug",
-    custom_scalars_module = "crate::infra::graphql"
-)]
-pub struct DeleteUserAttributeQuery;
-
-pub struct DeleteUserAttribute {
-    common: CommonComponentParts<Self>,
-    node_ref: NodeRef,
-    modal: Option<Modal>,
-}
-
-#[derive(yew::Properties, Clone, PartialEq, Debug)]
-pub struct DeleteUserAttributeProps {
-    pub attribute_name: String,
-    pub on_attribute_deleted: Callback<String>,
-    pub on_error: Callback<Error>,
-}
-
-pub enum Msg {
-    ClickedDeleteUserAttribute,
-    ConfirmDeleteUserAttribute,
-    DismissModal,
-    DeleteUserAttributeResponse(Result<delete_user_attribute_query::ResponseData>),
-}
-
-impl CommonComponent<DeleteUserAttribute> for DeleteUserAttribute {
-    fn handle_msg(
-        &mut self,
-        ctx: &Context<Self>,
-        msg: <Self as Component>::Message,
-    ) -> Result<bool> {
-        match msg {
-            Msg::ClickedDeleteUserAttribute => {
-                self.modal.as_ref().expect("modal not initialized").show();
-            }
-            Msg::ConfirmDeleteUserAttribute => {
-                self.update(ctx, Msg::DismissModal);
-                self.common.call_graphql::<DeleteUserAttributeQuery, _>(
-                    ctx,
-                    delete_user_attribute_query::Variables {
-                        name: ctx.props().attribute_name.clone(),
-                    },
-                    Msg::DeleteUserAttributeResponse,
-                    "Error trying to delete user attribute",
-                );
-            }
-            Msg::DismissModal => {
-                self.modal.as_ref().expect("modal not initialized").hide();
-            }
-            Msg::DeleteUserAttributeResponse(response) => {
-                response?;
-                ctx.props()
-                    .on_attribute_deleted
-                    .emit(ctx.props().attribute_name.clone());
-            }
-        }
-        Ok(true)
-    }
-
-    fn mut_common(&mut self) -> &mut CommonComponentParts<Self> {
-        &mut self.common
-    }
-}
-
-impl Component for DeleteUserAttribute {
-    type Message = Msg;
-    type Properties = DeleteUserAttributeProps;
-
-    fn create(_: &Context<Self>) -> Self {
-        Self {
-            common: CommonComponentParts::<Self>::create(),
-            node_ref: NodeRef::default(),
-            modal: None,
-        }
-    }
-
-    fn rendered(&mut self, _: &Context<Self>, first_render: bool) {
-        if first_render {
-            self.modal = Some(Modal::new(
-                self.node_ref
-                    .cast::<web_sys::Element>()
-                    .expect("Modal node is not an element"),
-            ));
-        }
-    }
-
-    fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
-        CommonComponentParts::<Self>::update_and_report_error(
-            self,
-            ctx,
-            msg,
-            ctx.props().on_error.clone(),
-        )
-    }
-
-    fn view(&self, ctx: &Context<Self>) -> Html {
-        let link = &ctx.link();
-        html! {
-          <>
-          <button
-            class="btn btn-danger"
-            disabled={self.common.is_task_running()}
-            onclick={link.callback(|_| Msg::ClickedDeleteUserAttribute)}>
-            <i class="bi-x-circle-fill" aria-label="Delete attribute" />
-          </button>
-          {self.show_modal(ctx)}
-          </>
-        }
-    }
-}
-
-impl DeleteUserAttribute {
-    fn show_modal(&self, ctx: &Context<Self>) -> Html {
-        let link = &ctx.link();
-        html! {
-          <div
-            class="modal fade"
-            id={"deleteUserAttributeModal".to_string() + &ctx.props().attribute_name}
-            tabindex="-1"
-            aria-labelledby="deleteUserAttributeModalLabel"
-            aria-hidden="true"
-            ref={self.node_ref.clone()}>
-            <div class="modal-dialog">
-              <div class="modal-content">
-                <div class="modal-header">
-                  <h5 class="modal-title" id="deleteUserAttributeModalLabel">{"Delete user attribute?"}</h5>
-                  <button
-                    type="button"
-                    class="btn-close"
-                    aria-label="Close"
-                    onclick={link.callback(|_| Msg::DismissModal)} />
-                </div>
-                <div class="modal-body">
-                <span>
-                  {"Are you sure you want to delete user attribute "}
-                  <b>{&ctx.props().attribute_name}</b>{"?"}
-                </span>
-                </div>
-                <div class="modal-footer">
-                  <button
-                    type="button"
-                    class="btn btn-secondary"
-                    onclick={link.callback(|_| Msg::DismissModal)}>
-                      <i class="bi-x-circle me-2"></i>
-                      {"Cancel"}
-                  </button>
-                  <button
-                    type="button"
-                    onclick={link.callback(|_| Msg::ConfirmDeleteUserAttribute)}
-                    class="btn btn-danger">
-                    <i class="bi-check-circle me-2"></i>
-                    {"Yes, I'm sure"}
-                 </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        }
-    }
-}

app/src/components/form/attribute_input.rs

@@ -1,190 +0,0 @@
-use crate::{
-    components::form::{date_input::DateTimeInput, file_input::JpegFileInput},
-    infra::{schema::AttributeType, tooltip::Tooltip},
-};
-use web_sys::Element;
-use yew::{
-    function_component, html, use_effect_with_deps, use_node_ref, virtual_dom::AttrValue,
-    Component, Context, Html, Properties,
-};
-
-#[derive(Properties, PartialEq)]
-struct AttributeInputProps {
-    name: AttrValue,
-    attribute_type: AttributeType,
-    #[prop_or(None)]
-    value: Option<String>,
-}
-
-#[function_component(AttributeInput)]
-fn attribute_input(props: &AttributeInputProps) -> Html {
-    let input_type = match props.attribute_type {
-        AttributeType::String => "text",
-        AttributeType::Integer => "number",
-        AttributeType::DateTime => {
-            return html! {
-                <DateTimeInput name={props.name.clone()} value={props.value.clone()} />
-            }
-        }
-        AttributeType::Jpeg => {
-            return html! {
-                <JpegFileInput name={props.name.clone()} value={props.value.clone()} />
-            }
-        }
-    };
-
-    html! {
-        <input
-            type={input_type}
-            name={props.name.clone()}
-            class="form-control"
-            value={props.value.clone()} />
-    }
-}
-
-#[derive(Properties, PartialEq)]
-struct AttributeLabelProps {
-    pub name: String,
-}
-#[function_component(AttributeLabel)]
-fn attribute_label(props: &AttributeLabelProps) -> Html {
-    let tooltip_ref = use_node_ref();
-
-    use_effect_with_deps(
-        move |tooltip_ref| {
-            Tooltip::new(
-                tooltip_ref
-                    .cast::<Element>()
-                    .expect("Tooltip element should exist"),
-            );
-            || {}
-        },
-        tooltip_ref.clone(),
-    );
-
-    html! {
-        <label for={props.name.clone()}
-            class="form-label col-4 col-form-label"
-            >
-            {props.name[0..1].to_uppercase() + &props.name[1..].replace('_', " ")}{":"}
-            <button
-                class="btn btn-sm btn-link"
-                type="button"
-                data-bs-placement="right"
-                title={props.name.clone()}
-                ref={tooltip_ref}>
-                <i class="bi bi-info-circle" aria-label="Info" />
-            </button>
-        </label>
-    }
-}
-
-#[derive(Properties, PartialEq)]
-pub struct SingleAttributeInputProps {
-    pub name: String,
-    pub attribute_type: AttributeType,
-    #[prop_or(None)]
-    pub value: Option<String>,
-}
-
-#[function_component(SingleAttributeInput)]
-pub fn single_attribute_input(props: &SingleAttributeInputProps) -> Html {
-    html! {
-        <div class="row mb-3">
-            <AttributeLabel name={props.name.clone()} />
-            <div class="col-8">
-            <AttributeInput
-                attribute_type={props.attribute_type.clone()}
-                name={props.name.clone()}
-                value={props.value.clone()} />
-            </div>
-        </div>
-    }
-}
-
-#[derive(Properties, PartialEq)]
-pub struct ListAttributeInputProps {
-    pub name: String,
-    pub attribute_type: AttributeType,
-    #[prop_or(vec!())]
-    pub values: Vec<String>,
-}
-
-pub enum ListAttributeInputMsg {
-    Remove(usize),
-    Append,
-}
-
-pub struct ListAttributeInput {
-    indices: Vec<usize>,
-    next_index: usize,
-    values: Vec<String>,
-}
-impl Component for ListAttributeInput {
-    type Message = ListAttributeInputMsg;
-    type Properties = ListAttributeInputProps;
-
-    fn create(ctx: &Context<Self>) -> Self {
-        let values = ctx.props().values.clone();
-        Self {
-            indices: (0..values.len()).collect(),
-            next_index: values.len(),
-            values,
-        }
-    }
-
-    fn update(&mut self, _ctx: &Context<Self>, msg: Self::Message) -> bool {
-        match msg {
-            ListAttributeInputMsg::Remove(removed) => {
-                self.indices.retain_mut(|x| *x != removed);
-            }
-            ListAttributeInputMsg::Append => {
-                self.indices.push(self.next_index);
-                self.next_index += 1;
-            }
-        };
-        true
-    }
-
-    fn changed(&mut self, ctx: &Context<Self>) -> bool {
-        if ctx.props().values != self.values {
-            self.values.clone_from(&ctx.props().values);
-            self.indices = (0..self.values.len()).collect();
-            self.next_index = self.values.len();
-        }
-        true
-    }
-
-    fn view(&self, ctx: &Context<Self>) -> Html {
-        let props = &ctx.props();
-        let link = &ctx.link();
-        html! {
-            <div class="row mb-3">
-                <AttributeLabel name={props.name.clone()} />
-                <div class="col-8">
-                {self.indices.iter().map(|&i| html! {
-                    <div class="input-group mb-2" key={i}>
-                    <AttributeInput
-                        attribute_type={props.attribute_type.clone()}
-                        name={props.name.clone()}
-                        value={props.values.get(i).cloned().unwrap_or_default()} />
-                    <button
-                        class="btn btn-danger"
-                        type="button"
-                        onclick={link.callback(move |_| ListAttributeInputMsg::Remove(i))}>
-                        <i class="bi-x-circle-fill" aria-label="Remove value" />
-                    </button>
-                    </div>
-                }).collect::<Html>()}
-                <button
-                    class="btn btn-secondary"
-                    type="button"
-                    onclick={link.callback(|_| ListAttributeInputMsg::Append)}>
-                    <i class="bi-plus-circle me-2"></i>
-                    {"Add value"}
-                </button>
-                </div>
-            </div>
-        }
-    }
-}

app/src/components/form/checkbox.rs

@@ -1,35 +0,0 @@
-use yew::{function_component, html, virtual_dom::AttrValue, Callback, Properties};
-use yew_form::{Form, Model};
-
-#[derive(Properties, PartialEq)]
-pub struct Props<T: Model> {
-    pub label: AttrValue,
-    pub field_name: String,
-    pub form: Form<T>,
-    #[prop_or(false)]
-    pub required: bool,
-    #[prop_or_else(Callback::noop)]
-    pub ontoggle: Callback<bool>,
-}
-
-#[function_component(CheckBox)]
-pub fn checkbox<T: Model>(props: &Props<T>) -> Html {
-    html! {
-        <div class="form-group row mb-3">
-            <label for={props.field_name.clone()}
-                class="form-label col-4 col-form-label">
-                {&props.label}
-                {if props.required {
-                    html!{<span class="text-danger">{"*"}</span>}
-                } else {html!{}}}
-                {":"}
-            </label>
-            <div class="col-8">
-                <yew_form::CheckBox<T>
-                form={&props.form}
-                field_name={props.field_name.clone()}
-                ontoggle={props.ontoggle.clone()} />
-            </div>
-        </div>
-    }
-}

app/src/components/form/date_input.rs

@@ -1,49 +0,0 @@
-use std::str::FromStr;
-
-use chrono::{DateTime, NaiveDateTime, Utc};
-use wasm_bindgen::JsCast;
-use web_sys::HtmlInputElement;
-use yew::{function_component, html, use_state, virtual_dom::AttrValue, Event, Properties};
-
-#[derive(Properties, PartialEq)]
-pub struct DateTimeInputProps {
-    pub name: AttrValue,
-    pub value: Option<String>,
-}
-
-#[function_component(DateTimeInput)]
-pub fn date_time_input(props: &DateTimeInputProps) -> Html {
-    let value = use_state(|| {
-        props
-            .value
-            .as_ref()
-            .and_then(|x| DateTime::<Utc>::from_str(x).ok())
-    });
-
-    html! {
-        <div class="input-group">
-            <input
-                type="hidden"
-                name={props.name.clone()}
-                value={value.as_ref().map(|v: &DateTime<Utc>| v.to_rfc3339())} />
-            <input
-                type="datetime-local"
-                step="1"
-                class="form-control"
-                value={value.as_ref().map(|v: &DateTime<Utc>| v.naive_utc().to_string())}
-                onchange={move |e: Event| {
-                    let string_val =
-                        e.target()
-                         .expect("Event should have target")
-                         .unchecked_into::<HtmlInputElement>()
-                         .value();
-                    value.set(
-                        NaiveDateTime::from_str(&string_val)
-                            .ok()
-                            .map(|x| DateTime::from_naive_utc_and_offset(x, Utc))
-                    )
-                }} />
-            <span class="input-group-text">{"UTC"}</span>
-        </div>
-    }
-}

app/src/components/form/field.rs

@@ -1,48 +0,0 @@
-use yew::{function_component, html, virtual_dom::AttrValue, Callback, InputEvent, Properties};
-use yew_form::{Form, Model};
-
-#[derive(Properties, PartialEq)]
-pub struct Props<T: Model> {
-    pub label: AttrValue,
-    pub field_name: String,
-    pub form: Form<T>,
-    #[prop_or(false)]
-    pub required: bool,
-    #[prop_or(String::from("text"))]
-    pub input_type: String,
-    // If not present, will default to field_name
-    #[prop_or(None)]
-    pub autocomplete: Option<String>,
-    #[prop_or_else(Callback::noop)]
-    pub oninput: Callback<InputEvent>,
-}
-
-#[function_component(Field)]
-pub fn field<T: Model>(props: &Props<T>) -> Html {
-    html! {
-      <div class="row mb-3">
-        <label for={props.field_name.clone()}
-          class="form-label col-4 col-form-label">
-          {&props.label}
-          {if props.required {
-            html!{<span class="text-danger">{"*"}</span>}
-          } else {html!{}}}
-          {":"}
-        </label>
-        <div class="col-8">
-          <yew_form::Field<T>
-            form={&props.form}
-            field_name={props.field_name.clone()}
-            input_type={props.input_type.clone()}
-            class="form-control"
-            class_invalid="is-invalid has-error"
-            class_valid="has-success"
-            autocomplete={props.autocomplete.clone().unwrap_or(props.field_name.clone())}
-            oninput={&props.oninput} />
-            <div class="invalid-feedback">
-              {&props.form.field_message(&props.field_name)}
-            </div>
-        </div>
-      </div>
-    }
-}

app/src/components/form/file_input.rs

@@ -1,238 +0,0 @@
-use std::{fmt::Display, str::FromStr};
-
-use anyhow::{bail, Error, Ok, Result};
-use gloo_file::{
-    callbacks::{read_as_bytes, FileReader},
-    File,
-};
-use web_sys::{FileList, HtmlInputElement, InputEvent};
-use yew::Properties;
-use yew::{prelude::*, virtual_dom::AttrValue};
-
-#[derive(Default)]
-struct JsFile {
-    file: Option<File>,
-    contents: Option<Vec<u8>>,
-}
-
-impl Display for JsFile {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            self.file.as_ref().map(File::name).unwrap_or_default()
-        )
-    }
-}
-
-impl FromStr for JsFile {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<Self> {
-        if s.is_empty() {
-            Ok(JsFile::default())
-        } else {
-            bail!("Building file from non-empty string")
-        }
-    }
-}
-
-fn to_base64(file: &JsFile) -> Result<String> {
-    match file {
-        JsFile {
-            file: None,
-            contents: None,
-        } => Ok(String::new()),
-        JsFile {
-            file: Some(_),
-            contents: None,
-        } => bail!("Image file hasn't finished loading, try again"),
-        JsFile {
-            file: Some(_),
-            contents: Some(data),
-        } => {
-            if !is_valid_jpeg(data.as_slice()) {
-                bail!("Chosen image is not a valid JPEG");
-            }
-            Ok(base64::encode(data))
-        }
-        JsFile {
-            file: None,
-            contents: Some(data),
-        } => Ok(base64::encode(data)),
-    }
-}
-
-/// A [yew::Component] to display the user details, with a form allowing to edit them.
-pub struct JpegFileInput {
-    // None means that the avatar hasn't changed.
-    avatar: Option<JsFile>,
-    reader: Option<FileReader>,
-}
-
-pub enum Msg {
-    Update,
-    /// A new file was selected.
-    FileSelected(File),
-    /// The "Clear" button for the avatar was clicked.
-    ClearClicked,
-    /// A picked file finished loading.
-    FileLoaded(String, Result<Vec<u8>>),
-}
-
-#[derive(Properties, Clone, PartialEq, Eq)]
-pub struct Props {
-    pub name: AttrValue,
-    pub value: Option<String>,
-}
-
-impl Component for JpegFileInput {
-    type Message = Msg;
-    type Properties = Props;
-
-    fn create(ctx: &Context<Self>) -> Self {
-        Self {
-            avatar: Some(JsFile {
-                file: None,
-                contents: ctx
-                    .props()
-                    .value
-                    .as_ref()
-                    .and_then(|x| base64::decode(x).ok()),
-            }),
-            reader: None,
-        }
-    }
-
-    fn changed(&mut self, ctx: &Context<Self>) -> bool {
-        self.avatar = Some(JsFile {
-            file: None,
-            contents: ctx
-                .props()
-                .value
-                .as_ref()
-                .and_then(|x| base64::decode(x).ok()),
-        });
-        self.reader = None;
-        true
-    }
-
-    fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
-        match msg {
-            Msg::Update => true,
-            Msg::FileSelected(new_avatar) => {
-                if self
-                    .avatar
-                    .as_ref()
-                    .and_then(|f| f.file.as_ref().map(|f| f.name()))
-                    != Some(new_avatar.name())
-                {
-                    let file_name = new_avatar.name();
-                    let link = ctx.link().clone();
-                    self.reader = Some(read_as_bytes(&new_avatar, move |res| {
-                        link.send_message(Msg::FileLoaded(
-                            file_name,
-                            res.map_err(|e| anyhow::anyhow!("{:#}", e)),
-                        ))
-                    }));
-                    self.avatar = Some(JsFile {
-                        file: Some(new_avatar),
-                        contents: None,
-                    });
-                }
-                true
-            }
-            Msg::ClearClicked => {
-                self.avatar = Some(JsFile::default());
-                true
-            }
-            Msg::FileLoaded(file_name, data) => {
-                if let Some(avatar) = &mut self.avatar {
-                    if let Some(file) = &avatar.file {
-                        if file.name() == file_name {
-                            if let Result::Ok(data) = data {
-                                if !is_valid_jpeg(data.as_slice()) {
-                                    // Clear the selection.
-                                    self.avatar = Some(JsFile::default());
-                                    // TODO: bail!("Chosen image is not a valid JPEG");
-                                } else {
-                                    avatar.contents = Some(data);
-                                    return true;
-                                }
-                            }
-                        }
-                    }
-                }
-                self.reader = None;
-                true
-            }
-        }
-    }
-
-    fn view(&self, ctx: &Context<Self>) -> Html {
-        let link = &ctx.link();
-
-        let avatar_string = match &self.avatar {
-            Some(avatar) => {
-                let avatar_base64 = to_base64(avatar);
-                avatar_base64.as_deref().unwrap_or("").to_owned()
-            }
-            None => String::new(),
-        };
-        html! {
-            <div class="row align-items-center">
-                <div class="col-5">
-                    <input type="hidden" name={ctx.props().name.clone()} value={avatar_string.clone()} />
-                    <input
-                        class="form-control"
-                        id="avatarInput"
-                        type="file"
-                        accept="image/jpeg"
-                        oninput={link.callback(|e: InputEvent| {
-                            let input: HtmlInputElement = e.target_unchecked_into();
-                            Self::upload_files(input.files())
-                        })} />
-                </div>
-                <div class="col-3">
-                    <button
-                        class="btn btn-secondary col-auto"
-                        id="avatarClear"
-                        type="button"
-                        onclick={link.callback(|_| {Msg::ClearClicked})}>
-                        {"Clear"}
-                        </button>
-                </div>
-                <div class="col-4">
-                {
-                    if !avatar_string.is_empty() {
-                        html!{
-                            <img
-                            id="avatarDisplay"
-                            src={format!("data:image/jpeg;base64, {}", avatar_string)}
-                            style="max-height:128px;max-width:128px;height:auto;width:auto;"
-                            alt="Avatar" />
-                        }
-                    } else { html! {} }
-                }
-                </div>
-            </div>
-        }
-    }
-}
-
-impl JpegFileInput {
-    fn upload_files(files: Option<FileList>) -> Msg {
-        match files {
-            Some(files) if files.length() > 0 => {
-                Msg::FileSelected(File::from(files.item(0).unwrap()))
-            }
-            Some(_) | None => Msg::Update,
-        }
-    }
-}
-
-fn is_valid_jpeg(bytes: &[u8]) -> bool {
-    image::io::Reader::with_format(std::io::Cursor::new(bytes), image::ImageFormat::Jpeg)
-        .decode()
-        .is_ok()
-}

app/src/components/form/mod.rs

@@ -1,8 +0,0 @@
-pub mod attribute_input;
-pub mod checkbox;
-pub mod date_input;
-pub mod field;
-pub mod file_input;
-pub mod select;
-pub mod static_value;
-pub mod submit;

app/src/components/form/select.rs

@@ -1,46 +0,0 @@
-use yew::{
-    function_component, html, virtual_dom::AttrValue, Callback, Children, InputEvent, Properties,
-};
-use yew_form::{Form, Model};
-
-#[derive(Properties, PartialEq)]
-pub struct Props<T: Model> {
-    pub label: AttrValue,
-    pub field_name: String,
-    pub form: Form<T>,
-    #[prop_or(false)]
-    pub required: bool,
-    #[prop_or_else(Callback::noop)]
-    pub oninput: Callback<InputEvent>,
-    pub children: Children,
-}
-
-#[function_component(Select)]
-pub fn select<T: Model>(props: &Props<T>) -> Html {
-    html! {
-        <div class="row mb-3">
-            <label for={props.field_name.clone()}
-                class="form-label col-4 col-form-label">
-                {&props.label}
-                {if props.required {
-                    html!{<span class="text-danger">{"*"}</span>}
-                } else {html!{}}}
-                {":"}
-            </label>
-            <div class="col-8">
-                <yew_form::Select<T>
-                    form={&props.form}
-                    class="form-control"
-                    class_invalid="is-invalid has-error"
-                    class_valid="has-success"
-                    field_name={props.field_name.clone()}
-                    oninput={&props.oninput} >
-                    {for props.children.iter()}
-                </yew_form::Select<T>>
-                <div class="invalid-feedback">
-                    {&props.form.field_message(&props.field_name)}
-                </div>
-            </div>
-        </div>
-    }
-}

app/src/components/form/static_value.rs

@@ -1,26 +0,0 @@
-use yew::{function_component, html, virtual_dom::AttrValue, Children, Properties};
-
-#[derive(Properties, PartialEq)]
-pub struct Props {
-    pub label: AttrValue,
-    pub id: AttrValue,
-    pub children: Children,
-}
-
-#[function_component(StaticValue)]
-pub fn static_value(props: &Props) -> Html {
-    html! {
-      <div class="row mb-3">
-        <label for={props.id.clone()}
-          class="form-label col-4 col-form-label">
-          {&props.label}
-          {":"}
-        </label>
-        <div class="col-8">
-          <span id={props.id.clone()} class="form-control-static">
-            {for props.children.iter()}
-          </span>
-        </div>
-      </div>
-    }
-}

app/src/components/form/submit.rs

@@ -1,30 +0,0 @@
-use web_sys::MouseEvent;
-use yew::{function_component, html, virtual_dom::AttrValue, Callback, Children, Properties};
-
-#[derive(Properties, PartialEq)]
-pub struct Props {
-    pub disabled: bool,
-    pub onclick: Callback<MouseEvent>,
-    // Additional elements to insert after the button, in the same div
-    #[prop_or_default]
-    pub children: Children,
-    #[prop_or(AttrValue::from("Submit"))]
-    pub text: AttrValue,
-}
-
-#[function_component(Submit)]
-pub fn submit(props: &Props) -> Html {
-    html! {
-      <div class="form-group row justify-content-center">
-        <button
-          class="btn btn-primary col-auto col-form-label"
-          type="submit"
-          disabled={props.disabled}
-          onclick={&props.onclick}>
-          <i class="bi-save me-2"></i>
-          {props.text.clone()}
-        </button>
-        {for props.children.iter()}
-      </div>
-    }
-}

app/src/components/group_details.rs

@@ -1,15 +1,10 @@
 use crate::{
     components::{
         add_group_member::{self, AddGroupMemberComponent},
-        group_details_form::GroupDetailsForm,
         remove_user_from_group::RemoveUserFromGroupComponent,
         router::{AppRoute, Link},
     },
-    convert_attribute_type,
+    infra::common_component::{CommonComponent, CommonComponentParts},
-    infra::{
-        common_component::{CommonComponent, CommonComponentParts},
-        form_utils::GraphQlAttributeSchema,
-    },
 };
 use anyhow::{bail, Error, Result};
 use graphql_client::GraphQLQuery;
@@ -27,28 +22,12 @@ pub struct GetGroupDetails;
 pub type Group = get_group_details::GetGroupDetailsGroup;
 pub type User = get_group_details::GetGroupDetailsGroupUsers;
 pub type AddGroupMemberUser = add_group_member::User;
-pub type Attribute = get_group_details::GetGroupDetailsGroupAttributes;
-pub type AttributeSchema = get_group_details::GetGroupDetailsSchemaGroupSchemaAttributes;
-pub type AttributeType = get_group_details::AttributeType;
-
-convert_attribute_type!(AttributeType);
-
-impl From<&AttributeSchema> for GraphQlAttributeSchema {
-    fn from(attr: &AttributeSchema) -> Self {
-        Self {
-            name: attr.name.clone(),
-            is_list: attr.is_list,
-            is_readonly: attr.is_readonly,
-            is_editable: attr.is_editable,
-        }
-    }
-}
 
 pub struct GroupDetails {
     common: CommonComponentParts<Self>,
     /// The group info. If none, the error is in `error`. If `error` is None, then we haven't
     /// received the server response yet.
-    group_and_schema: Option<(Group, Vec<AttributeSchema>)>,
+    group: Option<Group>,
 }
 
 /// State machine describing the possible transitions of the component state.
@@ -59,13 +38,11 @@ pub enum Msg {
     OnError(Error),
     OnUserAddedToGroup(AddGroupMemberUser),
     OnUserRemovedFromGroup((String, i64)),
-    DisplayNameUpdated,
 }
 
 #[derive(yew::Properties, Clone, PartialEq, Eq)]
 pub struct Props {
     pub group_id: i64,
-    pub is_admin: bool,
 }
 
 impl GroupDetails {
@@ -92,16 +69,41 @@ impl GroupDetails {
         }
     }
 
-    fn view_details(&self, ctx: &Context<Self>, g: &Group, schema: Vec<AttributeSchema>) -> Html {
+    fn view_details(&self, g: &Group) -> Html {
         html! {
           <>
             <h3>{g.display_name.to_string()}</h3>
-            <GroupDetailsForm
+            <div class="py-3">
-              group={g.clone()}
+              <form class="form">
-              group_attributes_schema={schema}
+                <div class="form-group row mb-3">
-              is_admin={ctx.props().is_admin}
+                  <label for="displayName"
-              on_display_name_updated={ctx.link().callback(|_| Msg::DisplayNameUpdated)}
+                    class="form-label col-4 col-form-label">
-            />
+                    {"Group: "}
+                  </label>
+                  <div class="col-8">
+                    <span id="groupId" class="form-constrol-static">{g.display_name.to_string()}</span>
+                  </div>
+                </div>
+                <div class="form-group row mb-3">
+                  <label for="creationDate"
+                    class="form-label col-4 col-form-label">
+                    {"Creation date: "}
+                  </label>
+                  <div class="col-8">
+                    <span id="creationDate" class="form-constrol-static">{g.creation_date.naive_local().date()}</span>
+                  </div>
+                </div>
+                <div class="form-group row mb-3">
+                  <label for="uuid"
+                    class="form-label col-4 col-form-label">
+                    {"UUID: "}
+                  </label>
+                  <div class="col-8">
+                    <span id="uuid" class="form-constrol-static">{g.uuid.to_string()}</span>
+                  </div>
+                </div>
+              </form>
+            </div>
           </>
         }
     }
@@ -180,38 +182,29 @@ impl GroupDetails {
 }
 
 impl CommonComponent<GroupDetails> for GroupDetails {
-    fn handle_msg(
+    fn handle_msg(&mut self, _: &Context<Self>, msg: <Self as Component>::Message) -> Result<bool> {
-        &mut self,
-        ctx: &Context<Self>,
-        msg: <Self as Component>::Message,
-    ) -> Result<bool> {
         match msg {
             Msg::GroupDetailsResponse(response) => match response {
-                Ok(group) => {
+                Ok(group) => self.group = Some(group.group),
-                    self.group_and_schema =
-                        Some((group.group, group.schema.group_schema.attributes))
-                }
                 Err(e) => {
-                    self.group_and_schema = None;
+                    self.group = None;
                     bail!("Error getting user details: {}", e);
                 }
             },
             Msg::OnError(e) => return Err(e),
             Msg::OnUserAddedToGroup(user) => {
-                self.group_and_schema.as_mut().unwrap().0.users.push(User {
+                self.group.as_mut().unwrap().users.push(User {
                     id: user.id,
                     display_name: user.display_name,
                 });
             }
             Msg::OnUserRemovedFromGroup((user_id, _)) => {
-                self.group_and_schema
+                self.group
                     .as_mut()
                     .unwrap()
-                    .0
                     .users
                     .retain(|u| u.id != user_id);
             }
-            Msg::DisplayNameUpdated => self.get_group_details(ctx),
         }
         Ok(true)
     }
@@ -228,7 +221,7 @@ impl Component for GroupDetails {
     fn create(ctx: &Context<Self>) -> Self {
         let mut table = Self {
             common: CommonComponentParts::<Self>::create(),
-            group_and_schema: None,
+            group: None,
         };
         table.get_group_details(ctx);
         table
@@ -239,15 +232,15 @@ impl Component for GroupDetails {
     }
 
     fn view(&self, ctx: &Context<Self>) -> Html {
-        match (&self.group_and_schema, &self.common.error) {
+        match (&self.group, &self.common.error) {
             (None, None) => html! {{"Loading..."}},
             (None, Some(e)) => html! {<div>{"Error: "}{e.to_string()}</div>},
-            (Some((group, schema)), error) => {
+            (Some(u), error) => {
                 html! {
                     <div>
-                      {self.view_details(ctx, group, schema.clone())}
+                      {self.view_details(u)}
-                      {self.view_user_list(ctx, group)}
+                      {self.view_user_list(ctx, u)}
-                      {self.view_add_user_button(ctx, group)}
+                      {self.view_add_user_button(ctx, u)}
                       {self.view_messages(error)}
                     </div>
                 }

app/src/components/group_details_form.rs

@@ -1,272 +0,0 @@
-use crate::{
-    components::{
-        form::{
-            attribute_input::{ListAttributeInput, SingleAttributeInput},
-            static_value::StaticValue,
-            submit::Submit,
-        },
-        group_details::{Attribute, AttributeSchema, Group},
-    },
-    infra::{
-        common_component::{CommonComponent, CommonComponentParts},
-        form_utils::{read_all_form_attributes, AttributeValue, EmailIsRequired, IsAdmin},
-        schema::AttributeType,
-    },
-};
-use anyhow::{Ok, Result};
-use graphql_client::GraphQLQuery;
-use yew::prelude::*;
-
-/// The GraphQL query sent to the server to update the group details.
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "../schema.graphql",
-    query_path = "queries/update_group.graphql",
-    response_derives = "Debug",
-    variables_derives = "Clone,PartialEq,Eq",
-    custom_scalars_module = "crate::infra::graphql"
-)]
-pub struct UpdateGroup;
-
-/// A [yew::Component] to display the group details, with a form allowing to edit them.
-pub struct GroupDetailsForm {
-    common: CommonComponentParts<Self>,
-    /// True if we just successfully updated the group, to display a success message.
-    just_updated: bool,
-    updated_group_name: bool,
-    group: Group,
-    form_ref: NodeRef,
-}
-
-pub enum Msg {
-    /// A form field changed.
-    Update,
-    /// The "Submit" button was clicked.
-    SubmitClicked,
-    /// We got the response from the server about our update message.
-    GroupUpdated(Result<update_group::ResponseData>),
-}
-
-#[derive(yew::Properties, Clone, PartialEq)]
-pub struct Props {
-    /// The current group details.
-    pub group: Group,
-    pub group_attributes_schema: Vec<AttributeSchema>,
-    pub is_admin: bool,
-    pub on_display_name_updated: Callback<()>,
-}
-
-impl CommonComponent<GroupDetailsForm> for GroupDetailsForm {
-    fn handle_msg(
-        &mut self,
-        ctx: &Context<Self>,
-        msg: <Self as Component>::Message,
-    ) -> Result<bool> {
-        match msg {
-            Msg::Update => Ok(true),
-            Msg::SubmitClicked => self.submit_group_update_form(ctx),
-            Msg::GroupUpdated(Err(e)) => Err(e),
-            Msg::GroupUpdated(Result::Ok(_)) => {
-                self.just_updated = true;
-                if self.updated_group_name {
-                    self.updated_group_name = false;
-                    ctx.props().on_display_name_updated.emit(());
-                }
-                Ok(true)
-            }
-        }
-    }
-
-    fn mut_common(&mut self) -> &mut CommonComponentParts<Self> {
-        &mut self.common
-    }
-}
-
-impl Component for GroupDetailsForm {
-    type Message = Msg;
-    type Properties = Props;
-
-    fn create(ctx: &Context<Self>) -> Self {
-        Self {
-            common: CommonComponentParts::<Self>::create(),
-            just_updated: false,
-            updated_group_name: false,
-            group: ctx.props().group.clone(),
-            form_ref: NodeRef::default(),
-        }
-    }
-
-    fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
-        self.just_updated = false;
-        CommonComponentParts::<Self>::update(self, ctx, msg)
-    }
-
-    fn view(&self, ctx: &Context<Self>) -> Html {
-        let link = &ctx.link();
-
-        let can_edit =
-            |a: &AttributeSchema| (ctx.props().is_admin || a.is_editable) && !a.is_readonly;
-        let display_field = |a: &AttributeSchema| {
-            if can_edit(a) {
-                get_custom_attribute_input(a, &self.group.attributes)
-            } else {
-                get_custom_attribute_static(a, &self.group.attributes)
-            }
-        };
-        html! {
-          <div class="py-3">
-            <form
-              class="form"
-              ref={self.form_ref.clone()}>
-              <StaticValue label="Group ID" id="groupId">
-                <i>{&self.group.id}</i>
-              </StaticValue>
-              {
-                  ctx
-                      .props()
-                      .group_attributes_schema
-                      .iter()
-                      .filter(|a| a.is_hardcoded && a.name != "group_id")
-                      .map(display_field)
-                      .collect::<Vec<_>>()
-              }
-              {
-                  ctx
-                      .props()
-                      .group_attributes_schema
-                      .iter()
-                      .filter(|a| !a.is_hardcoded)
-                      .map(display_field)
-                      .collect::<Vec<_>>()
-              }
-              <Submit
-                text="Save changes"
-                disabled={self.common.is_task_running()}
-                onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitClicked})} />
-            </form>
-            {
-              if let Some(e) = &self.common.error {
-                html! {
-                  <div class="alert alert-danger">
-                    {e.to_string() }
-                  </div>
-                }
-              } else { html! {} }
-            }
-            <div hidden={!self.just_updated}>
-              <div class="alert alert-success mt-4">{"Group successfully updated!"}</div>
-            </div>
-          </div>
-        }
-    }
-}
-
-fn get_custom_attribute_input(
-    attribute_schema: &AttributeSchema,
-    group_attributes: &[Attribute],
-) -> Html {
-    let values = group_attributes
-        .iter()
-        .find(|a| a.name == attribute_schema.name)
-        .map(|attribute| attribute.value.clone())
-        .unwrap_or_default();
-    if attribute_schema.is_list {
-        html! {
-            <ListAttributeInput
-               name={attribute_schema.name.clone()}
-               attribute_type={Into::<AttributeType>::into(attribute_schema.attribute_type.clone())}
-               values={values}
-            />
-        }
-    } else {
-        html! {
-            <SingleAttributeInput
-                name={attribute_schema.name.clone()}
-                attribute_type={Into::<AttributeType>::into(attribute_schema.attribute_type.clone())}
-                value={values.first().cloned().unwrap_or_default()}
-            />
-        }
-    }
-}
-
-fn get_custom_attribute_static(
-    attribute_schema: &AttributeSchema,
-    group_attributes: &[Attribute],
-) -> Html {
-    let values = group_attributes
-        .iter()
-        .find(|a| a.name == attribute_schema.name)
-        .map(|attribute| attribute.value.clone())
-        .unwrap_or_default();
-    html! {
-        <StaticValue label={attribute_schema.name.clone()} id={attribute_schema.name.clone()}>
-            {values.into_iter().map(|x| html!{<div>{x}</div>}).collect::<Vec<_>>()}
-        </StaticValue>
-    }
-}
-
-impl GroupDetailsForm {
-    fn submit_group_update_form(&mut self, ctx: &Context<Self>) -> Result<bool> {
-        let mut all_values = read_all_form_attributes(
-            ctx.props().group_attributes_schema.iter(),
-            &self.form_ref,
-            IsAdmin(ctx.props().is_admin),
-            EmailIsRequired(false),
-        )?;
-        let base_attributes = &self.group.attributes;
-        all_values.retain(|a| {
-            let base_val = base_attributes
-                .iter()
-                .find(|base_val| base_val.name == a.name);
-            base_val
-                .map(|v| v.value != a.values)
-                .unwrap_or(!a.values.is_empty())
-        });
-        if all_values.iter().any(|a| a.name == "display_name") {
-            self.updated_group_name = true;
-        }
-        let remove_attributes: Option<Vec<String>> = if all_values.is_empty() {
-            None
-        } else {
-            Some(all_values.iter().map(|a| a.name.clone()).collect())
-        };
-        let insert_attributes: Option<Vec<update_group::AttributeValueInput>> =
-            if remove_attributes.is_none() {
-                None
-            } else {
-                Some(
-                    all_values
-                        .into_iter()
-                        .filter(|a| !a.values.is_empty())
-                        .map(
-                            |AttributeValue { name, values }| update_group::AttributeValueInput {
-                                name,
-                                value: values,
-                            },
-                        )
-                        .collect(),
-                )
-            };
-        let mut group_input = update_group::UpdateGroupInput {
-            id: self.group.id,
-            displayName: None,
-            removeAttributes: None,
-            insertAttributes: None,
-        };
-        let default_group_input = group_input.clone();
-        group_input.removeAttributes = remove_attributes;
-        group_input.insertAttributes = insert_attributes;
-        // Nothing changed.
-        if group_input == default_group_input {
-            return Ok(false);
-        }
-        let req = update_group::Variables { group: group_input };
-        self.common.call_graphql::<UpdateGroup, _>(
-            ctx,
-            req,
-            Msg::GroupUpdated,
-            "Error trying to update group",
-        );
-        Ok(false)
-    }
-}

app/src/components/group_schema_table.rs

@@ -1,198 +0,0 @@
-use crate::{
-    components::{
-        delete_group_attribute::DeleteGroupAttribute,
-        router::{AppRoute, Link},
-    },
-    convert_attribute_type,
-    infra::{
-        common_component::{CommonComponent, CommonComponentParts},
-        schema::AttributeType,
-    },
-};
-use anyhow::{anyhow, Error, Result};
-use gloo_console::log;
-use graphql_client::GraphQLQuery;
-use yew::prelude::*;
-
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "../schema.graphql",
-    query_path = "queries/get_group_attributes_schema.graphql",
-    response_derives = "Debug,Clone,PartialEq,Eq",
-    custom_scalars_module = "crate::infra::graphql"
-)]
-pub struct GetGroupAttributesSchema;
-
-use get_group_attributes_schema::ResponseData;
-
-pub type Attribute =
-    get_group_attributes_schema::GetGroupAttributesSchemaSchemaGroupSchemaAttributes;
-
-convert_attribute_type!(get_group_attributes_schema::AttributeType);
-
-#[derive(yew::Properties, Clone, PartialEq, Eq)]
-pub struct Props {
-    pub hardcoded: bool,
-}
-
-pub struct GroupSchemaTable {
-    common: CommonComponentParts<Self>,
-    attributes: Option<Vec<Attribute>>,
-}
-
-pub enum Msg {
-    ListAttributesResponse(Result<ResponseData>),
-    OnAttributeDeleted(String),
-    OnError(Error),
-}
-
-impl CommonComponent<GroupSchemaTable> for GroupSchemaTable {
-    fn handle_msg(&mut self, _: &Context<Self>, msg: <Self as Component>::Message) -> Result<bool> {
-        match msg {
-            Msg::ListAttributesResponse(schema) => {
-                self.attributes =
-                    Some(schema?.schema.group_schema.attributes.into_iter().collect());
-                Ok(true)
-            }
-            Msg::OnError(e) => Err(e),
-            Msg::OnAttributeDeleted(attribute_name) => {
-                match self.attributes {
-                    None => {
-                        log!(format!("Attribute {attribute_name} was  deleted but component has no attributes"));
-                        Err(anyhow!("invalid state"))
-                    }
-                    Some(_) => {
-                        self.attributes
-                            .as_mut()
-                            .unwrap()
-                            .retain(|a| a.name != attribute_name);
-                        Ok(true)
-                    }
-                }
-            }
-        }
-    }
-
-    fn mut_common(&mut self) -> &mut CommonComponentParts<Self> {
-        &mut self.common
-    }
-}
-
-impl Component for GroupSchemaTable {
-    type Message = Msg;
-    type Properties = Props;
-
-    fn create(ctx: &Context<Self>) -> Self {
-        let mut table = GroupSchemaTable {
-            common: CommonComponentParts::<Self>::create(),
-            attributes: None,
-        };
-        table.common.call_graphql::<GetGroupAttributesSchema, _>(
-            ctx,
-            get_group_attributes_schema::Variables {},
-            Msg::ListAttributesResponse,
-            "Error trying to fetch group schema",
-        );
-        table
-    }
-
-    fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
-        CommonComponentParts::<Self>::update(self, ctx, msg)
-    }
-
-    fn view(&self, ctx: &Context<Self>) -> Html {
-        html! {
-            <div>
-              {self.view_attributes(ctx)}
-              {self.view_errors()}
-            </div>
-        }
-    }
-}
-
-impl GroupSchemaTable {
-    fn view_attributes(&self, ctx: &Context<Self>) -> Html {
-        let hardcoded = ctx.props().hardcoded;
-        let make_table = |attributes: &Vec<Attribute>| {
-            html! {
-                <div class="table-responsive">
-                    <h3>{if hardcoded {"Hardcoded"} else {"User-defined"}}{" attributes"}</h3>
-                    <table class="table table-hover">
-                        <thead>
-                            <tr>
-                                <th>{"Attribute name"}</th>
-                                <th>{"Type"}</th>
-                                <th>{"Visible"}</th>
-                                {if hardcoded {html!{}} else {html!{<th>{"Delete"}</th>}}}
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {attributes.iter().map(|u| self.view_attribute(ctx, u)).collect::<Vec<_>>()}
-                        </tbody>
-                    </table>
-                </div>
-            }
-        };
-        match &self.attributes {
-            None => html! {{"Loading..."}},
-            Some(attributes) => {
-                let mut attributes = attributes.clone();
-                attributes.retain(|attribute| attribute.is_hardcoded == ctx.props().hardcoded);
-                make_table(&attributes)
-            }
-        }
-    }
-
-    fn view_attribute(&self, ctx: &Context<Self>, attribute: &Attribute) -> Html {
-        let link = ctx.link();
-        let attribute_type = AttributeType::from(attribute.attribute_type.clone());
-        let checkmark = html! {
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check" viewBox="0 0 16 16">
-          <path d="M10.97 4.97a.75.75 0 0 1 1.07 1.05l-3.99 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425z"></path>
-        </svg>
-                };
-        let hardcoded = ctx.props().hardcoded;
-        html! {
-            <tr key={attribute.name.clone()}>
-                <td>{&attribute.name}</td>
-                <td>{if attribute.is_list { format!("List<{attribute_type}>")} else {attribute_type.to_string()}}</td>
-                <td>{if attribute.is_visible {checkmark.clone()} else {html!{}}}</td>
-                {
-                    if hardcoded {
-                        html!{}
-                    } else {
-                        html!{
-                            <td>
-                                <DeleteGroupAttribute
-                                    attribute_name={attribute.name.clone()}
-                                    on_attribute_deleted={link.callback(Msg::OnAttributeDeleted)}
-                                    on_error={link.callback(Msg::OnError)}/>
-                            </td>
-                        }
-                    }
-                }
-            </tr>
-        }
-    }
-
-    fn view_errors(&self) -> Html {
-        match &self.common.error {
-            None => html! {},
-            Some(e) => html! {<div>{"Error: "}{e.to_string()}</div>},
-        }
-    }
-}
-
-#[function_component(ListGroupSchema)]
-pub fn list_group_schema() -> Html {
-    html! {
-        <div>
-            <GroupSchemaTable hardcoded={true} />
-            <GroupSchemaTable hardcoded={false} />
-            <Link classes="btn btn-primary" to={AppRoute::CreateGroupAttribute}>
-                <i class="bi-plus-circle me-2"></i>
-                {"Create an attribute"}
-            </Link>
-        </div>
-    }
-}

app/src/components/login.rs

@@ -1,8 +1,5 @@
 use crate::{
-    components::{
+    components::router::{AppRoute, Link},
-        form::submit::Submit,
-        router::{AppRoute, Link},
-    },
     infra::{
         api::HostService,
         common_component::{CommonComponent, CommonComponentParts},
@@ -158,62 +155,68 @@ impl Component for LoginForm {
             }
         } else {
             html! {
-              <form class="form center-block col-sm-4 col-offset-4">
+              <form
-                <div class="input-group">
+                class="form center-block col-sm-4 col-offset-4">
-                  <div class="input-group-prepend">
+                  <div class="input-group">
-                    <span class="input-group-text">
+                    <div class="input-group-prepend">
-                      <i class="bi-person-fill"/>
+                      <span class="input-group-text">
-                    </span>
+                        <i class="bi-person-fill"/>
+                      </span>
+                    </div>
+                    <Field
+                      class="form-control"
+                      class_invalid="is-invalid has-error"
+                      class_valid="has-success"
+                      form={&self.form}
+                      field_name="username"
+                      placeholder="Username"
+                      autocomplete="username"
+                      oninput={link.callback(|_| Msg::Update)} />
                   </div>
-                  <Field
+                  <div class="input-group">
-                    class="form-control"
+                    <div class="input-group-prepend">
-                    class_invalid="is-invalid has-error"
+                      <span class="input-group-text">
-                    class_valid="has-success"
+                        <i class="bi-lock-fill"/>
-                    form={&self.form}
+                      </span>
-                    field_name="username"
+                    </div>
-                    placeholder="Username"
+                    <Field
-                    autocomplete="username"
+                      class="form-control"
-                    oninput={link.callback(|_| Msg::Update)} />
+                      class_invalid="is-invalid has-error"
-                </div>
+                      class_valid="has-success"
-                <div class="input-group">
+                      form={&self.form}
-                  <div class="input-group-prepend">
+                      field_name="password"
-                    <span class="input-group-text">
+                      input_type="password"
-                      <i class="bi-lock-fill"/>
+                      placeholder="Password"
-                    </span>
+                      autocomplete="current-password" />
+                  </div>
+                  <div class="form-group mt-3">
+                    <button
+                      type="submit"
+                      class="btn btn-primary"
+                      disabled={self.common.is_task_running()}
+                      onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::Submit})}>
+                      <i class="bi-box-arrow-in-right me-2"/>
+                      {"Login"}
+                    </button>
+                    { if password_reset_enabled {
+                      html! {
+                        <Link
+                          classes="btn-link btn"
+                          disabled={self.common.is_task_running()}
+                          to={AppRoute::StartResetPassword}>
+                          {"Forgot your password?"}
+                        </Link>
+                      }
+                    } else {
+                      html!{}
+                    }}
+                  </div>
+                  <div class="form-group">
+                  { if let Some(e) = &self.common.error {
+                      html! { e.to_string() }
+                    } else { html! {} }
+                  }
                   </div>
-                  <Field
-                    class="form-control"
-                    class_invalid="is-invalid has-error"
-                    class_valid="has-success"
-                    form={&self.form}
-                    field_name="password"
-                    input_type="password"
-                    placeholder="Password"
-                    autocomplete="current-password" />
-                </div>
-                <Submit
-                  text="Login"
-                  disabled={self.common.is_task_running()}
-                  onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::Submit})}>
-                  { if password_reset_enabled {
-                    html! {
-                      <Link
-                        classes="btn-link btn"
-                        disabled={self.common.is_task_running()}
-                        to={AppRoute::StartResetPassword}>
-                        {"Forgot your password?"}
-                      </Link>
-                    }
-                  } else {
-                    html!{}
-                  }}
-                </Submit>
-                <div class="form-group">
-                { if let Some(e) = &self.common.error {
-                    html! { e.to_string() }
-                  } else { html! {} }
-                }
-                </div>
               </form>
             }
         }

app/src/components/mod.rs

@@ -1,21 +1,12 @@
 pub mod add_group_member;
 pub mod add_user_to_group;
 pub mod app;
-pub mod avatar;
-pub mod banner;
 pub mod change_password;
 pub mod create_group;
-pub mod create_group_attribute;
 pub mod create_user;
-pub mod create_user_attribute;
 pub mod delete_group;
-pub mod delete_group_attribute;
 pub mod delete_user;
-pub mod delete_user_attribute;
-pub mod form;
 pub mod group_details;
-pub mod group_details_form;
-pub mod group_schema_table;
 pub mod group_table;
 pub mod login;
 pub mod logout;
@@ -26,5 +17,4 @@ pub mod router;
 pub mod select;
 pub mod user_details;
 pub mod user_details_form;
-pub mod user_schema_table;
 pub mod user_table;

app/src/components/reset_password_step1.rs

@@ -104,11 +104,7 @@ impl Component for ResetPasswordStep1Form {
                 </div>
                 { if self.just_succeeded {
                     html! {
-                      {"If a user with this username or email exists, a password reset email will \
+                      {"A reset token has been sent to your email."}
-                          be sent to the associated email address. Please check your email and \
-                          follow the instructions. If you don't receive an email, please check \
-                          your spam folder. If you still don't receive an email, please contact \
-                          your administrator."}
                     }
                 } else {
                     html! {

app/src/components/reset_password_step2.rs

@@ -1,8 +1,5 @@
 use crate::{
-    components::{
+    components::router::{AppRoute, Link},
-        form::{field::Field, submit::Submit},
-        router::{AppRoute, Link},
-    },
     infra::{
         api::HostService,
         common_component::{CommonComponent, CommonComponentParts},
@@ -167,29 +164,61 @@ impl Component for ResetPasswordStep2Form {
             }
             _ => (),
         };
+        type Field = yew_form::Field<FormModel>;
         html! {
           <>
             <h2>{"Reset your password"}</h2>
-            <form class="form">
+            <form
-              <Field<FormModel>
+              class="form">
-                label="New password"
+              <div class="form-group row">
-                required=true
+                <label for="new_password"
-                form={&self.form}
+                  class="form-label col-sm-2 col-form-label">
-                field_name="password"
+                  {"New password*:"}
-                autocomplete="new-password"
+                </label>
-                input_type="password"
+                <div class="col-sm-10">
-                oninput={link.callback(|_| Msg::FormUpdate)} />
+                  <Field
-              <Field<FormModel>
+                    form={&self.form}
-                label="Confirm password"
+                    field_name="password"
-                required=true
+                    class="form-control"
-                form={&self.form}
+                    class_invalid="is-invalid has-error"
-                field_name="confirm_password"
+                    class_valid="has-success"
-                autocomplete="new-password"
+                    autocomplete="new-password"
-                input_type="password"
+                    input_type="password"
-                oninput={link.callback(|_| Msg::FormUpdate)} />
+                    oninput={link.callback(|_| Msg::FormUpdate)} />
-              <Submit
+                  <div class="invalid-feedback">
-                disabled={self.common.is_task_running()}
+                    {&self.form.field_message("password")}
-                onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::Submit})} />
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row">
+                <label for="confirm_password"
+                  class="form-label col-sm-2 col-form-label">
+                  {"Confirm password*:"}
+                </label>
+                <div class="col-sm-10">
+                  <Field
+                    form={&self.form}
+                    field_name="confirm_password"
+                    class="form-control"
+                    class_invalid="is-invalid has-error"
+                    class_valid="has-success"
+                    autocomplete="new-password"
+                    input_type="password"
+                    oninput={link.callback(|_| Msg::FormUpdate)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("confirm_password")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row mt-2">
+                <button
+                  class="btn btn-primary col-sm-1 col-form-label"
+                  type="submit"
+                  disabled={self.common.is_task_running()}
+                  onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::Submit})}>
+                  {"Submit"}
+                </button>
+              </div>
             </form>
             { if let Some(e) = &self.common.error {
                 html! {

app/src/components/router.rs

@@ -22,14 +22,6 @@ pub enum AppRoute {
     ListGroups,
     #[at("/group/:group_id")]
     GroupDetails { group_id: i64 },
-    #[at("/user-attributes")]
-    ListUserSchema,
-    #[at("/user-attributes/create")]
-    CreateUserAttribute,
-    #[at("/group-attributes")]
-    ListGroupSchema,
-    #[at("/group-attributes/create")]
-    CreateGroupAttribute,
     #[at("/")]
     Index,
 }

app/src/components/user_details.rs

@@ -5,11 +5,7 @@ use crate::{
         router::{AppRoute, Link},
         user_details_form::UserDetailsForm,
     },
-    convert_attribute_type,
+    infra::common_component::{CommonComponent, CommonComponentParts},
-    infra::{
-        common_component::{CommonComponent, CommonComponentParts},
-        form_utils::GraphQlAttributeSchema,
-    },
 };
 use anyhow::{bail, Error, Result};
 use graphql_client::GraphQLQuery;
@@ -26,34 +22,12 @@ pub struct GetUserDetails;
 
 pub type User = get_user_details::GetUserDetailsUser;
 pub type Group = get_user_details::GetUserDetailsUserGroups;
-pub type Attribute = get_user_details::GetUserDetailsUserAttributes;
-pub type AttributeSchema = get_user_details::GetUserDetailsSchemaUserSchemaAttributes;
-pub type AttributeType = get_user_details::AttributeType;
-
-convert_attribute_type!(AttributeType);
-
-impl From<&AttributeSchema> for GraphQlAttributeSchema {
-    fn from(attr: &AttributeSchema) -> Self {
-        Self {
-            name: attr.name.clone(),
-            is_list: attr.is_list,
-            is_readonly: attr.is_readonly,
-            is_editable: attr.is_editable,
-        }
-    }
-}
 
 pub struct UserDetails {
     common: CommonComponentParts<Self>,
     /// The user info. If none, the error is in `error`. If `error` is None, then we haven't
     /// received the server response yet.
-    user_and_schema: Option<(User, Vec<AttributeSchema>)>,
+    user: Option<User>,
-}
-
-impl UserDetails {
-    fn mut_groups(&mut self) -> &mut Vec<Group> {
-        &mut self.user_and_schema.as_mut().unwrap().0.groups
-    }
 }
 
 /// State machine describing the possible transitions of the component state.
@@ -76,20 +50,22 @@ impl CommonComponent<UserDetails> for UserDetails {
     fn handle_msg(&mut self, _: &Context<Self>, msg: <Self as Component>::Message) -> Result<bool> {
         match msg {
             Msg::UserDetailsResponse(response) => match response {
-                Ok(user) => {
+                Ok(user) => self.user = Some(user.user),
-                    self.user_and_schema = Some((user.user, user.schema.user_schema.attributes))
-                }
                 Err(e) => {
-                    self.user_and_schema = None;
+                    self.user = None;
                     bail!("Error getting user details: {}", e);
                 }
             },
             Msg::OnError(e) => return Err(e),
             Msg::OnUserAddedToGroup(group) => {
-                self.mut_groups().push(group);
+                self.user.as_mut().unwrap().groups.push(group);
             }
             Msg::OnUserRemovedFromGroup((_, group_id)) => {
-                self.mut_groups().retain(|g| g.id != group_id);
+                self.user
+                    .as_mut()
+                    .unwrap()
+                    .groups
+                    .retain(|g| g.id != group_id);
             }
         }
         Ok(true)
@@ -202,7 +178,7 @@ impl Component for UserDetails {
     fn create(ctx: &Context<Self>) -> Self {
         let mut table = Self {
             common: CommonComponentParts::<Self>::create(),
-            user_and_schema: None,
+            user: None,
         };
         table.get_user_details(ctx);
         table
@@ -213,8 +189,10 @@ impl Component for UserDetails {
     }
 
     fn view(&self, ctx: &Context<Self>) -> Html {
-        match (&self.user_and_schema, &self.common.error) {
+        match (&self.user, &self.common.error) {
-            (Some((u, schema)), error) => {
+            (None, None) => html! {{"Loading..."}},
+            (None, Some(e)) => html! {<div>{"Error: "}{e.to_string()}</div>},
+            (Some(u), error) => {
                 html! {
                   <>
                     <h3>{u.id.to_string()}</h3>
@@ -229,20 +207,13 @@ impl Component for UserDetails {
                     <div>
                       <h5 class="row m-3 fw-bold">{"User details"}</h5>
                     </div>
-                    <UserDetailsForm
+                    <UserDetailsForm user={u.clone()} />
-                      user={u.clone()}
-                      user_attributes_schema={schema.clone()}
-                      is_admin={ctx.props().is_admin}
-                      is_edited_user_admin={u.groups.iter().any(|g| g.display_name == "lldap_admin")}
-                    />
                     {self.view_group_memberships(ctx, u)}
                     {self.view_add_group_button(ctx, u)}
                     {self.view_messages(error)}
                   </>
                 }
             }
-            (None, None) => html! {{"Loading..."}},
-            (None, Some(e)) => html! {<div>{"Error: "}{e.to_string()}</div>},
         }
     }
 }

app/src/components/user_details_form.rs

@@ -1,21 +1,53 @@
+use std::str::FromStr;
+
 use crate::{
-    components::{
+    components::user_details::User,
-        form::{
+    infra::common_component::{CommonComponent, CommonComponentParts},
-            attribute_input::{ListAttributeInput, SingleAttributeInput},
+};
-            static_value::StaticValue,
+use anyhow::{bail, Error, Result};
-            submit::Submit,
+use gloo_file::{
-        },
+    callbacks::{read_as_bytes, FileReader},
-        user_details::{Attribute, AttributeSchema, User},
+    File,
-    },
-    infra::{
-        common_component::{CommonComponent, CommonComponentParts},
-        form_utils::{read_all_form_attributes, AttributeValue, EmailIsRequired, IsAdmin},
-        schema::AttributeType,
-    },
 };
-use anyhow::{Ok, Result};
 use graphql_client::GraphQLQuery;
+use validator_derive::Validate;
+use web_sys::{FileList, HtmlInputElement, InputEvent};
 use yew::prelude::*;
+use yew_form_derive::Model;
+
+#[derive(Default)]
+struct JsFile {
+    file: Option<File>,
+    contents: Option<Vec<u8>>,
+}
+
+impl ToString for JsFile {
+    fn to_string(&self) -> String {
+        self.file.as_ref().map(File::name).unwrap_or_default()
+    }
+}
+
+impl FromStr for JsFile {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self> {
+        if s.is_empty() {
+            Ok(JsFile::default())
+        } else {
+            bail!("Building file from non-empty string")
+        }
+    }
+}
+
+/// The fields of the form, with the editable details and the constraints.
+#[derive(Model, Validate, PartialEq, Eq, Clone)]
+pub struct UserModel {
+    #[validate(email)]
+    email: String,
+    display_name: String,
+    first_name: String,
+    last_name: String,
+}
 
 /// The GraphQL query sent to the server to update the user details.
 #[derive(GraphQLQuery)]
@@ -31,17 +63,26 @@ pub struct UpdateUser;
 /// A [yew::Component] to display the user details, with a form allowing to edit them.
 pub struct UserDetailsForm {
     common: CommonComponentParts<Self>,
+    form: yew_form::Form<UserModel>,
+    // None means that the avatar hasn't changed.
+    avatar: Option<JsFile>,
+    reader: Option<FileReader>,
     /// True if we just successfully updated the user, to display a success message.
     just_updated: bool,
     user: User,
-    form_ref: NodeRef,
 }
 
 pub enum Msg {
     /// A form field changed.
     Update,
+    /// A new file was selected.
+    FileSelected(File),
     /// The "Submit" button was clicked.
     SubmitClicked,
+    /// The "Clear" button for the avatar was clicked.
+    ClearAvatarClicked,
+    /// A picked file finished loading.
+    FileLoaded(String, Result<Vec<u8>>),
     /// We got the response from the server about our update message.
     UserUpdated(Result<update_user::ResponseData>),
 }
@@ -50,9 +91,6 @@ pub enum Msg {
 pub struct Props {
     /// The current user details.
     pub user: User,
-    pub user_attributes_schema: Vec<AttributeSchema>,
-    pub is_admin: bool,
-    pub is_edited_user_admin: bool,
 }
 
 impl CommonComponent<UserDetailsForm> for UserDetailsForm {
@@ -63,12 +101,53 @@ impl CommonComponent<UserDetailsForm> for UserDetailsForm {
     ) -> Result<bool> {
         match msg {
             Msg::Update => Ok(true),
-            Msg::SubmitClicked => self.submit_user_update_form(ctx),
+            Msg::FileSelected(new_avatar) => {
-            Msg::UserUpdated(Err(e)) => Err(e),
+                if self
-            Msg::UserUpdated(Result::Ok(_)) => {
+                    .avatar
-                self.just_updated = true;
+                    .as_ref()
+                    .and_then(|f| f.file.as_ref().map(|f| f.name()))
+                    != Some(new_avatar.name())
+                {
+                    let file_name = new_avatar.name();
+                    let link = ctx.link().clone();
+                    self.reader = Some(read_as_bytes(&new_avatar, move |res| {
+                        link.send_message(Msg::FileLoaded(
+                            file_name,
+                            res.map_err(|e| anyhow::anyhow!("{:#}", e)),
+                        ))
+                    }));
+                    self.avatar = Some(JsFile {
+                        file: Some(new_avatar),
+                        contents: None,
+                    });
+                }
                 Ok(true)
             }
+            Msg::SubmitClicked => self.submit_user_update_form(ctx),
+            Msg::ClearAvatarClicked => {
+                self.avatar = Some(JsFile::default());
+                Ok(true)
+            }
+            Msg::UserUpdated(response) => self.user_update_finished(response),
+            Msg::FileLoaded(file_name, data) => {
+                if let Some(avatar) = &mut self.avatar {
+                    if let Some(file) = &avatar.file {
+                        if file.name() == file_name {
+                            let data = data?;
+                            if !is_valid_jpeg(data.as_slice()) {
+                                // Clear the selection.
+                                self.avatar = None;
+                                bail!("Chosen image is not a valid JPEG");
+                            } else {
+                                avatar.contents = Some(data);
+                                return Ok(true);
+                            }
+                        }
+                    }
+                }
+                self.reader = None;
+                Ok(false)
+            }
         }
     }
 
@@ -82,11 +161,19 @@ impl Component for UserDetailsForm {
     type Properties = Props;
 
     fn create(ctx: &Context<Self>) -> Self {
+        let model = UserModel {
+            email: ctx.props().user.email.clone(),
+            display_name: ctx.props().user.display_name.clone(),
+            first_name: ctx.props().user.first_name.clone(),
+            last_name: ctx.props().user.last_name.clone(),
+        };
         Self {
             common: CommonComponentParts::<Self>::create(),
+            form: yew_form::Form::new(model),
+            avatar: None,
             just_updated: false,
+            reader: None,
             user: ctx.props().user.clone(),
-            form_ref: NodeRef::default(),
         }
     }
 
@@ -96,47 +183,173 @@ impl Component for UserDetailsForm {
     }
 
     fn view(&self, ctx: &Context<Self>) -> Html {
+        type Field = yew_form::Field<UserModel>;
         let link = &ctx.link();
 
-        let can_edit =
+        let avatar_string = match &self.avatar {
-            |a: &AttributeSchema| (ctx.props().is_admin || a.is_editable) && !a.is_readonly;
+            Some(avatar) => {
-        let display_field = |a: &AttributeSchema| {
+                let avatar_base64 = to_base64(avatar);
-            if can_edit(a) {
+                avatar_base64.as_deref().unwrap_or("").to_owned()
-                get_custom_attribute_input(a, &self.user.attributes)
-            } else {
-                get_custom_attribute_static(a, &self.user.attributes)
             }
+            None => self.user.avatar.as_deref().unwrap_or("").to_owned(),
         };
         html! {
           <div class="py-3">
-            <form
+            <form class="form">
-              class="form"
+              <div class="form-group row mb-3">
-              ref={self.form_ref.clone()}>
+                <label for="userId"
-              <StaticValue label="User ID" id="userId">
+                  class="form-label col-4 col-form-label">
-                <i>{&self.user.id}</i>
+                  {"User ID: "}
-              </StaticValue>
+                </label>
-              {
+                <div class="col-8">
-                  ctx
+                  <span id="userId" class="form-control-static"><i>{&self.user.id}</i></span>
-                      .props()
+                </div>
-                      .user_attributes_schema
+              </div>
-                      .iter()
+              <div class="form-group row mb-3">
-                      .filter(|a| a.is_hardcoded && a.name != "user_id")
+                <label for="creationDate"
-                      .map(display_field)
+                  class="form-label col-4 col-form-label">
-                      .collect::<Vec<_>>()
+                  {"Creation date: "}
-              }
+                </label>
-              {
+                <div class="col-8">
-                  ctx
+                  <span id="creationDate" class="form-control-static">{&self.user.creation_date.naive_local().date()}</span>
-                      .props()
+                </div>
-                      .user_attributes_schema
+              </div>
-                      .iter()
+              <div class="form-group row mb-3">
-                      .filter(|a| !a.is_hardcoded)
+                <label for="uuid"
-                      .map(display_field)
+                  class="form-label col-4 col-form-label">
-                      .collect::<Vec<_>>()
+                  {"UUID: "}
-              }
+                </label>
-              <Submit
+                <div class="col-8">
-                text="Save changes"
+                  <span id="creationDate" class="form-control-static">{&self.user.uuid}</span>
-                disabled={self.common.is_task_running()}
+                </div>
-                onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitClicked})} />
+              </div>
+              <div class="form-group row mb-3">
+                <label for="email"
+                  class="form-label col-4 col-form-label">
+                  {"Email"}
+                  <span class="text-danger">{"*"}</span>
+                  {":"}
+                </label>
+                <div class="col-8">
+                  <Field
+                    class="form-control"
+                    class_invalid="is-invalid has-error"
+                    class_valid="has-success"
+                    form={&self.form}
+                    field_name="email"
+                    autocomplete="email"
+                    oninput={link.callback(|_| Msg::Update)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("email")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row mb-3">
+                <label for="display_name"
+                  class="form-label col-4 col-form-label">
+                  {"Display Name: "}
+                </label>
+                <div class="col-8">
+                  <Field
+                    class="form-control"
+                    class_invalid="is-invalid has-error"
+                    class_valid="has-success"
+                    form={&self.form}
+                    field_name="display_name"
+                    autocomplete="name"
+                    oninput={link.callback(|_| Msg::Update)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("display_name")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row mb-3">
+                <label for="first_name"
+                  class="form-label col-4 col-form-label">
+                  {"First Name: "}
+                </label>
+                <div class="col-8">
+                  <Field
+                    class="form-control"
+                    form={&self.form}
+                    field_name="first_name"
+                    autocomplete="given-name"
+                    oninput={link.callback(|_| Msg::Update)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("first_name")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row mb-3">
+                <label for="last_name"
+                  class="form-label col-4 col-form-label">
+                  {"Last Name: "}
+                </label>
+                <div class="col-8">
+                  <Field
+                    class="form-control"
+                    form={&self.form}
+                    field_name="last_name"
+                    autocomplete="family-name"
+                    oninput={link.callback(|_| Msg::Update)} />
+                  <div class="invalid-feedback">
+                    {&self.form.field_message("last_name")}
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row align-items-center mb-3">
+                <label for="avatar"
+                  class="form-label col-4 col-form-label">
+                  {"Avatar: "}
+                </label>
+                <div class="col-8">
+                  <div class="row align-items-center">
+                    <div class="col-5">
+                      <input
+                        class="form-control"
+                        id="avatarInput"
+                        type="file"
+                        accept="image/jpeg"
+                        oninput={link.callback(|e: InputEvent| {
+                            let input: HtmlInputElement = e.target_unchecked_into();
+                            Self::upload_files(input.files())
+                        })} />
+                    </div>
+                    <div class="col-3">
+                      <button
+                        class="btn btn-secondary col-auto"
+                        id="avatarClear"
+                        disabled={self.common.is_task_running()}
+                        onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::ClearAvatarClicked})}>
+                      {"Clear"}
+                      </button>
+                    </div>
+                    <div class="col-4">
+                    {
+                      if !avatar_string.is_empty() {
+                        html!{
+                          <img
+                            id="avatarDisplay"
+                            src={format!("data:image/jpeg;base64, {}", avatar_string)}
+                            style="max-height:128px;max-width:128px;height:auto;width:auto;"
+                            alt="Avatar" />
+                        }
+                      } else { html! {} }
+                    }
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row justify-content-center mt-3">
+                <button
+                  type="submit"
+                  class="btn btn-primary col-auto col-form-label"
+                  disabled={self.common.is_task_running()}
+                  onclick={link.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitClicked})}>
+                  <i class="bi-save me-2"></i>
+                  {"Save changes"}
+                </button>
+              </div>
             </form>
             {
               if let Some(e) = &self.common.error {
@@ -155,97 +368,19 @@ impl Component for UserDetailsForm {
     }
 }
 
-fn get_custom_attribute_input(
-    attribute_schema: &AttributeSchema,
-    user_attributes: &[Attribute],
-) -> Html {
-    let values = user_attributes
-        .iter()
-        .find(|a| a.name == attribute_schema.name)
-        .map(|attribute| attribute.value.clone())
-        .unwrap_or_default();
-    if attribute_schema.is_list {
-        html! {
-            <ListAttributeInput
-               name={attribute_schema.name.clone()}
-               attribute_type={Into::<AttributeType>::into(attribute_schema.attribute_type.clone())}
-               values={values}
-            />
-        }
-    } else {
-        html! {
-            <SingleAttributeInput
-                name={attribute_schema.name.clone()}
-                attribute_type={Into::<AttributeType>::into(attribute_schema.attribute_type.clone())}
-                value={values.first().cloned().unwrap_or_default()}
-            />
-        }
-    }
-}
-
-fn get_custom_attribute_static(
-    attribute_schema: &AttributeSchema,
-    user_attributes: &[Attribute],
-) -> Html {
-    let values = user_attributes
-        .iter()
-        .find(|a| a.name == attribute_schema.name)
-        .map(|attribute| attribute.value.clone())
-        .unwrap_or_default();
-    html! {
-        <StaticValue label={attribute_schema.name.clone()} id={attribute_schema.name.clone()}>
-            {values.into_iter().map(|x| html!{<div>{x}</div>}).collect::<Vec<_>>()}
-        </StaticValue>
-    }
-}
-
 impl UserDetailsForm {
     fn submit_user_update_form(&mut self, ctx: &Context<Self>) -> Result<bool> {
-        // TODO: Handle unloaded files.
+        if !self.form.validate() {
-        // if let Some(JsFile {
+            bail!("Invalid inputs");
-        //     file: Some(_),
+        }
-        //     contents: None,
+        if let Some(JsFile {
-        // }) = &self.avatar
+            file: Some(_),
-        // {
+            contents: None,
-        //     bail!("Image file hasn't finished loading, try again");
+        }) = &self.avatar
-        // }
+        {
-        let mut all_values = read_all_form_attributes(
+            bail!("Image file hasn't finished loading, try again");
-            ctx.props().user_attributes_schema.iter(),
+        }
-            &self.form_ref,
+        let base_user = &self.user;
-            IsAdmin(ctx.props().is_admin),
-            EmailIsRequired(!ctx.props().is_edited_user_admin),
-        )?;
-        let base_attributes = &self.user.attributes;
-        all_values.retain(|a| {
-            let base_val = base_attributes
-                .iter()
-                .find(|base_val| base_val.name == a.name);
-            base_val
-                .map(|v| v.value != a.values)
-                .unwrap_or(!a.values.is_empty())
-        });
-        let remove_attributes: Option<Vec<String>> = if all_values.is_empty() {
-            None
-        } else {
-            Some(all_values.iter().map(|a| a.name.clone()).collect())
-        };
-        let insert_attributes: Option<Vec<update_user::AttributeValueInput>> =
-            if remove_attributes.is_none() {
-                None
-            } else {
-                Some(
-                    all_values
-                        .into_iter()
-                        .filter(|a| !a.values.is_empty())
-                        .map(
-                            |AttributeValue { name, values }| update_user::AttributeValueInput {
-                                name,
-                                value: values,
-                            },
-                        )
-                        .collect(),
-                )
-            };
         let mut user_input = update_user::UpdateUserInput {
             id: self.user.id.clone(),
             email: None,
@@ -257,8 +392,23 @@ impl UserDetailsForm {
             insertAttributes: None,
         };
         let default_user_input = user_input.clone();
-        user_input.removeAttributes = remove_attributes;
+        let model = self.form.model();
-        user_input.insertAttributes = insert_attributes;
+        let email = model.email;
+        if base_user.email != email {
+            user_input.email = Some(email);
+        }
+        if base_user.display_name != model.display_name {
+            user_input.displayName = Some(model.display_name);
+        }
+        if base_user.first_name != model.first_name {
+            user_input.firstName = Some(model.first_name);
+        }
+        if base_user.last_name != model.last_name {
+            user_input.lastName = Some(model.last_name);
+        }
+        if let Some(avatar) = &self.avatar {
+            user_input.avatar = Some(to_base64(avatar)?);
+        }
         // Nothing changed.
         if user_input == default_user_input {
             return Ok(false);
@@ -272,4 +422,58 @@ impl UserDetailsForm {
         );
         Ok(false)
     }
+
+    fn user_update_finished(&mut self, r: Result<update_user::ResponseData>) -> Result<bool> {
+        r?;
+        let model = self.form.model();
+        self.user.email = model.email;
+        self.user.display_name = model.display_name;
+        self.user.first_name = model.first_name;
+        self.user.last_name = model.last_name;
+        if let Some(avatar) = &self.avatar {
+            self.user.avatar = Some(to_base64(avatar)?);
+        }
+        self.just_updated = true;
+        Ok(true)
+    }
+
+    fn upload_files(files: Option<FileList>) -> Msg {
+        if let Some(files) = files {
+            if files.length() > 0 {
+                Msg::FileSelected(File::from(files.item(0).unwrap()))
+            } else {
+                Msg::Update
+            }
+        } else {
+            Msg::Update
+        }
+    }
+}
+
+fn is_valid_jpeg(bytes: &[u8]) -> bool {
+    image::io::Reader::with_format(std::io::Cursor::new(bytes), image::ImageFormat::Jpeg)
+        .decode()
+        .is_ok()
+}
+
+fn to_base64(file: &JsFile) -> Result<String> {
+    match file {
+        JsFile {
+            file: None,
+            contents: _,
+        } => Ok(String::new()),
+        JsFile {
+            file: Some(_),
+            contents: None,
+        } => bail!("Image file hasn't finished loading, try again"),
+        JsFile {
+            file: Some(_),
+            contents: Some(data),
+        } => {
+            if !is_valid_jpeg(data.as_slice()) {
+                bail!("Chosen image is not a valid JPEG");
+            }
+            Ok(base64::encode(data))
+        }
+    }
 }

app/src/components/user_schema_table.rs

@@ -1,198 +0,0 @@
-use crate::{
-    components::{
-        delete_user_attribute::DeleteUserAttribute,
-        router::{AppRoute, Link},
-    },
-    convert_attribute_type,
-    infra::{
-        common_component::{CommonComponent, CommonComponentParts},
-        schema::AttributeType,
-    },
-};
-use anyhow::{anyhow, Error, Result};
-use gloo_console::log;
-use graphql_client::GraphQLQuery;
-use yew::prelude::*;
-
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "../schema.graphql",
-    query_path = "queries/get_user_attributes_schema.graphql",
-    response_derives = "Debug,Clone,PartialEq,Eq",
-    custom_scalars_module = "crate::infra::graphql"
-)]
-pub struct GetUserAttributesSchema;
-
-use get_user_attributes_schema::ResponseData;
-
-pub type Attribute = get_user_attributes_schema::GetUserAttributesSchemaSchemaUserSchemaAttributes;
-
-convert_attribute_type!(get_user_attributes_schema::AttributeType);
-
-#[derive(yew::Properties, Clone, PartialEq, Eq)]
-pub struct Props {
-    pub hardcoded: bool,
-}
-
-pub struct UserSchemaTable {
-    common: CommonComponentParts<Self>,
-    attributes: Option<Vec<Attribute>>,
-}
-
-pub enum Msg {
-    ListAttributesResponse(Result<ResponseData>),
-    OnAttributeDeleted(String),
-    OnError(Error),
-}
-
-impl CommonComponent<UserSchemaTable> for UserSchemaTable {
-    fn handle_msg(&mut self, _: &Context<Self>, msg: <Self as Component>::Message) -> Result<bool> {
-        match msg {
-            Msg::ListAttributesResponse(schema) => {
-                self.attributes = Some(schema?.schema.user_schema.attributes.into_iter().collect());
-                Ok(true)
-            }
-            Msg::OnError(e) => Err(e),
-            Msg::OnAttributeDeleted(attribute_name) => {
-                match self.attributes {
-                    None => {
-                        log!(format!("Attribute {attribute_name} was  deleted but component has no attributes"));
-                        Err(anyhow!("invalid state"))
-                    }
-                    Some(_) => {
-                        self.attributes
-                            .as_mut()
-                            .unwrap()
-                            .retain(|a| a.name != attribute_name);
-                        Ok(true)
-                    }
-                }
-            }
-        }
-    }
-
-    fn mut_common(&mut self) -> &mut CommonComponentParts<Self> {
-        &mut self.common
-    }
-}
-
-impl Component for UserSchemaTable {
-    type Message = Msg;
-    type Properties = Props;
-
-    fn create(ctx: &Context<Self>) -> Self {
-        let mut table = UserSchemaTable {
-            common: CommonComponentParts::<Self>::create(),
-            attributes: None,
-        };
-        table.common.call_graphql::<GetUserAttributesSchema, _>(
-            ctx,
-            get_user_attributes_schema::Variables {},
-            Msg::ListAttributesResponse,
-            "Error trying to fetch user schema",
-        );
-        table
-    }
-
-    fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
-        CommonComponentParts::<Self>::update(self, ctx, msg)
-    }
-
-    fn view(&self, ctx: &Context<Self>) -> Html {
-        html! {
-            <div>
-              {self.view_attributes(ctx)}
-              {self.view_errors()}
-            </div>
-        }
-    }
-}
-
-impl UserSchemaTable {
-    fn view_attributes(&self, ctx: &Context<Self>) -> Html {
-        let hardcoded = ctx.props().hardcoded;
-        let make_table = |attributes: &Vec<Attribute>| {
-            html! {
-                <div class="table-responsive">
-                    <h3>{if hardcoded {"Hardcoded"} else {"User-defined"}}{" attributes"}</h3>
-                    <table class="table table-hover">
-                        <thead>
-                            <tr>
-                                <th>{"Attribute name"}</th>
-                                <th>{"Type"}</th>
-                                <th>{"Editable"}</th>
-                                <th>{"Visible"}</th>
-                                {if hardcoded {html!{}} else {html!{<th>{"Delete"}</th>}}}
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {attributes.iter().map(|u| self.view_attribute(ctx, u)).collect::<Vec<_>>()}
-                        </tbody>
-                    </table>
-                </div>
-            }
-        };
-        match &self.attributes {
-            None => html! {{"Loading..."}},
-            Some(attributes) => {
-                let mut attributes = attributes.clone();
-                attributes.retain(|attribute| attribute.is_hardcoded == ctx.props().hardcoded);
-                make_table(&attributes)
-            }
-        }
-    }
-
-    fn view_attribute(&self, ctx: &Context<Self>, attribute: &Attribute) -> Html {
-        let link = ctx.link();
-        let attribute_type = AttributeType::from(attribute.attribute_type.clone());
-        let checkmark = html! {
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check" viewBox="0 0 16 16">
-          <path d="M10.97 4.97a.75.75 0 0 1 1.07 1.05l-3.99 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425z"></path>
-        </svg>
-                };
-        let hardcoded = ctx.props().hardcoded;
-        html! {
-            <tr key={attribute.name.clone()}>
-                <td>{&attribute.name}</td>
-                <td>{if attribute.is_list { format!("List<{attribute_type}>")} else {attribute_type.to_string()}}</td>
-                <td>{if attribute.is_editable {checkmark.clone()} else {html!{}}}</td>
-                <td>{if attribute.is_visible {checkmark.clone()} else {html!{}}}</td>
-                {
-                    if hardcoded {
-                        html!{}
-                    } else {
-                        html!{
-                            <td>
-                                <DeleteUserAttribute
-                                    attribute_name={attribute.name.clone()}
-                                    on_attribute_deleted={link.callback(Msg::OnAttributeDeleted)}
-                                    on_error={link.callback(Msg::OnError)}/>
-                            </td>
-                        }
-                    }
-                }
-            </tr>
-        }
-    }
-
-    fn view_errors(&self) -> Html {
-        match &self.common.error {
-            None => html! {},
-            Some(e) => html! {<div>{"Error: "}{e.to_string()}</div>},
-        }
-    }
-}
-
-#[function_component(ListUserSchema)]
-pub fn list_user_schema() -> Html {
-    html! {
-        <div>
-            <UserSchemaTable hardcoded={true} />
-            <UserSchemaTable hardcoded={false} />
-            <Link classes="btn btn-primary" to={AppRoute::CreateUserAttribute}>
-                <i class="bi-plus-circle me-2"></i>
-                {"Create an attribute"}
-            </Link>
-        </div>
-    }
-}

app/src/infra/api.rs

@@ -1,6 +1,6 @@
 use super::cookies::set_cookie;
 use anyhow::{anyhow, Context, Result};
-use gloo_net::http::{Method, RequestBuilder};
+use gloo_net::http::{Method, Request};
 use graphql_client::GraphQLQuery;
 use lldap_auth::{login, registration, JWTClaims};
 
@@ -16,32 +16,25 @@ fn get_claims_from_jwt(jwt: &str) -> Result<JWTClaims> {
     Ok(token.claims().clone())
 }
 
-enum RequestType<Body: Serialize> {
+const NO_BODY: Option<()> = None;
-    Get,
-    Post(Body),
-}
-
-const GET_REQUEST: RequestType<()> = RequestType::Get;
 
 fn base_url() -> String {
     yew_router::utils::base_url().unwrap_or_default()
 }
 
-async fn call_server<Body: Serialize>(
+async fn call_server(
     url: &str,
-    body: RequestType<Body>,
+    body: Option<impl Serialize>,
     error_message: &'static str,
 ) -> Result<String> {
-    let request_builder = RequestBuilder::new(url)
+    let mut request = Request::new(url)
         .header("Content-Type", "application/json")
         .credentials(RequestCredentials::SameOrigin);
-    let request = if let RequestType::Post(b) = body {
+    if let Some(b) = body {
-        request_builder
+        request = request
-            .method(Method::POST)
+            .body(serde_json::to_string(&b)?)
-            .body(serde_json::to_string(&b)?)?
+            .method(Method::POST);
-    } else {
+    }
-        request_builder.build()?
-    };
     let response = request.send().await?;
     if response.ok() {
         Ok(response.text().await?)
@@ -58,7 +51,7 @@ async fn call_server<Body: Serialize>(
 
 async fn call_server_json_with_error_message<CallbackResult, Body: Serialize>(
     url: &str,
-    request: RequestType<Body>,
+    request: Option<Body>,
     error_message: &'static str,
 ) -> Result<CallbackResult>
 where
@@ -70,7 +63,7 @@ where
 
 async fn call_server_empty_response_with_error_message<Body: Serialize>(
     url: &str,
-    request: RequestType<Body>,
+    request: Option<Body>,
     error_message: &'static str,
 ) -> Result<()> {
     call_server(url, request, error_message).await.map(|_| ())
@@ -109,7 +102,7 @@ impl HostService {
         let request_body = QueryType::build_query(variables);
         call_server_json_with_error_message::<graphql_client::Response<_>, _>(
             &(base_url() + "/api/graphql"),
-            RequestType::Post(request_body),
+            Some(request_body),
             error_message,
         )
         .await
@@ -121,7 +114,7 @@ impl HostService {
     ) -> Result<Box<login::ServerLoginStartResponse>> {
         call_server_json_with_error_message(
             &(base_url() + "/auth/opaque/login/start"),
-            RequestType::Post(request),
+            Some(request),
             "Could not start authentication: ",
         )
         .await
@@ -130,7 +123,7 @@ impl HostService {
     pub async fn login_finish(request: login::ClientLoginFinishRequest) -> Result<(String, bool)> {
         call_server_json_with_error_message::<login::ServerLoginResponse, _>(
             &(base_url() + "/auth/opaque/login/finish"),
-            RequestType::Post(request),
+            Some(request),
             "Could not finish authentication",
         )
         .await
@@ -142,7 +135,7 @@ impl HostService {
     ) -> Result<Box<registration::ServerRegistrationStartResponse>> {
         call_server_json_with_error_message(
             &(base_url() + "/auth/opaque/register/start"),
-            RequestType::Post(request),
+            Some(request),
             "Could not start registration: ",
         )
         .await
@@ -153,7 +146,7 @@ impl HostService {
     ) -> Result<()> {
         call_server_empty_response_with_error_message(
             &(base_url() + "/auth/opaque/register/finish"),
-            RequestType::Post(request),
+            Some(request),
             "Could not finish registration",
         )
         .await
@@ -162,7 +155,7 @@ impl HostService {
     pub async fn refresh() -> Result<(String, bool)> {
         call_server_json_with_error_message::<login::ServerLoginResponse, _>(
             &(base_url() + "/auth/refresh"),
-            GET_REQUEST,
+            NO_BODY,
             "Could not start authentication: ",
         )
         .await
@@ -173,7 +166,7 @@ impl HostService {
     pub async fn logout() -> Result<()> {
         call_server_empty_response_with_error_message(
             &(base_url() + "/auth/logout"),
-            GET_REQUEST,
+            NO_BODY,
             "Could not logout",
         )
         .await
@@ -186,7 +179,7 @@ impl HostService {
                 base_url(),
                 url_escape::encode_query(&username)
             ),
-            RequestType::Post(""),
+            NO_BODY,
             "Could not initiate password reset",
         )
         .await
@@ -197,14 +190,14 @@ impl HostService {
     ) -> Result<lldap_auth::password_reset::ServerPasswordResetResponse> {
         call_server_json_with_error_message(
             &format!("{}/auth/reset/step2/{}", base_url(), token),
-            GET_REQUEST,
+            NO_BODY,
             "Could not validate token",
         )
         .await
     }
 
     pub async fn probe_password_reset() -> Result<bool> {
-        Ok(gloo_net::http::Request::post(
+        Ok(gloo_net::http::Request::get(
             &(base_url() + "/auth/reset/step1/lldap_unlikely_very_long_user_name"),
         )
         .header("Content-Type", "application/json")

app/src/infra/form_utils.rs

@@ -1,70 +0,0 @@
-use anyhow::{anyhow, ensure, Result};
-use validator::validate_email;
-use web_sys::{FormData, HtmlFormElement};
-use yew::NodeRef;
-
-#[derive(Debug)]
-pub struct AttributeValue {
-    pub name: String,
-    pub values: Vec<String>,
-}
-
-pub struct GraphQlAttributeSchema {
-    pub name: String,
-    pub is_list: bool,
-    pub is_readonly: bool,
-    pub is_editable: bool,
-}
-
-fn validate_attributes(
-    all_values: &[AttributeValue],
-    email_is_required: EmailIsRequired,
-) -> Result<()> {
-    let maybe_email_values = all_values.iter().find(|a| a.name == "mail");
-    if email_is_required.0 || maybe_email_values.is_some() {
-        let email_values = &maybe_email_values
-            .ok_or_else(|| anyhow!("Email is required"))?
-            .values;
-        ensure!(email_values.len() == 1, "Email is required");
-        ensure!(validate_email(&email_values[0]), "Email is not valid");
-    }
-    Ok(())
-}
-
-pub struct IsAdmin(pub bool);
-pub struct EmailIsRequired(pub bool);
-
-pub fn read_all_form_attributes(
-    schema: impl IntoIterator<Item = impl Into<GraphQlAttributeSchema>>,
-    form_ref: &NodeRef,
-    is_admin: IsAdmin,
-    email_is_required: EmailIsRequired,
-) -> Result<Vec<AttributeValue>> {
-    let form = form_ref.cast::<HtmlFormElement>().unwrap();
-    let form_data = FormData::new_with_form(&form)
-        .map_err(|e| anyhow!("Failed to get FormData: {:#?}", e.as_string()))?;
-    let all_values = schema
-        .into_iter()
-        .map(Into::<GraphQlAttributeSchema>::into)
-        .filter(|attr| !attr.is_readonly && (is_admin.0 || attr.is_editable))
-        .map(|attr| -> Result<AttributeValue> {
-            let val = form_data
-                .get_all(attr.name.as_str())
-                .iter()
-                .map(|js_val| js_val.as_string().unwrap_or_default())
-                .filter(|val| !val.is_empty())
-                .collect::<Vec<String>>();
-            ensure!(
-                val.len() <= 1 || attr.is_list,
-                "Multiple values supplied for non-list attribute {}",
-                attr.name
-            );
-            Ok(AttributeValue {
-                name: attr.name.clone(),
-                values: val,
-            })
-        })
-        .collect::<Result<Vec<_>>>()?;
-    validate_attributes(&all_values, email_is_required)?;
-    Ok(all_values)
-}

app/src/infra/functional.rs

@@ -1,59 +0,0 @@
-use crate::infra::api::HostService;
-use anyhow::Result;
-use graphql_client::GraphQLQuery;
-use wasm_bindgen_futures::spawn_local;
-use yew::{use_effect_with_deps, use_state_eq, UseStateHandle};
-
-// Enum to represent a result that is fetched asynchronously.
-#[derive(Debug)]
-pub enum LoadableResult<T> {
-    // The result is still being fetched
-    Loading,
-    // The async call is completed
-    Loaded(Result<T>),
-}
-
-impl<T: PartialEq> PartialEq for LoadableResult<T> {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (LoadableResult::Loading, LoadableResult::Loading) => true,
-            (LoadableResult::Loaded(Ok(d1)), LoadableResult::Loaded(Ok(d2))) => d1.eq(d2),
-            (LoadableResult::Loaded(Err(e1)), LoadableResult::Loaded(Err(e2))) => {
-                e1.to_string().eq(&e2.to_string())
-            }
-            _ => false,
-        }
-    }
-}
-
-pub fn use_graphql_call<QueryType>(
-    variables: QueryType::Variables,
-) -> UseStateHandle<LoadableResult<QueryType::ResponseData>>
-where
-    QueryType: GraphQLQuery + 'static,
-    <QueryType as graphql_client::GraphQLQuery>::Variables: std::cmp::PartialEq + Clone,
-    <QueryType as graphql_client::GraphQLQuery>::ResponseData: std::cmp::PartialEq,
-{
-    let loadable_result: UseStateHandle<LoadableResult<QueryType::ResponseData>> =
-        use_state_eq(|| LoadableResult::Loading);
-    {
-        let loadable_result = loadable_result.clone();
-        use_effect_with_deps(
-            move |variables| {
-                let task = HostService::graphql_query::<QueryType>(
-                    variables.clone(),
-                    "Failed graphql query",
-                );
-
-                spawn_local(async move {
-                    let response = task.await;
-                    loadable_result.set(LoadableResult::Loaded(response));
-                });
-
-                || ()
-            },
-            variables,
-        )
-    }
-    loadable_result.clone()
-}

app/src/infra/mod.rs

@@ -1,9 +1,5 @@
 pub mod api;
 pub mod common_component;
 pub mod cookies;
-pub mod form_utils;
-pub mod functional;
 pub mod graphql;
 pub mod modal;
-pub mod schema;
-pub mod tooltip;

app/src/infra/modal.rs

@@ -1,5 +1,3 @@
-#![allow(clippy::empty_docs)]
-
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]

app/src/infra/schema.rs

@@ -1,66 +0,0 @@
-use anyhow::Result;
-use std::{fmt::Display, str::FromStr};
-use validator::ValidationError;
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum AttributeType {
-    String,
-    Integer,
-    DateTime,
-    Jpeg,
-}
-
-impl Display for AttributeType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:?}", self)
-    }
-}
-
-impl FromStr for AttributeType {
-    type Err = ();
-    fn from_str(value: &str) -> Result<Self, Self::Err> {
-        match value {
-            "String" => Ok(AttributeType::String),
-            "Integer" => Ok(AttributeType::Integer),
-            "DateTime" => Ok(AttributeType::DateTime),
-            "Jpeg" => Ok(AttributeType::Jpeg),
-            _ => Err(()),
-        }
-    }
-}
-
-// Macro to generate traits for converting between AttributeType and the
-// graphql generated equivalents.
-#[macro_export]
-macro_rules! convert_attribute_type {
-    ($source_type:ty) => {
-        impl From<$source_type> for $crate::infra::schema::AttributeType {
-            fn from(value: $source_type) -> Self {
-                match value {
-                    <$source_type>::STRING => $crate::infra::schema::AttributeType::String,
-                    <$source_type>::INTEGER => $crate::infra::schema::AttributeType::Integer,
-                    <$source_type>::DATE_TIME => $crate::infra::schema::AttributeType::DateTime,
-                    <$source_type>::JPEG_PHOTO => $crate::infra::schema::AttributeType::Jpeg,
-                    _ => panic!("Unknown attribute type"),
-                }
-            }
-        }
-
-        impl From<$crate::infra::schema::AttributeType> for $source_type {
-            fn from(value: $crate::infra::schema::AttributeType) -> Self {
-                match value {
-                    $crate::infra::schema::AttributeType::String => <$source_type>::STRING,
-                    $crate::infra::schema::AttributeType::Integer => <$source_type>::INTEGER,
-                    $crate::infra::schema::AttributeType::DateTime => <$source_type>::DATE_TIME,
-                    $crate::infra::schema::AttributeType::Jpeg => <$source_type>::JPEG_PHOTO,
-                }
-            }
-        }
-    };
-}
-
-pub fn validate_attribute_type(attribute_type: &str) -> Result<(), ValidationError> {
-    AttributeType::from_str(attribute_type)
-        .map_err(|_| ValidationError::new("Invalid attribute type"))?;
-    Ok(())
-}

app/src/infra/tooltip.rs

@@ -1,12 +0,0 @@
-#![allow(clippy::empty_docs)]
-
-use wasm_bindgen::prelude::*;
-
-#[wasm_bindgen]
-extern "C" {
-    #[wasm_bindgen(js_namespace = bootstrap)]
-    pub type Tooltip;
-
-    #[wasm_bindgen(constructor, js_namespace = bootstrap)]
-    pub fn new(e: web_sys::Element) -> Tooltip;
-}

auth/Cargo.toml

@@ -6,7 +6,7 @@ homepage = "https://github.com/lldap/lldap"
 license = "GPL-3.0-only"
 name = "lldap_auth"
 repository = "https://github.com/lldap/lldap"
-version = "0.6.0"
+version = "0.4.0"
 
 [features]
 default = ["opaque_server", "opaque_client"]
@@ -25,20 +25,15 @@ serde = "*"
 sha2 = "0.9"
 thiserror = "*"
 
-[dependencies.derive_more]
-features = ["debug", "display"]
-default-features = false
-version = "1"
-
 [dependencies.opaque-ke]
-version = "0.7"
+version = "0.6"
 
 [dependencies.chrono]
 version = "*"
-features = ["serde"]
+features = [ "serde" ]
 
 [dependencies.sea-orm]
-version = "0.12"
+version= "0.12"
 default-features = false
 features = ["macros"]
 optional = true

auth/src/lib.rs

@@ -108,7 +108,7 @@ pub mod types {
     use serde::{Deserialize, Serialize};
 
     #[cfg(feature = "sea_orm")]
-    use sea_orm::{DbErr, DeriveValueType, TryFromU64, Value};
+    use sea_orm::{DbErr, DeriveValueType, QueryResult, TryFromU64, Value};
 
     #[derive(
         PartialEq, Eq, PartialOrd, Ord, Clone, Debug, Default, Hash, Serialize, Deserialize,
@@ -151,22 +151,10 @@ pub mod types {
     }
 
     #[derive(
-        PartialEq,
+        PartialEq, Eq, PartialOrd, Ord, Clone, Debug, Default, Hash, Serialize, Deserialize,
-        Eq,
-        PartialOrd,
-        Ord,
-        Clone,
-        Default,
-        Hash,
-        Serialize,
-        Deserialize,
-        derive_more::Debug,
-        derive_more::Display,
     )]
     #[cfg_attr(feature = "sea_orm", derive(DeriveValueType))]
     #[serde(from = "CaseInsensitiveString")]
-    #[debug(r#""{}""#, _0.as_str())]
-    #[display("{}", _0.as_str())]
     pub struct UserId(CaseInsensitiveString);
 
     impl UserId {
@@ -188,6 +176,11 @@ pub mod types {
             Self(s.into())
         }
     }
+    impl std::fmt::Display for UserId {
+        fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+            write!(f, "{}", self.0.as_str())
+        }
+    }
 
     #[cfg(feature = "sea_orm")]
     impl From<&UserId> for Value {

docs/architecture.md

@@ -14,14 +14,15 @@ Backend:
     is defined in `schema.graphql`.
   * The static frontend files are served by this port too.
 
-Note that HTTPS is currently not supported. This can be worked around by using
+Note that secure protocols (LDAPS, HTTPS) are currently not supported. This can
-a reverse proxy in front of the server (for the HTTP API) that wraps/unwraps
+be worked around by using a reverse proxy in front of the server (for the HTTP
-the HTTPS messages. LDAPS is supported.
+API) that wraps/unwraps the HTTPS messages, or only open the service to
+localhost or other trusted docker containers (for the LDAP API).
 
 Frontend:
 * User management UI.
 * Written in Rust compiled to WASM as an SPA with the Yew library.
-* Based on components, with a React-like framework.
+* Based on components, with a React-like organization.
 
 Data storage:
 * The data (users, groups, memberships, active JWTs, ...) is stored in SQL.
@@ -49,19 +50,19 @@ Data storage:
 Authentication is done via the OPAQUE protocol, meaning that the passwords are
 never sent to the server, but instead the client proves that they know the
 correct password (zero-knowledge proof). This is likely overkill, especially
-considered that the LDAP interface requires sending the password in cleartext
+considered that the LDAP interface requires sending the password to the server,
-to the server, but it's one less potential flaw (especially since the LDAP
+but it's one less potential flaw (especially since the LDAP interface can be
-interface can be restricted to an internal docker-only network while the web
+restricted to an internal docker-only network while the web app is exposed to
-app is exposed to the Internet).
+the Internet).
 
 OPAQUE's "passwords" (user-specific blobs of data that can only be used in a
 zero-knowledge proof that the password is correct) are hashed using Argon2, the
 state of the art in terms of password storage. They are hashed using a secret
-provided in the configuration (which can be given as environment variable,
+provided in the configuration (which can be given as environment variable or
-command line argument or a file as well): this should be kept secret and
+command line argument as well): this should be kept secret and shouldn't change
-shouldn't change (it would invalidate all passwords). Note that even if it was
+(it would invalidate all passwords). Note that even if it was compromised, the
-compromised, the attacker wouldn't be able to decrypt the passwords without
+attacker wouldn't be able to decrypt the passwords without running an expensive
-running an expensive brute-force search independently for each password.
+brute-force search independently for each password.
 
 ### JWTs and refresh tokens
 

example_configs/MegaRAC-SP-X-BMC.md

@@ -1,48 +0,0 @@
-# MegaRAC SP-X BMC IPMI LDAP Setup
-
-The MegaRAC SP-X BMC is a service processor firmware stack designed by American Megatrends Inc. (AMI), aimed at providing out-of-band management for servers and computing systems. 
-It's part of the MegaRAC family of management solutions, offering remote server management capabilities, including monitoring, control, and maintenance functionalities, independent of the operating system or system state. 
-This enables administrators to manage systems remotely for tasks such as updates, troubleshooting, and recovery.
-
-## Setting up LLDAP with MegaRAC SP-X BMC IPMI
-
-### Pre-requisites
-- Create and assign the `ipmi` group in LLDAP to a (test) user.
-- Bind User: It is recommended that you create a separate user account (e.g, `bind_user`) instead of admin for sharing Bind credentials with other services. The bind_user should be a member of the lldap_strict_readonly group to limit access to your LDAP configuration in LLDAP.
-- Bind Password: password of the user specified above
-
-### Configuration Steps
-
-1. **Navigate**: Go to `Settings > External User Settings > LDAP/E-Directory Settings > General Settings`.
-
-2. **General LDAP Settings**:
-    - **Encryption Type**: `SSL` (or No Encryption if preferred)
-    - **Common Name Type**: `FQDN` (or IP if you use a plain IP address to connect to lldap)
-    - **Server Address**: `fqdn.lldap.tld`
-    - **Port**: `6360` (default for SSL, adjust if necessary to default non ssl `3890`)
-
-3. **Authentication** (use read-only bind user):
-    - **Bind DN**: `uid=bind_user,ou=people,dc=example,dc=com`
-    - **Password**: `change_bind_user_password`
-
-4. **Search Configuration**:
-    - **Search Base**: `ou=people,dc=example,dc=com`
-    - **Attribute of User Login**: `uid`
-
-![General LDAP Settings](images/megarac_user.png)
-
-5. **Navigate**: Go to `Settings > External User Settings > LDAP/E-Directory Settings > Role groups`.
-
-6. **Click on empty role group in order to assign a new one**
-
-7. **Role Group - Group Details**:
-    - **Group Name**: `ipmi`
-    - **Group Domain**: `cn=ipmi,ou=groups,dc=example,dc=com`
-    - **Group Privilege**: `Administrator`
-
-8. **Group Permissions**:
-    - KVM Access: Enabled (adjust as needed)
-    - VMedia Access: Enabled (adjust as needed)
-
-![Role Groups](images/megarac_group.png)
-

example_configs/authelia_config.yml

@@ -15,7 +15,7 @@ authentication_backend:
     implementation: custom
     # Pattern is ldap://HOSTNAME-OR-IP:PORT
     # Normal ldap port is 389, standard in LLDAP is 3890
-    address: ldap://lldap:3890
+    url: ldap://lldap:3890
     # The dial timeout for LDAP.
     timeout: 5s
     # Use StartTLS with the LDAP connection, TLS not supported right now
@@ -25,6 +25,7 @@ authentication_backend:
     #  minimum_version: TLS1.2
     # Set base dn, like dc=google,dc.com
     base_dn: dc=example,dc=com
+    username_attribute: uid
     # You need to set this to ou=people, because all users are stored in this ou!
     additional_users_dn: ou=people
     # To allow sign in both with username and email, one can use a filter like
@@ -35,17 +36,13 @@ authentication_backend:
     # The groups are not displayed in the UI, but this filter works.
     groups_filter: "(member={dn})"
     # The attribute holding the name of the group.
-    attributes:
+    group_name_attribute: cn
-      display_name: displayName
+    # Email attribute
-      username: uid
+    mail_attribute: mail
-      group_name: cn
+    # The attribute holding the display name of the user. This will be used to greet an authenticated user.
-      mail: mail
+    display_name_attribute: displayName
-      # distinguished_name: distinguishedName
+    # The username and password of the admin user.
-      # member_of: memberOf
+    # "admin" should be the admin username you set in the LLDAP configuration
-
+    user: uid=admin,ou=people,dc=example,dc=com
-    # The username and password of the bind user.
-    # "bind_user" should be the username you created for authentication with the "lldap_strict_readonly" permission. It is not recommended to use an actual admin account here.
-    # If you are configuring Authelia to change user passwords, then the account used here needs the "lldap_password_manager" permission instead.
-    user: uid=bind_user,ou=people,dc=example,dc=com
     # Password can also be set using a secret: https://www.authelia.com/docs/configuration/secrets.html
     password: 'REPLACE_ME'

example_configs/bootstrap/bootstrap.md

@@ -1,4 +1,4 @@
-# Bootstrapping lldap using [bootstrap.sh](/scripts/bootstrap.sh) script
+# Bootstrapping lldap using [bootstrap.sh](bootstrap.sh) script
 
 bootstrap.sh allows managing your lldap in a git-ops, declarative way using JSON config files.
 
@@ -12,7 +12,7 @@ The script can:
 * create groups
 * delete redundant users and groups (when `DO_CLEANUP` env var is true)
 * maintain the desired state described in JSON config files
-* create user/group user-defined attributes
+
 
 ![](bootstrap-example-log-1.jpeg)
 
@@ -27,13 +27,11 @@ The script can:
 
 ## Environment variables
 
-- `LLDAP_URL` or `LLDAP_URL_FILE` (default value: `http://localhost:17170`) - URL to your lldap instance or path to file that contains URL
+- `LLDAP_URL` or `LLDAP_URL_FILE` - URL to your lldap instance or path to file that contains URL (**MANDATORY**)
-- `LLDAP_ADMIN_USERNAME` or `LLDAP_ADMIN_USERNAME_FILE` (default value: `admin`) - admin username or path to file that contains username
+- `LLDAP_ADMIN_USERNAME` or `LLDAP_ADMIN_USERNAME_FILE` - admin username or path to file that contains username (**MANDATORY**)
-- `LLDAP_ADMIN_PASSWORD` or `LLDAP_ADMIN_PASSWORD_FILE` (default value: `password`) - admin password or path to file that contains password
+- `LLDAP_ADMIN_PASSWORD` or `LLDAP_ADMIN_PASSWORD_FILE` - admin password or path to file that contains password (**MANDATORY**)
-- `USER_CONFIGS_DIR` (default value: `/bootstrap/user-configs`) - directory where the user JSON configs could be found
+- `USER_CONFIGS_DIR` (default value: `/user-configs`) - directory where the user JSON configs could be found
-- `GROUP_CONFIGS_DIR` (default value: `/bootstrap/group-configs`) - directory where the group JSON configs could be found
+- `GROUP_CONFIGS_DIR` (default value: `/group-configs`) - directory where the group JSON configs could be found
-- `USER_SCHEMAS_DIR` (default value: `/bootstrap/user-schemas`) - directory where the user schema JSON configs could be found
-- `GROUP_SCHEMAS_DIR` (default value: `/bootstrap/group-schemas`) - directory where the group schema JSON configs could be found
 - `LLDAP_SET_PASSWORD_PATH` - path to the `lldap_set_password` utility (default value: `/app/lldap_set_password`)
 - `DO_CLEANUP` (default value: `false`) - delete groups and users not specified in config files, also remove users from groups that they do not belong to
 
@@ -98,44 +96,6 @@ Fields description:
 
 ```
 
-### User and group schema config file example
-
-User and group schema have the same structure.
-
-Fields description:
-
-* `name`: name of field, case insensitve - you should use lowercase
-* `attributeType`: `STRING` / `INTEGER` / `JPEG` / `DATE_TIME`
-* `isList`: single on multiple value field
-* `isEditable`: self-explanatory
-* `isVisible`: self-explanatory
-
-```json
-[
-  {
-    "name": "uid",
-    "attributeType": "INTEGER",
-    "isEditable": false,
-    "isList": false,
-    "isVisible": true
-  },
-  {
-    "name": "mailbox",
-    "attributeType": "STRING",
-    "isEditable": false,
-    "isList": false,
-    "isVisible": true
-  },
-  {
-    "name": "mail_alias",
-    "attributeType": "STRING",
-    "isEditable": false,
-    "isList": true,
-    "isVisible": true
-  }
-]
-```
-
 ## Usage example
 
 ### Manually
@@ -150,21 +110,11 @@ export LLDAP_ADMIN_USERNAME=admin
 export LLDAP_ADMIN_PASSWORD=changeme
 export USER_CONFIGS_DIR="$(realpath ./configs/user)"
 export GROUP_CONFIGS_DIR="$(realpath ./configs/group)"
-export USER_SCHEMAS_DIR="$(realpath ./configs/user-schema)"
-export GROUP_SCHEMAS_DIR="$(realpath ./configs/group-schema)"
 export LLDAP_SET_PASSWORD_PATH="$(realpath ./lldap_set_password)"
 export DO_CLEANUP=false
 ./bootstrap.sh
 ```
 
-### Manually from running docker container or service
-
-After setting a docker container you can bootstrap users using:
-
-```
-docker exec -e LLDAP_ADMIN_PASSWORD_FILE=password -v ./bootstrap:/bootstrap -it $(docker ps --filter name=lldap -q) /app/bootstrap.sh
-```
-
 ### Docker compose
 
 Let's suppose you have the next file structure:
@@ -179,17 +129,10 @@ Let's suppose you have the next file structure:
    │  ├─ ...
    │  └─ user-n.json
    └─ group-configs
-   |  ├─ group-1.json
+      ├─ group-1.json
-   |  ├─ ...
-   |  └─ group-n.json
-   └─ user-schemas
-   |  ├─ user-attrs-1.json
-   |  ├─ ...
-   |  └─ user-attrs-n.json
-   └─ group-schemas
-      ├─ group-attrs-1.json
       ├─ ...
-      └─ group-attrs-n.json
+      └─ group-n.json
+   
 ```
 
 You should mount `bootstrap` dir to lldap container and set the corresponding `env` variables:
@@ -217,8 +160,6 @@ services:
       - LLDAP_ADMIN_PASSWORD=changeme # same as LLDAP_LDAP_USER_PASS
       - USER_CONFIGS_DIR=/bootstrap/user-configs
       - GROUP_CONFIGS_DIR=/bootstrap/group-configs
-      - USER_SCHEMAS_DIR=/bootstrap/user-schemas
-      - GROUP_SCHEMAS_DIR=/bootstrap/group-schemas
       - DO_CLEANUP=false
 ```
 
@@ -264,15 +205,14 @@ spec:
           volumeMounts:
             - name: bootstrap
               mountPath: /bootstrap/bootstrap.sh
-              readOnly: true
               subPath: bootstrap.sh
 
             - name: user-configs
-              mountPath: /bootstrap/user-configs
+              mountPath: /user-configs
               readOnly: true
 
             - name: group-configs
-              mountPath: /bootstrap/group-configs
+              mountPath: /group-configs
               readOnly: true
 
       volumes:

example_configs/bootstrap/bootstrap.sh

@@ -3,24 +3,14 @@
 set -e
 set -o pipefail
 
-LLDAP_URL="${LLDAP_URL:-http://localhost:17170}"
+LLDAP_URL="${LLDAP_URL}"
-LLDAP_ADMIN_USERNAME="${LLDAP_ADMIN_USERNAME:-admin}"
+LLDAP_ADMIN_USERNAME="${LLDAP_ADMIN_USERNAME}"
-LLDAP_ADMIN_PASSWORD="${LLDAP_ADMIN_PASSWORD:-password}"
+LLDAP_ADMIN_PASSWORD="${LLDAP_ADMIN_PASSWORD}"
-USER_SCHEMAS_DIR="${USER_SCHEMAS_DIR:-/bootstrap/user-schemas}"
+USER_CONFIGS_DIR="${USER_CONFIGS_DIR:-/user-configs}"
-GROUP_SCHEMAS_DIR="${GROUP_SCHEMAS_DIR:-/bootstrap/group-schemas}"
+GROUP_CONFIGS_DIR="${GROUP_CONFIGS_DIR:-/group-configs}"
-USER_CONFIGS_DIR="${USER_CONFIGS_DIR:-/bootstrap/user-configs}"
-GROUP_CONFIGS_DIR="${GROUP_CONFIGS_DIR:-/bootstrap/group-configs}"
 LLDAP_SET_PASSWORD_PATH="${LLDAP_SET_PASSWORD_PATH:-/app/lldap_set_password}"
 DO_CLEANUP="${DO_CLEANUP:-false}"
 
-# Fallback to support legacy defaults
-if [[ ! -d $USER_CONFIGS_DIR ]] && [[ -d "/user-configs" ]]; then
-  USER_CONFIGS_DIR="/user-configs"
-fi
-if [[ ! -d $GROUP_CONFIGS_DIR ]] && [[ -d "/group-configs" ]]; then
-  GROUP_CONFIGS_DIR="/group-configs"
-fi
-
 check_install_dependencies() {
   local commands=('curl' 'jq' 'jo')
   local commands_not_found='false'
@@ -262,7 +252,7 @@ get_users_list() {
 }
 
 user_exists() {
-  if [[ "$(get_users_list | jq --raw-output --arg id "$1" '.data.users | any(.[]; .id == $id)')" == 'true' ]]; then
+  if [[ "$(get_users_list | jq --raw-output --arg id "$1" '.data.users | any(.[]; contains({"id": $id}))')" == 'true' ]]; then
     return 0
   else
     return 1
@@ -290,80 +280,6 @@ delete_user() {
   fi
 }
 
-get_group_property_list() {
-  local query='{"query":"query GetGroupAttributesSchema { schema { groupSchema { attributes { name }}}}","operationName":"GetGroupAttributesSchema"}'
-  make_query <(printf '%s' "$query") <(printf '{}')
-}
-group_property_exists() {
-  if [[ "$(get_group_property_list | jq --raw-output --arg name "$1" '.data.schema.groupSchema.attributes | any(.[]; select(.name == $name))')" == 'true' ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-create_group_schema_property() {
-  local name="$1"
-  local attributeType="$2"
-  local isEditable="$3"
-  local isList="$4"
-  local isVisible="$5"
-
-  if group_property_exists "$name"; then
-    printf 'Group property "%s" already exists\n' "$name"
-    return
-  fi
-
-  # shellcheck disable=SC2016
-  local query='{"query":"mutation CreateGroupAttribute($name: String!, $attributeType: AttributeType!, $isList: Boolean!, $isVisible: Boolean!, $isEditable: Boolean!) {addGroupAttribute(name: $name, attributeType: $attributeType, isList: $isList, isVisible: $isVisible, isEditable: $isEditable) {ok}}","operationName":"CreateGroupAttribute"}'
-
-  local response='' error=''
-  response="$(make_query <(printf '%s' "$query") <(jo -- name="$name" attributeType="$attributeType" isEditable="$isEditable" isList="$isList" isVisible="$isVisible"))"
-  error="$(printf '%s' "$response" | jq --raw-output '.errors | if . != null then .[].message else empty end')"
-  if [[ -n "$error" ]]; then
-    printf '%s\n' "$error"
-  else
-    printf 'Group attribute "%s" successfully created\n' "$name"
-  fi
-}
-
-get_user_property_list() {
-  local query='{"query":"query GetUserAttributesSchema { schema { userSchema { attributes { name }}}}","operationName":"GetUserAttributesSchema"}'
-  make_query <(printf '%s' "$query") <(printf '{}')
-}
-user_property_exists() {
-  if [[ "$(get_user_property_list | jq --raw-output --arg name "$1" '.data.schema.userSchema.attributes | any(.[]; select(.name == $name))')" == 'true' ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-create_user_schema_property() {
-  local name="$1"
-  local attributeType="$2"
-  local isEditable="$3"
-  local isList="$4"
-  local isVisible="$5"
-
-  if user_property_exists "$name"; then
-    printf 'User property "%s" already exists\n' "$name"
-    return
-  fi
-
-  # shellcheck disable=SC2016
-  local query='{"query":"mutation CreateUserAttribute($name: String!, $attributeType: AttributeType!, $isList: Boolean!, $isVisible: Boolean!, $isEditable: Boolean!) {addUserAttribute(name: $name, attributeType: $attributeType, isList: $isList, isVisible: $isVisible, isEditable: $isEditable) {ok}}","operationName":"CreateUserAttribute"}'
-
-  local response='' error=''
-  response="$(make_query <(printf '%s' "$query") <(jo -- name="$name" attributeType="$attributeType" isEditable="$isEditable" isList="$isList" isVisible="$isVisible"))"
-  error="$(printf '%s' "$response" | jq --raw-output '.errors | if . != null then .[].message else empty end')"
-  if [[ -n "$error" ]]; then
-    printf '%s\n' "$error"
-  else
-    printf 'User attribute "%s" successfully created\n' "$name"
-  fi
-}
-
 __common_user_mutation_query() {
   local \
     query="$1" \
@@ -471,18 +387,8 @@ main() {
 
   local user_config_files=("${USER_CONFIGS_DIR}"/*.json)
   local group_config_files=("${GROUP_CONFIGS_DIR}"/*.json)
-  local user_schema_files=()
-  local group_schema_files=()
 
-  local file=''
+  if ! check_configs_validity "${group_config_files[@]}" "${user_config_files[@]}"; then
-  [[ -d "$USER_SCHEMAS_DIR" ]] && for file in "${USER_SCHEMAS_DIR}"/*.json; do
-    user_schema_files+=("$file")
-  done
-  [[ -d "$GROUP_SCHEMAS_DIR" ]] && for file in "${GROUP_SCHEMAS_DIR}"/*.json; do
-    group_schema_files+=("$file")
-  done
-
-  if ! check_configs_validity "${group_config_files[@]}" "${user_config_files[@]}" "${group_schema_files[@]}" "${user_schema_files[@]}"; then
     exit 1
   fi
 
@@ -493,28 +399,6 @@ main() {
 
   auth "$LLDAP_URL" "$LLDAP_ADMIN_USERNAME" "$LLDAP_ADMIN_PASSWORD"
 
-  printf -- '\n--- group schemas ---\n'
-  local group_schema_config_row=''
-  [[ ${#group_schema_files[@]} -gt 0 ]] && while read -r group_schema_config_row; do
-    local field='' name='' attributeType='' isEditable='' isList='' isVisible=''
-    for field in 'name' 'attributeType' 'isEditable' 'isList' 'isVisible'; do
-      declare "$field"="$(printf '%s' "$group_schema_config_row" | jq --raw-output --arg field "$field" '.[$field]')"
-    done
-    create_group_schema_property "$name" "$attributeType" "$isEditable" "$isList" "$isVisible"
-  done < <(jq --compact-output '.[]' -- "${group_schema_files[@]}")
-  printf -- '--- group schemas ---\n'
-
-  printf -- '\n--- user schemas ---\n'
-  local user_schema_config_row=''
-  [[ ${#user_schema_files[@]} -gt 0 ]] && while read -r user_schema_config_row; do
-    local field='' name='' attributeType='' isEditable='' isList='' isVisible=''
-    for field in 'name' 'attributeType' 'isEditable' 'isList' 'isVisible'; do
-      declare "$field"="$(printf '%s' "$user_schema_config_row" | jq --raw-output --arg field "$field" '.[$field]')"
-    done
-    create_user_schema_property "$name" "$attributeType" "$isEditable" "$isList" "$isVisible"
-  done < <(jq --compact-output '.[]' -- "${user_schema_files[@]}")
-  printf -- '--- user schemas ---\n'
-
   local redundant_groups=''
   redundant_groups="$(get_group_list | jq '[ .data.groups[].displayName ]' | jq --compact-output '. - ["lldap_admin","lldap_password_manager","lldap_strict_readonly"]')"
 

example_configs/carpal.md

@@ -1,59 +0,0 @@
-# Configuration for Carpal
-
-[Carpal](https://github.com/peeley/carpal) is a small, configurable
-[WebFinger](https://webfinger.net) server than can pull resource information
-from LDAP directories.
-
-There are two files used to configure Carpal for LDAP:
-
-- The YAML configuration file for Carpal itself
-- A Go template file for injecting the LDAP data into the WebFinger response
-
-### YAML File
-
-Replace the server URL, admin credentials, and domain for your server:
-
-```yaml
-# /etc/carpal/config.yml
-
-driver: ldap
-ldap:
-  url: ldap://myldapserver
-  bind_user: uid=myadmin,ou=people,dc=foobar,dc=com
-  bind_pass: myadminpassword
-  basedn: ou=people,dc=foobar,dc=com
-  filter: (uid=*)
-  user_attr: uid
-  attributes:
-    - uid
-    - mail
-    - cn
-  template: /etc/carpal/ldap.gotempl
-```
-
-If you have configured any user-defined attributes on your users, you can also
-add those to the `attributes` field.
-
-### Go Template File
-
-This is an example template; the template file is intended to be editable for
-your needs. If your users, for example, don't have Mastodon profiles, you can
-delete the Mastodon alias.
-
-```gotempl
-# /etc/carpal/ldap.gotempl
-
-aliases:
-  - "mailto:{{ index . "mail" }}"
-  - "https://mastodon/{{ index . "uid" }}"
-properties:
-  'http://webfinger.example/ns/name': '{{ index . "cn" }}'
-links:
-  - rel: "http://webfinger.example/rel/profile-page"
-    href: "https://www.example.com/~{{ index . "uid" }}/"
-```
-
-This example also only contains the default attributes present on all LLDAP
-users. If you have added custom user-defined attributes to your users and added
-them to the `attributes` field of the YAML config file, you can use them in
-this template file.

example_configs/dex_config.yml

@@ -10,7 +10,8 @@ connectors:
     id: ldap
     name: LDAP
     config:
-      host: lldap-host:3890 # or 6360 if you have ldaps enabled, make sure it does not start with `ldap://`
+      host: lldap-host # make sure it does not start with `ldap://`
+      port: 3890 # or 6360 if you have ldaps enabled
       insecureNoSSL: true # or false if you have ldaps enabled
       insecureSkipVerify: true # or false if you have ldaps enabled
       bindDN: uid=admin,ou=people,dc=example,dc=com # replace admin with your admin user

example_configs/dokuwiki.md

@@ -9,7 +9,7 @@ $conf['authtype']       = 'authldap';  //enable this Auth plugin
 $conf['superuser'] = 'admin';
 $conf['plugin']['authldap']['server']      = 'ldap://lldap_server:3890'; #IP of your lldap
 $conf['plugin']['authldap']['usertree']    = 'ou=people,dc=example,dc=com';
-$conf['plugin']['authldap']['grouptree']   = 'ou=groups,dc=example,dc=com';
+$conf['plugin']['authldap']['grouptree']   = 'ou=groups, dc=example, dc=com';
 $conf['plugin']['authldap']['userfilter']  = '(&(uid=%{user})(objectClass=person))';
 $conf['plugin']['authldap']['groupfilter'] = '(&(member=%{dn})(objectClass=groupOfUniqueNames))';
 $conf['plugin']['authldap']['attributes']  = array('cn', 'displayname', 'mail', 'givenname', 'objectclass', 'sn', 'uid', 'memberof');
@@ -24,11 +24,3 @@ All you need to do is to activate the plugin. This can be done on the DokuWiki E
 Once the LDAP settings are defined, proceed to define the default authentication method.
 Navigate to Table of Contents > DokuWiki > Authentication.
 On the Authentication backend, select ```authldap``` and save the changes.
-
-## Internal (or other authentication) fallback
-If you dont want to use LDAP authentication exclusively, you can install the [authchained plugin](https://www.dokuwiki.org/plugin:authchained). It tries multiple auth backends when a user logs in.
-
-```
-$conf['authtype'] = 'authchained';
-$conf['plugin']['authchained']['authtypes'] = 'authldap:authplain';
-```

example_configs/freebsd/freebsd-install.md

@@ -1,18 +0,0 @@
-Extract lldap's [FreeBSD tar.gz](https://github.com/n-connect/rustd-hbbx/blob/main/x86_64-freebsd_lldap-0.5.1.tar.gz) under /usr/local/:
-
-`tar -xvf x86_64-freebsd_lldap-0.5.1.tar.gz -C /usr/local/`
-
-Move rc.d script into the right place:
-`mv /usr/local/lldap_server/rc.d_lldap /usr/local/etc/rc.d/lldap`
-
-Make your config, if your want to enable LDAPS, copy your server key and certification files, and set the owneship (currently www):
-
-`cp /usr/local/lldap_server/lldap_config.docker_template.toml /usr/local/lldap_server/lldap_config..toml`
-
-Enable lldap service in /etc/rc.conf:
-
-`sysrc lldap_enable="YES"`
-
-Start your service:
-
-`service lldap start`

example_configs/freebsd/rc.d_lldap

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: lldap
-# REQUIRE: DAEMON NETWORKING
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable lldap:
-# lldap_enable : set to "YES" to enable the daemon, default is "NO"
-
-. /etc/rc.subr
-
-name=lldap
-rcvar=lldap_enable
-
-lldap_chdir="/usr/local/lldap_server"
-
-load_rc_config $name
-
-lldap_enable=${lldap_enable:-"NO"}
-
-logfile="/var/log/${name}.log"
-
-procname=/usr/local/lldap_server/lldap
-command="/usr/sbin/daemon"
-command_args="-u www -o ${logfile} -t ${name} /usr/local/lldap_server/lldap run"
-
-run_rc_command "$1"

example_configs/grafana_ldap_config.toml

@@ -20,7 +20,7 @@ ssl_skip_verify = false
 # client_key = "/path/to/client.key"
 
 # Search user bind dn
-bind_dn = "uid=<your grafana user>,ou=people,dc=example,dc=com"
+bind_dn = "uid=<your grafana user>,ou=people,dc=example,dc=org"
 # Search user bind password
 # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
 bind_password = "<grafana user password>"
@@ -31,7 +31,7 @@ search_filter = "(uid=%s)"
 # search_filter = "(&(uid=%s)(memberOf=cn=<your group>,ou=groups,dc=example,dc=org))"
 
 # An array of base dns to search through
-search_base_dns = ["dc=example,dc=com"]
+search_base_dns = ["dc=example,dc=org"]
 
 # Specify names of the LDAP attributes your LDAP uses
 [servers.attributes]

example_configs/harbor.md

@@ -1,31 +0,0 @@
-[Harbor](https://goharbor.io) is a CNCF cloud native container registry for kubernetes. 
-
-You can pass environment variables into ``harbor-core`` for auth configuration as documented [here](https://github.com/goharbor/website/blob/release-2.10.0/docs/install-config/configure-system-settings-cli.md#harbor-configuration-items).
-
-Configure ``ldap_url`` and ``ldap_verify_cert`` as needed for your installation.
-
-Using the [harbor-helm](https://github.com/goharbor/harbor-helm) chart, these vars can be passed in under ``core.configureUserSettings`` as a JSON string:
-
-```yaml
-core:
-  configureUserSettings: |
-    {
-      "auth_mode": "ldap_auth",
-      "ldap_url": "ldaps://lldap.example.com",
-      "ldap_base_dn": "ou=people,dc=example,dc=com",
-      "ldap_search_dn": "uid=bind,ou=people,dc=example,dc=com",
-      "ldap_search_password": "very-secure-password",
-      "ldap_group_base_dn": "ou=groups,dc=example,dc=com",
-      "ldap_group_admin_dn": "cn=harbor-admin-group,ou=groups,dc=example,dc=com",
-      "ldap_group_search_filter": "(objectClass=groupOfUniqueNames)",
-      "ldap_group_attribute_name": "uid"
-    }
-```
-
-> [!IMPORTANT]  
-> ``ldap_search_dn`` needs to be able to bind and search. The ``lldap_strict_readonly`` group is sufficient.
-
-> [!NOTE]  
-> Members of the ``ldap_group_admin_dn`` group will receive harbor admin privledges.
-> Users outside this group will have their ldap group(s) imported into harbor (under "groups" with type "ldap").
-> These groups can be used for permissions assigned to a harbor "project".

example_configs/hashicorp-vault.md

@@ -1,77 +0,0 @@
-# Configuration for HashiCorp Vault
-
-Official LDAP configuration documentation is located [here](https://developer.hashicorp.com/vault/docs/auth/ldap).
-
-**You'll need to authenticate using your root token or as a user who has permission to modify authentication methods!**
-
-## User Interface
-
-1. Navigate to `Access -> Authentication Methods`
-2. Click `Enable new method +` in the top right and choose `LDAP` under `Infra`
-3. Name the path whatever you want (preferably keep it default) and click `Enable method` at the bottom
-
-* URL: `ldap://lldap.example.com:3890` or `ldaps://lldap.example.com:6360`
-* LDAP Options
-    * If you're using LDAPS and your server does not have your LDAPS certificate installed check `Insecure TLS` otherwise leave this unchecked
-    * User Attribute: `uid`
-    * User Principal (UPN) Domain: **LEAVE THIS BLANK**
-* Customize User Search
-    * Name of Object to bind (binddn): `cn=admin,ou=people,dc=example,dc=com`
-    * User DN: `ou=people,dc=example,dc=com`
-    * Bindpass: `ChangeMe!`
-    * User Search Filter: `(&(uid={{.Username}})(objectClass=person))`
-* Customize Group Member Search
-    * Group Filter: `(&(member={{.UserDN}})(objectclass=groupOfUniqueNames))`
-    * Group Attribute: `cn`
-    * Group DN: `ou=groups,dc=example,dc=com`
-
-4. Click `Save` at the bottom
-5. Click into the auth menthod and then `Create group +` under the `Groups` tab
-6. Set the name as the group you want users to have to authenticate to HashiCorp Vault
-7. Set policy as `default` or whatever policy you want to tie to this group
-8. Click `Save` at the bottom
-
-As long as your user is in the group you specified, you should now be able to select `LDAP` from the dropdown on the login page and use your credentials.
-
-## CLI
-
-**This requires the vault CLI to be installed on your machine**
-
-1. Set VAULT_ADDR environment variable 
-    
-    ```bash
-    export VAULT_ADDR=https://vault.example.com
-    ```
-2. Login to vault and provide token when prompted
-
-    ```bash
-    vault login
-    ````
-3. Enable the LDAP authentication method
-
-    ```bash
-    vault auth enable ldap
-    ```
-4. Configure the LDAP authentication method
-
-    ```bash
-    vault write auth/ldap/config \
-    url="ldaps://lldaps.example.com:6360" \
-    binddn="cn=admin,ou=people,dc=example,dc=com" \
-    bindpass="ChangeMe!" \
-    userdn="ou=people,dc=example,dc=com" \
-    userfilter="(&(uid={{.Username}})(objectClass=person))" \
-    groupdn="ou=groups,dc=example,dc=com" \
-    groupfilter="(&(member={{.UserDN}})(objectclass=groupOfUniqueNames))" \
-    userattr="uid" \
-    groupattr="cn" \
-    discoverdn=false
-    ```
-    If you are using plain LDAP, change the URL accordingly. If you're using LDAPS and your server does not have your LDAPS certificate installed append `insecure_tls=true` to the bottom of the command.
-5.  Add your group to the LDAP configuration and set the policy
-    
-    ```bash
-    vault write auth/ldap/groups/vault_users policies=default
-    ```
-
-As long as your user is in the group you specified, you should now be able to select `LDAP` from the dropdown on the login page and use your credentials.

example_configs/jellyfin.md

@@ -1,12 +1,10 @@
 # Configuration for Jellyfin
 
-Replace all instances of `dc=example,dc=com` with your LLDAP configured domain.
+Replace `dc=example,dc=com` with your LLDAP configured domain.
 
-## LDAP Server Settings
 ### LDAP Bind User
-Create an ldap user for Jellyfin to run search queries (and optionally reset passwords). For example `jellyfin_bind_user`
 ```
-uid=jellyfin_bind_user,ou=people,dc=example,dc=com
+uid=admin,ou=people,dc=example,dc=com
 ```
 
 ### LDAP Base DN for searches
@@ -14,30 +12,31 @@ uid=jellyfin_bind_user,ou=people,dc=example,dc=com
 ou=people,dc=example,dc=com
 ```
 
-## LDAP User Settings
+### LDAP Attributes
-### LDAP Search Filter
+
-If you have a `media` group, you can use:
-```
-(memberof=cn=media,ou=groups,dc=example,dc=com)
-```
-Otherwise, just use:
-```
-(uid=*)
-```
-### LDAP Search Attributes
 ```
 uid, mail
 ```
-### LDAP Uid Attribute
+
-```
+### LDAP Name Attribute
-uid
+
-```
-### LDAP Username Attribute
 ```
 uid
 ```
 
-### LDAP Admin Base DN
+### User Filter
+
+If you have a `media` group, you can use:
+```
+(memberof=cn=media,ou=groups,dc=example,dc=com)
+```
+
+Otherwise, just use:
+```
+(uid=*)
+```
+### Admin Base DN
+
 The DN to search for your admins.
 ```
 ou=people,dc=example,dc=com

example_configs/keycloak.md

@@ -69,4 +69,4 @@ Since Keycloak and LLDAP use different attributes for different parts of a user'
 
 Go back to "User Federation", edit your LDAP integration and click on the "Mappers" tab.
 
-Find or create the "first name" mapper (it should have type `user-attribute-ldap-mapper`) and ensure the "LDAP Attribute" setting is set to `givenName`. Keycloak may have defaulted to `cn` which LLDAP uses for the "Display Name" of a user.
+Find or create the "first name" mapper (it should have type `user-attribute-ldap-mapper`) and ensure the "LDAP Attribute" setting is set to `givenname`. Keycloak may have defaulted to `cn` which LLDAP uses for the "Display Name" of a user.

example_configs/kimai.yaml

@@ -1,36 +0,0 @@
-# See https://www.kimai.org/documentation/local-yaml.html
-# this file should be renamed local.yaml
-kimai:
-  ldap:
-    activate: true
-    connection:
-      host: lldap
-      port: 3890       # 6360 for LDAPS
-      useSsl: false    # true for LDAPS
-      useStartTls: false
-      username: uid=admin,ou=people,dc=example,dc=com
-      password: <PASSWORD_HERE>
-      accountFilterFormat: (&(objectClass=person)(uid=%s))
-      bindRequiresDn: true
-      optReferrals: false
-
-    user:
-      baseDn: ou=people, dc=example, dc=com
-      usernameAttribute: uid
-      filter: (&(objectClass=person))   # to filter by group, add (memberof=cn=kimai,ou=groups,dc=example,dc=com) [group 'kimai' must be created in web UI]
-      attributes:
-        - { ldap_attr: "uid", user_method: setUserIdentifier }
-        - { ldap_attr: "mail", user_method: setEmail }
-        - { ldap_attr: "cn", user_method: setAlias }
-
-    role:
-      baseDn: ou=groups, dc=example, dc=com
-      filter: (&(objectClass=groupOfUniqueNames))
-      usernameAttribute: cn
-      nameAttribute: cn
-      userDnAttribute: member
-
-      # Convert LDAP group name (nameAttribute) to Kimai role. Available roles are listed here: https://www.kimai.org/documentation/permissions.html
-      groups:
-        - { ldap_value: lldap_admin, role: ROLE_SUPER_ADMIN }
-        # add additional group mappings here

example_configs/maddy.md

@@ -1,83 +0,0 @@
-# Configuration for Maddy Mail Server
-
-Documentation for maddy LDAP can be found [here](https://maddy.email/reference/auth/ldap/).  
-Maddy will automatically create an imap-acct if a new user connects via LDAP.  
-Replace `dc=example,dc=com` with your LLDAP configured domain.
-
-
-## Simple Setup
-Depending on the mail client(s) the simple setup can work for you. However, if this does not work for you, follow the instructions in the `Advanced Setup` section.
-
-### DN Template
-You only have to specify the dn template:
-```
-dn_template "cn={username},ou=people,dc=example,dc=com"
-```
-
-### Config Example with Docker
-Example maddy configuration with LLDAP running in docker.  
-You can replace `local_authdb` with another name if you want to use multiple auth backends.  
-If you only want to use one storage backend make sure to disable `auth.pass_table local_authdb` in your config if it is still active.
-```
-auth.ldap local_authdb {
-    urls ldap://lldap:3890
-
-    dn_template "cn={username},ou=people,dc=example,dc=com"
-
-    starttls off
-    debug off
-    connect_timeout 1m
-}
-```
-
-
-## Advanced Setup
-If the simple setup does not work for you, you can use a proper lookup.
-
-### Bind Credentials
-If you have a service account in LLDAP with restricted rights (e.g. `lldap_strict_readonly`), replace `admin` with your LLDAP service account.  
-Replace `admin_password` with the password of either the admin or service account.  
-```
-bind plain "cn=admin,ou=people,dc=example,dc=com" "admin_password"
-```
-If you do not want to use plain auth check the [maddy LDAP page](https://maddy.email/reference/auth/ldap/) for other options.
-
-### Base DN
-```
-base_dn "dc=example,dc=com"
-```
-
-### Filter
-Depending on the mail client, maddy receives and sends either the username or the full E-Mail address as username (even if the username is not an E-Mail).  
-For the username use:
-```
-filter "(&(objectClass=person)(uid={username}))"
-```
-For mapping the username (as E-Mail):
-```
-filter "(&(objectClass=person)(mail={username}))"
-```
-For allowing both, username and username as E-Mail use:
-```
-filter "(&(|(uid={username})(mail={username}))(objectClass=person))"
-```
-
-### Config Example with Docker
-Example maddy configuration with LLDAP running in docker.  
-You can replace `local_authdb` with another name if you want to use multiple auth backends.  
-If you only want to use one storage backend make sure to disable `auth.pass_table local_authdb` in your config if it is still active.
-```
-auth.ldap local_authdb {
-    urls ldap://lldap:3890
-
-    bind plain "cn=admin,ou=people,dc=example,dc=com" "admin_password"
-    base_dn "dc=example,dc=com"
-    filter "(&(|(uid={username})(mail={username}))(objectClass=person))"
-
-    starttls off
-    debug off
-    connect_timeout 1m
-}
-```
-
-

example_configs/mailserver.md

@@ -54,14 +54,14 @@ services:
       - ENABLE_OPENDMARC=0
       # >>> Postfix LDAP Integration
       - ACCOUNT_PROVISIONER=LDAP
-      - LDAP_SERVER_HOST=ldap://lldap:3890
+      - LDAP_SERVER_HOST=lldap:3890
-      - LDAP_SEARCH_BASE=ou=people,dc=example,dc=com
+      - LDAP_SEARCH_BASE=dc=example,dc=com
       - LDAP_BIND_DN=uid=admin,ou=people,dc=example,dc=com
       - LDAP_BIND_PW=adminpassword
       - LDAP_QUERY_FILTER_USER=(&(objectClass=inetOrgPerson)(|(uid=%u)(mail=%u)))
       - LDAP_QUERY_FILTER_GROUP=(&(objectClass=groupOfUniqueNames)(uid=%s))
       - LDAP_QUERY_FILTER_ALIAS=(&(objectClass=inetOrgPerson)(|(uid=%u)(mail=%u)))
-      - LDAP_QUERY_FILTER_DOMAIN=(mail=*@%s)
+      - LDAP_QUERY_FILTER_DOMAIN=((mail=*@%s))
       # <<< Postfix LDAP Integration
       # >>> Dovecot LDAP Integration
       - DOVECOT_AUTH_BIND=yes

example_configs/metabase.md

@@ -1,79 +0,0 @@
-# Configuring LDAP in Metabase
-
-[Metabase](https://github.com/metabase/metabase) 
-
-The simplest, fastest way to get business intelligence and analytics to everyone in your company 😋
-
----
-
-## LDAP Host
-
-```
-example.com
-```
-
-## LDAP Port
-
-```
-3890
-```
-
-## LDAP Security
-```
-None
-```
-
-## Username or DN
-It is recommended to use users belonging to the `lldap_strict_readonly` group
-```
-cn=adminro,ou=people,dc=example,dc=com
-```
-
-## Password
-```
-passwd
-```
-
-## User search base
-```
-ou=people,dc=example,dc=com
-```
-
-## User filter
-Only users in the `metabase_users` group can log in
-```
-(&(objectClass=inetOrgPerson)(|(uid={login})(mail={login}))(memberOf=cn=metabase_users,ou=groups,dc=example,dc=com))
-```
-
-## Email attribute
-```
-mail
-```
-
-## First name attribute
-```
-givenname
-```
-
-## Last name attribute
-```
-cn
-```
-
-## Group Schema
-
-**Synchronize Group Memberships**: Check this option to synchronize LDAP group memberships.
-
-**New Mapping**: Create a new mapping between Metabase and LDAP groups:
-
-- **Group Name**: `cn=metabase_users,ou=groups,dc=example,dc=com`
-
-## Group search base
-
-```
-ou=groups,dc=example,dc=com
-```
-
-## Useful links
-
-> [Metabase docker-compose.yaml](https://www.metabase.com/docs/latest/troubleshooting-guide/ldap)

example_configs/minio.md

@@ -35,38 +35,3 @@ Creating MinIO policies is outside of the scope for this document, but it is wel
 
 - Alias your MinIO instance: `mc alias set myMinIO http://<your-minio-address>:<your-minio-api-port> admin <your-admin-password>`
 - Attach a policy to your LDAP group: `mc admin policy attach myMinIO consoleAdmin --group='cn=minio_admin,ou=groups,dc=example,dc=com'`
-
-## Alternative configuration
-
-The above options didn't work for me (thielj; 2024-6-10; latest lldap and minio docker images). In particular, having a User DN search base of `ou=people,dc=example,dc=com` conflicted with the condition `memberOf=cn=admins,ou=groups,dc=example,dc=com` due to the groups being outside the 'ou=people' search base. Using just `dc=example,dc=com` as search base was frowned upon by MinIO due to duplicate results. 
-
-The following environment variables made both MinIO and LLDAP happy:
-
-```yaml
-    environment:
-      MINIO_ROOT_USER: "admin"
-      MINIO_ROOT_PASSWORD: "${ADMIN_PASSWORD:?error}"
-      
-      MINIO_IDENTITY_LDAP_SERVER_ADDR: "ldap.${TOP_DOMAIN}:636"
-      #MINIO_IDENTITY_LDAP_TLS_SKIP_VERIFY: "off"
-      #MINIO_IDENTITY_LDAP_SERVER_INSECURE: "off"
-      #MINIO_IDENTITY_LDAP_SERVER_STARTTLS: "off"
-
-      # https://github.com/lldap/lldap/blob/main/example_configs/minio.md
-      MINIO_IDENTITY_LDAP_LOOKUP_BIND_DN: "${LDAP_AUTH_BIND_USER}"
-      MINIO_IDENTITY_LDAP_LOOKUP_BIND_PASSWORD: "${LDAP_AUTH_BIND_PASSWORD}"
-      MINIO_IDENTITY_LDAP_USER_DN_SEARCH_BASE_DN: "ou=people,${LDAP_BASE_DN}"
-      # allow all users to login; they need a policy attached before they can actually do anything
-      MINIO_IDENTITY_LDAP_USER_DN_SEARCH_FILTER: "(&(objectclass=posixAccount)(uid=%s))"
-      #MINIO_IDENTITY_LDAP_USER_DN_ATTRIBUTES: "uid,cn,mail"
-      MINIO_IDENTITY_LDAP_GROUP_SEARCH_BASE_DN: "ou=groups,${LDAP_BASE_DN}"
-      MINIO_IDENTITY_LDAP_GROUP_SEARCH_FILTER: "(&(objectclass=groupOfUniqueNames)(member=%d))"
-```
-
-Another tip, there's no need to download or install the MinIO CLI. Assuming your running container is named `minio`, this does the trick:
-
-```
-$ docker exec minio mc alias set localhost http://localhost:9000 admin "${ADMIN_PASSWORD}"
-$ docker exec minio mc ready localhost
-$ docker exec minio mc admin policy attach localhost consoleAdmin --group="cn=admins,ou=groups,${LDAP_BASE_DN}"
-```

example_configs/netbox.md

@@ -1,149 +0,0 @@
-# Configuration for Netbox
-
-Netbox LDAP configuration is located [here](https://netboxlabs.com/docs/netbox/en/stable/installation/6-ldap/)
-
-## Prerequisites
-
-1. Install requirements
-    
-    **Debian/Ubuntu:** `sudo apt install -y libldap2-dev libsasl2-dev libssl-dev`
-
-    **CentOS:** `sudo yum install -y openldap-devel python3-devel`
-
-2. Install django-auth-ldap
-
-    `source /opt/netbox/venv/bin/activatepip3 install django-auth-ldap`
-
-3. Add package to local requirements
-
-    `sudo sh -c "echo 'django-auth-ldap' >> /opt/netbox/local_requirements.txt"`
-
-4. Enable LDAP backend in configuration.py (*default: /opt/netbox/netbox/netbox/configuration.py*)
-
-    `REMOTE_AUTH_BACKEND = 'netbox.authentication.LDAPBackend'`
-
-## LDAP Configuration
-
-1. Create ldap_config.py file
-
-    `touch /opt/netbox/netbox/netbox/ldap_config.py`
-
-2. Copy and modify the configuration below
-
-```python
-import ldap
-from django_auth_ldap.config import LDAPSearch, NestedGroupOfNamesType
-
-# Server URI
-AUTH_LDAP_SERVER_URI = "ldaps://lldap.example.com:6360"
-
-# Connection options, if necessary
-AUTH_LDAP_CONNECTION_OPTIONS = {
-    ldap.OPT_REFERRALS: 0  # Disable referral chasing if not needed
-}
-
-# Bind DN and password for the service account
-AUTH_LDAP_BIND_DN = "uid=admin,ou=people,dc=example,dc=com"
-AUTH_LDAP_BIND_PASSWORD = "ChangeMe!"
-
-# Ignore certificate errors (for self-signed certificates)
-LDAP_IGNORE_CERT_ERRORS = False  # Only use in development or testing!
-
-# Include this setting if you want to validate the LDAP server certificates against a CA certificate directory on your server
-# Note that this is a NetBox-specific setting which sets:
-#     ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, LDAP_CA_CERT_DIR)
-LDAP_CA_CERT_DIR = '/etc/ssl/certs'
-
-# Include this setting if you want to validate the LDAP server certificates against your own CA.
-# Note that this is a NetBox-specific setting which sets:
-#     ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, LDAP_CA_CERT_FILE)
-LDAP_CA_CERT_FILE = '/path/to/example-CA.crt'
-
-# User search configuration
-AUTH_LDAP_USER_SEARCH = LDAPSearch(
-    "ou=people,dc=example,dc=com",
-    ldap.SCOPE_SUBTREE,
-    "(uid=%(user)s)"
-)
-
-# User DN template
-AUTH_LDAP_USER_DN_TEMPLATE = "uid=%(user)s,ou=people,dc=example,dc=com"
-
-# Map LDAP attributes to Django user attributes
-AUTH_LDAP_USER_ATTR_MAP = {
-    "username": "uid",
-    "email": "mail",
-    "first_name": "givenName",
-    "last_name": "sn",
-}
-
-# Group search configuration
-AUTH_LDAP_GROUP_SEARCH = LDAPSearch(
-    "ou=groups,dc=example,dc=com",
-    ldap.SCOPE_SUBTREE,
-    "(objectClass=group)"
-)
-AUTH_LDAP_GROUP_TYPE = NestedGroupOfNamesType()
-
-# Require users to be in a specific group to log in
-AUTH_LDAP_REQUIRE_GROUP = "cn=netbox_users,ou=groups,dc=example,dc=com"
-
-# Mirror LDAP group assignments
-AUTH_LDAP_MIRROR_GROUPS = True
-
-# Map LDAP groups to Django user flags
-AUTH_LDAP_USER_FLAGS_BY_GROUP = {
-    "is_superuser": "cn=netbox_admins,ou=groups,dc=example,dc=com"
-}
-
-# Find group permissions
-AUTH_LDAP_FIND_GROUP_PERMS = True
-
-# Cache group memberships to reduce LDAP traffic
-AUTH_LDAP_CACHE_TIMEOUT = 3600
-
-# Always update user information from LDAP on login
-AUTH_LDAP_ALWAYS_UPDATE_USER = True
-```
-
-3. Restart netbox and netbox-rq
-
-    `sudo systemctl restart netbox netbox-rq`
-
-## Troubleshoot LDAP
-
-1. Make logging directory
-
-    `sudo mkdir -p /opt/netbox/local/logs/`
-
-2. Make log file
-
-    `sudo touch /opt/netbox/local/logs/django-ldap-debug.log`
-
-3. Set permissions
-
-    `sudo chown -R netbox:root /opt/netbox/local`
-
-4. Add the following to */opt/netbox/netbox/netbox/configuration.py*
-
-```py
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
-        'netbox_auth_log': {
-            'level': 'DEBUG',
-            'class': 'logging.handlers.RotatingFileHandler',
-            'filename': '/opt/netbox/local/logs/django-ldap-debug.log',
-            'maxBytes': 1024 * 500,
-            'backupCount': 5,
-        },
-    },
-    'loggers': {
-        'django_auth_ldap': {
-            'handlers': ['netbox_auth_log'],
-            'level': 'DEBUG',
-        },
-    },
-}
-```

example_configs/nextcloud.md

@@ -74,7 +74,6 @@ occ ldap:set-config s01 ldapUserDisplayName displayname
 occ ldap:set-config s01 ldapUserFilterMode 1
 occ ldap:set-config s01 ldapUuidGroupAttribute auto
 occ ldap:set-config s01 ldapUuidUserAttribute auto
-occ ldap:set-config s01 ldapExpertUsernameAttr user_id
 ```
 With a bit of of luck, you should be able to log in your nextcloud instance with LLDAP accounts in the `nextcloud_users` group.
 
@@ -115,16 +114,9 @@ Enter a valid username in lldap and check if your filter is working.
 ### Groups
 
 You can use the menus for this part : select `groupOfUniqueNames` in the first menu and check every group you want members to be allowed to view their group member / share files with.
-For example:
+
-```
-(&(|(objectclass=groupOfUniqueNames))(|(cn=family)(cn=friends)))
-```
 ![groups configuration page](images/nextcloud_groups.png)
 
-### Expert
-
-Set `Internal Username` to `user_id`. This is needed to that the user ID used by Nextcloud corresponds to the `user_id` field and not the `UUID` field.
-
 ## Sharing restrictions
 
 Go to Settings > Administration > Sharing and check following boxes :

example_configs/nexus.md

@@ -19,7 +19,7 @@ Click `Verify connection` if successful click `Next`
 * Select a template: Generic ldap server
 * User Relative DN: `ou=people`
 * User subtree: Leave unchecked
-* Object class: `person`
+* Object class: person
 * User Filter:  Leave empty to allow all users to log in or `(memberOf=uid=nexus_users,ou=groups,dc=example,dc=com)` for a specific group
 * Username Attribute: `uid`
 * Real Name Attribute: `cn`
@@ -53,4 +53,4 @@ Click `Create Role`
 * Role Name: e.g. nexus_admin (group in lldap)
 * Add privileges/roles as needed e.g. under Roles add nx-admin to the "contained" list
 
-Click `Save`
+Click `Save`

example_configs/ocis.md

@@ -1,99 +0,0 @@
-# OCIS (OwnCloud Infinite Scale)
-
-This is using version 5 which is currently still in RC.
-
-IMPORTANT: There is a bug/quirk in how the OCIS container handles bind mounts.  
-
-If the bind mount locations (eg. `/srv/ocis/{app,cfg}`) don't exist when the container is started, OCIS creates them with `root` permissions.  It then seems to drop permissions to UID 1000 and gives an error because it can't create files in the `{app,cfg}`.
-
-So you must create the bind mount locations and manually chown them to uid/gid 1000, eg.
-
-```
-# cd /srv/ocis
-# mkdir app cfg
-# chown 1000:1000 app cfg
-# docker compose up -d && docker compose logs -f 
-```
-
-## .env
-
-```
-OCIS_URL="https://ocis.example.nz"
-LDAP_BASE_DN="dc=example,dc=nz"
-LDAP_BIND_PASSWORD=very-secret-yogurt
-# LLDAP UUID to be given admin permissions
-LLDAP_ADMIN_UUID=c1c2428a-xxxx-yyyy-zzzz-6cc946bf6809
-```
-
-## docker-compose.yml
-
-```
-version: "3.7"
-
-networks:
-  caddy:
-    external: true
-
-services:
-  ocis:
-    image: owncloud/ocis:5.0.0-rc.4
-    container_name: ocis
-    networks:
-      - caddy
-    entrypoint:
-      - /bin/sh
-    command: ["-c", "ocis init || true; ocis server"]
-    environment:
-      OCIS_URL: ${OCIS_URL}
-      OCIS_LOG_LEVEL: warn
-      OCIS_LOG_COLOR: "false"
-      PROXY_TLS: "false" # do not use SSL between Traefik and oCIS
-      OCIS_INSECURE: "false"
-      # Basic Auth is required for WebDAV clients that don't support OIDC
-      PROXY_ENABLE_BASIC_AUTH: "false"
-      #IDM_ADMIN_PASSWORD: "${ADMIN_PASSWORD}" # Not needed if admin user is in LDAP (?)
-      #OCIS_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: "banned-password-list.txt"
-
-      # Assumes your LLDAP container is named `lldap`
-      OCIS_LDAP_URI: ldap://lldap:3890
-      OCIS_LDAP_INSECURE: "true"
-      OCIS_LDAP_BIND_DN: "uid=admin,ou=people,${LDAP_BASE_DN}"
-      OCIS_LDAP_BIND_PASSWORD: ${LDAP_BIND_PASSWORD}
-      OCIS_ADMIN_USER_ID: ${LLDAP_ADMIN_UUID}
-
-      OCIS_LDAP_USER_ENABLED_ATTRIBUTE: uid
-      GRAPH_LDAP_SERVER_WRITE_ENABLED: "false" # Does your LLDAP bind user have write access?
-      GRAPH_LDAP_REFINT_ENABLED: "false"
-      # Disable the built in LDAP server
-      OCIS_EXCLUDE_RUN_SERVICES: idm
-      # both text and binary cause errors in LLDAP, seems harmless though (?)
-      #IDP_LDAP_UUID_ATTRIBUTE_TYPE: 'text'
-
-      LDAP_LOGIN_ATTRIBUTES: "uid"
-      IDP_LDAP_LOGIN_ATTRIBUTE: "uid"
-      IDP_LDAP_UUID_ATTRIBUTE: "entryuuid"
-      OCIS_LDAP_USER_SCHEMA_ID: "entryuuid"
-      OCIS_LDAP_GROUP_SCHEMA_ID: "uid"
-      OCIS_LDAP_GROUP_SCHEMA_GROUPNAME: "uid"
-
-      OCIS_LDAP_GROUP_BASE_DN: "ou=groups,${LDAP_BASE_DN}"
-      OCIS_LDAP_GROUP_OBJECTCLASS: "groupOfUniqueNames"
-      # can filter which groups are imported, eg: `(&(objectclass=groupOfUniqueNames)(uid=ocis_*))`
-      OCIS_LDAP_GROUP_FILTER: "(objectclass=groupOfUniqueNames)"
-
-      OCIS_LDAP_USER_BASE_DN: "ou=people,${LDAP_BASE_DN}"
-      OCIS_LDAP_USER_OBJECTCLASS: "inetOrgPerson"
-      # Allows all users
-      #OCIS_LDAP_USER_FILTER: "(objectclass=inetOrgPerson)"
-      # Allows users who are in the LLDAP group `ocis_users`
-      OCIS_LDAP_USER_FILTER: "(&(objectclass=person)(memberOf=cn=ocis_users,ou=groups,${LDAP_BASE_DN}))"
-      # NOT WORKING: Used instead of restricting users with OCIS_LDAP_USER_FILTER
-      #OCIS_LDAP_DISABLE_USER_MECHANISM: "group"
-      #OCIS_LDAP_DISABLED_USERS_GROUP_DN: "uid=ocis_disabled,ou=groups,${LDAP_BASE_DN}"
-    volumes:
-      # - ./config/ocis/banned-password-list.txt:/etc/ocis/banned-password-list.txt
-      # IMPORTANT: see note at top about creating/cowning bind mounts
-      - ./cfg:/etc/ocis
-      - ./app:/var/lib/ocis
-    restart: always
-```

example_configs/onedev.md

@@ -1,23 +0,0 @@
-# Configuration for OneDev
-In Onedev, go to `Administration > External Authentication Source > Authenticator` and Select `Generic LDAP`
-
-* LDAP URL: ldap://lldap_ip_or_hostname:3890 or ldaps://lldap_ip_or_hostname:6360
-* Authentication Required: On
-* Manager DN: `uid=admin,ou=people,dc=example,dc=com`
-* Manager Password: Your bind user's password
-* User Search Base: `ou=people,dc=example,dc=com`
-* User Search Filter: `(&(uid={0})(objectclass=person))`
-* User Full Name Attribute: `displayName`
-* Email Attribute: mail
-* User SSH Key Attribute: (Leave Blank)
-* Group Retrieval: "Search Groups Using Filter"
-* Group Search Base: `ou=groups,dc=example,dc=com`
-* Group Search Filter: `(&(uniqueMember={0})(objectclass=groupOfUniqueNames))`
-* Group Name Attribute: cn
-* Create User As Guest: Off
-* Default Group: "No Default Group"
-* Timeout: 300
-
-Replace every instance of `dc=example,dc=com` with your configured domain.
-
-After applying the above settings, users should be able to log in with their user name.

example_configs/pam/README.md

@@ -1,90 +0,0 @@
-# Configure lldap
-
-You MUST use LDAPS. You MUST NOT use plain ldap. Even over a private network
-this costs you nearly nothing, and passwords will be sent in PLAIN TEXT without
-it.
-
-```toml
-[ldaps_options]
-enabled=true
-port=6360
-cert_file="cert.pem"
-key_file="key.pem"
-```
-
-You can generate an SSL certificate for it with the following command. The
-`subjectAltName` is REQUIRED. Make sure all domains are listed there, even your
-`CN`.
-
-```sh
-openssl req -x509 -nodes -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256 -days 36500 -nodes -subj "/CN=lldap.example.net" -addext "subjectAltName = DNS:lldap.example.net"
-```
-
-# Install the client packages.
-
-This guide used `libnss-ldapd` (which is different from `libnss-ldap`).
-
-PURGE the following ubuntu packages: `libnss-ldap`, `libpam-ldap`
-
-Install the following ubuntu packages: `libnss-ldapd`, `nslcd`, `nscd`, `libpam-ldapd`
-
-# Configure the client's `nslcd` settings.
-
-Edit `/etc/nslcd.conf`. Use the [provided template](./nslcd.conf).
-
-You will need to set `tls_cacertfile` to a copy of the public portion of your
-LDAPS certificate, which must be available on the client. This is used to
-verify the LDAPS server identity.
-
-You will need to add the `binddn` and `bindpw` settings.
-
-The provided implementation uses custom attributes to mark users and groups
-that should be included in the system (for instance, you don't want LDAP
-accounts of other services to have a matching unix user).
-
-For users, you need to add an (integer) `unix-uid` attribute to the schema, and
-manually set the value for the users you want to enable to login with PAM.
-
-For groups, you need an (integer) `unix-gid` attribute, similarly set manually
-to some value.
-
-If you want to change this representation, update the `filter passwd` and
-`filter group` accordingly.
-
-You should check whether you need to edit the `pam_authz_search` setting. This
-is used after authentication, at the PAM `account` stage, to determine whether
-the user should be allowed to log in. If someone is an LDAP user, even if they
-use an SSH key to log in, they must still pass this check. The provided example
-will check for membership of a group named `YOUR_LOGIN_GROUP_FOR_THIS_MACHINE`.
-
-You should review the `map` settings. These contain custom attributes that you
-will need to add to lldap and set on your users.
-
-# Configure the client OS.
-
-Ensure the `nslcd` and `nscd` services are installed and running. `nslcd`
-provides LDAP NSS service. `nscd` provides caching for NSS databased. You want
-the caching.
-
-```
-systemctl enable --now nslcd nscd
-```
-
-Configure PAM to create the home directory for LDAP users automatically at
-first login.
-
-```
-pam-auth-update --enable mkhomedir
-```
-
-Edit /etc/nsswitch.conf and add "ldap" to the END of the "passwd" and "group"
-lines.
-
-You're done!
-
-## Clearing nscd caches.
-
-If you want to manually clear nscd's caches, run `nscd -i passwd; nscd -i group`.
-
-[scripting]: https://github.com/lldap/lldap/blob/main/docs/scripting.md
-

example_configs/pam/nslcd.conf

@@ -1,59 +0,0 @@
-# /etc/nslcd.conf
-# nslcd configuration file. See nslcd.conf(5)
-# for details.
-
-# The user and group nslcd should run as.
-uid nslcd
-gid nslcd
-
-# The location at which the LDAP server(s) should be reachable.
-uri ldaps://lldap.example.net:6360/
-
-# The search base that will be used for all queries.
-base dc=example,dc=net
-
-# The LDAP protocol version to use.
-#ldap_version 3
-
-# The DN to bind with for normal lookups.
-binddn cn=...,ou=people,dc=example,dc=com
-bindpw ...
-
-# The DN used for password modifications by root.
-#rootpwmoddn cn=admin,dc=example,dc=com
-
-# SSL options
-#ssl off
-tls_reqcert demand
-tls_cacertfile /etc/cert-lldap.example.com.pem
-
-# The search scope.
-#scope sub
-
-reconnect_invalidate passwd group
-nss_initgroups_ignoreusers ALLLOCAL
-
-# Do you have users/groups that aren't for linux?  These filters determine which user/group objects are used.
-filter passwd (&(objectClass=posixAccount)(unix-uid=*))
-filter group (&(objectClass=groupOfUniqueNames)(unix-gid=*))
-
-# This check is done AFTER authentication, in the pam "account" stage.
-# Regardless of if they used a LDAP password, or an SSH key, if they're an LDAP user, they have to pass this check.
-pam_authz_search (&(objectClass=posixAccount)(unix-uid=*)(unix-username=$username)(memberOf=cn=YOUR_LOGIN_GROUP_FOR_THIS_MACHINE,ou=groups,dc=example,dc=com))
-
-
-map passwd uid unix-username
-map passwd uidNumber unix-uid
-map passwd gidNumber unix-gid
-map passwd gecos unix-username
-map passwd homeDirectory "/home/${unix-username}"
-map passwd loginShell unix-shell
-
-map group gidNumber unix-gid
-map group memberUid member
-
-nss_min_uid 1000
-
-pam_password_prohibit_message "Please use the forgot password link on https://lldap.example.com/ to change your password."
-
-

example_configs/pfsense.md

@@ -1,8 +1,5 @@
 # Configuration for pfSense
 
-> [!NOTE]  
-> Replace `dc=example,dc=com` with the same LDAP Base DN that you set via the *LLDAP_LDAP_BASE_DN* environment variable or in `lldap_config.toml`.
-
 ## Create a LDAP Server
 
 - Login to pfSense
@@ -19,9 +16,7 @@
 - Protocol version: `3`
 - Server Timeout: `25`
 
-> [!NOTE]
+(Make sure the host running LLDAP is accessible to pfSense and that you mapped the LLDAP port to the LLDAP host)
-> Make sure the host running LLDAP is accessible to pfSense and that you mapped the LLDAP port to the LLDAP host
-
 ### Search Scope
 ```
 Entire Subtree
@@ -32,25 +27,18 @@ Entire Subtree
 dc=example,dc=com
 ```
 
+This is the same LDAP Base DN that you set via the *LLDAP_LDAP_BASE_DN* environment variable or in `lldap_config.toml`.
 ### Authentication containers
 
 ```
 ou=people
 ```
 
-> [!Note]
+Note: The `Select a container` box may not work for selecting containers. You can just enter the `Authentication containers` directly into the text field.
-> The `Select a container` seach fuction will not work for selecting containers. You enter the `Authentication containers` directly into the text field.
-> This is due to Pfsense running the following filter `"(|(ou=*)(cn=Users))"`, and `Organizational Units` is currently not supported.Could not connect to the LDAP server. Please check the LDAP configuration.
-
-> [!WARNING] 
-> if search button is pressed a warning will show on the bottom of the page: `Could not connect to the LDAP server. Please check the LDAP configuration.`
-
 
 ### Extended Query
 
-Enable extended query: 
+Enable extended query: `Checked`
-
-- [X] `Checked`
 
 ### Query:
 
@@ -61,8 +49,7 @@ Enable extended query:
 This example gives you two groups in LLDAP, one for pfSense admin access (`pfsense_admin`) and one for guest access (`pfsense_guest`). You **must** create these exact same groups in both LLDAP and pfSense, then give them the correct permissions in pfSense.
 
 ### Bind Anonymous
-
+`Unchecked`
-- [ ] `Unchecked`
 
 ### Bind credentials
 
@@ -93,18 +80,13 @@ cn
 memberof
 ```
 ### RFC 2307 Groups
-
+`Unchecked`
-- [ ] `Unchecked`
 
 ### Group Object Class
-```
+`groupOfUniqueNames`
-groupOfUniqueNames
-```
 
 ### Shell Authentication Group DN
-```
+`cn=pfsense_admin,ou=groups,dc=example,dc=com`
-cn=pfsense_admin,ou=groups,dc=example,dc=com
-```
 
 (This is only if you want to give a group shell access through LDAP. Leave blank and only the pfSense admin user will have shell access.
 
@@ -112,9 +94,9 @@ cn=pfsense_admin,ou=groups,dc=example,dc=com
 
 Enable the following options on the pfSense configuration page for your LLDAP server (the same page where you entered the prior configuration):
 
-- [X] UTF8 Encodes: `Checked`
+- UTF8 Encodes: `Checked`
-- [ ] Username Alterations: `Unchecked`
+- Username Alterations: `Unchecked`
-- [ ] Allow unauthenticated bind: `Unchecked`
+- Allow unauthenticated bind: `Unchecked`
 
 ### Create pfSense Groups
 
@@ -130,9 +112,6 @@ Go to `System > User Manager > Settings` page. Add your LLDAP server configurati
 
 pfSense includes a built-in feature for testing user authentication at `Diagnostics > Authentication`. Select your LLDAP server configuration in the `Authentication Server` to test logins for your LLDAP users. The groups (only the ones you added to pfSense) should show up when tested.
 
-> [!WARNING] 
-> When running `Save and test`, the `Attempting to fetch Organizational Units from` will fail. This is due to Pfsense running the following filter `"(|(ou=*)(cn=Users))"`, and `Organizational Units` is currently not supported.
-
 ## More Information
 
 Please read the [pfSense docs](https://docs.netgate.com/pfsense/en/latest/usermanager/ldap.html) for more information on LDAP configuration and managing access to pfSense.

example_configs/prosody.md

@@ -1,15 +0,0 @@
-# Configuration for Prosody XMPP server
-
-Prosody is setup with virtual hosts, at least one. If you want to have users access only specific virtual hosts, create a group per vHost (I called it `xmpp-example.com`). If not, remove the memberOf part in the filter below. I would also create a read only user (mine is called `query`) with the group `lldap_strict_readonly` to find the users that will be used to bind.
-
-In `prosody.cfg.lua` you need to set `authentication` to `ldap` and the following settings:
-
-```authentication = "ldap"
-ldap_base = "dc=example,dc=com"
-ldap_server = "lldap_ip:3890"
-ldap_rootdn = "uid=query,ou=people,dc=example,dc=com"
-ldap_password = "query-password"
-ldap_filter = "(&(uid=$user)(memberOf=cn=xmpp-$host,ou=groups,dc=example,dc=com)(objectclass=person))"
-```
-
-Restart Prosody and you should be good to go.

example_configs/radicale.md

@@ -1,29 +0,0 @@
-# Configuration of Radicale authentication with LLDAP
-
-## Native configuration (requires Radicale >=3.3.0)
-
-```ini
-[auth]
-type = ldap
-ldap_uri = ldap://lldap:3890
-ldap_base = dc=example,dc=com
-ldap_reader_dn = uid=admin,ou=people,dc=example,dc=com
-ldap_secret = CHANGEME
-ldap_filter = (&(objectClass=person)(uid={0}))
-lc_username = True
-```
-
-## Plugin configuration (requires [radicale-auth-ldap](https://github.com/shroomify-it/radicale-auth-ldap-plugin) plugin and Radicale >=3.0)
-
-```ini
-[auth]
-type = radicale_auth_ldap
-ldap_url = ldap://lldap:3890
-ldap_base = dc=example,dc=com
-ldap_attribute = uid
-ldap_filter = (objectClass=person)
-ldap_binddn = uid=admin,ou=people,dc=example,dc=com
-ldap_password = CHANGEME
-ldap_scope = LEVEL
-ldap_support_extended = no
-```

example_configs/sonarqube.md

@@ -1,57 +0,0 @@
-# Configuring LDAP in SonarQube
-
-[SonarQube](https://github.com/SonarSource/sonarqube)
-
-Continuous Inspection
-
----
-
-SonarQube can configure ldap through environment variables when deploying using docker-compose
-
-## docker-compose.yaml
-
-```yaml
-version: "3"
-
-services:
-  sonarqube:
-    image: sonarqube:community
-    depends_on:
-      - db
-    environment:
-      SONAR_JDBC_URL: jdbc:postgresql://db:5432/sonar
-      SONAR_JDBC_USERNAME: sonar
-      SONAR_JDBC_PASSWORD: sonar
-      LDAP_URL: ldap://example.com:3890
-      LDAP_BINDDN: cn=admin,ou=people,dc=example,dc=com
-      LDAP_BINDPASSWORD: passwd
-      LDAP_AUTHENTICATION: simple
-      LDAP_USER_BASEDN: ou=people,dc=example,dc=com
-      LDAP_USER_REQUEST: (&(objectClass=inetOrgPerson)(uid={login})(memberof=cn=sonarqube_users,ou=groups,dc=example,dc=com))
-      LDAP_USER_REALNAMEATTRIBUTE: cn
-      LDAP_USER_EMAILATTRIBUTE: mail
-    volumes:
-      - sonarqube_data:/opt/sonarqube/data
-      - sonarqube_extensions:/opt/sonarqube/extensions
-      - sonarqube_logs:/opt/sonarqube/logs
-    ports:
-      - "9000:9000"
-  db:
-    image: postgres:12
-    environment:
-      POSTGRES_USER: sonar
-      POSTGRES_PASSWORD: sonar
-    volumes:
-      - postgresql:/var/lib/postgresql
-      - postgresql_data:/var/lib/postgresql/data
-
-volumes:
-  sonarqube_data:
-  sonarqube_extensions:
-  sonarqube_logs:
-  postgresql:
-  postgresql_data:
-```
-
-> [SonarQube docker-compose.yaml example](https://docs.sonarsource.com/sonarqube/latest/setup-and-upgrade/install-the-server/installing-sonarqube-from-docker/)
-

example_configs/vaultwarden.md

@@ -9,11 +9,12 @@ Replace `dc=example,dc=com` with your LLDAP configured domain.
 version: '3'
 services:
   ldap_sync:
-    image: vividboarder/vaultwarden_ldap:2.0.2
+    image: vividboarder/vaultwarden_ldap:0.6-alpine
     volumes:
       - ./config.toml:/config.toml:ro
     environment:
       CONFIG_PATH: /config.toml
+      RUST_BACKTRACE: 1
     restart: always
 ```
 Configuration to use LDAP in `config.toml`
@@ -22,7 +23,6 @@ vaultwarden_url = "http://your_bitwarden_url:port"
 vaultwarden_admin_token = "insert_admin_token_vaultwarden"
 ldap_host = "insert_ldap_host"
 ldap_port = 3890
-ldap_ssl  = false # true if using LDAPS
 ldap_bind_dn = "uid=admin,ou=people,dc=example,dc=com"
 ldap_bind_password = "insert_admin_pw_ldap"
 ldap_search_base_dn = "dc=example,dc=com"

generate_secrets.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-print_random () {
+function print_random () {
   LC_ALL=C tr -dc 'A-Za-z0-9!#%&()*+,-./:;<=>?@[\]^_{|}~' </dev/urandom | head -c 32
 }
 

lldap_config.docker_template.toml

@@ -82,8 +82,7 @@
 ## Break glass in case of emergency: if you lost the admin password, you
 ## can set this to true to force a reset of the admin password to the value
 ## of ldap_user_pass above.
-## Alternatively, you can set it to "always" to reset every time the server starts.
+# force_reset_admin_password = false
-# force_ldap_user_pass_reset = false
 
 ## Database URL.
 ## This encodes the type of database (SQlite, MySQL, or PostgreSQL)