Fix comments

Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com>
Use shorten messaging API
2026-08-07 15:25:48 +00:00 · 2020-10-14 11:03:39 +02:00 · 2020-10-14 10:41:46 +02:00
4709 changed files with 895426 additions and 214685 deletions
@@ -1,6 +1,3 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
 .git
 .github
 build
@@ -0,0 +1,275 @@
+# Docker: Environment variables in Compose
+
+## NginX
+MF_NGINX_HTTP_PORT=80
+MF_NGINX_SSL_PORT=443
+MF_NGINX_MQTT_PORT=1883
+MF_NGINX_MQTTS_PORT=8883
+
+## NATS
+MF_NATS_URL=nats://nats:4222
+
+## Redis
+MF_REDIS_TCP_PORT=6379
+
+## Grafana
+MF_GRAFANA_PORT=3000
+
+## Jaeger
+MF_JAEGER_PORT=6831
+MF_JAEGER_FRONTEND=16686
+MF_JAEGER_COLLECTOR=14268
+MF_JAEGER_CONFIGS=5778
+MF_JAEGER_URL=jaeger:6831
+
+## Core Services
+
+### AuthN
+MF_AUTHN_LOG_LEVEL=debug
+MF_AUTHN_HTTP_PORT=8189
+MF_AUTHN_GRPC_PORT=8181
+MF_AUTHN_GRPC_URL=authn:8181
+MF_AUTHN_GRPC_TIMEOUT=1s
+MF_AUTHN_DB_PORT=5432
+MF_AUTHN_DB_USER=mainflux
+MF_AUTHN_DB_PASS=mainflux
+MF_AUTHN_DB=authn
+MF_AUTHN_SECRET=secret
+
+### Users
+MF_USERS_LOG_LEVEL=debug
+MF_USERS_HTTP_PORT=8180
+MF_USERS_DB_PORT=5432
+MF_USERS_DB_USER=mainflux
+MF_USERS_DB_PASS=mainflux
+MF_USERS_DB=users
+MF_USERS_ADMIN_EMAIL=admin@example.com
+MF_USERS_ADMIN_PASSWORD=12345678
+
+### Email utility
+MF_EMAIL_DRIVER=smtp
+MF_EMAIL_HOST=smtp.mailtrap.io
+MF_EMAIL_PORT=2525
+MF_EMAIL_USERNAME=18bf7f70705139
+MF_EMAIL_PASSWORD=2b0d302e775b1e
+MF_EMAIL_FROM_ADDRESS=from@example.com
+MF_EMAIL_FROM_NAME=Example
+MF_EMAIL_TEMPLATE=email.tmpl
+
+### Token utility
+MF_TOKEN_RESET_ENDPOINT=/reset-request
+
+### Things
+MF_THINGS_LOG_LEVEL=debug
+MF_THINGS_HTTP_PORT=8182
+MF_THINGS_AUTH_HTTP_PORT=8989
+MF_THINGS_AUTH_GRPC_PORT=8183
+MF_THINGS_AUTH_GRPC_URL=things:8183
+MF_THINGS_AUTH_GRPC_TIMEOUT=1s
+MF_THINGS_DB_PORT=5432
+MF_THINGS_DB_USER=mainflux
+MF_THINGS_DB_PASS=mainflux
+MF_THINGS_DB=things
+MF_THINGS_ES_URL=localhost:6379
+MF_THINGS_ES_PASS=
+MF_THINGS_ES_DB=0
+
+### HTTP
+MF_HTTP_ADAPTER_PORT=8185
+
+### MQTT
+MF_MQTT_ADAPTER_LOG_LEVEL=debug
+MF_MQTT_ADAPTER_MQTT_PORT=1883
+MF_MQTT_BROKER_PORT=1883
+MF_MQTT_ADAPTER_WS_PORT=8080
+MF_MQTT_BROKER_WS_PORT=8080
+MF_MQTT_ADAPTER_ES_DB=0
+MF_MQTT_ADAPTER_ES_PASS=
+
+### VERMEMQ
+MF_DOCKER_VERNEMQ_ALLOW_ANONYMOUS=on
+MF_DOCKER_VERNEMQ_LOG__CONSOLE__LEVEL=error
+
+### CoAP
+MF_COAP_ADAPTER_LOG_LEVEL=debug
+MF_COAP_ADAPTER_PORT=5683
+
+## Addons Services
+### Bootstrap
+MF_BOOTSTRAP_LOG_LEVEL=debug
+MF_BOOTSTRAP_PORT=8202
+MF_BOOTSTRAP_DB_PORT=5432
+MF_BOOTSTRAP_DB_USER=mainflux
+MF_BOOTSTRAP_DB_PASS=mainflux
+MF_BOOTSTRAP_DB=bootstrap
+MF_BOOTSTRAP_DB_SSL_MODE=disable
+
+### Provision
+MF_PROVISION_CONFIG_FILE=/configs/config.toml
+MF_PROVISION_LOG_LEVEL=debug
+MF_PROVISION_HTTP_PORT=8190
+MF_PROVISION_ENV_CLIENTS_TLS=false
+MF_PROVISION_SERVER_CERT=
+MF_PROVISION_SERVER_KEY=
+MF_PROVISION_MQTT_URL=tcp://localhost
+MF_PROVISION_USERS_LOCATION=http://localhost:8180
+MF_PROVISION_THINGS_LOCATION=http://things:8182
+MF_PROVISION_USER=
+MF_PROVISION_PASS=
+MF_PROVISION_API_KEY=
+MF_PROVISION_CERTS_SVC_URL=http://certs:8204
+MF_PROVISION_X509_PROVISIONING=true
+MF_PROVISION_BS_SVC_URL=http://bootstrap:8202/things
+MF_PROVISION_BS_SVC_WHITELIST_URL=http://bootstrap:8202/things/state
+MF_PROVISION_BS_CONFIG_PROVISIONING=true
+MF_PROVISION_BS_AUTO_WHITELIST=true
+MF_PROVISION_BS_CONTENT=
+MF_PROVISION_CERTS_RSA_BITS=4096
+MF_PROVISION_CERTS_HOURS_VALID=2400h
+
+# Certs
+MF_CERTS_LOG_LEVEL=debug
+MF_CERTS_HTTP_PORT=8204
+MF_CERTS_DB_HOST=certs-db
+MF_CERTS_DB_PORT=5432
+MF_CERTS_DB_USER=mainflux
+MF_CERTS_DB_PASS=mainflux
+MF_CERTS_DB=certs
+MF_CERTS_DB_SSL_MODE=
+MF_CERTS_DB_SSL_CERT=
+MF_CERTS_DB_SSL_KEY=
+MF_CERTS_DB_SSL_ROOT_CERT=
+MF_CERTS_ENCRYPT_KEY=
+MF_CERTS_CLIENT_TLS=
+MF_CERTS_CA_CERTS=
+MF_CERTS_SERVER_CERT=
+MF_CERTS_SERVER_KEY=
+MF_SDK_BASE_URL=http://172.17.0.1
+MF_SDK_THINGS_PREFIX=
+MF_CERTS_SIGN_CA_PATH=/etc/ssl/certs/ca.crt
+MF_CERTS_SIGN_CA_KEY_PATH=/etc/ssl/certs/ca.key
+MF_CERTS_SIGN_HOURS_VALID=2048h
+MF_CERTS_SIGN_RSA_BITS=2048
+MF_CERTS_VAULT_HOST=
+MF_CERTS_VAULT_PKI_PATH=pki_int
+MF_CERTS_VAULT_ROLE=agent
+MF_CERTS_VAULT_TOKEN=s.nArgw6xn3uIOfA7nfKk8LFaW
+
+
+### LoRa
+MF_LORA_ADAPTER_LOG_LEVEL=debug
+MF_LORA_ADAPTER_MESSAGES_URL=tcp://lora.mqtt.mainflux.io:1883
+MF_LORA_ADAPTER_HTTP_PORT=8187
+MF_LORA_ADAPTER_ROUTE_MAP_URL=localhost:6379
+MF_LORA_ADAPTER_ROUTE_MAP_PASS=
+MF_LORA_ADAPTER_ROUTE_MAP_DB=0
+
+### OPC-UA
+MF_OPCUA_ADAPTER_HTTP_PORT=8188
+MF_OPCUA_ADAPTER_LOG_LEVEL=debug
+MF_OPCUA_ADAPTER_POLICY=
+MF_OPCUA_ADAPTER_MODE=
+MF_OPCUA_ADAPTER_CERT_FILE=
+MF_OPCUA_ADAPTER_KEY_FILE=
+MF_OPCUA_ADAPTER_ROUTE_MAP_URL=localhost:6379
+MF_OPCUA_ADAPTER_ROUTE_MAP_PASS=
+MF_OPCUA_ADAPTER_ROUTE_MAP_DB=0
+MF_OPCUA_ADAPTER_EVENT_CONSUMER=opcua
+
+### Cassandra Writer
+MF_CASSANDRA_WRITER_LOG_LEVEL=debug
+MF_CASSANDRA_WRITER_PORT=8902
+MF_CASSANDRA_WRITER_DB_PORT=9042
+MF_CASSANDRA_WRITER_DB_CLUSTER=mainflux-cassandra
+MF_CASSANDRA_WRITER_DB_KEYSPACE=mainflux
+MF_CASSANDRA_WRITER_CONTENT_TYPE=application/senml+json
+
+### Cassandra Reader
+MF_CASSANDRA_READER_LOG_LEVEL=debug
+MF_CASSANDRA_READER_PORT=8903
+MF_CASSANDRA_READER_DB_PORT=9042
+MF_CASSANDRA_READER_DB_CLUSTER=mainflux-cassandra
+MF_CASSANDRA_READER_DB_KEYSPACE=mainflux
+MF_CASSANDRA_READER_SERVER_CERT=
+MF_CASSANDRA_READER_SERVER_KEY=
+
+### InfluxDB Writer
+MF_INFLUX_WRITER_LOG_LEVEL=debug
+MF_INFLUX_WRITER_PORT=8900
+MF_INFLUX_WRITER_BATCH_SIZE=5000
+MF_INFLUX_WRITER_BATCH_TIMEOUT=5
+MF_INFLUX_WRITER_DB_PORT=8086
+MF_INFLUX_WRITER_DB_USER=mainflux
+MF_INFLUX_WRITER_DB_PASS=mainflux
+MF_INFLUX_WRITER_DB=mainflux
+MF_INFLUX_WRITER_GRAFANA_PORT=3001
+MF_INFLUX_WRITER_CONTENT_TYPE=application/senml+json
+
+### InfluxDB Reader
+MF_INFLUX_READER_LOG_LEVEL=debug
+MF_INFLUX_READER_PORT=8905
+MF_INFLUX_READER_DB_PORT=8086
+MF_INFLUX_READER_DB_USER=mainflux
+MF_INFLUX_READER_DB_PASS=mainflux
+MF_INFLUX_READER_DB=mainflux
+MF_INFLUX_READER_SERVER_CERT=
+MF_INFLUX_READER_SERVER_KEY=
+
+### MongoDB Writer
+MF_MONGO_WRITER_LOG_LEVEL=debug
+MF_MONGO_WRITER_PORT=8901
+MF_MONGO_WRITER_DB=mainflux
+MF_MONGO_WRITER_DB_PORT=27017
+MF_MONGO_WRITER_CONTENT_TYPE=application/senml+json
+
+### MongoDB Reader
+MF_MONGO_READER_LOG_LEVEL=debug
+MF_MONGO_READER_PORT=8904
+MF_MONGO_READER_DB=mainflux
+MF_MONGO_READER_DB_PORT=27017
+MF_MONGO_READER_SERVER_CERT=
+MF_MONGO_READER_SERVER_KEY=
+
+### Postgres Writer
+MF_POSTGRES_WRITER_LOG_LEVEL=debug
+MF_POSTGRES_WRITER_PORT=9104
+MF_POSTGRES_WRITER_DB_PORT=5432
+MF_POSTGRES_WRITER_DB_USER=mainflux
+MF_POSTGRES_WRITER_DB_PASS=mainflux
+MF_POSTGRES_WRITER_DB=mainflux
+MF_POSTGRES_WRITER_DB_SSL_MODE=disable
+MF_POSTGRES_WRITER_DB_SSL_CERT=""
+MF_POSTGRES_WRITER_DB_SSL_KEY=""
+MF_POSTGRES_WRITER_DB_SSL_ROOT_CERT=""
+MF_POSTGRES_WRITER_CONTENT_TYPE=application/senml+json
+
+### Postgres Reader
+MF_POSTGRES_READER_LOG_LEVEL=debug
+MF_POSTGRES_READER_PORT=9204
+MF_POSTGRES_READER_CLIENT_TLS=false
+MF_POSTGRES_READER_CA_CERTS=""
+MF_POSTGRES_READER_DB_PORT=5432
+MF_POSTGRES_READER_DB_USER=mainflux
+MF_POSTGRES_READER_DB_PASS=mainflux
+MF_POSTGRES_READER_DB=mainflux
+MF_POSTGRES_READER_DB_SSL_MODE=disable
+MF_POSTGRES_READER_DB_SSL_CERT=""
+MF_POSTGRES_READER_DB_SSL_KEY=""
+MF_POSTGRES_READER_DB_SSL_ROOT_CERT=""
+
+# Twins
+MF_TWINS_LOG_LEVEL=debug
+MF_TWINS_HTTP_PORT=9021
+MF_TWINS_SERVER_CERT=""
+MF_TWINS_SERVER_KEY=""
+MF_TWINS_DB=mainflux-twins
+MF_TWINS_DB_HOST=twins-db
+MF_TWINS_DB_PORT=27018
+MF_TWINS_SINGLE_USER_EMAIL=""
+MF_TWINS_SINGLE_USER_TOKEN=""
+MF_TWINS_CLIENT_TLS=""
+MF_TWINS_CA_CERTS=""
+MF_TWINS_CHANNEL_ID=
+MF_TWINS_CACHE_URL=es-redis:6379
+MF_TWINS_CACHE_PASS=
+MF_TWINS_CACHE_DB=0
@@ -1,14 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-# CoAP is temporarily ignored since we don't have tests for it yet.
-coverage:
-  ignore:
-    - "tools/*"
-    - "cmd/*"
-    - "coap/*"
-    - "*/mocks/*"
-    - "*/middleware/*"
-    - "pkg/sid/mock.go"
-    - "pkg/tracing/utils.go"
-    - "pkg/prometheus/*"
@@ -1 +1 @@
-*   @absmach/supermq
+*   @mainflux/maintainers
@@ -0,0 +1,30 @@
+<!--
+The GitHub issue tracker is for bug reports and feature requests. General support can be found at
+the following locations:
+
+- Google group - https://groups.google.com/forum/#!forum/mainflux
+- Gitter - https://gitter.im/mainflux/mainflux
+-->
+
+**FEATURE REQUEST**
+
+1. Is there an open issue addressing this request? If it does, please add a "+1" reaction to the
+   existing issue, otherwise proceed to step 2.
+
+2. Describe the feature you are requesting, as well as the possible use case(s) for it.
+
+3. Indicate the importance of this feature to you (must-have, should-have, nice-to-have).
+
+**BUG REPORT**
+
+1. What were you trying to achieve?
+
+2. What are the expected results?
+
+3. What are the received results?
+
+4. What are the steps to reproduce the issue?
+
+5. In what environment did you encounter the issue?
+
+6. Additional information you deem important:
@@ -1,52 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-name: Bug Report
-description: File a bug/issue report. Make sure to search to see if an issue already exists for the bug you encountered.
-title: "Bug: <title>"
-labels: ["bug", "needs-review", "help wanted"]
-body:
-  - type: textarea
-    attributes:
-      label: What were you trying to achieve?
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: What are the expected results?
-      description: A concise description of what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: What are the received results?
-      description: A concise description of what you received.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: What are the steps to reproduce the issue?
-      placeholder: |
-        1. In this environment...
-        2. With this config...
-        3. Run '...'
-        4. See error...
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: In what environment did you encounter the issue?
-      description: A concise description of the environment you encountered the issue in.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional information you deem important
-      description: |
-        Links? References? Anything that will give us more context about the issue you are encountering!
-
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false
@@ -1,11 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-blank_issues_enabled: false
-contact_links:
-  - name: Google group
-    url: https://groups.google.com/forum/#!forum/mainflux
-    about: Join the SuperMQ community on Google group.
-  - name: Gitter
-    url: https://gitter.im/mainflux/mainflux
-    about: Join the SuperMQ community on Gitter.
@@ -1,39 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-name: Feature Request
-description: File a feature request. Make sure to search to see if a request already exists for the feature you are requesting.
-title: "Feature: <title>"
-labels: ["enchancement", "needs-review"]
-body:
-  - type: textarea
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the feature you are requesting, as well as the possible use case(s) for it.
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Indicate the importance of this feature to you.
-      description: This will help us prioritize the feature request.
-      options:
-        - Must-have
-        - Should-have
-        - Nice-to-have
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Anything else?
-      description: |
-        Links? References? Anything that will give us more context about the feature that you are requesting.
-
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false
@@ -1,69 +1,15 @@
-<!-- Copyright (c) Abstract Machines
-SPDX-License-Identifier: Apache-2.0 -->
+Pull request title should be `MF-XXX - description` or `NOISSUE - description` where XXX is ID of issue that this PR relate to.
+Please review the [CONTRIBUTING.md](./CONTRIBUTING.md) file for detailed contributing guidelines.

-<!--
+### What does this do?

-Pull request title should be `SMQ-XXX - description` or `NOISSUE - description` where XXX is ID of the issue that this PR relate to.
-Please review the [CONTRIBUTING.md](https://github.com/absmach/supermq/blob/main/CONTRIBUTING.md) file for detailed contributing guidelines.
+### Which issue(s) does this PR fix/relate to?
+Put here `Resolves #XXX` to auto-close the issue that your PR fixes (if such)

-For Work In Progress Pull Requests, please use the Draft PR feature, see https://github.blog/2019-02-14-introducing-draft-pull-requests/ for further details.
+### List any changes that modify/break current functionality

-For a timely review/response, please avoid force-pushing additional commits if your PR already received reviews or comments.
+### Have you included tests for your changes?

- Provide tests for your changes.
- Use descriptive commit messages.
- Comment your code where appropriate.
- Squash your commits
- Update any related documentation.
-->
-
-# What type of PR is this?
-
-<!--This represents the type of PR you are submitting.
-
-For example:
-This is a bug fix because it fixes the following issue: #1234
-This is a feature because it adds the following functionality: ...
-This is a refactor because it changes the following functionality: ...
-This is a documentation update because it updates the following documentation: ...
-This is a dependency update because it updates the following dependencies: ...
-This is an optimization because it improves the following functionality: ...
-->
-
-## What does this do?
-
-<!--
-Please provide a brief description of what this PR is intended to do.
-Include List any changes that modify/break current functionality.
-->
-
-## Which issue(s) does this PR fix/relate to?
-
-<!--
-For pull requests that relate or close an issue, please include them below.  We like to follow [Github's guidance on linking issues to pull requests](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
-
-For example having the text: "Resolves #1234" would connect the current pull request to issue 1234.  And when we merge the pull request, Github will automatically close the issue.
-->
-
- Related Issue #
- Resolves #
-
-## Have you included tests for your changes?
-
-<!--If you have not included tests, please explain why.
-For example:
-Yes, I have included tests for my changes.
-No, I have not included tests because I do not know how to.
-->
-
-## Did you document any new/modified feature?
-
-<!--If you have not included documentation, please explain why.
-For example:
-Yes, I have updated the documentation for the new feature.
-No, I have not updated the documentation because I do not know how to.
-->
+### Did you document any new/modified functionality?

 ### Notes
-
-<!--Please provide any additional information you feel is important.-->
@@ -1,33 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "./.github/workflows"
-    schedule:
-      interval: "monthly"
-      day: "monday"
-      timezone: "Europe/Paris"
-    groups:
-      gh-dependency:
-        patterns:
-          - "*"
-
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-      timezone: "Europe/Paris"
-
-  - package-ecosystem: "docker"
-    directory: "./docker"
-    schedule:
-      interval: "monthly"
-      day: "monday"
-      timezone: "Europe/Paris"
-    groups:
-      docker-dependency:
-        patterns:
-          - "*"
@@ -1,183 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-name: Property Based Tests
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - ".github/workflows/api-tests.yaml"
-      - "api/**"
-      - "auth/api/http/**"
-      - "channels/api/http/**"
-      - "clients/api/http/**"
-      - "domains/api/http/**"
-      - "groups/api/http/**"
-      - "http/api/**"
-      - "journal/api/**"
-      - "users/api/**"
-
-env:
-  TOKENS_URL: http://localhost:9002/users/tokens/issue
-  CREATE_DOMAINS_URL: http://localhost:9003/domains
-  USER_IDENTITY: admin@example.com
-  USER_SECRET: 12345678
-  DOMAIN_NAME: demo-test
-  USERS_URL: http://localhost:9002
-  DOMAIN_URL: http://localhost:9003
-  CLIENTS_URL: http://localhost:9006
-  CHANNELS_URL: http://localhost:9005
-  GROUPS_URL: http://localhost:9004
-  HTTP_ADAPTER_URL: http://localhost:8008
-  AUTH_URL: http://localhost:9001
-  JOURNAL_URL: http://localhost:9021
-
-jobs:
-  api-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v5
-
-      - name: Install Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: 1.25.x
-          cache-dependency-path: "go.sum"
-
-      - name: Build images
-        run: make all -j $(nproc) && make dockers_dev -j $(nproc)
-
-      - name: Start containers
-        run: make run up args="-d" && make run_addons up args="-d"
-
-      - name: Set access token
-        run: |
-          export USER_TOKEN=$(curl -sSX POST $TOKENS_URL -H "Content-Type: application/json" -d "{\"identity\": \"$USER_IDENTITY\",\"secret\": \"$USER_SECRET\"}" | jq -r .access_token)
-          export DOMAIN_ID=$(curl -sSX POST $CREATE_DOMAINS_URL -H "Content-Type: application/json" -H "Authorization: Bearer $USER_TOKEN" -d "{\"name\":\"$DOMAIN_NAME\",\"route\":\"$DOMAIN_NAME\"}" | jq -r .id)
-          echo "USER_TOKEN=$USER_TOKEN" >> $GITHUB_ENV
-          export CLIENT_SECRET=$(supermq-cli provision test | /usr/bin/grep -Eo '"secret": "[^"]+"' | awk 'NR % 2 == 0' | sed 's/"secret": "\(.*\)"/\1/')
-          echo "CLIENT_SECRET=$CLIENT_SECRET" >> $GITHUB_ENV
-
-      - name: Check for changes in specific paths
-        uses: dorny/paths-filter@v3
-        id: changes
-        with:
-          filters: |
-            journal:
-              - ".github/workflows/api-tests.yaml"
-              - "apidocs/openapi/journal.yaml"
-              - "journal/api/**"
-
-            auth:
-              - ".github/workflows/api-tests.yaml"
-              - "apidocs/openapi/auth.yaml"
-              - "auth/api/http/**"
-
-            domains:
-              - ".github/workflows/api-tests.yaml"
-              - "apidocs/openapi/domains.yaml"
-              - "domains/api/http/**"
-
-            http:
-              - ".github/workflows/api-tests.yaml"
-              - "apidocs/openapi/http.yaml"
-              - "http/api/**"
-
-            clients:
-              - ".github/workflows/api-tests.yaml"
-              - "apidocs/openapi/clients.yaml"
-              - "clients/api/http/**"
-
-            channels:
-              - ".github/workflows/api-tests.yaml"
-              - "apidocs/openapi/channels.yaml"
-              - "channels/api/http/**"
-
-            groups:
-              - ".github/workflows/api-tests.yaml"
-              - "apidocs/openapi/groups.yaml"
-              - "groups/api/http/**"
-
-            users:
-              - ".github/workflows/api-tests.yaml"
-              - "apidocs/openapi/users.yaml"
-              - "users/api/**"
-
-      - name: Run Users API tests
-        if: steps.changes.outputs.users == 'true'
-        uses: schemathesis/action@v2.1.0
-        with:
-          schema: apidocs/openapi/users.yaml
-          base-url: ${{ env.USERS_URL }}
-          checks: all
-          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --suppress-health-check=filter_too_much --exclude-checks=positive_data_acceptance --exclude-operation-id=requestPasswordReset --phases=examples,stateful'
-
-      - name: Run Groups API tests
-        if: steps.changes.outputs.groups == 'true'
-        uses: schemathesis/action@v2.1.0
-        with:
-          schema: apidocs/openapi/groups.yaml
-          base-url: ${{ env.GROUPS_URL }}
-          checks: all
-          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --suppress-health-check=filter_too_much --exclude-checks=positive_data_acceptance --phases=examples'
-
-      - name: Run Clients API tests
-        if: steps.changes.outputs.clients == 'true'
-        uses: schemathesis/action@v2.1.0
-        with:
-          schema: apidocs/openapi/clients.yaml
-          base-url: ${{ env.CLIENTS_URL }}
-          checks: all
-          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --suppress-health-check=filter_too_much --exclude-checks=positive_data_acceptance --phases=examples'
-
-      - name: Run Channels API tests
-        if: steps.changes.outputs.channels == 'true'
-        uses: schemathesis/action@v2.1.0
-        with:
-          schema: apidocs/openapi/channels.yaml
-          base-url: ${{ env.CHANNELS_URL }}
-          checks: all
-          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --suppress-health-check=filter_too_much --exclude-checks=positive_data_acceptance --phases=examples'
-
-      - name: Run HTTP Adapter API tests
-        if: steps.changes.outputs.http == 'true'
-        uses: schemathesis/action@v2.1.0
-        with:
-          schema: apidocs/openapi/http.yaml
-          base-url: ${{ env.HTTP_ADAPTER_URL }}
-          checks: all
-          args: '--header "Authorization: Client ${{ env.CLIENT_SECRET }}" --suppress-health-check=filter_too_much --exclude-checks=positive_data_acceptance --phases=examples'
-
-      - name: Run Auth API tests
-        if: steps.changes.outputs.auth == 'true'
-        uses: schemathesis/action@v2.1.0
-        with:
-          schema: apidocs/openapi/auth.yaml
-          base-url: ${{ env.AUTH_URL }}
-          checks: all
-          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --suppress-health-check=filter_too_much --exclude-checks=positive_data_acceptance --phases=examples'
-
-      - name: Run Domains API tests
-        if: steps.changes.outputs.domains == 'true'
-        uses: schemathesis/action@v2.1.0
-        with:
-          schema: apidocs/openapi/domains.yaml
-          base-url: ${{ env.DOMAIN_URL }}
-          checks: all
-          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --suppress-health-check=filter_too_much --exclude-checks=positive_data_acceptance --phases=examples'
-
-      - name: Run Journal API tests
-        if: steps.changes.outputs.journal == 'true'
-        uses: schemathesis/action@v2.1.0
-        with:
-          schema: apidocs/openapi/journal.yaml
-          base-url: ${{ env.JOURNAL_URL }}
-          checks: all
-          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --suppress-health-check=filter_too_much --exclude-checks=positive_data_acceptance --phases=examples'
-
-      - name: Stop containers
-        if: always()
-        run: make run down args="-v" && make run_addons down args="-v"
@@ -1,77 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-name: Continuous Delivery
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build-and-push:
-    name: Build and Push
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Fetch tags for the build
-        run: |
-          git fetch --prune --unshallow --tags
-
-      - name: Setup Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: 1.25.x
-          cache-dependency-path: "go.sum"
-
-      - name: Set GOBIN
-        run: echo "GOBIN=$HOME/.local/bin" >> $GITHUB_ENV
-
-      - name: Add GOBIN to PATH
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Run tests
-        run: |
-          make test
-
-      - name: Upload coverage
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV }}
-          files: ./coverage/*.out
-          verbose: true
-
-      - name: Set up Docker Build
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Compile check for rabbitmq
-        run: |
-          SMQ_MESSAGE_BROKER_TYPE=msg_rabbitmq make mqtt
-
-      - name: Compile check for redis
-        run: |
-          SMQ_ES_TYPE=es_redis make mqtt
-
-      - name: Build and push Docker images
-        run: |
-          make latest -j $(nproc)
-
-      - name: Trigger Helm Chart Deployment
-        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: peter-evans/repository-dispatch@v4
-        with:
-          token: ${{ secrets.REPO_DISPATCH_TOKEN }}
-          repository: absmach/amdm
-          event-type: deploy-latest-smq-images
@@ -1,141 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-name: Check the consistency of generated files
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  check-generated-files:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Install Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: 1.25.x
-          cache-dependency-path: "go.sum"
-
-      - name: Set GOBIN
-        run: echo "GOBIN=$HOME/.local/bin" >> $GITHUB_ENV
-
-      - name: Add GOBIN to PATH
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Check for changes in go.mod
-        run: |
-          go mod tidy
-          git diff --exit-code
-
-      - name: Check for changes in specific paths
-        uses: dorny/paths-filter@v3
-        id: changes
-        with:
-          base: main
-          filters: |
-            proto:
-              - ".github/workflows/check-generated-files.yaml"
-              - "auth.proto"
-              - "auth/*.pb.go"
-              - "pkg/messaging/message.proto"
-              - "pkg/messaging/*.pb.go"
-
-            mocks:
-              - ".github/workflows/check-generated-files.yaml"
-              - "pkg/sdk/sdk.go"
-              - "users/postgres/clients.go"
-              - "users/clients.go"
-              - "pkg/clients/clients.go"
-              - "pkg/messaging/pubsub.go"
-              - "clients/postgres/clients.go"
-              - "clients/clients.go"
-              - "pkg/authz.go"
-              - "pkg/authn.go"
-              - "auth/domains.go"
-              - "auth/keys.go"
-              - "auth/service.go"
-              - "pkg/events/events.go"
-              - "pkg/groups/groups.go"
-              - "users/emailer.go"
-              - "users/hasher.go"
-              - "journal/journal.go"
-              - "consumers/notifier.go"
-
-      - name: Set up protoc
-        if: steps.changes.outputs.proto == 'true'
-        run: |
-          PROTOC_VERSION=33.0
-          PROTOC_GEN_VERSION=v1.36.10
-          PROTOC_GRPC_VERSION=v1.5.1
-
-          # Export the variables so they are available in future steps
-          echo "PROTOC_VERSION=$PROTOC_VERSION" >> $GITHUB_ENV
-          echo "PROTOC_GEN_VERSION=$PROTOC_GEN_VERSION" >> $GITHUB_ENV
-          echo "PROTOC_GRPC_VERSION=$PROTOC_GRPC_VERSION" >> $GITHUB_ENV
-
-          # Download and install protoc
-          PROTOC_ZIP=protoc-$PROTOC_VERSION-linux-x86_64.zip
-          curl -0L -o $PROTOC_ZIP https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOC_VERSION/$PROTOC_ZIP
-          unzip -o $PROTOC_ZIP -d protoc3
-          sudo mv protoc3/bin/* /usr/local/bin/
-          sudo mv protoc3/include/* /usr/local/include/
-          rm -rf $PROTOC_ZIP protoc3
-
-          # Install protoc-gen-go and protoc-gen-go-grpc
-          go install google.golang.org/protobuf/cmd/protoc-gen-go@$PROTOC_GEN_VERSION
-          go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@$PROTOC_GRPC_VERSION
-
-          # Add protoc to the PATH
-          export PATH=$PATH:/usr/local/bin/protoc
-
-      - name: Check Protobuf is up to Date
-        if: steps.changes.outputs.proto == 'true'
-        run: |
-          for p in $(find . -name "*.pb.go"); do
-            mv $p $p.tmp
-          done
-
-          make proto
-
-          for p in $(find . -name "*.pb.go"); do
-            if ! cmp -s $p $p.tmp; then
-              echo "Error: Proto file and generated Go file $p are out of sync!"
-              echo "Here is the difference:"
-              diff $p $p.tmp || true
-              echo "Please run 'make proto' with protoc version $PROTOC_VERSION, protoc-gen-go version $PROTOC_GEN_VERSION and protoc-gen-go-grpc version $PROTOC_GRPC_VERSION and commit the changes."
-              exit 1
-            fi
-          done
-
-      - name: Check Mocks are up to Date
-        if: steps.changes.outputs.mocks == 'true'
-        run: |
-          for f in $(find . -type f -path '*/mocks/*.go' ! -name 'doc.go'); do
-              mv $f $f.tmp
-          done
-
-          make mocks
-
-          check_mock_changes() {
-            local file_path=$1
-            local tmp_file_path=$1.tmp
-            local entity_name=$2
-
-            if ! cmp -s "$file_path" "$tmp_file_path"; then
-                echo "Error: Generated mocks for $entity_name are out of sync!"
-                echo "Please run 'make mocks' with mockery version $MOCKERY_VERSION and commit the changes."
-                exit 1
-            fi
-          }
-
-          for f in $(find . -type f -path '*/mocks/*.go' ! -name 'doc.go'); do
-              check_mock_changes $f "$f"
-          done
@@ -1,40 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-name: Check License Header
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  check-license:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Check License Header
-        run: |
-          CHECK=""
-          for file in $(grep -rl --exclude-dir={.git,build} \
-            --exclude=\*.{crt,key,pem,zed,hcl,md,json,csv,mod,sum,tmpl,args} \
-            --exclude={CODEOWNERS,LICENSE,MAINTAINERS,enabled_plugins,rabbitmq.conf} \
-            .); do
-              
-              if ! head -n 5 "$file" | grep -q "Copyright (c) Abstract Machines"; then
-                CHECK="$CHECK $file"
-              fi
-          done
-
-          if [ "$CHECK" ]; then
-            echo "License header check failed. Fix the following files:"
-            echo "$CHECK"
-            exit 1
-          else
-            echo "All files have the correct license header!"
-          fi
@@ -1,31 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-name: Deploy GitHub Pages
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  swagger-ui:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Swagger UI action
-        id: swagger-ui-action
-        uses: blokovi/swagger-ui-action@main
-        with:
-          dir: "./apidocs/openapi"
-          pattern: "*.yaml"
-          debug: "true"
-
-      - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: swagger-ui
-          cname: docs.api.supermq.absmach.eu
@@ -1,365 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-name: CI Pipeline
-
-on:
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  lint-and-build: # Linting and building are combined to save time for setting up Go
-    name: Lint and Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v5
-
-      - name: Setup Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: 1.25.x
-          cache-dependency-path: "go.sum"
-
-      - name: Fetch Certs
-        run: |
-          make fetch_certs
-          if [[ -n $(git status --porcelain docker/addons/certs) ]]; then
-            echo "Certs docker file is not up to date. Please update it"
-            git diff docker/addons/certs
-            exit 1
-          else
-            exit 0
-          fi
-
-      - name: Install protolint
-        run: |
-          go install github.com/yoheimuta/protolint/cmd/protolint@latest
-
-      - name: Lint Protobuf Files
-        run: |
-          protolint .
-
-      - name: Run linters
-        uses: golangci/golangci-lint-action@v8
-        with:
-          version: v2.4.0
-          args: --config ./tools/config/.golangci.yaml
-
-      - name: Build all Binaries
-        run: |
-          make all -j $(nproc)
-
-      - name: Compile check for rabbitmq
-        run: |
-          SMQ_MESSAGE_BROKER_TYPE=msg_rabbitmq make mqtt
-
-      - name: Compile check for redis
-        run: |
-          SMQ_ES_TYPE=es_redis make mqtt
-
-  run-tests:
-    name: Run tests
-    runs-on: ubuntu-latest
-    needs: lint-and-build
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-
-      - name: Setup Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: 1.25.x
-          cache-dependency-path: "go.sum"
-
-      - name: Check for changes in specific paths
-        uses: dorny/paths-filter@v3
-        id: changes
-        with:
-          base: main
-          filters: |
-            workflow:
-              - ".github/workflows/tests.yaml"
-
-            auth:
-              - "auth/**"
-              - "cmd/auth/**"
-              - "auth.proto"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "pkg/ulid/**"
-              - "pkg/uuid/**"
-
-            channels:
-              - "channels/**"
-              - "cmd/channels/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "auth/**"
-              - "pkg/sdk/**"
-              - "clients/api/grpc/**"
-              - "groups/api/grpc/**"
-              - "domains/api/grpc/**"
-              - "internal/grpc/**"
-
-            cli:
-              - "cli/**"
-              - "cmd/cli/**"
-              - "pkg/sdk/**"
-
-            clients:
-              - "clients/**"
-              - "cmd/clients/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "auth/**"
-              - "pkg/ulid/**"
-              - "pkg/uuid/**"
-              - "pkg/events/**"
-              - "groups/api/grpc/**"
-              - "channels/api/grpc/**"
-              - "domains/api/grpc/**"
-              - "internal/grpc/**"
-
-            coap:
-              - "coap/**"
-              - "cmd/coap/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "clients/**"
-              - "pkg/messaging/**"
-
-            domains:
-              - "domains/**"
-              - "cmd/domains/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "auth/**"
-              - "internal/grpc/**"
-
-            groups:
-              - "groups/**"
-              - "cmd/groups/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "auth/**"
-              - "pkg/ulid/**"
-              - "pkg/uuid/**"
-              - "clients/api/grpc/**"
-              - "channels/api/grpc/**"
-              - "domains/api/grpc/**"
-              - "internal/grpc/**"
-
-            http:
-              - "http/**"
-              - "cmd/http/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "clients/**"
-              - "pkg/messaging/**"
-              - "logger/**"
-
-            internal:
-              - "internal/**"
-
-            journal:
-              - "journal/**"
-              - "cmd/journal/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "auth/**"
-              - "pkg/events/**"
-
-            logger:
-              - "logger/**"
-
-            mqtt:
-              - "mqtt/**"
-              - "cmd/mqtt/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "clients/**"
-              - "pkg/messaging/**"
-              - "logger/**"
-              - "pkg/events/**"
-
-            pkg-errors:
-              - "pkg/errors/**"
-
-            pkg-events:
-              - "pkg/events/**"
-              - "pkg/messaging/**"
-
-            pkg-grpcclient:
-              - "pkg/grpcclient/**"
-
-            pkg-messaging:
-              - "pkg/messaging/**"
-
-            pkg-sdk:
-              - "pkg/sdk/**"
-              - "pkg/errors/**"
-              - "pkg/groups/**"
-              - "auth/**"
-              - "http/**"
-              - "internal/*"
-              - "clients/**"
-              - "users/**"
-              - "channels/**"
-              - "domains/**"
-              - "groups/**"
-              - "journal/**"
-              - "api/http/**"
-
-            pkg-transformers:
-              - "pkg/transformers/**"
-
-            pkg-ulid:
-              - "pkg/ulid/**"
-
-            pkg-uuid:
-              - "pkg/uuid/**"
-
-            users:
-              - "users/**"
-              - "cmd/users/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "auth/**"
-              - "pkg/ulid/**"
-              - "pkg/uuid/**"
-              - "pkg/events/**"
-
-            ws:
-              - "ws/**"
-              - "cmd/ws/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "clients/**"
-              - "pkg/messaging/**"
-
-      - name: Create coverage directory
-        run: |
-          mkdir coverage
-
-      - name: Run journal tests
-        if: steps.changes.outputs.journal == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/journal.out ./journal/...
-
-      - name: Run auth tests
-        if: steps.changes.outputs.auth == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/auth.out ./auth/...
-
-      - name: Run domains tests
-        if: steps.changes.outputs.domains == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/domains.out ./domains/...
-
-      - name: Run cli tests
-        if: steps.changes.outputs.cli == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/cli.out ./cli/...
-
-      - name: Run CoAP tests
-        if: steps.changes.outputs.coap == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/coap.out ./coap/...
-
-      - name: Run HTTP tests
-        if: steps.changes.outputs.http == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/http.out ./http/...
-
-      - name: Run internal tests
-        if: steps.changes.outputs.internal == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/internal.out ./internal/...
-
-      - name: Run logger tests
-        if: steps.changes.outputs.logger == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/logger.out ./logger/...
-
-      - name: Run MQTT tests
-        if: steps.changes.outputs.mqtt == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/mqtt.out ./mqtt/...
-
-      - name: Run pkg errors tests
-        if: steps.changes.outputs.pkg-errors == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/pkg-errors.out ./pkg/errors/...
-
-      - name: Run pkg events tests
-        if: steps.changes.outputs.pkg-events == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/pkg-events.out ./pkg/events/...
-
-      - name: Run pkg grpcclient tests
-        if: steps.changes.outputs.pkg-grpcclient == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/pkg-grpcclient.out ./pkg/grpcclient/...
-
-      - name: Run pkg messaging tests
-        if: steps.changes.outputs.pkg-messaging == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/pkg-messaging.out ./pkg/messaging/...
-
-      - name: Run pkg sdk tests
-        if: steps.changes.outputs.pkg-sdk == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/pkg-sdk.out ./pkg/sdk/...
-
-      - name: Run pkg transformers tests
-        if: steps.changes.outputs.pkg-transformers == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/pkg-transformers.out ./pkg/transformers/...
-
-      - name: Run pkg ulid tests
-        if: steps.changes.outputs.pkg-ulid == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/pkg-ulid.out ./pkg/ulid/...
-
-      - name: Run pkg uuid tests
-        if: steps.changes.outputs.pkg-uuid == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/pkg-uuid.out ./pkg/uuid/...
-
-      - name: Run clients tests
-        if: steps.changes.outputs.clients == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/clients.out ./clients/...
-
-      - name: Run channels tests
-        if: steps.changes.outputs.channels == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/channels.out ./channels/...
-
-      - name: Run users tests
-        if: steps.changes.outputs.users == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/users.out ./users/...
-
-      - name: Run groups tests
-        if: steps.changes.outputs.groups == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/groups.out ./groups/...
-
-      - name: Run WebSocket tests
-        if: steps.changes.outputs.ws == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/ws.out ./ws/...
-
-      - name: Upload coverage
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV }}
-          files: ./coverage/*.out
-          verbose: true
@@ -1,20 +1,8 @@
-# Copyright (c) Abstract Machines
+# Copyright (c) Mainflux
 # SPDX-License-Identifier: Apache-2.0

-# build dirs
+# Set your private global .gitignore:
+# https://digitalfortress.tech/tricks/creating-a-global-gitignore/
+
 build

-# tools
-tools/e2e/e2e
-tools/mqtt-bench/mqtt-bench
-tools/provision/provision
-tools/provision/mgconn.toml
-
-# coverage files
-coverage
-
-# Schemathesis
-.hypothesis
-
-# Ignore Openbao data directory as it contains runtime-generated data
-docker/addons/certs/openbao/
@@ -1,36 +0,0 @@
-# Adopters
-
-As SuperMQ Community grows, we'd like to keep track of SuperMQ adopters to grow the community, contact other users, share experiences and best practices.
-
-To accomplish this, we created a public ledger. The list of organizations and users who consider themselves as SuperMQ adopters and that **publicly/officially** shared information and/or details of their adoption journey(optional).
-Where users themselves directly maintain the list.
-
-## Adding yourself as an adopter
-If you are using SuperMQ, please consider adding yourself as an adopter with a brief description of your use case by opening a pull request to this file and adding a section describing your adoption of SuperMQ technology.
-
-**Please send PRs to add or remove organizations/users**
-
-### Format
-
-```
-N: Name of user (company or individual)
-D: Short Use Case Description (optional)
-L: Link with further information (optional)
-T: Type of adaptation: Evaluation, Core Technology, Production Usage (optional)
-```
-
-## Requirements
-* You must represent the user or organization listed. Do NOT add entries on behalf of other organizations or individuals.
-Pull request commit must be [signed](https://docs.github.com/en/github/authenticating-to-github/signing-commits) and auto-checked with [ Developer Certificate of Origin (DCO)](https://probot.github.io/apps/dco/)
-* There is no minimum requirement or adaptation size, but we request to list permanent deployments only, i.e., no demo or trial deployments. Commercial or production use is not required. A well-done home lab setup can be equally impressive as a large-scale commercial deployment.
-
-
-**The list of organizations/users that have publicly shared the usage of SuperMQ:**
-
-**Note**: Several other organizations/users couldn't publicly share their usage details but are active project contributors and SuperMQ Community members.
-
-
-## Adopters list (alphabetical)
-
-
-**Note:** The list is maintained by the users themselves. If you find yourself on this list, and you think it's inappropriate. Please contact [project maintainers](https://github.com/absmach/supermq/blob/main/MAINTAINERS) and you will be permanently removed from the list.
@@ -0,0 +1,502 @@
+# Mainflux Changelog
+
+## Generation
+Mainflux release notes for the latest release can be obtained via:
+```
+make changelog
+```
+
+Otherwise, whole log in a similar format can be observed via:
+```
+git log --pretty=oneline --abbrev-commit
+```
+
+## 0.11.0 - 29. MAY 2020.
+### Features and Bugfixes
+- Add VerneMQ docker image build from source (#1178)
+- MF-994 - Add tracing middleware for twins and states repos (#1181)
+- MF-995 - Add Twins tests for endpoint list twins and list states (#1174)
+- NOISSUE - Update dependencies (#1176)
+- MF-1163 - Fix influxdb-reader to use nanoseconds precision (#1171)
+- Rename environment variable MF_MQTT_ADAPTER_PORT to MF_MQTT_ADAPTER_MQTT_PORT in docker environment (#1170)
+- Remove thing related code from twins service (#1169)
+- MF-997 - Add twins service swagger file (#1167)
+- MF-1079 - Add MQTT forwarder (#1164)
+- MF-1159 - add gateway metadata update in provision method (#1160)
+- MF-1055 - rollback/release transaction on error (#1166)
+- NOISSUE - Use log level error for VermeMQ docker (#1162)
+- NOISSUE - Fix default nats pubsub subject (#1153)
+- MF-1125 - Document Provision service (#1143)
+- NOISSUE - Fix bootstrap SDK args naming (#1151)
+- Use VerneMQ default log level (#1150)
+- NOISSUE - Update provision service (#1133)
+- NOISSUE - Refactor messaging (#1141)
+- Add JSON tags to SDK entities (#1146)
+- NOISSUE - Update CLI README.md (#1139)
+- NOISSUE - Update mProxy version (#1137)
+- fix nginx, channel connect (#1136)
+- Remove concurrency flag for golangci-lint (#1134)
+- MF-1088 - Remove message payload content type (#1121)
+- MF-1129 - Use snake_case for Lora and OPC-UA metadata fields (#1130)
+- MF-1128 - Add golangci-linter to a CI script (#1131)
+- MF-1123 - Move Provision service to monorepo (#1132)
+- MF-845 - Add FOSSA badge for licensing (#1127)
+- MF-1087 - Remove WebSocket adapter (#1120)
+- NOISSUE - Use HTTP Status in SDK error messages (#1119)
+- NOISSUE - Fix bootstrap token naming and interfaces named args (#1117)
+- MF-1115 - Improve the SDK error encoding (#1118)
+- MF-862 - Add boostrap CRUD to SDK and CLI (#1114)
+- NOISSUE - Update coding style in Things service (#1116)
+- NOISSUE - Remove defers from TestMain (#1111)
+- NOISSUE - Create func to encode SDK errors (#1110)
+- MF-1078 - Add timestamp to published messages and use it in Transformer (#1106)
+- Fix prometheus namespace in postgres reader & writer (#1109)
+- NOISSUE - Implement errors package in senml transformer, readers and writers (#1108)
+- NOISSUE - Implement errors package in Authentication service (#1105)
+- MF-1103 - API key should ignore empty expiration time (#1104)
+- MF-1096 - Fix AuthN and Things Auth ENVARS (#1066)
+- fix Contains function for nil arguments (#1102)
+- MF-1099 - Add email subdomain validator (#1101)
+- MF-1091 - Use channels. as broker prefix (#1098)
+- MF-1090 - Use named Interfaces args (#1097)
+- NOISSUE - Create broker package for NATS (#1080)
+- NOISSUE - Implement errors package in bootstrap service (#1093)
+- NOISSUE - Fix writers loadSubjectsConfig if file is missing (#1094)
+- NOISSUE - Adding subtopics filtering in writer services (#1072)
+- NOISSUE - Improve errors package (#1086)
+- NOISSUE - Enable MQTT over WS in docker composition (#1085)
+- NOISSUE - Rm unused opc-ua envars (#1083)
+- MF-798 - Add utf8 support for email validation (#1082)
+- Remove unused Tokenizer interface (#1084)
+- Update mqtt adapter imports (#1081)
+- NOISSUE - Update state based on SenML time value (#1075)
+- NOISSUE - Fix StatusBadDecodingError for opc-ua browse (#1074)
+- Save senml array msg to multiple states (#1073)
+- NOISSUE - Fix opc-ua message type handling (#1071)
+- NOISSUE - Add Publisher field to MQTT adapter (#1067)
+- NOISSUE - Fix users CLI (#1062)
+- NOISSUE - Fix SDK Messages response (#1064)
+- Merged MQTT docker compose in core composition file (#1060)
+- MF-1016 - Add UserUpdate and UpdatePassword to sdk and CLI (#1057)
+- Update mProxy (#1058)
+- MF-1053 - Add disconnect event to MQTT adapter (#1056)
+- Fix data type for data_value in databases (#1054)
+- NOISSUE - Fix opc-ua subscriptions store (#1052)
+- NOISSUE - Fix connect CLI command and remove ConnectThing func from SDK (#1051)
+- NOISSUE - Update Vernemq image repository (#1050)
+- Removed VerneMQ auth plugin, Aedes impl. Added mproxy support in docker (#1049)
+- NOISSUE - Add default subscription nodeID and Interval ENVAR (#1046)
+- MF-415 - Merge mProxy support  (#1045)
+- NOISSUE - Remove twins-service mqtt dependency and publish notifs to nats (#1042)
+- Add arbitrary SenML value type saving to twin state (#1039)
+- Fixed Aedes dependencies (#1036)
+- MF-998 - Add Twins service to Makefile and docker-compose.yml (#1035)
+- MF-1032 - Fix redis docker volume of opcua-adapter (#1033)
+- NOISSUE - add nats conf (#1031)
+- MF-442 - Add SSL encryption to the MongoDB, InfluxDB and Cassanda readers (#1024)
+- NOISSUE - Add opc-ua type handling and unsubscription (#1029)
+- NOISSUE - Add aggregate attribute-based search for twin retrieval (#1027)
+- NOISSUE - Fix metadata in add Things endpoint (#1028)
+- NOISSUE - Fix minimal password length (#1023)
+- MF-1020 - Change default password for CLI provision test (#1021)
+- NOISSUE - Add subtopic to opcua messages (#1022)
+- NOISSUE - Add details to browsed OPC-UA nodes (#1019)
+- NOISSUE Fix obsolete attribute persistance (#1018)
+- Fix twins update revision counter (#1011)
+- Fixed docs instructions in README (#1010)
+- Fix copyright year (#1009)
+- Fix issuing recovery key (#1007)
+- Removed gatling load-test (#1005)
+- Removed old k8s manifests (#1004)
+- NOISSUE - Remove UI from docker-compose (#1001)
+- NOISSUE - Store successfull OPC-UA subscriptions (#999)
+- MF-730 - Add digital twin service for things (#855)
+- Fix Redis event naming (#996)
+- NOISSUE - Add a Browse endpoint in opcua-adapter (#988)
+- NOISSUE - Add Redis ES Username/Pass for VerneMQ (#991)
+- MF-982 - Add error when connecting empty channels or things (#985)
+
+## 0.10.0 - 17. DEC 2019.
+### Features
+- MF-932 - User API keys (#941)
+- NOISSUE - Use opcua server timestamp in opcua-adapter messages (#980)
+- Simplify CI script (#979)
+- NOISSUE - Add opcua-adapter conn route-map, use ServerURI and NodeID (#975)
+- Move docs to a separate repo (#976)
+- NOISSUE - Support multiple types values in opcua-adapter (#973)
+- Migrate from dep to go modules (#971)
+- NOISSUE - Add Node IdentifierType config in opcua-adapter (#967)
+- NOISSUE - Remove messages limit in influxdb-reader (#968)
+- MF-898 - Add bulk connect to CLI and SDK (#956)
+- MF-538 - Improve logging and API errors (#866)
+- NOISSUE - Remove Elm UI (#953)
+- MF-898 - Add bulk connections endpoint (#948)
+- MF-898 - Change thing's service to use bulk connect (#946)
+- MF-898 - Add transactions to postgres connect (#940)
+- Add missing user service tests (#945)
+- Remove Normalizer service from compose (#937)
+- MF-919 - Mainflux message updates (#924)
+- NOISSUE - Remove ARM multi-arch images (#929)
+- MF-906 - Change single creation endpoints to use bulk service calls (#927)
+- MF-922 - Add UpdateUser endpoint (#923)
+- MF-780 - Use Normalizer as a lib (#915)
+- NOISSUE - Switch to grpcbox for VerneMQ (#914)
+- Change channels to chs (#918)
+- MF-484 - Add bulk provisioning for things and channels (#889)
+- MF-899 - Update README and official docs (#910)
+- NOISSUE - Fix Redis envars (#903)
+- Add disconnect on gen_server terminate() (#913)
+- MF-890 - Add OPC-UA docs  (#904)
+- NOISSUE - Update Protobuf version (#902)
+- MF-886 - Add OPC-UA adapter (#878)
+- MF-532 - Password reset (#873)
+- MF-785 - Change CanAccess to CanAccessByKey (#894)
+- NOISSUE - Add MQTT UserName check on register and InstanceId in Redis (#884)
+- Add MQTT troubleshooting section (#882)
+- MF-875 - Add tracing to official documentation (#877)
+- MF-788 - Remove date and minimize copyright comments (#876)
+- MF-787 - Add tags to user, thing, and channel spans (#869)
+- Update docker-compose version for addons (#874)
+- MF-859 - Channels metadata search (#867)
+- MF-858 Users metadata (#861)
+- NOISSUE - Simplify MQTT benchmarking tool (#852)
+- NOISSUE - Upgrade Go version to 1.13 in container images (#868)
+- MF-820 - Fetch messages for a particular device (#843)
+- Update gorilla websocket version (#865)
+- NOISSUE - Update aedes version and fix Dockerfile (#863)
+- NOISSUE - Search by metadata (#849)
+- MF-846 - Install python in docker build for aedes mqtt image (#860)
+- NOISSUE - Clean NginX files, move .gitignores to dirs (#853)
+- NOISSUE - Add docker-compose for MQTT cluster (#841)
+- Add debug logs to the WS adapter (#848)
+- NOISSUE - Add measuring time from pub to sub (#839)
+- NOISSUE - update mqtt prov tool and some refactor (#831)
+- NOISSUE - Use Thing ID to update certs data (#827)
+- NOISSUE - Improve VerneMQ plugin code, add configurable gRPC pool size (#836)
+- NOISSUE - Use gRPC for VerneMQ (#835)
+- Switch secure of WS connection according to secure of http connection of UI (#829)
+- NOISSUE - Use current hostname instead of localhost for a WebSocket connection in the UI (#826)
+- NOISSUE - Improve MQTT benchmarking tools (#828)
+- NOISSUE - update mqtt benchmark (#824)
+- Add encryption key to env vars table (#823)
+- NOISSUE - Add version endpoint to MQTT adapter (#816)
+- MF-295 add mqtt benchmark tool (#817)
+- update mqtts commands (#815)
+- NOISSUE - Support encrypted bootstrap (#796)
+- Add config to writers docs (#812)
+- NOISSUE - Add VerneMQ support (#809)
+- NOISSUE - Add content type as part of MQTT subscription topic (#810)
+
+### Bugfixes
+- Fix MQTT protobuf filename(#981)  
+- MF-950 - Runtime error in normalizer - CBOR SenML (#974)
+- NOISSUE - Fix opcua-adapter events warnings (#965)
+- NOISSUE - Fix opcua-adapter events decode (#951)
+- Fix subtopic handling in VerneMQ (#962)
+- NOISSUE - Fix Update User (#959)
+- NOISSUE - Fix make dockers (#957)
+- Add dev_ back to make dockers_dev (#955)
+- NOISSUE - Fix docs (#952)
+- MF-916 - Fix Things and Channels counters (#947)
+- MF-942 - Fix email template logic  (#944)
+- NOISSUE - Fix HTTP header for Things and Channels creation (#939)
+- NOISSUE - Fix docker ui image name (#938)
+- NOISSUE - Fix lora-adapter (#936)
+- NOISSUE - Fix lora creation events (#933)
+- Fix doc for ENV vars in README (#920)
+- Fix compilation (#911)
+- Revert "NOISSUE - Make event sourcing optional (#907)" (#909)
+- NOISSUE - Make event sourcing optional (#907)
+- NOISSUE - Fix InfluxDB env vars (#908)
+- Fix Elm version for ARM Docker images (#905)
+- Fix Elm version in Dockerfile (#901)
+- NOISSUE - fix security doc (#897)
+- NOISSUE - Fix typo in docs and README (#891)
+- Fix Nginx mTLS configuration (#885)
+- Fix provision tool connect error handling (#879)
+- Fix: Correct 404 and Content-Type Issues in MQTT Version Endpoint (#837)
+- NOISSUE - Fix proto files in VerneMQ (#834)
+- NOISSUE - Fix hackney HTTP request (#833)
+- Add socket pool and fix pattern matching (#830)
+- Fix typo (#814)
+
+## 0.9.0 - 19. JUL 2019.
+### Features
+- Create and push docker manifest for new release from Makefile (#794)
+- MF-399 - Add open tracing support (#782)
+- MF-783 - Allow access checking by a thing ID (#784)
+- NOISSUE - Add authorization HTTP API to things service (#772)
+- Remove cli executable from repo (#776)
+- NOISSUE - Use .env vars in docker-compose (#770)
+- MF-663 - enable nginx port conf from docker env (#769)
+- Update docs (#766)
+- NOISSUE - Remove installing non-existent package in ci (#758)
+-  NOISSUE - Add searchable Channels name  (#754)
+- MF-466 - ARM docker deployment (#756)
+- Add missing Websocket.js into docker ui image (#755)
+- NOISSUE - Add searchable Things name (#750)
+- NOISSUE - Add certificate fields to the Bootstrap service (#752)
+- Update grpc and protobuf deps in mqtt adapter (#751)
+- MF-742 - Things to support single user scenario (#749)
+- MF-732 - Add Postgres reader (#740)
+- MF-722 - Change UUID lib (#746)
+- Add performance improvement to writer filtering (#744)
+- NOISSUE - Update nginx version (#748)
+- MF-574 - Add missing environment variables to Cassandra writer (#745)
+- NOISSUE - Add compile test to CI (#743)
+- MF-708 - Assign Writer(s) to a channel (#737)
+- MF-732 - Add PostgreSQL writer (#733)
+- NOISSUE - Add readers pagination in SDK (#736)
+- Add UI websocket open/close and send/receive (#728)
+- MF-707 - Allow custom Thing key (#726)
+- MF-525 - Add pagination response to the readers (#729)
+- NOISSUE - Rm Things type from lora-adapter (#727)
+- skip deleting of persistent volumes by default (#723)
+- MF-488 - Remove Thing type (app or device) (#718)
+- Remove empty channels check (#720)
+- MF-655 Proper usage of docker volumes (#657)
+- NOISSUE - Improve UI styling (#719)
+- MF-715 - Conflict on updating connection with a valid list of channels (#716)
+- MF-711 - Create separate Redis instance for ES (#717)
+- NOISSUE - Update event fields naming (#713)
+- MF-698 - Add missing info and docs about sys event sourcing (#712)
+- MF-549 - Change metadata format from JSON string to JSON object (#706)
+- NOISSUE - Replace repeating code by card gen func (#697)
+- Update Bootstrap service docker-compose.yml (#700)
+- Remove Debug function (#699)
+- MF-687 - Add event sourcing to Bootstrap service (#695)
+- NOISSUE - Remove debugging message from response of handle error function (#696)
+- Add event stream to MQTT adapter for conn status (#692)
+- NOISSUE - Improve UI style (#691)
+- Update docs structure (#686)
+- Use images instead of carousel (#685)
+- NOISSUE - Update docs (#683)
+- MF-662 - Change menu style (#678)
+- MF-651 - X509 Mutual TLS authentication (#676)
+- Update Aedes version for MQTT adapter (#677)
+- MF-661 - Bootstrap pagination in UI (#672)
+- Update subtopics section in documentation (#670)
+- Remove default base URL value (#671)
+
+### Bugfixes
+- NOISSUE - Fix Readers logs (#735)
+- NOISSUE - Fix Docker for ARM (#760)
+- NOISSUE - Fix count when search by name is performed (#767)
+- NOISSUE - Typo fix (#777)
+- NOISSUE - Fix Postgres logs in Things service (#734)
+- Fix CI with fixed plugin versions (#747)
+- fix building problems (#741)
+- fix docker-compose env (#775)
+- Fix MF_THINGS_AUTH_GRPC_PORT in addons' docker-compose files (#781)
+- Fix MQTT raw message deserialization (#753)
+- fix variant option for manifest annotate (#765)
+- fix to makefile for OSX/Darwin (#724)
+- Fix .dockerignore file by removing index.html (#725)
+- Fix things and channels metadata create and edit & remove thing type (#721)
+- Fix Bootstrap service event map keys (#705)
+- Fix logging in publish event callback (#694)
+- Fix InfluxDB time bug (#689)
+- Fix users service to work in offline mode (#795)
+- fix mainflux_id parameter in bootstrap swagger (#789)
+- Fix offset calculation after deleting thing/channel, not to go to negative offset after deleting last thing/channel (#679)
+- Use errors and null packets in authorized pub/sub (#773)
+- NOISSUE - Fix CoAP adapter (#779)
+
+
+### Summary
+https://github.com/mainflux/mainflux/milestone/10?closed=1
+
+## 0.8.0 - 20. MAR 2019.
+### Features
+- MF-571 - Add Env.elm to set custom base URL (#654)
+- NOISSUE Added docs about docker-compose config overriding (#653)
+- MF-539 - Improve Bootstrap Service documentation (#646)
+- MF-596 - Add subtopic to RawMessage (#642)
+- NOISSUE - Prevent infinite loop in lora-adapter if Redis init fail (#647)
+- Corrected grammar and rephrased a few sentences to read nicely (#641)
+- MF-571 - Elm UI (#632)
+- MF-552 - Use event sourcing to keep Bootstrap service in sync with Things service (#603)
+- MF-540 - Add pagination in API responses for Bootstrap service (#575)
+- MF-600 - Handle custom LoRa Server application decoder (#608)
+- update docker-compose (#590)
+- Update generated code (#602)
+- Add generated files check (#601)
+- MF-597 - Removed legacy code as not needed anymore (#598)
+- NOISSUE - Added normalizer service to run script (#594)
+- Changed RawMessage (#587)
+- NOISSUE - fix CLI log (#581)
+- MF-519 - Refine Message (#567)
+- NOISSUE - Add name field for Bootstrap Config (#564)
+- Fix non-SenML message routing in normalizer (#573)
+- NOISSUE - Update authors list (#569)
+- Update lora.md (#568)
+- NOISSUE- Improve LoRa doc (#562)
+- MF-551 - Add metadata fields to Bootstrap Channels (#563)
+- Fix MQTT adapter by setting subscription queue (#561)
+- MF-558 - Add MQTT subtopics documentation (#559)
+- Fix regexp for SUB (#557)
+- Simplify MQTT topipc regexp (#555)
+- MF-429 -Enabled MQTT subtopic's (#554)
+- Add env var for number of concurrent messages (#545)
+- NOISSUE - Update doc and fix empty key bug (#544)
+- MF-370 - Simplify and refine CI (#541)
+- NOISSUE - Add connection commands to CLI (#542)
+- NOISSUE - Refine docs (#537)
+- Update licnese year (#533)
+- MF-513 - Add Bootstrapping service (#524)
+- Add dedicated env vars for event sourcing (#536)
+- NOISSUE - Fix docs (#535)
+- Add lora doc to getting-started.md (#529)
+- MF-483 - Enable channels and devices corresponding lists in backend (#520)
+- Add missing components doc to architecture.md (#531)
+
+### Bugfixes
+- MF-639 Split Content-Type header field on semicolon and evaluate all substrings (#644)
+- MF-656 - Change bootstrap service port to 8200 (#658)
+- Replace crossOrigin with relative path and fix messaging bug (#645)
+- MF-579 Things & Channels returns 404 when not found or ID is malformed, not 500 (#633)
+- Fix run command in dev guide (#605)
+- MF-583 - Correct cmd/mongodb-reader HTTPServer log Info (#584)
+- Fix Dusan Maldenovic GitHub (#570)
+- Fix CLI docs (#566)
+- Fix pagination response for empty page (#547)
+- Fix swagger and provisioning docs (#546)
+- NOISSUE - Fix event sourcing client on LoRa adapter (#527)
+- Fix MQTT adapter scaling issue (#526)
+- NOISSUE - Fix subtopic regex and restrict empty subtopic parts (#659)
+- Fix missing css in container ui (#638)
+- NOISSUE - Fix lora-adapter Object decode (#610)
+- NOISSUE - Fix users logs in main.go (#577)
+- NOISSUE - Fix normalizer exposed port in docker-compose (#548)
+
+### Summary
+https://github.com/mainflux/mainflux/milestone/9?closed=1
+
+
+## 0.7.0 - 08. DEC 2018.
+### Features
+
+- MF-486 - Add provisioning command to CLI (#487)
+- Fix lora-adapter event store handlers (#492)
+- NOISSUE - Add LoRa route map validation and fix LoRa messages URL (#491)
+- MF-475 - Replace increment ID with UUID (#490)
+- MF-166 - Add lora-adapter service (#481)
+- NOISSUE - Add Makefile target to clean old imgs (#485)
+- MF-473 -  Add metadata field to channel (#476)
+- Make CoAP ping period configurable (#469)
+- Add nginx ingress config to k8s services (#472)
+- Add CoAP section in getting-started (#468)
+- NOISSUE - Move CLI documentation from getting started guide to separate page (#470)
+- NOISSUE - Update Getting Started doc with CLI usage (#465)
+- Update CoAP docs with URL example (#463)
+- MF-447 - Add event sourcing to things service (#460)
+- Add TLS support to CoAP adapter and all readers (#459)
+- MF-417 - Implement SDK tests (#438)
+- MF-454 - Use message Time field as a time for InfluxDB points (#455)
+- NOISSUE - Add .dockerignore to project root (#457)
+- Update docker-compose so that every service has debug log level (#453)
+- NOISSUE - Add TLS flag for Mainflux services (#452)
+- MF-448 - Option for Postgres SSL Mode (#449)
+- MF-443 Update project dependencies (#444)
+- MF-426 - Add optional MF_CA_CERTS env variable to allow GRPC client to use TLS certs (#430)
+- Expose the InfluxDB and Cassandra ports to host (#441)
+- MF-374 - Bring back CoAP adapter (#413)
+
+### Bugfixes
+- gRPC Load Balancing between http-adapter and things (#387)
+- MF-407 - Values of zero are being omitted  (#434)
+
+### Summary
+https://github.com/mainflux/mainflux/milestone/8?closed=1
+
+
+## 0.6.0 - 26. OCT 2018.
+### Features
+
+- Added Go SDK (#357)
+- Updated NATS version (#412)
+- Added debbug level to MFX logger (#379)
+- Added Documentation for readers (#389)
+- Added Redis cache to improve performance (#382)
+
+
+## 0.5.1 - 05. SEP 2018.
+### Features
+- Improve performance by adding Redis cache (#382)
+
+### Bugfixes
+- Mixed up name and type of the things (#375)
+- Fix MQTT topic (#380)
+
+
+## 0.5.0 - 28. AUG 2018
+### Features
+- InfluxDB Reader (#311)
+- Cassandra Reader (#313)
+- MongoDB Reader (#344)
+- MQTT Persistance via Redis (#328)
+- CLI integrated into monorepo (#216)
+- Normalizer logging (#333)
+- WS swagger doc (#337)
+- Payload renamed to Metadata (#343)
+- Protobuf files added (#363)
+- SPDX headers added (#325)
+
+### Bugfixes
+- Docker network for InfluxDB (#346)
+- Vendor correct gRPC version (#340)
+
+### Summary
+https://github.com/mainflux/mainflux/milestone/6?closed=1
+
+
+## 0.4.0 - 01. JUN 2018.
+* Integrated MQTT adapter (#165 )
+* Support for storing messages in MongoDB (#237)
+* Support for storing messages in InfluxDB (#236)
+* Use UUID PKs with auto-incremented values (#269 )
+* Replaced JWT with plain string tokens in things service (#268 )
+* Emit non-SenML messages (#239 )
+* Support for Grafana (#296)
+* Added WS Load test (#299 )
+
+
+## 0.3.0 - 14. MAY 2018.
+- CoAP API for message exchange (#186)
+- Split `manager` service into `clients` and `users` (#266)
+- Replaced ORM with raw SQL (#265)
+- Setup Kubernetes (#226, #273)
+- Fix docker compose (#274)
+- Integrated `dashflux` into monorepo (#258)
+- Integrated (*non-compatible*) `mqtt` into monorepo (#260)
+
+
+## 0.2.3 - 24. APR 2018.
+- Fix examples in the documentation (#243)
+- Add service name in info response (#241)
+- Improve code coverage in WS adapter (#242)
+
+
+## 0.2.2 - 23. APR 2018.
+- Setup load testing scenarios (#225)
+
+
+## 0.2.1 - 22. APR 2018.
+- Fixed `Content-Type` header checking (#238)
+
+## 0.2.0 - 18. APR 2018
+- Protobuf message serialization (#192)
+- Websocket API for exchanging messages (#188)
+- Channel & client retrieval paging (#227)
+- Service instrumentation (#213)
+- `go-kit` based JSON logger (#212)
+- Project documentation (#218, #220)
+- API tests (#211, #224)
+
+
+## 0.1.2 - 18. MAR 2018.
+### Bug fixes
+
+- Fixed go lint warnings (#189)
+- Compose failing startup (#185)
+- Added missing service startup messages (#190)
@@ -1,11 +1,11 @@
-# Contributing to SuperMQ
+# Contributing to Mainflux

-The following is a set of guidelines to contribute to SuperMQ and its libraries, which are
-hosted on the [Abstract Machines Organization](https://github.com/absmach) on GitHub.
+The following is a set of guidelines to contribute to Mainflux and its libraries, which are
+hosted on the [Mainflux Organization](https://github.com/mainflux) on GitHub.

 This project adheres to the [Contributor Covenant 1.2](http://contributor-covenant.org/version/1/2/0).
 By participating, you are expected to uphold this code. Please report unacceptable behavior to
-[abuse@abstractmachines.fr](mailto:abuse@abstractmachines.fr).
+[abuse@mainflux.com](mailto:abuse@mainflux.com).

 ## Reporting issues

@@ -13,7 +13,7 @@ Reporting issues are a great way to contribute to the project. We are perpetuall
 thorough bug report.

 Before raising a new issue, check [our issue
-list](https://github.com/absmach/supermq/issues) to determine if it already contains the
+list](https://github.com/mainflux/mainflux/issues) to determine if it already contains the
 problem that you are facing.

 A good bug report shouldn't leave others needing to chase you for more information. Please be as detailed as possible. The following questions might serve as a template for writing a detailed
@@ -41,23 +41,23 @@ To contribute to the project, [fork](https://help.github.com/articles/fork-a-rep
 clone your fork repository, and configure the remotes:

 ```
-git clone https://github.com/<your-username>/supermq.git
-cd supermq
-git remote add upstream https://github.com/absmach/supermq.git
+git clone https://github.com/<your-username>/mainflux.git
+cd mainflux
+git remote add upstream https://github.com/mainflux/mainflux.git
 ```

 If your cloned repository is behind the upstream commits, then get the latest changes from upstream:

 ```
-git checkout main
-git pull --rebase upstream main
+git checkout master
+git pull --rebase upstream master
 ```

-Create a new topic branch from `main` using the naming convention `SMQ-[issue-number]`
+Create a new topic branch from `master` using the naming convention `MF-[issue-number]`
 to help us keep track of your contribution scope:

 ```
-git checkout -b SMQ-[issue-number]
+git checkout -b MF-[issue-number]
 ```

 Commit your changes in logical chunks. When you are ready to commit, make sure
@@ -74,13 +74,13 @@ and `user.email` git configs, you can sign your commit automatically with `git c
 Locally merge (or rebase) the upstream development branch into your topic branch:

 ```
-git pull --rebase upstream main
+git pull --rebase upstream master
 ```

 Push your topic branch up to your fork:

 ```
-git push origin SMQ-[issue-number]
+git push origin MF-[issue-number]
 ```

 [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title
@@ -176,7 +176,7 @@

   END OF TERMS AND CONDITIONS

-   Copyright 2015-2020 SuperMQ
+   Copyright 2015-2020 Mainflux

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -1,4 +1,4 @@
-# SuperMQ follows the timeless, highly efficient and totally unfair system
+# Mainflux follows the timeless, highly efficient and totally unfair system
 # known as [Benevolent dictator for
 # life](https://en.wikipedia.org/wiki/Benevolent_Dictator_for_Life), with
 # Drasko DRASKOVIC in the role of BDFL.
@@ -6,8 +6,8 @@
 [bdfl]
 	
 	[[drasko]]
-	Name	= "Drasko Draskovic"
-	Email	= "drasko@abstractmachines.fr"
+	Name	= "Drasko DRASKOVIC"
+	Email	= "drasko@mainflux.com"
 	GitHub	= "drasko"

 # However, this role serves only in dead-lock events, or in a special and very rare cases
@@ -18,13 +18,29 @@
 # Maintainers have the special role in the project in managing and accepting PRs,
 # overall leading the project and making design decisions on the maintained subsystems.
 #
-# A reference list of all maintainers of the SuperMQ project.
+# A reference list of all maintainers of the Mainflux project.

 # ADD YOURSELF HERE IN ALPHABETICAL ORDER

 [maintainers]
+
+	[[aleksandar]]
+	Name	= "Aleksandar NOVAKOVIC"
+	Email	= "aleksandar@mainflux.com"
+	GitHub	= "anovakovic01"
 
 	[[dusan]]
-	Name	= "Dusan Borovcanin"
-	Email	= "dusan.borovcanin@abstractmachines.fr"
-	GitHub	= "dborovcanin"
+	Name	= "Dusan BOROVCANIN"
+	Email	= "dusan@mainflux.com"
+	GitHub	= "dusanb94"
+
+	[[manuel]]
+	Name	= "Manuel IMPERIALE"
+	Email	= "manuel@mainflux.com"
+	GitHub	= "manuIO"
+
+	[[nikola]]
+	Name	= "Nikola MARCETIC"
+	Email	= "nikola@mainflux.com"
+	GitHub	= "nmarcetic"
+
@@ -1,51 +1,18 @@
-# Copyright (c) Abstract Machines
+# Copyright (c) Mainflux
 # SPDX-License-Identifier: Apache-2.0

-SMQ_DOCKER_IMAGE_NAME_PREFIX ?= supermq
-BUILD_DIR ?= build
-SERVICES = auth users clients groups channels domains http coap ws cli mqtt journal
-TEST_API_SERVICES = journal auth certs http clients users channels groups domains
-TEST_API = $(addprefix test_api_,$(TEST_API_SERVICES))
+MF_DOCKER_IMAGE_NAME_PREFIX ?= mainflux
+BUILD_DIR = build
+SERVICES = users things http coap lora influxdb-writer influxdb-reader mongodb-writer \
+	mongodb-reader cassandra-writer cassandra-reader postgres-writer postgres-reader cli \
+	bootstrap opcua authn twins mqtt provision certs
 DOCKERS = $(addprefix docker_,$(SERVICES))
 DOCKERS_DEV = $(addprefix docker_dev_,$(SERVICES))
 CGO_ENABLED ?= 0
 GOARCH ?= amd64
-VERSION ?= $(shell git describe --abbrev=0 --tags 2>/dev/null || echo 'unknown')
-COMMIT ?= $(shell git rev-parse HEAD)
-TIME ?= $(shell date +%F_%T)
-USER_REPO ?= $(shell git remote get-url origin | sed -E 's@.*/([^/]+)/([^/.]+)(\.git)?@\1_\2@')
-empty:=
-space:= $(empty) $(empty)
-# Docker compose project name should follow this guidelines: https://docs.docker.com/compose/reference/#use--p-to-specify-a-project-name
-DOCKER_PROJECT ?= $(shell echo $(subst $(space),,$(USER_REPO)) | sed -E 's/[^a-zA-Z0-9]/_/g' | tr '[:upper:]' '[:lower:]')
-DOCKER_COMPOSE_COMMANDS_SUPPORTED := up down config restart
-DEFAULT_DOCKER_COMPOSE_COMMAND  := up
-GRPC_MTLS_CERT_FILES_EXISTS = 0
-MOCKERY = $(GOBIN)/mockery
-MOCKERY_VERSION=3.5.5
-PKG_PROTO_GEN_OUT_DIR=api/grpc
-INTERNAL_PROTO_DIR=internal/proto
-INTERNAL_PROTO_FILES := $(shell find $(INTERNAL_PROTO_DIR) -name "*.proto" | sed 's|$(INTERNAL_PROTO_DIR)/||')
-
-ifneq ($(SMQ_MESSAGE_BROKER_TYPE),)
-	SMQ_MESSAGE_BROKER_TYPE := $(SMQ_MESSAGE_BROKER_TYPE)
-else
-	SMQ_MESSAGE_BROKER_TYPE=msg_nats
-endif
-
-ifneq ($(SMQ_ES_TYPE),)
-	SMQ_ES_TYPE := $(SMQ_ES_TYPE)
-else
-	SMQ_ES_TYPE=es_nats
-endif

 define compile_service
-	CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) \
-	go build -tags $(SMQ_MESSAGE_BROKER_TYPE) -tags $(SMQ_ES_TYPE) -ldflags "-s -w \
-	-X 'github.com/absmach/supermq.BuildTime=$(TIME)' \
-	-X 'github.com/absmach/supermq.Version=$(VERSION)' \
-	-X 'github.com/absmach/supermq.Commit=$(COMMIT)'" \
-	-o ${BUILD_DIR}/$(1) cmd/$(1)/main.go
+	CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build -mod=vendor -ldflags "-s -w" -o ${BUILD_DIR}/mainflux-$(1) cmd/$(1)/main.go
 endef

 define make_docker
@@ -56,10 +23,7 @@ define make_docker
 		--build-arg SVC=$(svc) \
 		--build-arg GOARCH=$(GOARCH) \
 		--build-arg GOARM=$(GOARM) \
-		--build-arg VERSION=$(VERSION) \
-		--build-arg COMMIT=$(COMMIT) \
-		--build-arg TIME=$(TIME) \
-		--tag=$(SMQ_DOCKER_IMAGE_NAME_PREFIX)/$(svc) \
+		--tag=$(MF_DOCKER_IMAGE_NAME_PREFIX)/$(svc) \
 		-f docker/Dockerfile .
 endef

@@ -69,129 +33,37 @@ define make_docker_dev
 	docker build \
 		--no-cache \
 		--build-arg SVC=$(svc) \
-		--tag=$(SMQ_DOCKER_IMAGE_NAME_PREFIX)/$(svc) \
+		--tag=$(MF_DOCKER_IMAGE_NAME_PREFIX)/$(svc) \
 		-f docker/Dockerfile.dev ./build
 endef

-ADDON_SERVICES = journal certs
-
-EXTERNAL_SERVICES = prometheus
-
-ifneq ($(filter run%,$(firstword $(MAKECMDGOALS))),)
-  temp_args := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
-  DOCKER_COMPOSE_COMMAND := $(if $(filter $(DOCKER_COMPOSE_COMMANDS_SUPPORTED),$(temp_args)), $(filter $(DOCKER_COMPOSE_COMMANDS_SUPPORTED),$(temp_args)), $(DEFAULT_DOCKER_COMPOSE_COMMAND))
-  $(eval $(DOCKER_COMPOSE_COMMAND):;@)
-endif
-
-ifneq ($(filter run_addons%,$(firstword $(MAKECMDGOALS))),)
-  temp_args := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
-  RUN_ADDON_ARGS :=  $(if $(filter-out $(DOCKER_COMPOSE_COMMANDS_SUPPORTED),$(temp_args)), $(filter-out $(DOCKER_COMPOSE_COMMANDS_SUPPORTED),$(temp_args)),$(ADDON_SERVICES) $(EXTERNAL_SERVICES))
-  $(eval $(RUN_ADDON_ARGS):;@)
-endif
-
-ifneq ("$(wildcard docker/ssl/certs/*-grpc-*)","")
-GRPC_MTLS_CERT_FILES_EXISTS = 1
-else
-GRPC_MTLS_CERT_FILES_EXISTS = 0
-endif
-
-FILTERED_SERVICES = $(filter-out $(RUN_ADDON_ARGS), $(SERVICES))
-
 all: $(SERVICES)

-.PHONY: all $(SERVICES) dockers dockers_dev latest release run run_addons grpc_mtls_certs check_mtls check_certs test_api mocks
+.PHONY: all $(SERVICES) dockers dockers_dev latest release

 clean:
 	rm -rf ${BUILD_DIR}

 cleandocker:
 	# Stops containers and removes containers, networks, volumes, and images created by up
-	docker compose -f docker/docker-compose.yaml -p $(DOCKER_PROJECT) down --rmi all -v --remove-orphans
+	docker-compose -f docker/docker-compose.yml down --rmi all -v --remove-orphans

 ifdef pv
 	# Remove unused volumes
-	docker volume ls -f name=$(SMQ_DOCKER_IMAGE_NAME_PREFIX) -f dangling=true -q | xargs -r docker volume rm
+	docker volume ls -f name=$(MF_DOCKER_IMAGE_NAME_PREFIX) -f dangling=true -q | xargs -r docker volume rm
 endif

 install:
-	for file in $(BUILD_DIR)/*; do \
-		cp $$file $(GOBIN)/supermq-`basename $$file`; \
-	done
+	cp ${BUILD_DIR}/* $(GOBIN)

-mocks: $(MOCKERY)
-	@$(MOCKERY) --config ./tools/config/.mockery.yaml
-
-$(MOCKERY):
-	@mkdir -p $(GOBIN)
-	@mkdir -p mockery
-	@echo ">> downloading mockery $(MOCKERY_VERSION)..."
-	@curl -sL https://github.com/vektra/mockery/releases/download/v$(MOCKERY_VERSION)/mockery_$(MOCKERY_VERSION)_Linux_x86_64.tar.gz | tar -xz -C mockery
-	@mv mockery/mockery $(GOBIN)
-	@rm -r mockery
-
-DIRS = consumers readers postgres internal
-test: mocks
-	mkdir -p coverage
-	@for dir in $(DIRS); do \
-		go test -v --race -failfast -count 1 -tags test -coverprofile=coverage/$$dir.out $$(go list ./... | grep $$dir | grep -v 'cmd'); \
-	done
-	go test -v --race -failfast -count 1 -tags test -coverprofile=coverage/coverage.out $$(go list ./... | grep -v 'consumers\|readers\|postgres\|internal\|cmd\|middleware')
-
-define test_api_service
-	$(eval svc=$(subst test_api_,,$(1)))
-	@which uv > /dev/null || (echo "uv not found, please install it from https://github.com/astral-sh/uv" && exit 1)
-
-	@if [ -z "$(USER_TOKEN)" ]; then \
-		echo "USER_TOKEN is not set"; \
-		echo "Please set it to a valid token"; \
-		exit 1; \
-	fi
-
-	@if [ "$(svc)" = "http" ] && [ -z "$(CLIENT_SECRET)" ]; then \
-		echo "CLIENT_SECRET is not set"; \
-		echo "Please set it to a valid secret"; \
-		exit 1; \
-	fi
-
-	@if [ "$(svc)" = "http" ]; then \
-		uvx schemathesis run apidocs/openapi/$(svc).yaml \
-		--checks all \
-		--url $(2) \
-		--header "Authorization: Client $(CLIENT_SECRET)" \
-		--suppress-health-check=filter_too_much \
-		--exclude-checks=positive_data_acceptance \
-		--phases=examples,stateful; \
-	else \
-		uvx schemathesis run apidocs/openapi/$(svc).yaml \
-		--checks all \
-		--url $(2) \
-		--header "Authorization: Bearer $(USER_TOKEN)" \
-		--suppress-health-check=filter_too_much \
-		--exclude-checks=positive_data_acceptance \
-		--exclude-operation-id=requestPasswordReset \
-		--phases=examples,stateful; \
-	fi
-endef
-
-test_api_users: TEST_API_URL := http://localhost:9002
-test_api_clients: TEST_API_URL := http://localhost:9006
-test_api_domains: TEST_API_URL := http://localhost:9003
-test_api_channels: TEST_API_URL := http://localhost:9005
-test_api_groups: TEST_API_URL := http://localhost:9004
-test_api_http: TEST_API_URL := http://localhost:8008
-test_api_auth: TEST_API_URL := http://localhost:9001
-test_api_certs: TEST_API_URL := http://localhost:9019
-test_api_journal: TEST_API_URL := http://localhost:9021
-
-$(TEST_API):
-	$(call test_api_service,$(@),$(TEST_API_URL))
+test:
+	go test -mod=vendor -v -race -count 1 -tags test $(shell go list ./... | grep -v 'vendor\|cmd')

 proto:
-	protoc -I. --go_out=. --go_opt=paths=source_relative pkg/messaging/*.proto
-	mkdir -p $(PKG_PROTO_GEN_OUT_DIR)
-	protoc -I $(INTERNAL_PROTO_DIR) --go_out=$(PKG_PROTO_GEN_OUT_DIR) --go_opt=paths=source_relative --go-grpc_out=$(PKG_PROTO_GEN_OUT_DIR) --go-grpc_opt=paths=source_relative $(INTERNAL_PROTO_FILES)
+	protoc --gofast_out=plugins=grpc:. *.proto
+	protoc --gofast_out=plugins=grpc:. pkg/messaging/*.proto

-$(FILTERED_SERVICES):
+$(SERVICES):
 	$(call compile_service,$(@))

 $(DOCKERS):
@@ -205,7 +77,7 @@ dockers_dev: $(DOCKERS_DEV)

 define docker_push
 	for svc in $(SERVICES); do \
-		docker push $(SMQ_DOCKER_IMAGE_NAME_PREFIX)/$$svc:$(1); \
+		docker push $(MF_DOCKER_IMAGE_NAME_PREFIX)/$$svc:$(1); \
 	done
 endef

@@ -220,57 +92,22 @@ release:
 	git checkout $(version)
 	$(MAKE) dockers
 	for svc in $(SERVICES); do \
-		docker tag $(SMQ_DOCKER_IMAGE_NAME_PREFIX)/$$svc $(SMQ_DOCKER_IMAGE_NAME_PREFIX)/$$svc:$(version); \
+		docker tag $(MF_DOCKER_IMAGE_NAME_PREFIX)/$$svc $(MF_DOCKER_IMAGE_NAME_PREFIX)/$$svc:$(version); \
 	done
 	$(call docker_push,$(version))

 rundev:
 	cd scripts && ./run.sh

-grpc_mtls_certs:
-	$(MAKE) -C docker/ssl auth_grpc_certs clients_grpc_certs
+run:
+	docker-compose -f docker/docker-compose.yml up

-check_tls:
-ifeq ($(GRPC_TLS),true)
-	@echo "gRPC TLS is enabled"
-	$(eval GRPC_MTLS :=)
-else
-	$(eval GRPC_TLS :=)
-endif
+runlora:
+	docker-compose \
+		-f docker/docker-compose.yml \
+		-f docker/addons/influxdb-writer/docker-compose.yml \
+		-f docker/addons/lora-adapter/docker-compose.yml up \

-check_mtls:
-ifeq ($(GRPC_MTLS),true)
-	@echo "gRPC MTLS is enabled"
-	$(eval GRPC_TLS :=)
-else
-	$(eval GRPC_MTLS :=)
-endif
-
-check_certs: check_mtls check_tls
-ifeq ($(GRPC_MTLS_CERT_FILES_EXISTS),0)
-ifeq ($(filter true,$(GRPC_MTLS) $(GRPC_TLS)),true)
-ifeq ($(filter $(DEFAULT_DOCKER_COMPOSE_COMMAND),$(DOCKER_COMPOSE_COMMAND)),$(DEFAULT_DOCKER_COMPOSE_COMMAND))
-	$(MAKE) -C docker/ssl auth_grpc_certs clients_grpc_certs
-endif
-endif
-endif
-
-fetch_certs:
-	@./scripts/certs.sh
-
-run: check_certs
-	docker compose -f docker/docker-compose.yaml --env-file docker/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)
-
-run_addons: check_certs
-	$(foreach SVC,$(RUN_ADDON_ARGS),$(if $(filter $(SVC),$(ADDON_SERVICES) $(EXTERNAL_SERVICES)),,$(error Invalid Service $(SVC))))
-	@docker compose -f docker/docker-compose.yaml --env-file ./docker/.env -p $(DOCKER_PROJECT) up -d auth domains jaeger
-	@for SVC in $(RUN_ADDON_ARGS); do \
-		if [ "$$SVC" = "certs" ]; then \
-			docker compose -f docker/addons/$$SVC/docker-compose.yaml -f docker/certs-docker-compose-override.yaml --env-file ./docker/.env --env-file ./docker/addons/$$SVC/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args) & \
-		else \
-			SMQ_ADDONS_CERTS_PATH_PREFIX="../."  docker compose -f docker/addons/$$SVC/docker-compose.yaml -p $(DOCKER_PROJECT) --env-file ./docker/.env $(DOCKER_COMPOSE_COMMAND) $(args) & \
-		fi; \
-	done
-
-run_live: check_certs
-	GOPATH=$(go env GOPATH) docker compose  -f docker/docker-compose.yaml -f docker/docker-compose-live.yaml --env-file docker/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)
+# Run all Mainflux core services except distributed tracing system - Jaeger. Recommended on gateways:
+rungw:
+	MF_JAEGER_URL= docker-compose -f docker/docker-compose.yml up --scale jaeger=0
@@ -1,118 +1,166 @@
-<div align="center">
+# Mainflux

-  # SuperMQ
-  
-  **Planetary event-driven infrastructure**
-  
-  **Made with ❤️ by [Abstract Machines](https://abstractmachines.fr/)**
-  
-  [![Build Status](https://github.com/absmach/supermq/actions/workflows/build.yaml/badge.svg?branch=main)](https://github.com/absmach/supermq/actions/workflows/build.yaml)
-  [![Check License Header](https://github.com/absmach/supermq/actions/workflows/check-license.yaml/badge.svg?branch=main)](https://github.com/absmach/supermq/actions/workflows/check-license.yaml)
-  [![Check Generated Files](https://github.com/absmach/supermq/actions/workflows/check-generated-files.yaml/badge.svg?branch=main)](https://github.com/absmach/supermq/actions/workflows/check-generated-files.yaml)
-  [![Go Report Card](https://goreportcard.com/badge/github.com/absmach/supermq)](https://goreportcard.com/report/github.com/absmach/supermq)
-  [![Coverage](https://codecov.io/gh/absmach/supermq/graph/badge.svg?token=nPCEr5nW8S)](https://codecov.io/gh/absmach/supermq)
-  [![License](https://img.shields.io/badge/license-Apache%20v2.0-blue.svg)](LICENSE)
- [![Matrix](https://img.shields.io/matrix/supermq%3Amatrix.org?label=Chat&style=flat&logo=matrix&logoColor=white)](https://matrix.to/#/#supermq:matrix.org)
-  
-  ### [Guide](https://docs.supermq.abstractmachines.fr) | [Contributing](CONTRIBUTING.md) | [Website](https://abstractmachines.fr/) | [Chat](https://matrix.to/#/#supermq:matrix.org)
+[![build][ci-badge]][ci-url]
+[![go report card][grc-badge]][grc-url]
+[![coverage][cov-badge]][cov-url]
+[![license][license]](LICENSE)
+[![chat][gitter-badge]][gitter]

-</div>
+![banner][banner]

+Mainflux is modern, scalable, secure, open-source, and patent-free IoT cloud platform written in Go.

+It accepts user and thing connections over various network protocols (i.e. HTTP,
+MQTT, WebSocket, CoAP), thus making a seamless bridge between them. It is used as the IoT middleware
+for building complex IoT solutions.

-## Introduction 📖
+For more details, check out the [official documentation][docs].

-SuperMQ is a distributed, highly scalable, and secure open-source cloud platform for messaging and event-driven architecture (EDA). It is a planetarily distributed, highly scalable, and secure platform that serves as a robust foundation for building advanced real-time and reactive systems.
+Mainflux is member of the [Linux Foundation][lf] and an active contributor
+to the [EdgeX Foundry][edgex] project. It has been made with :heart: by [Mainflux Labs][company],
+which maintains the project and offers professional services around it.

-## Why SuperMQ Stands Out 🚀
+## Features

-SuperMQ bridges the gap between various network protocols (HTTP, MQTT, WebSocket, CoAP, and more) to provide a seamless messaging experience. Whether you're working on IoT solutions, real-time data pipelines, or event-driven systems, SuperMQ has you covered. 🌐✨
+- Multi-protocol connectivity and bridging (HTTP, MQTT, WebSocket and CoAP)
+- Device management and provisioning (Zero Touch provisioning)
+- Mutual TLS Authentication (mTLS) using X.509 Certificates
+- Fine-grained access control
+- Message persistence (Cassandra, InfluxDB, MongoDB and PostgresSQL)
+- Platform logging and instrumentation support (Grafana, Prometheus and OpenTracing)
+- Event sourcing
+- Container-based deployment using [Docker][docker] and [Kubernetes][kubernetes]
+- [LoRaWAN][lora] network integration
+- SDK
+- CLI
+- Small memory footprint and fast execution
+- Domain-driven design architecture, high-quality code and test coverage

-## Key Features 🌟
+## Prerequisites

- **Multi-Protocol Connectivity**: HTTP, MQTT, WebSocket, CoAP, and more! 🌉
- **Secure by Design**: Mutual TLS (mTLS) with X.509 Certificates, JWT support, and multi-protocol authorization. 🔒
- **Fine-Grained Access Control**: Support for ABAC and RBAC policies. 📜
- **Multi-Tenant**: Manage multiple domains seamlessly. 🏢
- **Multi-User**: Unlimited organizational hierarchies for user management. 👥
- **Application Management**: Group and share messaging clients for streamlined operations. 📱
- **Ease of Use**: Simple and powerful communication channel management, grouping, and sharing. ✨
- **Personal Access Tokens (PATs)**: Scoped and revocable tokens for enhanced security. 🔑
- **Observability**: Integrated logging and instrumentation with Prometheus and OpenTelemetry. 📈
- **Event Sourcing**: Build robust and scalable architectures. ⚡
- **Edge and IoT Ready**: Supports MQTT and CoAP protocols for seamless IoT gateway and sensor communication and management. 🌍
- **Developer-Friendly**: SDKs, CLI tools, and comprehensive documentation to get you started. 👩‍💻👨‍💻
- **Production-Ready**: Container-based deployment using Docker and Kubernetes. 🐳☸️
+The following are needed to run Mainflux:

-## Installation 🛠️
+- [Docker](https://docs.docker.com/install/) (version 18.09)
+- [Docker compose](https://docs.docker.com/compose/install/) (version 1.24.1)

-Clone the repository and start SuperMQ services:
+Developing Mainflux will also require:
+
+- [Go](https://golang.org/doc/install) (version 1.13.3)
+- [Protobuf](https://github.com/protocolbuffers/protobuf#protocol-compiler-installation) (version 3.6.1)
+
+## Install
+
+Once the prerequisites are installed, execute the following commands from the project's root:

 ```bash
-git clone https://github.com/absmach/supermq.git
-cd supermq
-docker compose -f docker/docker-compose.yaml --env-file docker/.env up
+docker-compose -f docker/docker-compose.yml up
 ```

-Or use the [Makefile](Makefile) for a simpler command:
+This will bring up the Mainflux docker services and interconnect them. This command can also be executed using the project's included Makefile:

 ```bash
 make run
 ```

-For production deployments, check our [Kubernetes guide](https://docs.supermq.abstractmachines.fr/kubernetes). ⚙️
+## Usage

-### Usage 📤📥
+The quickest way to start using Mainflux is via the CLI. The latest version can be downloaded from the [official releases page][rel]. 

-#### Using the CLI:
+It can also be built and used from the project's root directory:

 ```bash
 make cli
-./build/supermq-cli status
+./build/mainflux-cli version
 ```

-This command retrieves the status of the SuperMQ server and outputs it to the console.
+Additional details on using the CLI can be found in the [CLI documentation](https://mainflux.readthedocs.io/en/latest/cli/).

-#### Using HTTP with Curl:
+## Documentation

-```bash
-curl -X GET http://localhost:8080/status
-```
+Official documentation is hosted at [Mainflux Read The Docs page][docs]. Documentation is auto-generated, checkout the instructions on [official docs repository](https://github.com/mainflux/docs):

-This request fetches the server status over HTTP and provides a JSON response.
+If you spot an error or a need for corrections, please let us know - or even better: send us a PR.

-See our [CLI documentation](https://docs.supermq.abstractmachines.fr/cli) for more details.
+Additional practical information, news and tutorials can be found on the [Mainflux blog][blog].

-## Documentation 📚
+## Authors

-The official documentation is hosted at [SuperMQ docs page](https://docs.supermq.abstractmachines.fr).
+Main architect and BDFL of Mainflux project is [@drasko][drasko].

-Documentation is auto-generated, check out the instructions in the [docs repository](https://github.com/absmach/supermq-docs).
-If you spot an error or a need for corrections, please let us know - or even better: send us a PR! 💌
+Additionally, [@nmarcetic][nikola] and [@janko-isidorovic][janko] assured
+overall architecture and design, while [@manuio][manu] and [@darkodraskovic][darko]
+helped with crafting initial implementation and continuously worked on the project evolutions.

-## Community and Contributing 🤝
+Besides them, Mainflux is constantly improved and actively
+developed by [@anovakovic01][alex], [@dusanb94][dusan], [@srados][sava],
+[@gsaleh][george], [@blokovi][iva], [@chombium][kole], [@mteodor][mirko] and a large set of contributors.

-Thank you for your interest in SuperMQ and the desire to contribute!
+Maintainers are listed in [MAINTAINERS](MAINTAINERS) file.

-1. Take a look at our [open issues](https://github.com/absmach/supermq/issues). The [good-first-issue](https://github.com/absmach/supermq/labels/good-first-issue) label is specifically for issues that are great for getting started.
+The Mainflux team would like to give special thanks to [@mijicd][dejan] for his monumental work
+on designing and implementing a highly improved and optimized version of the platform,
+and [@malidukica][dusanm] for his effort on implementing the initial user interface.
+
+## Contributing
+
+Thank you for your interest in Mainflux and the desire to contribute!
+
+1. Take a look at our [open issues](https://github.com/mainflux/mainflux/issues). The [good-first-issue](https://github.com/mainflux/mainflux/labels/good-first-issue) label is specifically for issues that are great for getting started.
 2. Checkout the [contribution guide](CONTRIBUTING.md) to learn more about our style and conventions.
 3. Make your changes compatible to our workflow.

-Join our community:
+### We're Hiring

- [Matrix Room](https://matrix.to/#/#supermq\:matrix.org)
+If you are interested in working professionally on Mainflux,
+please head to company's [careers page][careers] or shoot us an e-mail at <careers@mainflux.com>.

-## Professional Support 💼
+>The best way to grab our attention is by sending PRs :sunglasses:.

-Need help deploying SuperMQ or integrating it into your system? Reach out to **[Abstract Machines](https://abstractmachines.fr/)** for professional support and guidance.
+## Community

-## License 📜
+- [Google group][forum]
+- [Gitter][gitter]
+- [Twitter][twitter]

-SuperMQ is open-source software licensed under the [Apache License 2.0](LICENSE). Contributions are welcome!
+## License

-## Acknowledgments 🙌
+[Apache-2.0](LICENSE)

-Special thanks to the amazing contributors who make SuperMQ possible. Check out the [MAINTAINERS](MAINTAINERS) file to see the team behind the magic.
-
-Ready to build the future of messaging and event-driven systems? Let's get started! 🚀
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fmainflux%2Fmainflux.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fmainflux%2Fmainflux?ref=badge_large)

+[banner]: https://github.com/mainflux/docs/blob/master/docs/img/gopherBanner.jpg
+[ci-badge]: https://semaphoreci.com/api/v1/mainflux/mainflux/branches/master/badge.svg
+[ci-url]: https://semaphoreci.com/mainflux/mainflux
+[docs]: http://mainflux.readthedocs.io
+[docker]: https://www.docker.com
+[forum]: https://groups.google.com/forum/#!forum/mainflux
+[gitter]: https://gitter.im/mainflux/mainflux?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+[gitter-badge]: https://badges.gitter.im/Join%20Chat.svg
+[grc-badge]: https://goreportcard.com/badge/github.com/mainflux/mainflux
+[grc-url]: https://goreportcard.com/report/github.com/mainflux/mainflux
+[cov-badge]: https://codecov.io/gh/mainflux/mainflux/branch/master/graph/badge.svg
+[cov-url]: https://codecov.io/gh/mainflux/mainflux
+[license]: https://img.shields.io/badge/license-Apache%20v2.0-blue.svg
+[twitter]: https://twitter.com/mainflux
+[lora]: https://lora-alliance.org/
+[kubernetes]: https://kubernetes.io/
+[rel]: https://github.com/mainflux/mainflux/releases
+[careers]: https://www.mainflux.com/careers.html
+[lf]: https://www.linuxfoundation.org/
+[edgex]: https://www.edgexfoundry.org/
+[company]: https://www.mainflux.com/
+[blog]: https://medium.com/mainflux-iot-platform
+[drasko]: https://github.com/drasko
+[nikola]: https://github.com/nmarcetic
+[dejan]: https://github.com/mijicd
+[manu]: https://github.com/manuIO
+[darko]: https://github.com/darkodraskovic
+[janko]: https://github.com/janko-isidorovic
+[alex]: https://github.com/anovakovic01
+[dusan]: https://github.com/dusanb94
+[sava]: https://github.com/srados
+[george]: https://github.com/gesaleh
+[iva]: https://github.com/blokovi
+[kole]: https://github.com/chombium
+[dusanm]: https://github.com/malidukica
+[mirko]: https://github.com/mteodor
@@ -1,7 +1,7 @@
-// Copyright (c) Abstract Machines
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0

-package supermq
+package mainflux

 // Response contains HTTP response specific methods.
 type Response interface {
@@ -1,6 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Package api contains commonly used constants and functions
-// for the HTTP and gRPC API.
-package api
@@ -1,485 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.36.10
-// 	protoc        v6.33.0
-// source: auth/v1/auth.proto
-
-package v1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-	unsafe "unsafe"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type AuthNReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Token         string                 `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AuthNReq) Reset() {
-	*x = AuthNReq{}
-	mi := &file_auth_v1_auth_proto_msgTypes[0]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AuthNReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AuthNReq) ProtoMessage() {}
-
-func (x *AuthNReq) ProtoReflect() protoreflect.Message {
-	mi := &file_auth_v1_auth_proto_msgTypes[0]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AuthNReq.ProtoReflect.Descriptor instead.
-func (*AuthNReq) Descriptor() ([]byte, []int) {
-	return file_auth_v1_auth_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *AuthNReq) GetToken() string {
-	if x != nil {
-		return x.Token
-	}
-	return ""
-}
-
-type AuthNRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`                              // token id
-	UserId        string                 `protobuf:"bytes,2,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`        // user id
-	UserRole      uint32                 `protobuf:"varint,3,opt,name=user_role,json=userRole,proto3" json:"user_role,omitempty"` // user role
-	Verified      bool                   `protobuf:"varint,4,opt,name=verified,proto3" json:"verified,omitempty"`                 // verified user
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AuthNRes) Reset() {
-	*x = AuthNRes{}
-	mi := &file_auth_v1_auth_proto_msgTypes[1]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AuthNRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AuthNRes) ProtoMessage() {}
-
-func (x *AuthNRes) ProtoReflect() protoreflect.Message {
-	mi := &file_auth_v1_auth_proto_msgTypes[1]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AuthNRes.ProtoReflect.Descriptor instead.
-func (*AuthNRes) Descriptor() ([]byte, []int) {
-	return file_auth_v1_auth_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *AuthNRes) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *AuthNRes) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-func (x *AuthNRes) GetUserRole() uint32 {
-	if x != nil {
-		return x.UserRole
-	}
-	return 0
-}
-
-func (x *AuthNRes) GetVerified() bool {
-	if x != nil {
-		return x.Verified
-	}
-	return false
-}
-
-type AuthZReq struct {
-	state           protoimpl.MessageState `protogen:"open.v1"`
-	Domain          string                 `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"`                                          // Domain
-	SubjectType     string                 `protobuf:"bytes,2,opt,name=subject_type,json=subjectType,proto3" json:"subject_type,omitempty"`             // Client or User
-	SubjectKind     string                 `protobuf:"bytes,3,opt,name=subject_kind,json=subjectKind,proto3" json:"subject_kind,omitempty"`             // ID or Token
-	SubjectRelation string                 `protobuf:"bytes,4,opt,name=subject_relation,json=subjectRelation,proto3" json:"subject_relation,omitempty"` // Subject relation
-	Subject         string                 `protobuf:"bytes,5,opt,name=subject,proto3" json:"subject,omitempty"`                                        // Subject value (id or token, depending on kind)
-	Relation        string                 `protobuf:"bytes,6,opt,name=relation,proto3" json:"relation,omitempty"`                                      // Relation to filter
-	Permission      string                 `protobuf:"bytes,7,opt,name=permission,proto3" json:"permission,omitempty"`                                  // Action
-	Object          string                 `protobuf:"bytes,8,opt,name=object,proto3" json:"object,omitempty"`                                          // Object ID
-	ObjectType      string                 `protobuf:"bytes,9,opt,name=object_type,json=objectType,proto3" json:"object_type,omitempty"`                // Client, User, Group
-	unknownFields   protoimpl.UnknownFields
-	sizeCache       protoimpl.SizeCache
-}
-
-func (x *AuthZReq) Reset() {
-	*x = AuthZReq{}
-	mi := &file_auth_v1_auth_proto_msgTypes[2]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AuthZReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AuthZReq) ProtoMessage() {}
-
-func (x *AuthZReq) ProtoReflect() protoreflect.Message {
-	mi := &file_auth_v1_auth_proto_msgTypes[2]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AuthZReq.ProtoReflect.Descriptor instead.
-func (*AuthZReq) Descriptor() ([]byte, []int) {
-	return file_auth_v1_auth_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *AuthZReq) GetDomain() string {
-	if x != nil {
-		return x.Domain
-	}
-	return ""
-}
-
-func (x *AuthZReq) GetSubjectType() string {
-	if x != nil {
-		return x.SubjectType
-	}
-	return ""
-}
-
-func (x *AuthZReq) GetSubjectKind() string {
-	if x != nil {
-		return x.SubjectKind
-	}
-	return ""
-}
-
-func (x *AuthZReq) GetSubjectRelation() string {
-	if x != nil {
-		return x.SubjectRelation
-	}
-	return ""
-}
-
-func (x *AuthZReq) GetSubject() string {
-	if x != nil {
-		return x.Subject
-	}
-	return ""
-}
-
-func (x *AuthZReq) GetRelation() string {
-	if x != nil {
-		return x.Relation
-	}
-	return ""
-}
-
-func (x *AuthZReq) GetPermission() string {
-	if x != nil {
-		return x.Permission
-	}
-	return ""
-}
-
-func (x *AuthZReq) GetObject() string {
-	if x != nil {
-		return x.Object
-	}
-	return ""
-}
-
-func (x *AuthZReq) GetObjectType() string {
-	if x != nil {
-		return x.ObjectType
-	}
-	return ""
-}
-
-type AuthZPatReq struct {
-	state            protoimpl.MessageState `protogen:"open.v1"`
-	UserId           string                 `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`                                 // User id
-	PatId            string                 `protobuf:"bytes,2,opt,name=pat_id,json=patId,proto3" json:"pat_id,omitempty"`                                    // Pat id
-	EntityType       uint32                 `protobuf:"varint,3,opt,name=entity_type,json=entityType,proto3" json:"entity_type,omitempty"`                    // Entity type
-	OptionalDomainId string                 `protobuf:"bytes,4,opt,name=optional_domain_id,json=optionalDomainId,proto3" json:"optional_domain_id,omitempty"` // Optional domain id
-	Operation        uint32                 `protobuf:"varint,6,opt,name=operation,proto3" json:"operation,omitempty"`                                        // Operation
-	EntityId         string                 `protobuf:"bytes,7,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"`                           // EntityID
-	unknownFields    protoimpl.UnknownFields
-	sizeCache        protoimpl.SizeCache
-}
-
-func (x *AuthZPatReq) Reset() {
-	*x = AuthZPatReq{}
-	mi := &file_auth_v1_auth_proto_msgTypes[3]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AuthZPatReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AuthZPatReq) ProtoMessage() {}
-
-func (x *AuthZPatReq) ProtoReflect() protoreflect.Message {
-	mi := &file_auth_v1_auth_proto_msgTypes[3]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AuthZPatReq.ProtoReflect.Descriptor instead.
-func (*AuthZPatReq) Descriptor() ([]byte, []int) {
-	return file_auth_v1_auth_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *AuthZPatReq) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-func (x *AuthZPatReq) GetPatId() string {
-	if x != nil {
-		return x.PatId
-	}
-	return ""
-}
-
-func (x *AuthZPatReq) GetEntityType() uint32 {
-	if x != nil {
-		return x.EntityType
-	}
-	return 0
-}
-
-func (x *AuthZPatReq) GetOptionalDomainId() string {
-	if x != nil {
-		return x.OptionalDomainId
-	}
-	return ""
-}
-
-func (x *AuthZPatReq) GetOperation() uint32 {
-	if x != nil {
-		return x.Operation
-	}
-	return 0
-}
-
-func (x *AuthZPatReq) GetEntityId() string {
-	if x != nil {
-		return x.EntityId
-	}
-	return ""
-}
-
-type AuthZRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Authorized    bool                   `protobuf:"varint,1,opt,name=authorized,proto3" json:"authorized,omitempty"`
-	Id            string                 `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AuthZRes) Reset() {
-	*x = AuthZRes{}
-	mi := &file_auth_v1_auth_proto_msgTypes[4]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AuthZRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AuthZRes) ProtoMessage() {}
-
-func (x *AuthZRes) ProtoReflect() protoreflect.Message {
-	mi := &file_auth_v1_auth_proto_msgTypes[4]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AuthZRes.ProtoReflect.Descriptor instead.
-func (*AuthZRes) Descriptor() ([]byte, []int) {
-	return file_auth_v1_auth_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *AuthZRes) GetAuthorized() bool {
-	if x != nil {
-		return x.Authorized
-	}
-	return false
-}
-
-func (x *AuthZRes) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-var File_auth_v1_auth_proto protoreflect.FileDescriptor
-
-const file_auth_v1_auth_proto_rawDesc = "" +
-	"\n" +
-	"\x12auth/v1/auth.proto\x12\aauth.v1\" \n" +
-	"\bAuthNReq\x12\x14\n" +
-	"\x05token\x18\x01 \x01(\tR\x05token\"l\n" +
-	"\bAuthNRes\x12\x0e\n" +
-	"\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n" +
-	"\auser_id\x18\x02 \x01(\tR\x06userId\x12\x1b\n" +
-	"\tuser_role\x18\x03 \x01(\rR\buserRole\x12\x1a\n" +
-	"\bverified\x18\x04 \x01(\bR\bverified\"\xa2\x02\n" +
-	"\bAuthZReq\x12\x16\n" +
-	"\x06domain\x18\x01 \x01(\tR\x06domain\x12!\n" +
-	"\fsubject_type\x18\x02 \x01(\tR\vsubjectType\x12!\n" +
-	"\fsubject_kind\x18\x03 \x01(\tR\vsubjectKind\x12)\n" +
-	"\x10subject_relation\x18\x04 \x01(\tR\x0fsubjectRelation\x12\x18\n" +
-	"\asubject\x18\x05 \x01(\tR\asubject\x12\x1a\n" +
-	"\brelation\x18\x06 \x01(\tR\brelation\x12\x1e\n" +
-	"\n" +
-	"permission\x18\a \x01(\tR\n" +
-	"permission\x12\x16\n" +
-	"\x06object\x18\b \x01(\tR\x06object\x12\x1f\n" +
-	"\vobject_type\x18\t \x01(\tR\n" +
-	"objectType\"\xc7\x01\n" +
-	"\vAuthZPatReq\x12\x17\n" +
-	"\auser_id\x18\x01 \x01(\tR\x06userId\x12\x15\n" +
-	"\x06pat_id\x18\x02 \x01(\tR\x05patId\x12\x1f\n" +
-	"\ventity_type\x18\x03 \x01(\rR\n" +
-	"entityType\x12,\n" +
-	"\x12optional_domain_id\x18\x04 \x01(\tR\x10optionalDomainId\x12\x1c\n" +
-	"\toperation\x18\x06 \x01(\rR\toperation\x12\x1b\n" +
-	"\tentity_id\x18\a \x01(\tR\bentityId\":\n" +
-	"\bAuthZRes\x12\x1e\n" +
-	"\n" +
-	"authorized\x18\x01 \x01(\bR\n" +
-	"authorized\x12\x0e\n" +
-	"\x02id\x18\x02 \x01(\tR\x02id2\xf0\x01\n" +
-	"\vAuthService\x123\n" +
-	"\tAuthorize\x12\x11.auth.v1.AuthZReq\x1a\x11.auth.v1.AuthZRes\"\x00\x129\n" +
-	"\fAuthorizePAT\x12\x14.auth.v1.AuthZPatReq\x1a\x11.auth.v1.AuthZRes\"\x00\x126\n" +
-	"\fAuthenticate\x12\x11.auth.v1.AuthNReq\x1a\x11.auth.v1.AuthNRes\"\x00\x129\n" +
-	"\x0fAuthenticatePAT\x12\x11.auth.v1.AuthNReq\x1a\x11.auth.v1.AuthNRes\"\x00B-Z+github.com/absmach/supermq/api/grpc/auth/v1b\x06proto3"
-
-var (
-	file_auth_v1_auth_proto_rawDescOnce sync.Once
-	file_auth_v1_auth_proto_rawDescData []byte
-)
-
-func file_auth_v1_auth_proto_rawDescGZIP() []byte {
-	file_auth_v1_auth_proto_rawDescOnce.Do(func() {
-		file_auth_v1_auth_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_auth_v1_auth_proto_rawDesc), len(file_auth_v1_auth_proto_rawDesc)))
-	})
-	return file_auth_v1_auth_proto_rawDescData
-}
-
-var file_auth_v1_auth_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_auth_v1_auth_proto_goTypes = []any{
-	(*AuthNReq)(nil),    // 0: auth.v1.AuthNReq
-	(*AuthNRes)(nil),    // 1: auth.v1.AuthNRes
-	(*AuthZReq)(nil),    // 2: auth.v1.AuthZReq
-	(*AuthZPatReq)(nil), // 3: auth.v1.AuthZPatReq
-	(*AuthZRes)(nil),    // 4: auth.v1.AuthZRes
-}
-var file_auth_v1_auth_proto_depIdxs = []int32{
-	2, // 0: auth.v1.AuthService.Authorize:input_type -> auth.v1.AuthZReq
-	3, // 1: auth.v1.AuthService.AuthorizePAT:input_type -> auth.v1.AuthZPatReq
-	0, // 2: auth.v1.AuthService.Authenticate:input_type -> auth.v1.AuthNReq
-	0, // 3: auth.v1.AuthService.AuthenticatePAT:input_type -> auth.v1.AuthNReq
-	4, // 4: auth.v1.AuthService.Authorize:output_type -> auth.v1.AuthZRes
-	4, // 5: auth.v1.AuthService.AuthorizePAT:output_type -> auth.v1.AuthZRes
-	1, // 6: auth.v1.AuthService.Authenticate:output_type -> auth.v1.AuthNRes
-	1, // 7: auth.v1.AuthService.AuthenticatePAT:output_type -> auth.v1.AuthNRes
-	4, // [4:8] is the sub-list for method output_type
-	0, // [0:4] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_auth_v1_auth_proto_init() }
-func file_auth_v1_auth_proto_init() {
-	if File_auth_v1_auth_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_auth_v1_auth_proto_rawDesc), len(file_auth_v1_auth_proto_rawDesc)),
-			NumEnums:      0,
-			NumMessages:   5,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_auth_v1_auth_proto_goTypes,
-		DependencyIndexes: file_auth_v1_auth_proto_depIdxs,
-		MessageInfos:      file_auth_v1_auth_proto_msgTypes,
-	}.Build()
-	File_auth_v1_auth_proto = out.File
-	file_auth_v1_auth_proto_goTypes = nil
-	file_auth_v1_auth_proto_depIdxs = nil
-}
@@ -1,244 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             v6.33.0
-// source: auth/v1/auth.proto
-
-package v1
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	AuthService_Authorize_FullMethodName       = "/auth.v1.AuthService/Authorize"
-	AuthService_AuthorizePAT_FullMethodName    = "/auth.v1.AuthService/AuthorizePAT"
-	AuthService_Authenticate_FullMethodName    = "/auth.v1.AuthService/Authenticate"
-	AuthService_AuthenticatePAT_FullMethodName = "/auth.v1.AuthService/AuthenticatePAT"
-)
-
-// AuthServiceClient is the client API for AuthService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-//
-// AuthService is a service that provides authentication
-// and authorization functionalities for SuperMQ services.
-type AuthServiceClient interface {
-	Authorize(ctx context.Context, in *AuthZReq, opts ...grpc.CallOption) (*AuthZRes, error)
-	AuthorizePAT(ctx context.Context, in *AuthZPatReq, opts ...grpc.CallOption) (*AuthZRes, error)
-	Authenticate(ctx context.Context, in *AuthNReq, opts ...grpc.CallOption) (*AuthNRes, error)
-	AuthenticatePAT(ctx context.Context, in *AuthNReq, opts ...grpc.CallOption) (*AuthNRes, error)
-}
-
-type authServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewAuthServiceClient(cc grpc.ClientConnInterface) AuthServiceClient {
-	return &authServiceClient{cc}
-}
-
-func (c *authServiceClient) Authorize(ctx context.Context, in *AuthZReq, opts ...grpc.CallOption) (*AuthZRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(AuthZRes)
-	err := c.cc.Invoke(ctx, AuthService_Authorize_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *authServiceClient) AuthorizePAT(ctx context.Context, in *AuthZPatReq, opts ...grpc.CallOption) (*AuthZRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(AuthZRes)
-	err := c.cc.Invoke(ctx, AuthService_AuthorizePAT_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *authServiceClient) Authenticate(ctx context.Context, in *AuthNReq, opts ...grpc.CallOption) (*AuthNRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(AuthNRes)
-	err := c.cc.Invoke(ctx, AuthService_Authenticate_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *authServiceClient) AuthenticatePAT(ctx context.Context, in *AuthNReq, opts ...grpc.CallOption) (*AuthNRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(AuthNRes)
-	err := c.cc.Invoke(ctx, AuthService_AuthenticatePAT_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// AuthServiceServer is the server API for AuthService service.
-// All implementations must embed UnimplementedAuthServiceServer
-// for forward compatibility.
-//
-// AuthService is a service that provides authentication
-// and authorization functionalities for SuperMQ services.
-type AuthServiceServer interface {
-	Authorize(context.Context, *AuthZReq) (*AuthZRes, error)
-	AuthorizePAT(context.Context, *AuthZPatReq) (*AuthZRes, error)
-	Authenticate(context.Context, *AuthNReq) (*AuthNRes, error)
-	AuthenticatePAT(context.Context, *AuthNReq) (*AuthNRes, error)
-	mustEmbedUnimplementedAuthServiceServer()
-}
-
-// UnimplementedAuthServiceServer must be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedAuthServiceServer struct{}
-
-func (UnimplementedAuthServiceServer) Authorize(context.Context, *AuthZReq) (*AuthZRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Authorize not implemented")
-}
-func (UnimplementedAuthServiceServer) AuthorizePAT(context.Context, *AuthZPatReq) (*AuthZRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method AuthorizePAT not implemented")
-}
-func (UnimplementedAuthServiceServer) Authenticate(context.Context, *AuthNReq) (*AuthNRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Authenticate not implemented")
-}
-func (UnimplementedAuthServiceServer) AuthenticatePAT(context.Context, *AuthNReq) (*AuthNRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method AuthenticatePAT not implemented")
-}
-func (UnimplementedAuthServiceServer) mustEmbedUnimplementedAuthServiceServer() {}
-func (UnimplementedAuthServiceServer) testEmbeddedByValue()                     {}
-
-// UnsafeAuthServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to AuthServiceServer will
-// result in compilation errors.
-type UnsafeAuthServiceServer interface {
-	mustEmbedUnimplementedAuthServiceServer()
-}
-
-func RegisterAuthServiceServer(s grpc.ServiceRegistrar, srv AuthServiceServer) {
-	// If the following call pancis, it indicates UnimplementedAuthServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&AuthService_ServiceDesc, srv)
-}
-
-func _AuthService_Authorize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AuthZReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(AuthServiceServer).Authorize(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: AuthService_Authorize_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AuthServiceServer).Authorize(ctx, req.(*AuthZReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _AuthService_AuthorizePAT_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AuthZPatReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(AuthServiceServer).AuthorizePAT(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: AuthService_AuthorizePAT_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AuthServiceServer).AuthorizePAT(ctx, req.(*AuthZPatReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _AuthService_Authenticate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AuthNReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(AuthServiceServer).Authenticate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: AuthService_Authenticate_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AuthServiceServer).Authenticate(ctx, req.(*AuthNReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _AuthService_AuthenticatePAT_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AuthNReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(AuthServiceServer).AuthenticatePAT(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: AuthService_AuthenticatePAT_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AuthServiceServer).AuthenticatePAT(ctx, req.(*AuthNReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// AuthService_ServiceDesc is the grpc.ServiceDesc for AuthService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var AuthService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "auth.v1.AuthService",
-	HandlerType: (*AuthServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Authorize",
-			Handler:    _AuthService_Authorize_Handler,
-		},
-		{
-			MethodName: "AuthorizePAT",
-			Handler:    _AuthService_AuthorizePAT_Handler,
-		},
-		{
-			MethodName: "Authenticate",
-			Handler:    _AuthService_Authenticate_Handler,
-		},
-		{
-			MethodName: "AuthenticatePAT",
-			Handler:    _AuthService_AuthenticatePAT_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "auth/v1/auth.proto",
-}
@@ -1,402 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.36.10
-// 	protoc        v6.33.0
-// source: channels/v1/channels.proto
-
-package v1
-
-import (
-	v1 "github.com/absmach/supermq/api/grpc/common/v1"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-	unsafe "unsafe"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type RemoveClientConnectionsReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	ClientId      string                 `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RemoveClientConnectionsReq) Reset() {
-	*x = RemoveClientConnectionsReq{}
-	mi := &file_channels_v1_channels_proto_msgTypes[0]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RemoveClientConnectionsReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RemoveClientConnectionsReq) ProtoMessage() {}
-
-func (x *RemoveClientConnectionsReq) ProtoReflect() protoreflect.Message {
-	mi := &file_channels_v1_channels_proto_msgTypes[0]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RemoveClientConnectionsReq.ProtoReflect.Descriptor instead.
-func (*RemoveClientConnectionsReq) Descriptor() ([]byte, []int) {
-	return file_channels_v1_channels_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *RemoveClientConnectionsReq) GetClientId() string {
-	if x != nil {
-		return x.ClientId
-	}
-	return ""
-}
-
-type RemoveClientConnectionsRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RemoveClientConnectionsRes) Reset() {
-	*x = RemoveClientConnectionsRes{}
-	mi := &file_channels_v1_channels_proto_msgTypes[1]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RemoveClientConnectionsRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RemoveClientConnectionsRes) ProtoMessage() {}
-
-func (x *RemoveClientConnectionsRes) ProtoReflect() protoreflect.Message {
-	mi := &file_channels_v1_channels_proto_msgTypes[1]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RemoveClientConnectionsRes.ProtoReflect.Descriptor instead.
-func (*RemoveClientConnectionsRes) Descriptor() ([]byte, []int) {
-	return file_channels_v1_channels_proto_rawDescGZIP(), []int{1}
-}
-
-type UnsetParentGroupFromChannelsReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	ParentGroupId string                 `protobuf:"bytes,1,opt,name=parent_group_id,json=parentGroupId,proto3" json:"parent_group_id,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *UnsetParentGroupFromChannelsReq) Reset() {
-	*x = UnsetParentGroupFromChannelsReq{}
-	mi := &file_channels_v1_channels_proto_msgTypes[2]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *UnsetParentGroupFromChannelsReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UnsetParentGroupFromChannelsReq) ProtoMessage() {}
-
-func (x *UnsetParentGroupFromChannelsReq) ProtoReflect() protoreflect.Message {
-	mi := &file_channels_v1_channels_proto_msgTypes[2]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UnsetParentGroupFromChannelsReq.ProtoReflect.Descriptor instead.
-func (*UnsetParentGroupFromChannelsReq) Descriptor() ([]byte, []int) {
-	return file_channels_v1_channels_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *UnsetParentGroupFromChannelsReq) GetParentGroupId() string {
-	if x != nil {
-		return x.ParentGroupId
-	}
-	return ""
-}
-
-type UnsetParentGroupFromChannelsRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *UnsetParentGroupFromChannelsRes) Reset() {
-	*x = UnsetParentGroupFromChannelsRes{}
-	mi := &file_channels_v1_channels_proto_msgTypes[3]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *UnsetParentGroupFromChannelsRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UnsetParentGroupFromChannelsRes) ProtoMessage() {}
-
-func (x *UnsetParentGroupFromChannelsRes) ProtoReflect() protoreflect.Message {
-	mi := &file_channels_v1_channels_proto_msgTypes[3]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UnsetParentGroupFromChannelsRes.ProtoReflect.Descriptor instead.
-func (*UnsetParentGroupFromChannelsRes) Descriptor() ([]byte, []int) {
-	return file_channels_v1_channels_proto_rawDescGZIP(), []int{3}
-}
-
-type AuthzReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	DomainId      string                 `protobuf:"bytes,1,opt,name=domain_id,json=domainId,proto3" json:"domain_id,omitempty"`
-	ClientId      string                 `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
-	ClientType    string                 `protobuf:"bytes,3,opt,name=client_type,json=clientType,proto3" json:"client_type,omitempty"`
-	ChannelId     string                 `protobuf:"bytes,4,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
-	Type          uint32                 `protobuf:"varint,5,opt,name=type,proto3" json:"type,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AuthzReq) Reset() {
-	*x = AuthzReq{}
-	mi := &file_channels_v1_channels_proto_msgTypes[4]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AuthzReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AuthzReq) ProtoMessage() {}
-
-func (x *AuthzReq) ProtoReflect() protoreflect.Message {
-	mi := &file_channels_v1_channels_proto_msgTypes[4]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AuthzReq.ProtoReflect.Descriptor instead.
-func (*AuthzReq) Descriptor() ([]byte, []int) {
-	return file_channels_v1_channels_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *AuthzReq) GetDomainId() string {
-	if x != nil {
-		return x.DomainId
-	}
-	return ""
-}
-
-func (x *AuthzReq) GetClientId() string {
-	if x != nil {
-		return x.ClientId
-	}
-	return ""
-}
-
-func (x *AuthzReq) GetClientType() string {
-	if x != nil {
-		return x.ClientType
-	}
-	return ""
-}
-
-func (x *AuthzReq) GetChannelId() string {
-	if x != nil {
-		return x.ChannelId
-	}
-	return ""
-}
-
-func (x *AuthzReq) GetType() uint32 {
-	if x != nil {
-		return x.Type
-	}
-	return 0
-}
-
-type AuthzRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Authorized    bool                   `protobuf:"varint,1,opt,name=authorized,proto3" json:"authorized,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AuthzRes) Reset() {
-	*x = AuthzRes{}
-	mi := &file_channels_v1_channels_proto_msgTypes[5]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AuthzRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AuthzRes) ProtoMessage() {}
-
-func (x *AuthzRes) ProtoReflect() protoreflect.Message {
-	mi := &file_channels_v1_channels_proto_msgTypes[5]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AuthzRes.ProtoReflect.Descriptor instead.
-func (*AuthzRes) Descriptor() ([]byte, []int) {
-	return file_channels_v1_channels_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *AuthzRes) GetAuthorized() bool {
-	if x != nil {
-		return x.Authorized
-	}
-	return false
-}
-
-var File_channels_v1_channels_proto protoreflect.FileDescriptor
-
-const file_channels_v1_channels_proto_rawDesc = "" +
-	"\n" +
-	"\x1achannels/v1/channels.proto\x12\vchannels.v1\x1a\x16common/v1/common.proto\"9\n" +
-	"\x1aRemoveClientConnectionsReq\x12\x1b\n" +
-	"\tclient_id\x18\x01 \x01(\tR\bclientId\"\x1c\n" +
-	"\x1aRemoveClientConnectionsRes\"I\n" +
-	"\x1fUnsetParentGroupFromChannelsReq\x12&\n" +
-	"\x0fparent_group_id\x18\x01 \x01(\tR\rparentGroupId\"!\n" +
-	"\x1fUnsetParentGroupFromChannelsRes\"\x98\x01\n" +
-	"\bAuthzReq\x12\x1b\n" +
-	"\tdomain_id\x18\x01 \x01(\tR\bdomainId\x12\x1b\n" +
-	"\tclient_id\x18\x02 \x01(\tR\bclientId\x12\x1f\n" +
-	"\vclient_type\x18\x03 \x01(\tR\n" +
-	"clientType\x12\x1d\n" +
-	"\n" +
-	"channel_id\x18\x04 \x01(\tR\tchannelId\x12\x12\n" +
-	"\x04type\x18\x05 \x01(\rR\x04type\"*\n" +
-	"\bAuthzRes\x12\x1e\n" +
-	"\n" +
-	"authorized\x18\x01 \x01(\bR\n" +
-	"authorized2\xe1\x03\n" +
-	"\x0fChannelsService\x12;\n" +
-	"\tAuthorize\x12\x15.channels.v1.AuthzReq\x1a\x15.channels.v1.AuthzRes\"\x00\x12m\n" +
-	"\x17RemoveClientConnections\x12'.channels.v1.RemoveClientConnectionsReq\x1a'.channels.v1.RemoveClientConnectionsRes\"\x00\x12|\n" +
-	"\x1cUnsetParentGroupFromChannels\x12,.channels.v1.UnsetParentGroupFromChannelsReq\x1a,.channels.v1.UnsetParentGroupFromChannelsRes\"\x00\x12N\n" +
-	"\x0eRetrieveEntity\x12\x1c.common.v1.RetrieveEntityReq\x1a\x1c.common.v1.RetrieveEntityRes\"\x00\x12T\n" +
-	"\x11RetrieveIDByRoute\x12\x1f.common.v1.RetrieveIDByRouteReq\x1a\x1c.common.v1.RetrieveEntityRes\"\x00B1Z/github.com/absmach/supermq/api/grpc/channels/v1b\x06proto3"
-
-var (
-	file_channels_v1_channels_proto_rawDescOnce sync.Once
-	file_channels_v1_channels_proto_rawDescData []byte
-)
-
-func file_channels_v1_channels_proto_rawDescGZIP() []byte {
-	file_channels_v1_channels_proto_rawDescOnce.Do(func() {
-		file_channels_v1_channels_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_channels_v1_channels_proto_rawDesc), len(file_channels_v1_channels_proto_rawDesc)))
-	})
-	return file_channels_v1_channels_proto_rawDescData
-}
-
-var file_channels_v1_channels_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_channels_v1_channels_proto_goTypes = []any{
-	(*RemoveClientConnectionsReq)(nil),      // 0: channels.v1.RemoveClientConnectionsReq
-	(*RemoveClientConnectionsRes)(nil),      // 1: channels.v1.RemoveClientConnectionsRes
-	(*UnsetParentGroupFromChannelsReq)(nil), // 2: channels.v1.UnsetParentGroupFromChannelsReq
-	(*UnsetParentGroupFromChannelsRes)(nil), // 3: channels.v1.UnsetParentGroupFromChannelsRes
-	(*AuthzReq)(nil),                        // 4: channels.v1.AuthzReq
-	(*AuthzRes)(nil),                        // 5: channels.v1.AuthzRes
-	(*v1.RetrieveEntityReq)(nil),            // 6: common.v1.RetrieveEntityReq
-	(*v1.RetrieveIDByRouteReq)(nil),         // 7: common.v1.RetrieveIDByRouteReq
-	(*v1.RetrieveEntityRes)(nil),            // 8: common.v1.RetrieveEntityRes
-}
-var file_channels_v1_channels_proto_depIdxs = []int32{
-	4, // 0: channels.v1.ChannelsService.Authorize:input_type -> channels.v1.AuthzReq
-	0, // 1: channels.v1.ChannelsService.RemoveClientConnections:input_type -> channels.v1.RemoveClientConnectionsReq
-	2, // 2: channels.v1.ChannelsService.UnsetParentGroupFromChannels:input_type -> channels.v1.UnsetParentGroupFromChannelsReq
-	6, // 3: channels.v1.ChannelsService.RetrieveEntity:input_type -> common.v1.RetrieveEntityReq
-	7, // 4: channels.v1.ChannelsService.RetrieveIDByRoute:input_type -> common.v1.RetrieveIDByRouteReq
-	5, // 5: channels.v1.ChannelsService.Authorize:output_type -> channels.v1.AuthzRes
-	1, // 6: channels.v1.ChannelsService.RemoveClientConnections:output_type -> channels.v1.RemoveClientConnectionsRes
-	3, // 7: channels.v1.ChannelsService.UnsetParentGroupFromChannels:output_type -> channels.v1.UnsetParentGroupFromChannelsRes
-	8, // 8: channels.v1.ChannelsService.RetrieveEntity:output_type -> common.v1.RetrieveEntityRes
-	8, // 9: channels.v1.ChannelsService.RetrieveIDByRoute:output_type -> common.v1.RetrieveEntityRes
-	5, // [5:10] is the sub-list for method output_type
-	0, // [0:5] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_channels_v1_channels_proto_init() }
-func file_channels_v1_channels_proto_init() {
-	if File_channels_v1_channels_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_channels_v1_channels_proto_rawDesc), len(file_channels_v1_channels_proto_rawDesc)),
-			NumEnums:      0,
-			NumMessages:   6,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_channels_v1_channels_proto_goTypes,
-		DependencyIndexes: file_channels_v1_channels_proto_depIdxs,
-		MessageInfos:      file_channels_v1_channels_proto_msgTypes,
-	}.Build()
-	File_channels_v1_channels_proto = out.File
-	file_channels_v1_channels_proto_goTypes = nil
-	file_channels_v1_channels_proto_depIdxs = nil
-}
@@ -1,277 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             v6.33.0
-// source: channels/v1/channels.proto
-
-package v1
-
-import (
-	context "context"
-	v1 "github.com/absmach/supermq/api/grpc/common/v1"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	ChannelsService_Authorize_FullMethodName                    = "/channels.v1.ChannelsService/Authorize"
-	ChannelsService_RemoveClientConnections_FullMethodName      = "/channels.v1.ChannelsService/RemoveClientConnections"
-	ChannelsService_UnsetParentGroupFromChannels_FullMethodName = "/channels.v1.ChannelsService/UnsetParentGroupFromChannels"
-	ChannelsService_RetrieveEntity_FullMethodName               = "/channels.v1.ChannelsService/RetrieveEntity"
-	ChannelsService_RetrieveIDByRoute_FullMethodName            = "/channels.v1.ChannelsService/RetrieveIDByRoute"
-)
-
-// ChannelsServiceClient is the client API for ChannelsService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type ChannelsServiceClient interface {
-	Authorize(ctx context.Context, in *AuthzReq, opts ...grpc.CallOption) (*AuthzRes, error)
-	RemoveClientConnections(ctx context.Context, in *RemoveClientConnectionsReq, opts ...grpc.CallOption) (*RemoveClientConnectionsRes, error)
-	UnsetParentGroupFromChannels(ctx context.Context, in *UnsetParentGroupFromChannelsReq, opts ...grpc.CallOption) (*UnsetParentGroupFromChannelsRes, error)
-	RetrieveEntity(ctx context.Context, in *v1.RetrieveEntityReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error)
-	RetrieveIDByRoute(ctx context.Context, in *v1.RetrieveIDByRouteReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error)
-}
-
-type channelsServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewChannelsServiceClient(cc grpc.ClientConnInterface) ChannelsServiceClient {
-	return &channelsServiceClient{cc}
-}
-
-func (c *channelsServiceClient) Authorize(ctx context.Context, in *AuthzReq, opts ...grpc.CallOption) (*AuthzRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(AuthzRes)
-	err := c.cc.Invoke(ctx, ChannelsService_Authorize_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *channelsServiceClient) RemoveClientConnections(ctx context.Context, in *RemoveClientConnectionsReq, opts ...grpc.CallOption) (*RemoveClientConnectionsRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(RemoveClientConnectionsRes)
-	err := c.cc.Invoke(ctx, ChannelsService_RemoveClientConnections_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *channelsServiceClient) UnsetParentGroupFromChannels(ctx context.Context, in *UnsetParentGroupFromChannelsReq, opts ...grpc.CallOption) (*UnsetParentGroupFromChannelsRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(UnsetParentGroupFromChannelsRes)
-	err := c.cc.Invoke(ctx, ChannelsService_UnsetParentGroupFromChannels_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *channelsServiceClient) RetrieveEntity(ctx context.Context, in *v1.RetrieveEntityReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(v1.RetrieveEntityRes)
-	err := c.cc.Invoke(ctx, ChannelsService_RetrieveEntity_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *channelsServiceClient) RetrieveIDByRoute(ctx context.Context, in *v1.RetrieveIDByRouteReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(v1.RetrieveEntityRes)
-	err := c.cc.Invoke(ctx, ChannelsService_RetrieveIDByRoute_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ChannelsServiceServer is the server API for ChannelsService service.
-// All implementations must embed UnimplementedChannelsServiceServer
-// for forward compatibility.
-type ChannelsServiceServer interface {
-	Authorize(context.Context, *AuthzReq) (*AuthzRes, error)
-	RemoveClientConnections(context.Context, *RemoveClientConnectionsReq) (*RemoveClientConnectionsRes, error)
-	UnsetParentGroupFromChannels(context.Context, *UnsetParentGroupFromChannelsReq) (*UnsetParentGroupFromChannelsRes, error)
-	RetrieveEntity(context.Context, *v1.RetrieveEntityReq) (*v1.RetrieveEntityRes, error)
-	RetrieveIDByRoute(context.Context, *v1.RetrieveIDByRouteReq) (*v1.RetrieveEntityRes, error)
-	mustEmbedUnimplementedChannelsServiceServer()
-}
-
-// UnimplementedChannelsServiceServer must be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedChannelsServiceServer struct{}
-
-func (UnimplementedChannelsServiceServer) Authorize(context.Context, *AuthzReq) (*AuthzRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Authorize not implemented")
-}
-func (UnimplementedChannelsServiceServer) RemoveClientConnections(context.Context, *RemoveClientConnectionsReq) (*RemoveClientConnectionsRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RemoveClientConnections not implemented")
-}
-func (UnimplementedChannelsServiceServer) UnsetParentGroupFromChannels(context.Context, *UnsetParentGroupFromChannelsReq) (*UnsetParentGroupFromChannelsRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UnsetParentGroupFromChannels not implemented")
-}
-func (UnimplementedChannelsServiceServer) RetrieveEntity(context.Context, *v1.RetrieveEntityReq) (*v1.RetrieveEntityRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RetrieveEntity not implemented")
-}
-func (UnimplementedChannelsServiceServer) RetrieveIDByRoute(context.Context, *v1.RetrieveIDByRouteReq) (*v1.RetrieveEntityRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RetrieveIDByRoute not implemented")
-}
-func (UnimplementedChannelsServiceServer) mustEmbedUnimplementedChannelsServiceServer() {}
-func (UnimplementedChannelsServiceServer) testEmbeddedByValue()                         {}
-
-// UnsafeChannelsServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to ChannelsServiceServer will
-// result in compilation errors.
-type UnsafeChannelsServiceServer interface {
-	mustEmbedUnimplementedChannelsServiceServer()
-}
-
-func RegisterChannelsServiceServer(s grpc.ServiceRegistrar, srv ChannelsServiceServer) {
-	// If the following call pancis, it indicates UnimplementedChannelsServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&ChannelsService_ServiceDesc, srv)
-}
-
-func _ChannelsService_Authorize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AuthzReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ChannelsServiceServer).Authorize(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ChannelsService_Authorize_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChannelsServiceServer).Authorize(ctx, req.(*AuthzReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ChannelsService_RemoveClientConnections_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RemoveClientConnectionsReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ChannelsServiceServer).RemoveClientConnections(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ChannelsService_RemoveClientConnections_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChannelsServiceServer).RemoveClientConnections(ctx, req.(*RemoveClientConnectionsReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ChannelsService_UnsetParentGroupFromChannels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UnsetParentGroupFromChannelsReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ChannelsServiceServer).UnsetParentGroupFromChannels(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ChannelsService_UnsetParentGroupFromChannels_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChannelsServiceServer).UnsetParentGroupFromChannels(ctx, req.(*UnsetParentGroupFromChannelsReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ChannelsService_RetrieveEntity_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(v1.RetrieveEntityReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ChannelsServiceServer).RetrieveEntity(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ChannelsService_RetrieveEntity_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChannelsServiceServer).RetrieveEntity(ctx, req.(*v1.RetrieveEntityReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ChannelsService_RetrieveIDByRoute_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(v1.RetrieveIDByRouteReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ChannelsServiceServer).RetrieveIDByRoute(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ChannelsService_RetrieveIDByRoute_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChannelsServiceServer).RetrieveIDByRoute(ctx, req.(*v1.RetrieveIDByRouteReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// ChannelsService_ServiceDesc is the grpc.ServiceDesc for ChannelsService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var ChannelsService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "channels.v1.ChannelsService",
-	HandlerType: (*ChannelsServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Authorize",
-			Handler:    _ChannelsService_Authorize_Handler,
-		},
-		{
-			MethodName: "RemoveClientConnections",
-			Handler:    _ChannelsService_RemoveClientConnections_Handler,
-		},
-		{
-			MethodName: "UnsetParentGroupFromChannels",
-			Handler:    _ChannelsService_UnsetParentGroupFromChannels_Handler,
-		},
-		{
-			MethodName: "RetrieveEntity",
-			Handler:    _ChannelsService_RetrieveEntity_Handler,
-		},
-		{
-			MethodName: "RetrieveIDByRoute",
-			Handler:    _ChannelsService_RetrieveIDByRoute_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "channels/v1/channels.proto",
-}
@@ -1,384 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.36.10
-// 	protoc        v6.33.0
-// source: clients/v1/clients.proto
-
-package v1
-
-import (
-	v1 "github.com/absmach/supermq/api/grpc/common/v1"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-	unsafe "unsafe"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type AuthnReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Token         string                 `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AuthnReq) Reset() {
-	*x = AuthnReq{}
-	mi := &file_clients_v1_clients_proto_msgTypes[0]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AuthnReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AuthnReq) ProtoMessage() {}
-
-func (x *AuthnReq) ProtoReflect() protoreflect.Message {
-	mi := &file_clients_v1_clients_proto_msgTypes[0]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AuthnReq.ProtoReflect.Descriptor instead.
-func (*AuthnReq) Descriptor() ([]byte, []int) {
-	return file_clients_v1_clients_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *AuthnReq) GetToken() string {
-	if x != nil {
-		return x.Token
-	}
-	return ""
-}
-
-type AuthnRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Authenticated bool                   `protobuf:"varint,1,opt,name=authenticated,proto3" json:"authenticated,omitempty"`
-	Id            string                 `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AuthnRes) Reset() {
-	*x = AuthnRes{}
-	mi := &file_clients_v1_clients_proto_msgTypes[1]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AuthnRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AuthnRes) ProtoMessage() {}
-
-func (x *AuthnRes) ProtoReflect() protoreflect.Message {
-	mi := &file_clients_v1_clients_proto_msgTypes[1]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AuthnRes.ProtoReflect.Descriptor instead.
-func (*AuthnRes) Descriptor() ([]byte, []int) {
-	return file_clients_v1_clients_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *AuthnRes) GetAuthenticated() bool {
-	if x != nil {
-		return x.Authenticated
-	}
-	return false
-}
-
-func (x *AuthnRes) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-type RemoveChannelConnectionsReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	ChannelId     string                 `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RemoveChannelConnectionsReq) Reset() {
-	*x = RemoveChannelConnectionsReq{}
-	mi := &file_clients_v1_clients_proto_msgTypes[2]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RemoveChannelConnectionsReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RemoveChannelConnectionsReq) ProtoMessage() {}
-
-func (x *RemoveChannelConnectionsReq) ProtoReflect() protoreflect.Message {
-	mi := &file_clients_v1_clients_proto_msgTypes[2]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RemoveChannelConnectionsReq.ProtoReflect.Descriptor instead.
-func (*RemoveChannelConnectionsReq) Descriptor() ([]byte, []int) {
-	return file_clients_v1_clients_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *RemoveChannelConnectionsReq) GetChannelId() string {
-	if x != nil {
-		return x.ChannelId
-	}
-	return ""
-}
-
-type RemoveChannelConnectionsRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RemoveChannelConnectionsRes) Reset() {
-	*x = RemoveChannelConnectionsRes{}
-	mi := &file_clients_v1_clients_proto_msgTypes[3]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RemoveChannelConnectionsRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RemoveChannelConnectionsRes) ProtoMessage() {}
-
-func (x *RemoveChannelConnectionsRes) ProtoReflect() protoreflect.Message {
-	mi := &file_clients_v1_clients_proto_msgTypes[3]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RemoveChannelConnectionsRes.ProtoReflect.Descriptor instead.
-func (*RemoveChannelConnectionsRes) Descriptor() ([]byte, []int) {
-	return file_clients_v1_clients_proto_rawDescGZIP(), []int{3}
-}
-
-type UnsetParentGroupFromClientReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	ParentGroupId string                 `protobuf:"bytes,1,opt,name=parent_group_id,json=parentGroupId,proto3" json:"parent_group_id,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *UnsetParentGroupFromClientReq) Reset() {
-	*x = UnsetParentGroupFromClientReq{}
-	mi := &file_clients_v1_clients_proto_msgTypes[4]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *UnsetParentGroupFromClientReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UnsetParentGroupFromClientReq) ProtoMessage() {}
-
-func (x *UnsetParentGroupFromClientReq) ProtoReflect() protoreflect.Message {
-	mi := &file_clients_v1_clients_proto_msgTypes[4]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UnsetParentGroupFromClientReq.ProtoReflect.Descriptor instead.
-func (*UnsetParentGroupFromClientReq) Descriptor() ([]byte, []int) {
-	return file_clients_v1_clients_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *UnsetParentGroupFromClientReq) GetParentGroupId() string {
-	if x != nil {
-		return x.ParentGroupId
-	}
-	return ""
-}
-
-type UnsetParentGroupFromClientRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *UnsetParentGroupFromClientRes) Reset() {
-	*x = UnsetParentGroupFromClientRes{}
-	mi := &file_clients_v1_clients_proto_msgTypes[5]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *UnsetParentGroupFromClientRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UnsetParentGroupFromClientRes) ProtoMessage() {}
-
-func (x *UnsetParentGroupFromClientRes) ProtoReflect() protoreflect.Message {
-	mi := &file_clients_v1_clients_proto_msgTypes[5]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UnsetParentGroupFromClientRes.ProtoReflect.Descriptor instead.
-func (*UnsetParentGroupFromClientRes) Descriptor() ([]byte, []int) {
-	return file_clients_v1_clients_proto_rawDescGZIP(), []int{5}
-}
-
-var File_clients_v1_clients_proto protoreflect.FileDescriptor
-
-const file_clients_v1_clients_proto_rawDesc = "" +
-	"\n" +
-	"\x18clients/v1/clients.proto\x12\n" +
-	"clients.v1\x1a\x16common/v1/common.proto\" \n" +
-	"\bAuthnReq\x12\x14\n" +
-	"\x05token\x18\x01 \x01(\tR\x05token\"@\n" +
-	"\bAuthnRes\x12$\n" +
-	"\rauthenticated\x18\x01 \x01(\bR\rauthenticated\x12\x0e\n" +
-	"\x02id\x18\x02 \x01(\tR\x02id\"<\n" +
-	"\x1bRemoveChannelConnectionsReq\x12\x1d\n" +
-	"\n" +
-	"channel_id\x18\x01 \x01(\tR\tchannelId\"\x1d\n" +
-	"\x1bRemoveChannelConnectionsRes\"G\n" +
-	"\x1dUnsetParentGroupFromClientReq\x12&\n" +
-	"\x0fparent_group_id\x18\x01 \x01(\tR\rparentGroupId\"\x1f\n" +
-	"\x1dUnsetParentGroupFromClientRes2\x83\x05\n" +
-	"\x0eClientsService\x12<\n" +
-	"\fAuthenticate\x12\x14.clients.v1.AuthnReq\x1a\x14.clients.v1.AuthnRes\"\x00\x12N\n" +
-	"\x0eRetrieveEntity\x12\x1c.common.v1.RetrieveEntityReq\x1a\x1c.common.v1.RetrieveEntityRes\"\x00\x12T\n" +
-	"\x10RetrieveEntities\x12\x1e.common.v1.RetrieveEntitiesReq\x1a\x1e.common.v1.RetrieveEntitiesRes\"\x00\x12N\n" +
-	"\x0eAddConnections\x12\x1c.common.v1.AddConnectionsReq\x1a\x1c.common.v1.AddConnectionsRes\"\x00\x12W\n" +
-	"\x11RemoveConnections\x12\x1f.common.v1.RemoveConnectionsReq\x1a\x1f.common.v1.RemoveConnectionsRes\"\x00\x12n\n" +
-	"\x18RemoveChannelConnections\x12'.clients.v1.RemoveChannelConnectionsReq\x1a'.clients.v1.RemoveChannelConnectionsRes\"\x00\x12t\n" +
-	"\x1aUnsetParentGroupFromClient\x12).clients.v1.UnsetParentGroupFromClientReq\x1a).clients.v1.UnsetParentGroupFromClientRes\"\x00B0Z.github.com/absmach/supermq/api/grpc/clients/v1b\x06proto3"
-
-var (
-	file_clients_v1_clients_proto_rawDescOnce sync.Once
-	file_clients_v1_clients_proto_rawDescData []byte
-)
-
-func file_clients_v1_clients_proto_rawDescGZIP() []byte {
-	file_clients_v1_clients_proto_rawDescOnce.Do(func() {
-		file_clients_v1_clients_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_clients_v1_clients_proto_rawDesc), len(file_clients_v1_clients_proto_rawDesc)))
-	})
-	return file_clients_v1_clients_proto_rawDescData
-}
-
-var file_clients_v1_clients_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_clients_v1_clients_proto_goTypes = []any{
-	(*AuthnReq)(nil),                      // 0: clients.v1.AuthnReq
-	(*AuthnRes)(nil),                      // 1: clients.v1.AuthnRes
-	(*RemoveChannelConnectionsReq)(nil),   // 2: clients.v1.RemoveChannelConnectionsReq
-	(*RemoveChannelConnectionsRes)(nil),   // 3: clients.v1.RemoveChannelConnectionsRes
-	(*UnsetParentGroupFromClientReq)(nil), // 4: clients.v1.UnsetParentGroupFromClientReq
-	(*UnsetParentGroupFromClientRes)(nil), // 5: clients.v1.UnsetParentGroupFromClientRes
-	(*v1.RetrieveEntityReq)(nil),          // 6: common.v1.RetrieveEntityReq
-	(*v1.RetrieveEntitiesReq)(nil),        // 7: common.v1.RetrieveEntitiesReq
-	(*v1.AddConnectionsReq)(nil),          // 8: common.v1.AddConnectionsReq
-	(*v1.RemoveConnectionsReq)(nil),       // 9: common.v1.RemoveConnectionsReq
-	(*v1.RetrieveEntityRes)(nil),          // 10: common.v1.RetrieveEntityRes
-	(*v1.RetrieveEntitiesRes)(nil),        // 11: common.v1.RetrieveEntitiesRes
-	(*v1.AddConnectionsRes)(nil),          // 12: common.v1.AddConnectionsRes
-	(*v1.RemoveConnectionsRes)(nil),       // 13: common.v1.RemoveConnectionsRes
-}
-var file_clients_v1_clients_proto_depIdxs = []int32{
-	0,  // 0: clients.v1.ClientsService.Authenticate:input_type -> clients.v1.AuthnReq
-	6,  // 1: clients.v1.ClientsService.RetrieveEntity:input_type -> common.v1.RetrieveEntityReq
-	7,  // 2: clients.v1.ClientsService.RetrieveEntities:input_type -> common.v1.RetrieveEntitiesReq
-	8,  // 3: clients.v1.ClientsService.AddConnections:input_type -> common.v1.AddConnectionsReq
-	9,  // 4: clients.v1.ClientsService.RemoveConnections:input_type -> common.v1.RemoveConnectionsReq
-	2,  // 5: clients.v1.ClientsService.RemoveChannelConnections:input_type -> clients.v1.RemoveChannelConnectionsReq
-	4,  // 6: clients.v1.ClientsService.UnsetParentGroupFromClient:input_type -> clients.v1.UnsetParentGroupFromClientReq
-	1,  // 7: clients.v1.ClientsService.Authenticate:output_type -> clients.v1.AuthnRes
-	10, // 8: clients.v1.ClientsService.RetrieveEntity:output_type -> common.v1.RetrieveEntityRes
-	11, // 9: clients.v1.ClientsService.RetrieveEntities:output_type -> common.v1.RetrieveEntitiesRes
-	12, // 10: clients.v1.ClientsService.AddConnections:output_type -> common.v1.AddConnectionsRes
-	13, // 11: clients.v1.ClientsService.RemoveConnections:output_type -> common.v1.RemoveConnectionsRes
-	3,  // 12: clients.v1.ClientsService.RemoveChannelConnections:output_type -> clients.v1.RemoveChannelConnectionsRes
-	5,  // 13: clients.v1.ClientsService.UnsetParentGroupFromClient:output_type -> clients.v1.UnsetParentGroupFromClientRes
-	7,  // [7:14] is the sub-list for method output_type
-	0,  // [0:7] is the sub-list for method input_type
-	0,  // [0:0] is the sub-list for extension type_name
-	0,  // [0:0] is the sub-list for extension extendee
-	0,  // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_clients_v1_clients_proto_init() }
-func file_clients_v1_clients_proto_init() {
-	if File_clients_v1_clients_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_clients_v1_clients_proto_rawDesc), len(file_clients_v1_clients_proto_rawDesc)),
-			NumEnums:      0,
-			NumMessages:   6,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_clients_v1_clients_proto_goTypes,
-		DependencyIndexes: file_clients_v1_clients_proto_depIdxs,
-		MessageInfos:      file_clients_v1_clients_proto_msgTypes,
-	}.Build()
-	File_clients_v1_clients_proto = out.File
-	file_clients_v1_clients_proto_goTypes = nil
-	file_clients_v1_clients_proto_depIdxs = nil
-}
@@ -1,361 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             v6.33.0
-// source: clients/v1/clients.proto
-
-package v1
-
-import (
-	context "context"
-	v1 "github.com/absmach/supermq/api/grpc/common/v1"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	ClientsService_Authenticate_FullMethodName               = "/clients.v1.ClientsService/Authenticate"
-	ClientsService_RetrieveEntity_FullMethodName             = "/clients.v1.ClientsService/RetrieveEntity"
-	ClientsService_RetrieveEntities_FullMethodName           = "/clients.v1.ClientsService/RetrieveEntities"
-	ClientsService_AddConnections_FullMethodName             = "/clients.v1.ClientsService/AddConnections"
-	ClientsService_RemoveConnections_FullMethodName          = "/clients.v1.ClientsService/RemoveConnections"
-	ClientsService_RemoveChannelConnections_FullMethodName   = "/clients.v1.ClientsService/RemoveChannelConnections"
-	ClientsService_UnsetParentGroupFromClient_FullMethodName = "/clients.v1.ClientsService/UnsetParentGroupFromClient"
-)
-
-// ClientsServiceClient is the client API for ClientsService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-//
-// ClientsService is a service that provides clients
-// authorization functionalities for SuperMQ services.
-type ClientsServiceClient interface {
-	// Authorize checks if the client is authorized to perform
-	Authenticate(ctx context.Context, in *AuthnReq, opts ...grpc.CallOption) (*AuthnRes, error)
-	RetrieveEntity(ctx context.Context, in *v1.RetrieveEntityReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error)
-	RetrieveEntities(ctx context.Context, in *v1.RetrieveEntitiesReq, opts ...grpc.CallOption) (*v1.RetrieveEntitiesRes, error)
-	AddConnections(ctx context.Context, in *v1.AddConnectionsReq, opts ...grpc.CallOption) (*v1.AddConnectionsRes, error)
-	RemoveConnections(ctx context.Context, in *v1.RemoveConnectionsReq, opts ...grpc.CallOption) (*v1.RemoveConnectionsRes, error)
-	RemoveChannelConnections(ctx context.Context, in *RemoveChannelConnectionsReq, opts ...grpc.CallOption) (*RemoveChannelConnectionsRes, error)
-	UnsetParentGroupFromClient(ctx context.Context, in *UnsetParentGroupFromClientReq, opts ...grpc.CallOption) (*UnsetParentGroupFromClientRes, error)
-}
-
-type clientsServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewClientsServiceClient(cc grpc.ClientConnInterface) ClientsServiceClient {
-	return &clientsServiceClient{cc}
-}
-
-func (c *clientsServiceClient) Authenticate(ctx context.Context, in *AuthnReq, opts ...grpc.CallOption) (*AuthnRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(AuthnRes)
-	err := c.cc.Invoke(ctx, ClientsService_Authenticate_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clientsServiceClient) RetrieveEntity(ctx context.Context, in *v1.RetrieveEntityReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(v1.RetrieveEntityRes)
-	err := c.cc.Invoke(ctx, ClientsService_RetrieveEntity_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clientsServiceClient) RetrieveEntities(ctx context.Context, in *v1.RetrieveEntitiesReq, opts ...grpc.CallOption) (*v1.RetrieveEntitiesRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(v1.RetrieveEntitiesRes)
-	err := c.cc.Invoke(ctx, ClientsService_RetrieveEntities_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clientsServiceClient) AddConnections(ctx context.Context, in *v1.AddConnectionsReq, opts ...grpc.CallOption) (*v1.AddConnectionsRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(v1.AddConnectionsRes)
-	err := c.cc.Invoke(ctx, ClientsService_AddConnections_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clientsServiceClient) RemoveConnections(ctx context.Context, in *v1.RemoveConnectionsReq, opts ...grpc.CallOption) (*v1.RemoveConnectionsRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(v1.RemoveConnectionsRes)
-	err := c.cc.Invoke(ctx, ClientsService_RemoveConnections_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clientsServiceClient) RemoveChannelConnections(ctx context.Context, in *RemoveChannelConnectionsReq, opts ...grpc.CallOption) (*RemoveChannelConnectionsRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(RemoveChannelConnectionsRes)
-	err := c.cc.Invoke(ctx, ClientsService_RemoveChannelConnections_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clientsServiceClient) UnsetParentGroupFromClient(ctx context.Context, in *UnsetParentGroupFromClientReq, opts ...grpc.CallOption) (*UnsetParentGroupFromClientRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(UnsetParentGroupFromClientRes)
-	err := c.cc.Invoke(ctx, ClientsService_UnsetParentGroupFromClient_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ClientsServiceServer is the server API for ClientsService service.
-// All implementations must embed UnimplementedClientsServiceServer
-// for forward compatibility.
-//
-// ClientsService is a service that provides clients
-// authorization functionalities for SuperMQ services.
-type ClientsServiceServer interface {
-	// Authorize checks if the client is authorized to perform
-	Authenticate(context.Context, *AuthnReq) (*AuthnRes, error)
-	RetrieveEntity(context.Context, *v1.RetrieveEntityReq) (*v1.RetrieveEntityRes, error)
-	RetrieveEntities(context.Context, *v1.RetrieveEntitiesReq) (*v1.RetrieveEntitiesRes, error)
-	AddConnections(context.Context, *v1.AddConnectionsReq) (*v1.AddConnectionsRes, error)
-	RemoveConnections(context.Context, *v1.RemoveConnectionsReq) (*v1.RemoveConnectionsRes, error)
-	RemoveChannelConnections(context.Context, *RemoveChannelConnectionsReq) (*RemoveChannelConnectionsRes, error)
-	UnsetParentGroupFromClient(context.Context, *UnsetParentGroupFromClientReq) (*UnsetParentGroupFromClientRes, error)
-	mustEmbedUnimplementedClientsServiceServer()
-}
-
-// UnimplementedClientsServiceServer must be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedClientsServiceServer struct{}
-
-func (UnimplementedClientsServiceServer) Authenticate(context.Context, *AuthnReq) (*AuthnRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Authenticate not implemented")
-}
-func (UnimplementedClientsServiceServer) RetrieveEntity(context.Context, *v1.RetrieveEntityReq) (*v1.RetrieveEntityRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RetrieveEntity not implemented")
-}
-func (UnimplementedClientsServiceServer) RetrieveEntities(context.Context, *v1.RetrieveEntitiesReq) (*v1.RetrieveEntitiesRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RetrieveEntities not implemented")
-}
-func (UnimplementedClientsServiceServer) AddConnections(context.Context, *v1.AddConnectionsReq) (*v1.AddConnectionsRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method AddConnections not implemented")
-}
-func (UnimplementedClientsServiceServer) RemoveConnections(context.Context, *v1.RemoveConnectionsReq) (*v1.RemoveConnectionsRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RemoveConnections not implemented")
-}
-func (UnimplementedClientsServiceServer) RemoveChannelConnections(context.Context, *RemoveChannelConnectionsReq) (*RemoveChannelConnectionsRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RemoveChannelConnections not implemented")
-}
-func (UnimplementedClientsServiceServer) UnsetParentGroupFromClient(context.Context, *UnsetParentGroupFromClientReq) (*UnsetParentGroupFromClientRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UnsetParentGroupFromClient not implemented")
-}
-func (UnimplementedClientsServiceServer) mustEmbedUnimplementedClientsServiceServer() {}
-func (UnimplementedClientsServiceServer) testEmbeddedByValue()                        {}
-
-// UnsafeClientsServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to ClientsServiceServer will
-// result in compilation errors.
-type UnsafeClientsServiceServer interface {
-	mustEmbedUnimplementedClientsServiceServer()
-}
-
-func RegisterClientsServiceServer(s grpc.ServiceRegistrar, srv ClientsServiceServer) {
-	// If the following call pancis, it indicates UnimplementedClientsServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&ClientsService_ServiceDesc, srv)
-}
-
-func _ClientsService_Authenticate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AuthnReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClientsServiceServer).Authenticate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ClientsService_Authenticate_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClientsServiceServer).Authenticate(ctx, req.(*AuthnReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClientsService_RetrieveEntity_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(v1.RetrieveEntityReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClientsServiceServer).RetrieveEntity(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ClientsService_RetrieveEntity_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClientsServiceServer).RetrieveEntity(ctx, req.(*v1.RetrieveEntityReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClientsService_RetrieveEntities_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(v1.RetrieveEntitiesReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClientsServiceServer).RetrieveEntities(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ClientsService_RetrieveEntities_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClientsServiceServer).RetrieveEntities(ctx, req.(*v1.RetrieveEntitiesReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClientsService_AddConnections_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(v1.AddConnectionsReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClientsServiceServer).AddConnections(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ClientsService_AddConnections_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClientsServiceServer).AddConnections(ctx, req.(*v1.AddConnectionsReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClientsService_RemoveConnections_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(v1.RemoveConnectionsReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClientsServiceServer).RemoveConnections(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ClientsService_RemoveConnections_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClientsServiceServer).RemoveConnections(ctx, req.(*v1.RemoveConnectionsReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClientsService_RemoveChannelConnections_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RemoveChannelConnectionsReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClientsServiceServer).RemoveChannelConnections(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ClientsService_RemoveChannelConnections_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClientsServiceServer).RemoveChannelConnections(ctx, req.(*RemoveChannelConnectionsReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClientsService_UnsetParentGroupFromClient_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UnsetParentGroupFromClientReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClientsServiceServer).UnsetParentGroupFromClient(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ClientsService_UnsetParentGroupFromClient_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClientsServiceServer).UnsetParentGroupFromClient(ctx, req.(*UnsetParentGroupFromClientReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// ClientsService_ServiceDesc is the grpc.ServiceDesc for ClientsService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var ClientsService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "clients.v1.ClientsService",
-	HandlerType: (*ClientsServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Authenticate",
-			Handler:    _ClientsService_Authenticate_Handler,
-		},
-		{
-			MethodName: "RetrieveEntity",
-			Handler:    _ClientsService_RetrieveEntity_Handler,
-		},
-		{
-			MethodName: "RetrieveEntities",
-			Handler:    _ClientsService_RetrieveEntities_Handler,
-		},
-		{
-			MethodName: "AddConnections",
-			Handler:    _ClientsService_AddConnections_Handler,
-		},
-		{
-			MethodName: "RemoveConnections",
-			Handler:    _ClientsService_RemoveConnections_Handler,
-		},
-		{
-			MethodName: "RemoveChannelConnections",
-			Handler:    _ClientsService_RemoveChannelConnections_Handler,
-		},
-		{
-			MethodName: "UnsetParentGroupFromClient",
-			Handler:    _ClientsService_UnsetParentGroupFromClient_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "clients/v1/clients.proto",
-}
@@ -1,691 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.36.10
-// 	protoc        v6.33.0
-// source: common/v1/common.proto
-
-package v1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-	unsafe "unsafe"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type RetrieveEntitiesReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Ids           []string               `protobuf:"bytes,1,rep,name=ids,proto3" json:"ids,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RetrieveEntitiesReq) Reset() {
-	*x = RetrieveEntitiesReq{}
-	mi := &file_common_v1_common_proto_msgTypes[0]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RetrieveEntitiesReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RetrieveEntitiesReq) ProtoMessage() {}
-
-func (x *RetrieveEntitiesReq) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[0]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RetrieveEntitiesReq.ProtoReflect.Descriptor instead.
-func (*RetrieveEntitiesReq) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *RetrieveEntitiesReq) GetIds() []string {
-	if x != nil {
-		return x.Ids
-	}
-	return nil
-}
-
-type RetrieveEntitiesRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Total         uint64                 `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"`
-	Limit         uint64                 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
-	Offset        uint64                 `protobuf:"varint,3,opt,name=offset,proto3" json:"offset,omitempty"`
-	Entities      []*EntityBasic         `protobuf:"bytes,4,rep,name=entities,proto3" json:"entities,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RetrieveEntitiesRes) Reset() {
-	*x = RetrieveEntitiesRes{}
-	mi := &file_common_v1_common_proto_msgTypes[1]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RetrieveEntitiesRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RetrieveEntitiesRes) ProtoMessage() {}
-
-func (x *RetrieveEntitiesRes) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[1]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RetrieveEntitiesRes.ProtoReflect.Descriptor instead.
-func (*RetrieveEntitiesRes) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *RetrieveEntitiesRes) GetTotal() uint64 {
-	if x != nil {
-		return x.Total
-	}
-	return 0
-}
-
-func (x *RetrieveEntitiesRes) GetLimit() uint64 {
-	if x != nil {
-		return x.Limit
-	}
-	return 0
-}
-
-func (x *RetrieveEntitiesRes) GetOffset() uint64 {
-	if x != nil {
-		return x.Offset
-	}
-	return 0
-}
-
-func (x *RetrieveEntitiesRes) GetEntities() []*EntityBasic {
-	if x != nil {
-		return x.Entities
-	}
-	return nil
-}
-
-type RetrieveEntityReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RetrieveEntityReq) Reset() {
-	*x = RetrieveEntityReq{}
-	mi := &file_common_v1_common_proto_msgTypes[2]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RetrieveEntityReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RetrieveEntityReq) ProtoMessage() {}
-
-func (x *RetrieveEntityReq) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[2]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RetrieveEntityReq.ProtoReflect.Descriptor instead.
-func (*RetrieveEntityReq) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *RetrieveEntityReq) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-type RetrieveEntityRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Entity        *EntityBasic           `protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RetrieveEntityRes) Reset() {
-	*x = RetrieveEntityRes{}
-	mi := &file_common_v1_common_proto_msgTypes[3]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RetrieveEntityRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RetrieveEntityRes) ProtoMessage() {}
-
-func (x *RetrieveEntityRes) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[3]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RetrieveEntityRes.ProtoReflect.Descriptor instead.
-func (*RetrieveEntityRes) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *RetrieveEntityRes) GetEntity() *EntityBasic {
-	if x != nil {
-		return x.Entity
-	}
-	return nil
-}
-
-type EntityBasic struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	DomainId      string                 `protobuf:"bytes,2,opt,name=domain_id,json=domainId,proto3" json:"domain_id,omitempty"`
-	ParentGroupId string                 `protobuf:"bytes,3,opt,name=parent_group_id,json=parentGroupId,proto3" json:"parent_group_id,omitempty"`
-	Status        uint32                 `protobuf:"varint,4,opt,name=status,proto3" json:"status,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *EntityBasic) Reset() {
-	*x = EntityBasic{}
-	mi := &file_common_v1_common_proto_msgTypes[4]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *EntityBasic) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EntityBasic) ProtoMessage() {}
-
-func (x *EntityBasic) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[4]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EntityBasic.ProtoReflect.Descriptor instead.
-func (*EntityBasic) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *EntityBasic) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *EntityBasic) GetDomainId() string {
-	if x != nil {
-		return x.DomainId
-	}
-	return ""
-}
-
-func (x *EntityBasic) GetParentGroupId() string {
-	if x != nil {
-		return x.ParentGroupId
-	}
-	return ""
-}
-
-func (x *EntityBasic) GetStatus() uint32 {
-	if x != nil {
-		return x.Status
-	}
-	return 0
-}
-
-type AddConnectionsReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Connections   []*Connection          `protobuf:"bytes,1,rep,name=connections,proto3" json:"connections,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AddConnectionsReq) Reset() {
-	*x = AddConnectionsReq{}
-	mi := &file_common_v1_common_proto_msgTypes[5]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AddConnectionsReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AddConnectionsReq) ProtoMessage() {}
-
-func (x *AddConnectionsReq) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[5]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AddConnectionsReq.ProtoReflect.Descriptor instead.
-func (*AddConnectionsReq) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *AddConnectionsReq) GetConnections() []*Connection {
-	if x != nil {
-		return x.Connections
-	}
-	return nil
-}
-
-type AddConnectionsRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Ok            bool                   `protobuf:"varint,1,opt,name=ok,proto3" json:"ok,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AddConnectionsRes) Reset() {
-	*x = AddConnectionsRes{}
-	mi := &file_common_v1_common_proto_msgTypes[6]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AddConnectionsRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AddConnectionsRes) ProtoMessage() {}
-
-func (x *AddConnectionsRes) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[6]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AddConnectionsRes.ProtoReflect.Descriptor instead.
-func (*AddConnectionsRes) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *AddConnectionsRes) GetOk() bool {
-	if x != nil {
-		return x.Ok
-	}
-	return false
-}
-
-type RemoveConnectionsReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Connections   []*Connection          `protobuf:"bytes,1,rep,name=connections,proto3" json:"connections,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RemoveConnectionsReq) Reset() {
-	*x = RemoveConnectionsReq{}
-	mi := &file_common_v1_common_proto_msgTypes[7]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RemoveConnectionsReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RemoveConnectionsReq) ProtoMessage() {}
-
-func (x *RemoveConnectionsReq) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[7]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RemoveConnectionsReq.ProtoReflect.Descriptor instead.
-func (*RemoveConnectionsReq) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *RemoveConnectionsReq) GetConnections() []*Connection {
-	if x != nil {
-		return x.Connections
-	}
-	return nil
-}
-
-type RemoveConnectionsRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Ok            bool                   `protobuf:"varint,1,opt,name=ok,proto3" json:"ok,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RemoveConnectionsRes) Reset() {
-	*x = RemoveConnectionsRes{}
-	mi := &file_common_v1_common_proto_msgTypes[8]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RemoveConnectionsRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RemoveConnectionsRes) ProtoMessage() {}
-
-func (x *RemoveConnectionsRes) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[8]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RemoveConnectionsRes.ProtoReflect.Descriptor instead.
-func (*RemoveConnectionsRes) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *RemoveConnectionsRes) GetOk() bool {
-	if x != nil {
-		return x.Ok
-	}
-	return false
-}
-
-type Connection struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	ClientId      string                 `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
-	ChannelId     string                 `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
-	DomainId      string                 `protobuf:"bytes,3,opt,name=domain_id,json=domainId,proto3" json:"domain_id,omitempty"`
-	Type          uint32                 `protobuf:"varint,4,opt,name=type,proto3" json:"type,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *Connection) Reset() {
-	*x = Connection{}
-	mi := &file_common_v1_common_proto_msgTypes[9]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *Connection) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Connection) ProtoMessage() {}
-
-func (x *Connection) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[9]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Connection.ProtoReflect.Descriptor instead.
-func (*Connection) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *Connection) GetClientId() string {
-	if x != nil {
-		return x.ClientId
-	}
-	return ""
-}
-
-func (x *Connection) GetChannelId() string {
-	if x != nil {
-		return x.ChannelId
-	}
-	return ""
-}
-
-func (x *Connection) GetDomainId() string {
-	if x != nil {
-		return x.DomainId
-	}
-	return ""
-}
-
-func (x *Connection) GetType() uint32 {
-	if x != nil {
-		return x.Type
-	}
-	return 0
-}
-
-type RetrieveIDByRouteReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Route         string                 `protobuf:"bytes,1,opt,name=route,proto3" json:"route,omitempty"`
-	DomainId      string                 `protobuf:"bytes,2,opt,name=domain_id,json=domainId,proto3" json:"domain_id,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RetrieveIDByRouteReq) Reset() {
-	*x = RetrieveIDByRouteReq{}
-	mi := &file_common_v1_common_proto_msgTypes[10]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RetrieveIDByRouteReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RetrieveIDByRouteReq) ProtoMessage() {}
-
-func (x *RetrieveIDByRouteReq) ProtoReflect() protoreflect.Message {
-	mi := &file_common_v1_common_proto_msgTypes[10]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RetrieveIDByRouteReq.ProtoReflect.Descriptor instead.
-func (*RetrieveIDByRouteReq) Descriptor() ([]byte, []int) {
-	return file_common_v1_common_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *RetrieveIDByRouteReq) GetRoute() string {
-	if x != nil {
-		return x.Route
-	}
-	return ""
-}
-
-func (x *RetrieveIDByRouteReq) GetDomainId() string {
-	if x != nil {
-		return x.DomainId
-	}
-	return ""
-}
-
-var File_common_v1_common_proto protoreflect.FileDescriptor
-
-const file_common_v1_common_proto_rawDesc = "" +
-	"\n" +
-	"\x16common/v1/common.proto\x12\tcommon.v1\"'\n" +
-	"\x13RetrieveEntitiesReq\x12\x10\n" +
-	"\x03ids\x18\x01 \x03(\tR\x03ids\"\x8d\x01\n" +
-	"\x13RetrieveEntitiesRes\x12\x14\n" +
-	"\x05total\x18\x01 \x01(\x04R\x05total\x12\x14\n" +
-	"\x05limit\x18\x02 \x01(\x04R\x05limit\x12\x16\n" +
-	"\x06offset\x18\x03 \x01(\x04R\x06offset\x122\n" +
-	"\bentities\x18\x04 \x03(\v2\x16.common.v1.EntityBasicR\bentities\"#\n" +
-	"\x11RetrieveEntityReq\x12\x0e\n" +
-	"\x02id\x18\x01 \x01(\tR\x02id\"C\n" +
-	"\x11RetrieveEntityRes\x12.\n" +
-	"\x06entity\x18\x01 \x01(\v2\x16.common.v1.EntityBasicR\x06entity\"z\n" +
-	"\vEntityBasic\x12\x0e\n" +
-	"\x02id\x18\x01 \x01(\tR\x02id\x12\x1b\n" +
-	"\tdomain_id\x18\x02 \x01(\tR\bdomainId\x12&\n" +
-	"\x0fparent_group_id\x18\x03 \x01(\tR\rparentGroupId\x12\x16\n" +
-	"\x06status\x18\x04 \x01(\rR\x06status\"L\n" +
-	"\x11AddConnectionsReq\x127\n" +
-	"\vconnections\x18\x01 \x03(\v2\x15.common.v1.ConnectionR\vconnections\"#\n" +
-	"\x11AddConnectionsRes\x12\x0e\n" +
-	"\x02ok\x18\x01 \x01(\bR\x02ok\"O\n" +
-	"\x14RemoveConnectionsReq\x127\n" +
-	"\vconnections\x18\x01 \x03(\v2\x15.common.v1.ConnectionR\vconnections\"&\n" +
-	"\x14RemoveConnectionsRes\x12\x0e\n" +
-	"\x02ok\x18\x01 \x01(\bR\x02ok\"y\n" +
-	"\n" +
-	"Connection\x12\x1b\n" +
-	"\tclient_id\x18\x01 \x01(\tR\bclientId\x12\x1d\n" +
-	"\n" +
-	"channel_id\x18\x02 \x01(\tR\tchannelId\x12\x1b\n" +
-	"\tdomain_id\x18\x03 \x01(\tR\bdomainId\x12\x12\n" +
-	"\x04type\x18\x04 \x01(\rR\x04type\"I\n" +
-	"\x14RetrieveIDByRouteReq\x12\x14\n" +
-	"\x05route\x18\x01 \x01(\tR\x05route\x12\x1b\n" +
-	"\tdomain_id\x18\x02 \x01(\tR\bdomainIdB/Z-github.com/absmach/supermq/api/grpc/common/v1b\x06proto3"
-
-var (
-	file_common_v1_common_proto_rawDescOnce sync.Once
-	file_common_v1_common_proto_rawDescData []byte
-)
-
-func file_common_v1_common_proto_rawDescGZIP() []byte {
-	file_common_v1_common_proto_rawDescOnce.Do(func() {
-		file_common_v1_common_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_common_v1_common_proto_rawDesc), len(file_common_v1_common_proto_rawDesc)))
-	})
-	return file_common_v1_common_proto_rawDescData
-}
-
-var file_common_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
-var file_common_v1_common_proto_goTypes = []any{
-	(*RetrieveEntitiesReq)(nil),  // 0: common.v1.RetrieveEntitiesReq
-	(*RetrieveEntitiesRes)(nil),  // 1: common.v1.RetrieveEntitiesRes
-	(*RetrieveEntityReq)(nil),    // 2: common.v1.RetrieveEntityReq
-	(*RetrieveEntityRes)(nil),    // 3: common.v1.RetrieveEntityRes
-	(*EntityBasic)(nil),          // 4: common.v1.EntityBasic
-	(*AddConnectionsReq)(nil),    // 5: common.v1.AddConnectionsReq
-	(*AddConnectionsRes)(nil),    // 6: common.v1.AddConnectionsRes
-	(*RemoveConnectionsReq)(nil), // 7: common.v1.RemoveConnectionsReq
-	(*RemoveConnectionsRes)(nil), // 8: common.v1.RemoveConnectionsRes
-	(*Connection)(nil),           // 9: common.v1.Connection
-	(*RetrieveIDByRouteReq)(nil), // 10: common.v1.RetrieveIDByRouteReq
-}
-var file_common_v1_common_proto_depIdxs = []int32{
-	4, // 0: common.v1.RetrieveEntitiesRes.entities:type_name -> common.v1.EntityBasic
-	4, // 1: common.v1.RetrieveEntityRes.entity:type_name -> common.v1.EntityBasic
-	9, // 2: common.v1.AddConnectionsReq.connections:type_name -> common.v1.Connection
-	9, // 3: common.v1.RemoveConnectionsReq.connections:type_name -> common.v1.Connection
-	4, // [4:4] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for method input_type
-	4, // [4:4] is the sub-list for extension type_name
-	4, // [4:4] is the sub-list for extension extendee
-	0, // [0:4] is the sub-list for field type_name
-}
-
-func init() { file_common_v1_common_proto_init() }
-func file_common_v1_common_proto_init() {
-	if File_common_v1_common_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_common_v1_common_proto_rawDesc), len(file_common_v1_common_proto_rawDesc)),
-			NumEnums:      0,
-			NumMessages:   11,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_common_v1_common_proto_goTypes,
-		DependencyIndexes: file_common_v1_common_proto_depIdxs,
-		MessageInfos:      file_common_v1_common_proto_msgTypes,
-	}.Build()
-	File_common_v1_common_proto = out.File
-	file_common_v1_common_proto_goTypes = nil
-	file_common_v1_common_proto_depIdxs = nil
-}
@@ -1,187 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.36.10
-// 	protoc        v6.33.0
-// source: domains/v1/domains.proto
-
-package v1
-
-import (
-	v1 "github.com/absmach/supermq/api/grpc/common/v1"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-	unsafe "unsafe"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type DeleteUserRes struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Deleted       bool                   `protobuf:"varint,1,opt,name=deleted,proto3" json:"deleted,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *DeleteUserRes) Reset() {
-	*x = DeleteUserRes{}
-	mi := &file_domains_v1_domains_proto_msgTypes[0]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *DeleteUserRes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DeleteUserRes) ProtoMessage() {}
-
-func (x *DeleteUserRes) ProtoReflect() protoreflect.Message {
-	mi := &file_domains_v1_domains_proto_msgTypes[0]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DeleteUserRes.ProtoReflect.Descriptor instead.
-func (*DeleteUserRes) Descriptor() ([]byte, []int) {
-	return file_domains_v1_domains_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *DeleteUserRes) GetDeleted() bool {
-	if x != nil {
-		return x.Deleted
-	}
-	return false
-}
-
-type DeleteUserReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *DeleteUserReq) Reset() {
-	*x = DeleteUserReq{}
-	mi := &file_domains_v1_domains_proto_msgTypes[1]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *DeleteUserReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DeleteUserReq) ProtoMessage() {}
-
-func (x *DeleteUserReq) ProtoReflect() protoreflect.Message {
-	mi := &file_domains_v1_domains_proto_msgTypes[1]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DeleteUserReq.ProtoReflect.Descriptor instead.
-func (*DeleteUserReq) Descriptor() ([]byte, []int) {
-	return file_domains_v1_domains_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *DeleteUserReq) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-var File_domains_v1_domains_proto protoreflect.FileDescriptor
-
-const file_domains_v1_domains_proto_rawDesc = "" +
-	"\n" +
-	"\x18domains/v1/domains.proto\x12\n" +
-	"domains.v1\x1a\x16common/v1/common.proto\")\n" +
-	"\rDeleteUserRes\x12\x18\n" +
-	"\adeleted\x18\x01 \x01(\bR\adeleted\"\x1f\n" +
-	"\rDeleteUserReq\x12\x0e\n" +
-	"\x02id\x18\x01 \x01(\tR\x02id2\x87\x02\n" +
-	"\x0eDomainsService\x12O\n" +
-	"\x15DeleteUserFromDomains\x12\x19.domains.v1.DeleteUserReq\x1a\x19.domains.v1.DeleteUserRes\"\x00\x12N\n" +
-	"\x0eRetrieveStatus\x12\x1c.common.v1.RetrieveEntityReq\x1a\x1c.common.v1.RetrieveEntityRes\"\x00\x12T\n" +
-	"\x11RetrieveIDByRoute\x12\x1f.common.v1.RetrieveIDByRouteReq\x1a\x1c.common.v1.RetrieveEntityRes\"\x00B5Z3github.com/absmach/supermq/internal/grpc/domains/v1b\x06proto3"
-
-var (
-	file_domains_v1_domains_proto_rawDescOnce sync.Once
-	file_domains_v1_domains_proto_rawDescData []byte
-)
-
-func file_domains_v1_domains_proto_rawDescGZIP() []byte {
-	file_domains_v1_domains_proto_rawDescOnce.Do(func() {
-		file_domains_v1_domains_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_domains_v1_domains_proto_rawDesc), len(file_domains_v1_domains_proto_rawDesc)))
-	})
-	return file_domains_v1_domains_proto_rawDescData
-}
-
-var file_domains_v1_domains_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_domains_v1_domains_proto_goTypes = []any{
-	(*DeleteUserRes)(nil),           // 0: domains.v1.DeleteUserRes
-	(*DeleteUserReq)(nil),           // 1: domains.v1.DeleteUserReq
-	(*v1.RetrieveEntityReq)(nil),    // 2: common.v1.RetrieveEntityReq
-	(*v1.RetrieveIDByRouteReq)(nil), // 3: common.v1.RetrieveIDByRouteReq
-	(*v1.RetrieveEntityRes)(nil),    // 4: common.v1.RetrieveEntityRes
-}
-var file_domains_v1_domains_proto_depIdxs = []int32{
-	1, // 0: domains.v1.DomainsService.DeleteUserFromDomains:input_type -> domains.v1.DeleteUserReq
-	2, // 1: domains.v1.DomainsService.RetrieveStatus:input_type -> common.v1.RetrieveEntityReq
-	3, // 2: domains.v1.DomainsService.RetrieveIDByRoute:input_type -> common.v1.RetrieveIDByRouteReq
-	0, // 3: domains.v1.DomainsService.DeleteUserFromDomains:output_type -> domains.v1.DeleteUserRes
-	4, // 4: domains.v1.DomainsService.RetrieveStatus:output_type -> common.v1.RetrieveEntityRes
-	4, // 5: domains.v1.DomainsService.RetrieveIDByRoute:output_type -> common.v1.RetrieveEntityRes
-	3, // [3:6] is the sub-list for method output_type
-	0, // [0:3] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_domains_v1_domains_proto_init() }
-func file_domains_v1_domains_proto_init() {
-	if File_domains_v1_domains_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_domains_v1_domains_proto_rawDesc), len(file_domains_v1_domains_proto_rawDesc)),
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_domains_v1_domains_proto_goTypes,
-		DependencyIndexes: file_domains_v1_domains_proto_depIdxs,
-		MessageInfos:      file_domains_v1_domains_proto_msgTypes,
-	}.Build()
-	File_domains_v1_domains_proto = out.File
-	file_domains_v1_domains_proto_goTypes = nil
-	file_domains_v1_domains_proto_depIdxs = nil
-}
@@ -1,207 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             v6.33.0
-// source: domains/v1/domains.proto
-
-package v1
-
-import (
-	context "context"
-	v1 "github.com/absmach/supermq/api/grpc/common/v1"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	DomainsService_DeleteUserFromDomains_FullMethodName = "/domains.v1.DomainsService/DeleteUserFromDomains"
-	DomainsService_RetrieveStatus_FullMethodName        = "/domains.v1.DomainsService/RetrieveStatus"
-	DomainsService_RetrieveIDByRoute_FullMethodName     = "/domains.v1.DomainsService/RetrieveIDByRoute"
-)
-
-// DomainsServiceClient is the client API for DomainsService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-//
-// DomainsService is a service that provides access to
-// domains functionalities for SuperMQ services.
-type DomainsServiceClient interface {
-	DeleteUserFromDomains(ctx context.Context, in *DeleteUserReq, opts ...grpc.CallOption) (*DeleteUserRes, error)
-	RetrieveStatus(ctx context.Context, in *v1.RetrieveEntityReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error)
-	RetrieveIDByRoute(ctx context.Context, in *v1.RetrieveIDByRouteReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error)
-}
-
-type domainsServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewDomainsServiceClient(cc grpc.ClientConnInterface) DomainsServiceClient {
-	return &domainsServiceClient{cc}
-}
-
-func (c *domainsServiceClient) DeleteUserFromDomains(ctx context.Context, in *DeleteUserReq, opts ...grpc.CallOption) (*DeleteUserRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(DeleteUserRes)
-	err := c.cc.Invoke(ctx, DomainsService_DeleteUserFromDomains_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *domainsServiceClient) RetrieveStatus(ctx context.Context, in *v1.RetrieveEntityReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(v1.RetrieveEntityRes)
-	err := c.cc.Invoke(ctx, DomainsService_RetrieveStatus_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *domainsServiceClient) RetrieveIDByRoute(ctx context.Context, in *v1.RetrieveIDByRouteReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(v1.RetrieveEntityRes)
-	err := c.cc.Invoke(ctx, DomainsService_RetrieveIDByRoute_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// DomainsServiceServer is the server API for DomainsService service.
-// All implementations must embed UnimplementedDomainsServiceServer
-// for forward compatibility.
-//
-// DomainsService is a service that provides access to
-// domains functionalities for SuperMQ services.
-type DomainsServiceServer interface {
-	DeleteUserFromDomains(context.Context, *DeleteUserReq) (*DeleteUserRes, error)
-	RetrieveStatus(context.Context, *v1.RetrieveEntityReq) (*v1.RetrieveEntityRes, error)
-	RetrieveIDByRoute(context.Context, *v1.RetrieveIDByRouteReq) (*v1.RetrieveEntityRes, error)
-	mustEmbedUnimplementedDomainsServiceServer()
-}
-
-// UnimplementedDomainsServiceServer must be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedDomainsServiceServer struct{}
-
-func (UnimplementedDomainsServiceServer) DeleteUserFromDomains(context.Context, *DeleteUserReq) (*DeleteUserRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DeleteUserFromDomains not implemented")
-}
-func (UnimplementedDomainsServiceServer) RetrieveStatus(context.Context, *v1.RetrieveEntityReq) (*v1.RetrieveEntityRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RetrieveStatus not implemented")
-}
-func (UnimplementedDomainsServiceServer) RetrieveIDByRoute(context.Context, *v1.RetrieveIDByRouteReq) (*v1.RetrieveEntityRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RetrieveIDByRoute not implemented")
-}
-func (UnimplementedDomainsServiceServer) mustEmbedUnimplementedDomainsServiceServer() {}
-func (UnimplementedDomainsServiceServer) testEmbeddedByValue()                        {}
-
-// UnsafeDomainsServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to DomainsServiceServer will
-// result in compilation errors.
-type UnsafeDomainsServiceServer interface {
-	mustEmbedUnimplementedDomainsServiceServer()
-}
-
-func RegisterDomainsServiceServer(s grpc.ServiceRegistrar, srv DomainsServiceServer) {
-	// If the following call pancis, it indicates UnimplementedDomainsServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&DomainsService_ServiceDesc, srv)
-}
-
-func _DomainsService_DeleteUserFromDomains_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteUserReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DomainsServiceServer).DeleteUserFromDomains(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: DomainsService_DeleteUserFromDomains_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DomainsServiceServer).DeleteUserFromDomains(ctx, req.(*DeleteUserReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DomainsService_RetrieveStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(v1.RetrieveEntityReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DomainsServiceServer).RetrieveStatus(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: DomainsService_RetrieveStatus_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DomainsServiceServer).RetrieveStatus(ctx, req.(*v1.RetrieveEntityReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DomainsService_RetrieveIDByRoute_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(v1.RetrieveIDByRouteReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DomainsServiceServer).RetrieveIDByRoute(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: DomainsService_RetrieveIDByRoute_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DomainsServiceServer).RetrieveIDByRoute(ctx, req.(*v1.RetrieveIDByRouteReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// DomainsService_ServiceDesc is the grpc.ServiceDesc for DomainsService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var DomainsService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "domains.v1.DomainsService",
-	HandlerType: (*DomainsServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "DeleteUserFromDomains",
-			Handler:    _DomainsService_DeleteUserFromDomains_Handler,
-		},
-		{
-			MethodName: "RetrieveStatus",
-			Handler:    _DomainsService_RetrieveStatus_Handler,
-		},
-		{
-			MethodName: "RetrieveIDByRoute",
-			Handler:    _DomainsService_RetrieveIDByRoute_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "domains/v1/domains.proto",
-}
@@ -1,70 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.36.10
-// 	protoc        v6.33.0
-// source: groups/v1/groups.proto
-
-package v1
-
-import (
-	v1 "github.com/absmach/supermq/api/grpc/common/v1"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	unsafe "unsafe"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-var File_groups_v1_groups_proto protoreflect.FileDescriptor
-
-const file_groups_v1_groups_proto_rawDesc = "" +
-	"\n" +
-	"\x16groups/v1/groups.proto\x12\tgroups.v1\x1a\x16common/v1/common.proto2_\n" +
-	"\rGroupsService\x12N\n" +
-	"\x0eRetrieveEntity\x12\x1c.common.v1.RetrieveEntityReq\x1a\x1c.common.v1.RetrieveEntityRes\"\x00B/Z-github.com/absmach/supermq/api/grpc/groups/v1b\x06proto3"
-
-var file_groups_v1_groups_proto_goTypes = []any{
-	(*v1.RetrieveEntityReq)(nil), // 0: common.v1.RetrieveEntityReq
-	(*v1.RetrieveEntityRes)(nil), // 1: common.v1.RetrieveEntityRes
-}
-var file_groups_v1_groups_proto_depIdxs = []int32{
-	0, // 0: groups.v1.GroupsService.RetrieveEntity:input_type -> common.v1.RetrieveEntityReq
-	1, // 1: groups.v1.GroupsService.RetrieveEntity:output_type -> common.v1.RetrieveEntityRes
-	1, // [1:2] is the sub-list for method output_type
-	0, // [0:1] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_groups_v1_groups_proto_init() }
-func file_groups_v1_groups_proto_init() {
-	if File_groups_v1_groups_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_groups_v1_groups_proto_rawDesc), len(file_groups_v1_groups_proto_rawDesc)),
-			NumEnums:      0,
-			NumMessages:   0,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_groups_v1_groups_proto_goTypes,
-		DependencyIndexes: file_groups_v1_groups_proto_depIdxs,
-	}.Build()
-	File_groups_v1_groups_proto = out.File
-	file_groups_v1_groups_proto_goTypes = nil
-	file_groups_v1_groups_proto_depIdxs = nil
-}
@@ -1,131 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             v6.33.0
-// source: groups/v1/groups.proto
-
-package v1
-
-import (
-	context "context"
-	v1 "github.com/absmach/supermq/api/grpc/common/v1"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	GroupsService_RetrieveEntity_FullMethodName = "/groups.v1.GroupsService/RetrieveEntity"
-)
-
-// GroupsServiceClient is the client API for GroupsService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-//
-// GroupssService is a service that provides groups
-// functionalities for SuperMQ services.
-type GroupsServiceClient interface {
-	RetrieveEntity(ctx context.Context, in *v1.RetrieveEntityReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error)
-}
-
-type groupsServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewGroupsServiceClient(cc grpc.ClientConnInterface) GroupsServiceClient {
-	return &groupsServiceClient{cc}
-}
-
-func (c *groupsServiceClient) RetrieveEntity(ctx context.Context, in *v1.RetrieveEntityReq, opts ...grpc.CallOption) (*v1.RetrieveEntityRes, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(v1.RetrieveEntityRes)
-	err := c.cc.Invoke(ctx, GroupsService_RetrieveEntity_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// GroupsServiceServer is the server API for GroupsService service.
-// All implementations must embed UnimplementedGroupsServiceServer
-// for forward compatibility.
-//
-// GroupssService is a service that provides groups
-// functionalities for SuperMQ services.
-type GroupsServiceServer interface {
-	RetrieveEntity(context.Context, *v1.RetrieveEntityReq) (*v1.RetrieveEntityRes, error)
-	mustEmbedUnimplementedGroupsServiceServer()
-}
-
-// UnimplementedGroupsServiceServer must be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedGroupsServiceServer struct{}
-
-func (UnimplementedGroupsServiceServer) RetrieveEntity(context.Context, *v1.RetrieveEntityReq) (*v1.RetrieveEntityRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RetrieveEntity not implemented")
-}
-func (UnimplementedGroupsServiceServer) mustEmbedUnimplementedGroupsServiceServer() {}
-func (UnimplementedGroupsServiceServer) testEmbeddedByValue()                       {}
-
-// UnsafeGroupsServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to GroupsServiceServer will
-// result in compilation errors.
-type UnsafeGroupsServiceServer interface {
-	mustEmbedUnimplementedGroupsServiceServer()
-}
-
-func RegisterGroupsServiceServer(s grpc.ServiceRegistrar, srv GroupsServiceServer) {
-	// If the following call pancis, it indicates UnimplementedGroupsServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&GroupsService_ServiceDesc, srv)
-}
-
-func _GroupsService_RetrieveEntity_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(v1.RetrieveEntityReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(GroupsServiceServer).RetrieveEntity(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: GroupsService_RetrieveEntity_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(GroupsServiceServer).RetrieveEntity(ctx, req.(*v1.RetrieveEntityReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// GroupsService_ServiceDesc is the grpc.ServiceDesc for GroupsService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var GroupsService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "groups.v1.GroupsService",
-	HandlerType: (*GroupsServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "RetrieveEntity",
-			Handler:    _GroupsService_RetrieveEntity_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "groups/v1/groups.proto",
-}
@@ -1,287 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.36.10
-// 	protoc        v6.33.0
-// source: token/v1/token.proto
-
-package v1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-	unsafe "unsafe"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type IssueReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	UserId        string                 `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
-	UserRole      uint32                 `protobuf:"varint,2,opt,name=user_role,json=userRole,proto3" json:"user_role,omitempty"`
-	Type          uint32                 `protobuf:"varint,3,opt,name=type,proto3" json:"type,omitempty"`
-	Verified      bool                   `protobuf:"varint,4,opt,name=verified,proto3" json:"verified,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *IssueReq) Reset() {
-	*x = IssueReq{}
-	mi := &file_token_v1_token_proto_msgTypes[0]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *IssueReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IssueReq) ProtoMessage() {}
-
-func (x *IssueReq) ProtoReflect() protoreflect.Message {
-	mi := &file_token_v1_token_proto_msgTypes[0]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IssueReq.ProtoReflect.Descriptor instead.
-func (*IssueReq) Descriptor() ([]byte, []int) {
-	return file_token_v1_token_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *IssueReq) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-func (x *IssueReq) GetUserRole() uint32 {
-	if x != nil {
-		return x.UserRole
-	}
-	return 0
-}
-
-func (x *IssueReq) GetType() uint32 {
-	if x != nil {
-		return x.Type
-	}
-	return 0
-}
-
-func (x *IssueReq) GetVerified() bool {
-	if x != nil {
-		return x.Verified
-	}
-	return false
-}
-
-type RefreshReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	RefreshToken  string                 `protobuf:"bytes,1,opt,name=refresh_token,json=refreshToken,proto3" json:"refresh_token,omitempty"`
-	Verified      bool                   `protobuf:"varint,2,opt,name=verified,proto3" json:"verified,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *RefreshReq) Reset() {
-	*x = RefreshReq{}
-	mi := &file_token_v1_token_proto_msgTypes[1]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *RefreshReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RefreshReq) ProtoMessage() {}
-
-func (x *RefreshReq) ProtoReflect() protoreflect.Message {
-	mi := &file_token_v1_token_proto_msgTypes[1]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RefreshReq.ProtoReflect.Descriptor instead.
-func (*RefreshReq) Descriptor() ([]byte, []int) {
-	return file_token_v1_token_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *RefreshReq) GetRefreshToken() string {
-	if x != nil {
-		return x.RefreshToken
-	}
-	return ""
-}
-
-func (x *RefreshReq) GetVerified() bool {
-	if x != nil {
-		return x.Verified
-	}
-	return false
-}
-
-// If a token is not carrying any information itself, the type
-// field can be used to determine how to validate the token.
-// Also, different tokens can be encoded in different ways.
-type Token struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	AccessToken   string                 `protobuf:"bytes,1,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"`
-	RefreshToken  *string                `protobuf:"bytes,2,opt,name=refresh_token,json=refreshToken,proto3,oneof" json:"refresh_token,omitempty"`
-	AccessType    string                 `protobuf:"bytes,3,opt,name=access_type,json=accessType,proto3" json:"access_type,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *Token) Reset() {
-	*x = Token{}
-	mi := &file_token_v1_token_proto_msgTypes[2]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *Token) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Token) ProtoMessage() {}
-
-func (x *Token) ProtoReflect() protoreflect.Message {
-	mi := &file_token_v1_token_proto_msgTypes[2]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Token.ProtoReflect.Descriptor instead.
-func (*Token) Descriptor() ([]byte, []int) {
-	return file_token_v1_token_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Token) GetAccessToken() string {
-	if x != nil {
-		return x.AccessToken
-	}
-	return ""
-}
-
-func (x *Token) GetRefreshToken() string {
-	if x != nil && x.RefreshToken != nil {
-		return *x.RefreshToken
-	}
-	return ""
-}
-
-func (x *Token) GetAccessType() string {
-	if x != nil {
-		return x.AccessType
-	}
-	return ""
-}
-
-var File_token_v1_token_proto protoreflect.FileDescriptor
-
-const file_token_v1_token_proto_rawDesc = "" +
-	"\n" +
-	"\x14token/v1/token.proto\x12\btoken.v1\"p\n" +
-	"\bIssueReq\x12\x17\n" +
-	"\auser_id\x18\x01 \x01(\tR\x06userId\x12\x1b\n" +
-	"\tuser_role\x18\x02 \x01(\rR\buserRole\x12\x12\n" +
-	"\x04type\x18\x03 \x01(\rR\x04type\x12\x1a\n" +
-	"\bverified\x18\x04 \x01(\bR\bverified\"M\n" +
-	"\n" +
-	"RefreshReq\x12#\n" +
-	"\rrefresh_token\x18\x01 \x01(\tR\frefreshToken\x12\x1a\n" +
-	"\bverified\x18\x02 \x01(\bR\bverified\"\x87\x01\n" +
-	"\x05Token\x12!\n" +
-	"\faccess_token\x18\x01 \x01(\tR\vaccessToken\x12(\n" +
-	"\rrefresh_token\x18\x02 \x01(\tH\x00R\frefreshToken\x88\x01\x01\x12\x1f\n" +
-	"\vaccess_type\x18\x03 \x01(\tR\n" +
-	"accessTypeB\x10\n" +
-	"\x0e_refresh_token2r\n" +
-	"\fTokenService\x12.\n" +
-	"\x05Issue\x12\x12.token.v1.IssueReq\x1a\x0f.token.v1.Token\"\x00\x122\n" +
-	"\aRefresh\x12\x14.token.v1.RefreshReq\x1a\x0f.token.v1.Token\"\x00B.Z,github.com/absmach/supermq/api/grpc/token/v1b\x06proto3"
-
-var (
-	file_token_v1_token_proto_rawDescOnce sync.Once
-	file_token_v1_token_proto_rawDescData []byte
-)
-
-func file_token_v1_token_proto_rawDescGZIP() []byte {
-	file_token_v1_token_proto_rawDescOnce.Do(func() {
-		file_token_v1_token_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_token_v1_token_proto_rawDesc), len(file_token_v1_token_proto_rawDesc)))
-	})
-	return file_token_v1_token_proto_rawDescData
-}
-
-var file_token_v1_token_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_token_v1_token_proto_goTypes = []any{
-	(*IssueReq)(nil),   // 0: token.v1.IssueReq
-	(*RefreshReq)(nil), // 1: token.v1.RefreshReq
-	(*Token)(nil),      // 2: token.v1.Token
-}
-var file_token_v1_token_proto_depIdxs = []int32{
-	0, // 0: token.v1.TokenService.Issue:input_type -> token.v1.IssueReq
-	1, // 1: token.v1.TokenService.Refresh:input_type -> token.v1.RefreshReq
-	2, // 2: token.v1.TokenService.Issue:output_type -> token.v1.Token
-	2, // 3: token.v1.TokenService.Refresh:output_type -> token.v1.Token
-	2, // [2:4] is the sub-list for method output_type
-	0, // [0:2] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_token_v1_token_proto_init() }
-func file_token_v1_token_proto_init() {
-	if File_token_v1_token_proto != nil {
-		return
-	}
-	file_token_v1_token_proto_msgTypes[2].OneofWrappers = []any{}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_token_v1_token_proto_rawDesc), len(file_token_v1_token_proto_rawDesc)),
-			NumEnums:      0,
-			NumMessages:   3,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_token_v1_token_proto_goTypes,
-		DependencyIndexes: file_token_v1_token_proto_depIdxs,
-		MessageInfos:      file_token_v1_token_proto_msgTypes,
-	}.Build()
-	File_token_v1_token_proto = out.File
-	file_token_v1_token_proto_goTypes = nil
-	file_token_v1_token_proto_depIdxs = nil
-}
@@ -1,162 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             v6.33.0
-// source: token/v1/token.proto
-
-package v1
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	TokenService_Issue_FullMethodName   = "/token.v1.TokenService/Issue"
-	TokenService_Refresh_FullMethodName = "/token.v1.TokenService/Refresh"
-)
-
-// TokenServiceClient is the client API for TokenService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type TokenServiceClient interface {
-	Issue(ctx context.Context, in *IssueReq, opts ...grpc.CallOption) (*Token, error)
-	Refresh(ctx context.Context, in *RefreshReq, opts ...grpc.CallOption) (*Token, error)
-}
-
-type tokenServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewTokenServiceClient(cc grpc.ClientConnInterface) TokenServiceClient {
-	return &tokenServiceClient{cc}
-}
-
-func (c *tokenServiceClient) Issue(ctx context.Context, in *IssueReq, opts ...grpc.CallOption) (*Token, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(Token)
-	err := c.cc.Invoke(ctx, TokenService_Issue_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tokenServiceClient) Refresh(ctx context.Context, in *RefreshReq, opts ...grpc.CallOption) (*Token, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(Token)
-	err := c.cc.Invoke(ctx, TokenService_Refresh_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// TokenServiceServer is the server API for TokenService service.
-// All implementations must embed UnimplementedTokenServiceServer
-// for forward compatibility.
-type TokenServiceServer interface {
-	Issue(context.Context, *IssueReq) (*Token, error)
-	Refresh(context.Context, *RefreshReq) (*Token, error)
-	mustEmbedUnimplementedTokenServiceServer()
-}
-
-// UnimplementedTokenServiceServer must be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedTokenServiceServer struct{}
-
-func (UnimplementedTokenServiceServer) Issue(context.Context, *IssueReq) (*Token, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Issue not implemented")
-}
-func (UnimplementedTokenServiceServer) Refresh(context.Context, *RefreshReq) (*Token, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Refresh not implemented")
-}
-func (UnimplementedTokenServiceServer) mustEmbedUnimplementedTokenServiceServer() {}
-func (UnimplementedTokenServiceServer) testEmbeddedByValue()                      {}
-
-// UnsafeTokenServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to TokenServiceServer will
-// result in compilation errors.
-type UnsafeTokenServiceServer interface {
-	mustEmbedUnimplementedTokenServiceServer()
-}
-
-func RegisterTokenServiceServer(s grpc.ServiceRegistrar, srv TokenServiceServer) {
-	// If the following call pancis, it indicates UnimplementedTokenServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&TokenService_ServiceDesc, srv)
-}
-
-func _TokenService_Issue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(IssueReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TokenServiceServer).Issue(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TokenService_Issue_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TokenServiceServer).Issue(ctx, req.(*IssueReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TokenService_Refresh_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RefreshReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TokenServiceServer).Refresh(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TokenService_Refresh_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TokenServiceServer).Refresh(ctx, req.(*RefreshReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// TokenService_ServiceDesc is the grpc.ServiceDesc for TokenService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var TokenService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "token.v1.TokenService",
-	HandlerType: (*TokenServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Issue",
-			Handler:    _TokenService_Issue_Handler,
-		},
-		{
-			MethodName: "Refresh",
-			Handler:    _TokenService_Refresh_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "token/v1/token.proto",
-}
@@ -1,331 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package http
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/mail"
-	"regexp"
-	"strings"
-
-	"github.com/absmach/supermq"
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/clients"
-	"github.com/absmach/supermq/groups"
-	"github.com/absmach/supermq/pkg/errors"
-	svcerr "github.com/absmach/supermq/pkg/errors/service"
-	"github.com/absmach/supermq/users"
-	"github.com/gofrs/uuid/v5"
-)
-
-const (
-	OffsetKey = "offset"
-	DirKey    = "dir"
-	OrderKey  = "order"
-	LimitKey  = "limit"
-	OnlyTotal = "only_total"
-
-	NameOrder      = "name"
-	IDOrder        = "id"
-	AscDir         = "asc"
-	DescDir        = "desc"
-	UpdatedAtOrder = "updated_at"
-	CreatedAtOrder = "created_at"
-
-	MetadataKey = "metadata"
-	NameKey     = "name"
-	TagKey      = "tag"
-	StatusKey   = "status"
-
-	ClientKey   = "client"
-	ChannelKey  = "channel"
-	ConnTypeKey = "connection_type"
-	GroupKey    = "group"
-	DomainKey   = "domain"
-
-	StartLevelKey = "start_level"
-	EndLevelKey   = "end_level"
-	TreeKey       = "tree"
-	ParentKey     = "parent_id"
-	LevelKey      = "level"
-	RootGroupKey  = "root_group"
-
-	TokenKey   = "token"
-	SubjectKey = "subject"
-	ObjectKey  = "object"
-
-	RolesKey            = "roles"
-	ActionKey           = "action"
-	ActionsKey          = "actions"
-	RoleIDKey           = "role_id"
-	RoleNameKey         = "role_name"
-	AccessProviderIDKey = "access_provider_id"
-	AccessTypeKey       = "access_type"
-
-	UsernameKey  = "username"
-	UserKey      = "user"
-	EmailKey     = "email"
-	FirstNameKey = "first_name"
-	LastNameKey  = "last_name"
-
-	DefTotal        = uint64(100)
-	DefOffset       = 0
-	DefOrder        = "updated_at"
-	DefDir          = "desc"
-	DefLimit        = 10
-	DefLevel        = 0
-	DefStartLevel   = 1
-	DefEndLevel     = 0
-	DefStatus       = "enabled"
-	DefClientStatus = clients.Enabled
-	DefUserStatus   = users.Enabled
-	DefGroupStatus  = groups.Enabled
-
-	// ContentType represents JSON content type.
-	ContentType = "application/json"
-
-	// MaxNameSize limits name size to prevent making them too complex.
-	MaxLimitSize = 100
-	MaxNameSize  = 1024
-	MaxIDSize    = 36
-)
-
-var (
-	nameRegExp        = regexp.MustCompile(`^[a-z0-9][a-z0-9_-]{34}[a-z0-9]$`)
-	routeRegExp       = regexp.MustCompile(`^[a-zA-Z][a-zA-Z0-9_-]{0,35}$`)
-	userNameRegExp    = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_-]{0,31}$`)
-	errUnreadableName = errors.New("name containing double underscores or double dashes not allowed")
-)
-
-// ValidateUUID validates UUID format.
-func ValidateUUID(extID string) (err error) {
-	id, err := uuid.FromString(extID)
-	if id.String() != extID || err != nil {
-		return apiutil.ErrInvalidIDFormat
-	}
-
-	return nil
-}
-
-func ValidateEmail(email string) (err error) {
-	if _, err := mail.ParseAddress(email); err != nil {
-		return apiutil.ErrInvalidEmail
-	}
-	return nil
-}
-
-// ValidateName validates name format.
-func ValidateName(id string) error {
-	if !nameRegExp.MatchString(id) {
-		return apiutil.ErrInvalidNameFormat
-	}
-	// Names containing double underscores or double dashes are invalid due to similarity concerns.
-	if strings.Contains(id, "__") || strings.Contains(id, "--") {
-		return errors.Wrap(apiutil.ErrInvalidNameFormat, errUnreadableName)
-	}
-
-	return nil
-}
-
-// ValidateRoute validates route format.
-func ValidateRoute(route string) error {
-	if !routeRegExp.MatchString(route) {
-		return apiutil.ErrInvalidRouteFormat
-	}
-
-	if strings.Contains(route, "__") || strings.Contains(route, "--") {
-		return errors.Wrap(apiutil.ErrInvalidRouteFormat, errUnreadableName)
-	}
-
-	return nil
-}
-
-// ValidateUserName validates user name format.
-func ValidateUserName(name string) error {
-	if !userNameRegExp.MatchString(name) {
-		return apiutil.ErrInvalidUsername
-	}
-
-	if strings.Contains(name, "__") || strings.Contains(name, "--") {
-		return errors.Wrap(apiutil.ErrInvalidUsername, errUnreadableName)
-	}
-
-	return nil
-}
-
-// EncodeResponse encodes successful response.
-func EncodeResponse(_ context.Context, w http.ResponseWriter, response any) error {
-	if ar, ok := response.(supermq.Response); ok {
-		for k, v := range ar.Headers() {
-			w.Header().Set(k, v)
-		}
-		w.Header().Set("Content-Type", ContentType)
-		w.WriteHeader(ar.Code())
-
-		if ar.Empty() {
-			return nil
-		}
-	}
-
-	return json.NewEncoder(w).Encode(response)
-}
-
-// EncodeError encodes an error response.
-func EncodeError(_ context.Context, err error, w http.ResponseWriter) {
-	w.Header().Set("Content-Type", ContentType)
-	if sdkErr, ok := err.(errors.SDKError); ok {
-		w.WriteHeader(sdkErr.StatusCode())
-		if err := json.NewEncoder(w).Encode(sdkErr); err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-		}
-		return
-	}
-
-	var wrapper error
-	if errors.Contains(err, apiutil.ErrValidation) {
-		wrapper, err = errors.Unwrap(err)
-	}
-
-	switch {
-	case errors.Contains(err, errors.ErrTryAgain):
-		w.WriteHeader(http.StatusUnprocessableEntity)
-	case errors.Contains(err, errors.ErrEmailAlreadyExists),
-		errors.Contains(err, errors.ErrUsernameNotAvailable),
-		errors.Contains(err, errors.ErrRouteNotAvailable),
-		errors.Contains(err, errors.ErrChannelRouteNotAvailable),
-		errors.Contains(err, errors.ErrDomainRouteNotAvailable),
-		errors.Contains(err, svcerr.ErrExternalAuthProviderCouldNotChangePassword),
-		errors.Contains(err, svcerr.ErrExternalAuthProviderCouldNotResetPassword),
-		errors.Contains(err, svcerr.ErrExternalAuthProviderCouldNotUpdate):
-		w.WriteHeader(http.StatusBadRequest)
-	case errors.Contains(err, svcerr.ErrAuthorization),
-		errors.Contains(err, svcerr.ErrDomainAuthorization),
-		errors.Contains(err, svcerr.ErrUnauthorizedPAT),
-		errors.Contains(err, svcerr.ErrSuperAdminAction):
-		err = unwrap(err)
-		w.WriteHeader(http.StatusForbidden)
-
-	case errors.Contains(err, svcerr.ErrAuthentication),
-		errors.Contains(err, apiutil.ErrBearerToken),
-		errors.Contains(err, svcerr.ErrLogin),
-		errors.Contains(err, apiutil.ErrUnsupportedTokenType):
-		err = unwrap(err)
-		w.WriteHeader(http.StatusUnauthorized)
-	case errors.Contains(err, svcerr.ErrMalformedEntity),
-		errors.Contains(err, apiutil.ErrMalformedPolicy),
-		errors.Contains(err, apiutil.ErrMissingSecret),
-		errors.Contains(err, errors.ErrMalformedEntity),
-		errors.Contains(err, apiutil.ErrMissingID),
-		errors.Contains(err, apiutil.ErrInvalidVerification),
-		errors.Contains(err, apiutil.ErrMissingName),
-		errors.Contains(err, apiutil.ErrMissingEmail),
-		errors.Contains(err, apiutil.ErrInvalidEmail),
-		errors.Contains(err, apiutil.ErrMissingHost),
-		errors.Contains(err, apiutil.ErrInvalidResetPass),
-		errors.Contains(err, apiutil.ErrEmptyList),
-		errors.Contains(err, apiutil.ErrMissingMemberKind),
-		errors.Contains(err, apiutil.ErrMissingMemberType),
-		errors.Contains(err, apiutil.ErrLimitSize),
-		errors.Contains(err, apiutil.ErrBearerKey),
-		errors.Contains(err, svcerr.ErrInvalidStatus),
-		errors.Contains(err, apiutil.ErrNameSize),
-		errors.Contains(err, apiutil.ErrInvalidIDFormat),
-		errors.Contains(err, apiutil.ErrInvalidQueryParams),
-		errors.Contains(err, apiutil.ErrMissingRelation),
-		errors.Contains(err, apiutil.ErrValidation),
-		errors.Contains(err, apiutil.ErrMissingPass),
-		errors.Contains(err, apiutil.ErrMissingConfPass),
-		errors.Contains(err, apiutil.ErrPasswordFormat),
-		errors.Contains(err, svcerr.ErrInvalidRole),
-		errors.Contains(err, svcerr.ErrInvalidPolicy),
-		errors.Contains(err, apiutil.ErrInvitationState),
-		errors.Contains(err, apiutil.ErrInvalidAPIKey),
-		errors.Contains(err, svcerr.ErrViewEntity),
-		errors.Contains(err, apiutil.ErrMissingCertData),
-		errors.Contains(err, apiutil.ErrInvalidContact),
-		errors.Contains(err, apiutil.ErrInvalidTopic),
-		errors.Contains(err, apiutil.ErrInvalidCertData),
-		errors.Contains(err, apiutil.ErrEmptyMessage),
-		errors.Contains(err, apiutil.ErrInvalidLevel),
-		errors.Contains(err, apiutil.ErrInvalidDirection),
-		errors.Contains(err, apiutil.ErrInvalidEntityType),
-		errors.Contains(err, apiutil.ErrMissingEntityType),
-		errors.Contains(err, apiutil.ErrInvalidTimeFormat),
-		errors.Contains(err, svcerr.ErrSearch),
-		errors.Contains(err, apiutil.ErrEmptySearchQuery),
-		errors.Contains(err, apiutil.ErrLenSearchQuery),
-		errors.Contains(err, apiutil.ErrMissingDomainID),
-		errors.Contains(err, apiutil.ErrMissingUserID),
-		errors.Contains(err, apiutil.ErrMissingPATID),
-		errors.Contains(err, apiutil.ErrMissingUsername),
-		errors.Contains(err, apiutil.ErrMissingUsernameEmail),
-		errors.Contains(err, apiutil.ErrMissingFirstName),
-		errors.Contains(err, apiutil.ErrMissingLastName),
-		errors.Contains(err, apiutil.ErrInvalidUsername),
-		errors.Contains(err, apiutil.ErrMissingIdentity),
-		errors.Contains(err, apiutil.ErrInvalidProfilePictureURL),
-		errors.Contains(err, apiutil.ErrSelfParentingNotAllowed),
-		errors.Contains(err, apiutil.ErrMissingChildrenGroupIDs),
-		errors.Contains(err, apiutil.ErrMissingParentGroupID),
-		errors.Contains(err, apiutil.ErrMissingConnectionType),
-		errors.Contains(err, apiutil.ErrMissingRoleName),
-		errors.Contains(err, apiutil.ErrMissingRoleID),
-		errors.Contains(err, apiutil.ErrMissingPolicyEntityType),
-		errors.Contains(err, apiutil.ErrMissingRoleMembers),
-		errors.Contains(err, apiutil.ErrMissingDescription),
-		errors.Contains(err, apiutil.ErrMissingEntityID),
-		errors.Contains(err, apiutil.ErrInvalidRouteFormat),
-		errors.Contains(err, svcerr.ErrRetainOneMember),
-		errors.Contains(err, apiutil.ErrMissingRoute):
-		err = unwrap(err)
-		w.WriteHeader(http.StatusBadRequest)
-
-	case errors.Contains(err, svcerr.ErrCreateEntity),
-		errors.Contains(err, svcerr.ErrUpdateEntity),
-		errors.Contains(err, svcerr.ErrRemoveEntity),
-		errors.Contains(err, svcerr.ErrEnableClient),
-		errors.Contains(err, svcerr.ErrEnableUser),
-		errors.Contains(err, svcerr.ErrDisableUser):
-		err = unwrap(err)
-		w.WriteHeader(http.StatusUnprocessableEntity)
-
-	case errors.Contains(err, svcerr.ErrNotFound):
-		err = unwrap(err)
-		w.WriteHeader(http.StatusNotFound)
-
-	case errors.Contains(err, errors.ErrStatusAlreadyAssigned),
-		errors.Contains(err, svcerr.ErrInvitationAlreadyRejected),
-		errors.Contains(err, svcerr.ErrInvitationAlreadyAccepted),
-		errors.Contains(err, svcerr.ErrConflict):
-		err = unwrap(err)
-		w.WriteHeader(http.StatusConflict)
-
-	case errors.Contains(err, apiutil.ErrUnsupportedContentType):
-		err = unwrap(err)
-		w.WriteHeader(http.StatusUnsupportedMediaType)
-
-	default:
-		w.WriteHeader(http.StatusInternalServerError)
-	}
-
-	if wrapper != nil {
-		err = errors.Wrap(wrapper, err)
-	}
-
-	if errorVal, ok := err.(errors.Error); ok {
-		if err := json.NewEncoder(w).Encode(errorVal); err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-		}
-	}
-}
-
-func unwrap(err error) error {
-	wrapper, err := errors.Unwrap(err)
-	if wrapper != nil {
-		return wrapper
-	}
-	return err
-}
@@ -1,338 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package http_test
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"testing"
-	"time"
-
-	"github.com/absmach/supermq"
-	api "github.com/absmach/supermq/api/http"
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/internal/testsutil"
-	"github.com/absmach/supermq/pkg/errors"
-	svcerr "github.com/absmach/supermq/pkg/errors/service"
-	"github.com/stretchr/testify/assert"
-)
-
-var _ supermq.Response = (*response)(nil)
-
-var validUUID = testsutil.GenerateUUID(&testing.T{})
-
-type responseWriter struct {
-	body       []byte
-	statusCode int
-	header     http.Header
-}
-
-func newResponseWriter() *responseWriter {
-	return &responseWriter{
-		header: http.Header{},
-	}
-}
-
-func (w *responseWriter) Header() http.Header {
-	return w.header
-}
-
-func (w *responseWriter) Write(b []byte) (int, error) {
-	w.body = b
-	return 0, nil
-}
-
-func (w *responseWriter) WriteHeader(statusCode int) {
-	w.statusCode = statusCode
-}
-
-func (w *responseWriter) StatusCode() int {
-	return w.statusCode
-}
-
-func (w *responseWriter) Body() []byte {
-	return w.body
-}
-
-type response struct {
-	code    int
-	headers map[string]string
-	empty   bool
-
-	ID        string    `json:"id"`
-	Name      string    `json:"name"`
-	CreatedAt time.Time `json:"created_at"`
-}
-
-func (res response) Code() int {
-	return res.code
-}
-
-func (res response) Headers() map[string]string {
-	return res.headers
-}
-
-func (res response) Empty() bool {
-	return res.empty
-}
-
-type body struct {
-	Error   string `json:"error,omitempty"`
-	Message string `json:"message"`
-}
-
-func TestValidateUUID(t *testing.T) {
-	cases := []struct {
-		desc string
-		uuid string
-		err  error
-	}{
-		{
-			desc: "valid uuid",
-			uuid: validUUID,
-			err:  nil,
-		},
-		{
-			desc: "invalid uuid",
-			uuid: "invalid",
-			err:  apiutil.ErrInvalidIDFormat,
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.desc, func(t *testing.T) {
-			err := api.ValidateUUID(c.uuid)
-			assert.Equal(t, c.err, err)
-		})
-	}
-}
-
-func TestEncodeResponse(t *testing.T) {
-	now := time.Now()
-	validBody := []byte(`{"id":"` + validUUID + `","name":"test","created_at":"` + now.Format(time.RFC3339Nano) + `"}` + "\n" + ``)
-
-	cases := []struct {
-		desc   string
-		resp   any
-		header http.Header
-		code   int
-		body   []byte
-		err    error
-	}{
-		{
-			desc: "valid response",
-			resp: response{
-				code: http.StatusOK,
-				headers: map[string]string{
-					"Location": "/groups/" + validUUID,
-				},
-				ID:        validUUID,
-				Name:      "test",
-				CreatedAt: now,
-			},
-			header: http.Header{
-				"Content-Type": []string{"application/json"},
-				"Location":     []string{"/groups/" + validUUID},
-			},
-			code: http.StatusOK,
-			body: validBody,
-			err:  nil,
-		},
-		{
-			desc: "valid response with no headers",
-			resp: response{
-				code:      http.StatusOK,
-				ID:        validUUID,
-				Name:      "test",
-				CreatedAt: now,
-			},
-			header: http.Header{
-				"Content-Type": []string{"application/json"},
-			},
-			code: http.StatusOK,
-			body: validBody,
-			err:  nil,
-		},
-		{
-			desc: "valid response with many headers",
-			resp: response{
-				code: http.StatusOK,
-				headers: map[string]string{
-					"X-Test":  "test",
-					"X-Test2": "test2",
-				},
-				ID:        validUUID,
-				Name:      "test",
-				CreatedAt: now,
-			},
-			header: http.Header{
-				"Content-Type": []string{"application/json"},
-				"X-Test":       []string{"test"},
-				"X-Test2":      []string{"test2"},
-			},
-			code: http.StatusOK,
-			body: validBody,
-			err:  nil,
-		},
-		{
-			desc: "valid response with empty body",
-			resp: response{
-				code:  http.StatusOK,
-				empty: true,
-				ID:    validUUID,
-			},
-			header: http.Header{
-				"Content-Type": []string{"application/json"},
-			},
-			code: http.StatusOK,
-			body: []byte(``),
-			err:  nil,
-		},
-		{
-			desc: "invalid response",
-			resp: struct {
-				ID string `json:"id"`
-			}{
-				ID: validUUID,
-			},
-			header: http.Header{},
-			code:   0,
-			body:   []byte(`{"id":"` + validUUID + `"}` + "\n" + ``),
-			err:    nil,
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.desc, func(t *testing.T) {
-			responseWriter := newResponseWriter()
-			err := api.EncodeResponse(context.Background(), responseWriter, c.resp)
-			assert.Equal(t, c.err, err)
-			assert.Equal(t, c.header, responseWriter.Header())
-			assert.Equal(t, c.code, responseWriter.StatusCode())
-			assert.Equal(t, string(c.body), string(responseWriter.Body()))
-		})
-	}
-}
-
-func TestEncodeError(t *testing.T) {
-	cases := []struct {
-		desc string
-		errs []error
-		code int
-	}{
-		{
-			desc: "BadRequest",
-			errs: []error{
-				apiutil.ErrMissingSecret,
-				svcerr.ErrMalformedEntity,
-				errors.ErrMalformedEntity,
-				apiutil.ErrMissingID,
-				apiutil.ErrEmptyList,
-				apiutil.ErrMissingMemberType,
-				apiutil.ErrMissingMemberKind,
-				apiutil.ErrLimitSize,
-				apiutil.ErrNameSize,
-				svcerr.ErrViewEntity,
-			},
-			code: http.StatusBadRequest,
-		},
-		{
-			desc: "BadRequest with validation error",
-			errs: []error{
-				errors.Wrap(apiutil.ErrValidation, apiutil.ErrMissingSecret),
-				errors.Wrap(apiutil.ErrValidation, svcerr.ErrMalformedEntity),
-				errors.Wrap(apiutil.ErrValidation, errors.ErrMalformedEntity),
-				errors.Wrap(apiutil.ErrValidation, apiutil.ErrMissingID),
-				errors.Wrap(apiutil.ErrValidation, apiutil.ErrEmptyList),
-				errors.Wrap(apiutil.ErrValidation, apiutil.ErrMissingMemberType),
-				errors.Wrap(apiutil.ErrValidation, apiutil.ErrMissingMemberKind),
-				errors.Wrap(apiutil.ErrValidation, apiutil.ErrLimitSize),
-				errors.Wrap(apiutil.ErrValidation, apiutil.ErrNameSize),
-			},
-			code: http.StatusBadRequest,
-		},
-		{
-			desc: "Unauthorized",
-			errs: []error{
-				svcerr.ErrAuthentication,
-				svcerr.ErrAuthentication,
-				apiutil.ErrBearerToken,
-			},
-			code: http.StatusUnauthorized,
-		},
-
-		{
-			desc: "NotFound",
-			errs: []error{
-				svcerr.ErrNotFound,
-			},
-			code: http.StatusNotFound,
-		},
-		{
-			desc: "Conflict",
-			errs: []error{
-				svcerr.ErrConflict,
-				svcerr.ErrConflict,
-			},
-			code: http.StatusConflict,
-		},
-		{
-			desc: "Forbidden",
-			errs: []error{
-				svcerr.ErrAuthorization,
-				svcerr.ErrAuthorization,
-				svcerr.ErrDomainAuthorization,
-			},
-			code: http.StatusForbidden,
-		},
-		{
-			desc: "UnsupportedMediaType",
-			errs: []error{
-				apiutil.ErrUnsupportedContentType,
-			},
-			code: http.StatusUnsupportedMediaType,
-		},
-		{
-			desc: "StatusUnprocessableEntity",
-			errs: []error{
-				svcerr.ErrCreateEntity,
-				svcerr.ErrUpdateEntity,
-				svcerr.ErrRemoveEntity,
-			},
-			code: http.StatusUnprocessableEntity,
-		},
-		{
-			desc: "InternalServerError",
-			errs: []error{
-				errors.New("test"),
-			},
-			code: http.StatusInternalServerError,
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.desc, func(t *testing.T) {
-			responseWriter := newResponseWriter()
-			for _, err := range c.errs {
-				api.EncodeError(context.Background(), err, responseWriter)
-				assert.Equal(t, c.code, responseWriter.StatusCode())
-
-				message := body{}
-				jerr := json.Unmarshal(responseWriter.Body(), &message)
-				assert.NoError(t, jerr)
-
-				var wrapper error
-				switch errors.Contains(err, apiutil.ErrValidation) {
-				case true:
-					wrapper, err = errors.Unwrap(err)
-					assert.Equal(t, err.Error(), message.Error)
-					assert.Equal(t, wrapper.Error(), message.Message)
-				case false:
-					assert.Equal(t, err.Error(), message.Message)
-				}
-			}
-		})
-	}
-}
@@ -1,6 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Package api contains commonly used constants and functions
-// for the HTTP API.
-package http
@@ -1,27 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package http
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/absmach/supermq"
-	"github.com/go-chi/chi/v5/middleware"
-)
-
-func RequestIDMiddleware(idp supermq.IDProvider) func(http.Handler) http.Handler {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			requestID, err := idp.ID()
-			if err != nil {
-				EncodeError(r.Context(), err, w)
-				return
-			}
-
-			ctx := context.WithValue(r.Context(), middleware.RequestIDKey, requestID)
-			next.ServeHTTP(w, r.WithContext(ctx))
-		})
-	}
-}
@@ -1,277 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package util
-
-import "github.com/absmach/supermq/pkg/errors"
-
-// Errors defined in this file are used by the LoggingErrorEncoder decorator
-// to distinguish and log API request validation errors and avoid that service
-// errors are logged twice.
-var (
-	// ErrValidation indicates that an error was returned by the API.
-	ErrValidation = errors.New("something went wrong with the request")
-
-	// ErrBearerToken indicates missing or invalid bearer user token.
-	ErrBearerToken = errors.New("missing or invalid bearer user token")
-
-	// ErrBearerKey indicates missing or invalid bearer entity key.
-	ErrBearerKey = errors.New("missing or invalid bearer entity key")
-
-	// ErrMissingID indicates missing entity ID.
-	ErrMissingID = errors.New("missing entity id")
-
-	// ErrMissingEntityID indicates missing entity ID.
-	ErrMissingEntityID = errors.New("missing entity id")
-
-	// ErrMissingClientID indicates missing client ID.
-	ErrMissingClientID = errors.New("missing cient id")
-
-	// ErrMissingChannelID indicates missing client ID.
-	ErrMissingChannelID = errors.New("missing channel id")
-
-	// ErrMissingConnectionType indicates missing connection tpye.
-	ErrMissingConnectionType = errors.New("missing connection type")
-
-	// ErrMissingParentGroupID indicates missing parent group ID.
-	ErrMissingParentGroupID = errors.New("missing parent group id")
-
-	// ErrMissingChildrenGroupIDs indicates missing children group IDs.
-	ErrMissingChildrenGroupIDs = errors.New("missing children group ids")
-
-	// ErrSelfParentingNotAllowed indicates child id is same as parent id.
-	ErrSelfParentingNotAllowed = errors.New("self parenting not allowed")
-
-	// ErrInvalidChildGroupID indicates invalid child group ID.
-	ErrInvalidChildGroupID = errors.New("invalid child group id")
-
-	// ErrInvalidAuthKey indicates invalid auth key.
-	ErrInvalidAuthKey = errors.New("invalid auth key")
-
-	// ErrInvalidIDFormat indicates an invalid ID format.
-	ErrInvalidIDFormat = errors.New("invalid id format provided")
-
-	// ErrNameSize indicates that name size exceeds the max.
-	ErrNameSize = errors.New("invalid name size")
-
-	// ErrEmailSize indicates that email size exceeds the max.
-	ErrEmailSize = errors.New("invalid email size")
-
-	// ErrInvalidRole indicates that an invalid role.
-	ErrInvalidRole = errors.New("invalid client role")
-
-	// ErrLimitSize indicates that an invalid limit.
-	ErrLimitSize = errors.New("invalid limit size")
-
-	// ErrLevel indicates that an invalid level.
-	ErrLevel = errors.New("invalid level")
-
-	// ErrOffsetSize indicates an invalid offset.
-	ErrOffsetSize = errors.New("invalid offset size")
-
-	// ErrInvalidOrder indicates an invalid list order.
-	ErrInvalidOrder = errors.New("invalid list order provided")
-
-	// ErrInvalidDirection indicates an invalid list direction.
-	ErrInvalidDirection = errors.New("invalid list direction provided")
-
-	// ErrInvalidMemberKind indicates an invalid member kind.
-	ErrInvalidMemberKind = errors.New("invalid member kind")
-
-	// ErrEmptyList indicates that entity data is empty.
-	ErrEmptyList = errors.New("empty list provided")
-
-	// ErrMissingRoleName indicates that role name is empty.
-	ErrMissingRoleName = errors.New("empty role name")
-
-	// ErrMissingRoleID indicates that role id is empty.
-	ErrMissingRoleID = errors.New("empty role id")
-
-	// ErrMissingRoleOperations indicates that role operations are empty.
-	ErrMissingRoleOperations = errors.New("empty role operations")
-
-	// ErrMissingRoleMembers indicates that role members are empty.
-	ErrMissingRoleMembers = errors.New("empty role members")
-
-	// ErrMalformedPolicy indicates that policies are malformed.
-	ErrMalformedPolicy = errors.New("malformed policy")
-
-	// ErrMissingPolicySub indicates that policies are subject.
-	ErrMissingPolicySub = errors.New("malformed policy subject")
-
-	// ErrMissingPolicyObj indicates missing policies object.
-	ErrMissingPolicyObj = errors.New("malformed policy object")
-
-	// ErrMalformedPolicyAct indicates missing policies action.
-	ErrMalformedPolicyAct = errors.New("malformed policy action")
-
-	// ErrMissingPolicyEntityType indicates missing policies entity type.
-	ErrMissingPolicyEntityType = errors.New("missing policy entity type")
-
-	// ErrMalformedPolicyPer indicates missing policies relation.
-	ErrMalformedPolicyPer = errors.New("malformed policy permission")
-
-	// ErrMissingCertData indicates missing cert data (ttl).
-	ErrMissingCertData = errors.New("missing certificate data")
-
-	// ErrInvalidCertData indicates invalid cert data (ttl).
-	ErrInvalidCertData = errors.New("invalid certificate data")
-
-	// ErrInvalidTopic indicates an invalid subscription topic.
-	ErrInvalidTopic = errors.New("invalid Subscription topic")
-
-	// ErrInvalidContact indicates an invalid subscription contract.
-	ErrInvalidContact = errors.New("invalid Subscription contact")
-
-	// ErrMissingEmail indicates missing email.
-	ErrMissingEmail = errors.New("missing email")
-
-	// ErrInvalidEmail indicates missing email.
-	ErrInvalidEmail = errors.New("invalid email")
-
-	// ErrMissingHost indicates missing host.
-	ErrMissingHost = errors.New("missing host")
-
-	// ErrMissingPass indicates missing password.
-	ErrMissingPass = errors.New("missing password")
-
-	// ErrMissingConfPass indicates missing conf password.
-	ErrMissingConfPass = errors.New("missing conf password")
-
-	// ErrInvalidResetPass indicates an invalid reset password.
-	ErrInvalidResetPass = errors.New("invalid reset password")
-
-	// ErrInvalidComparator indicates an invalid comparator.
-	ErrInvalidComparator = errors.New("invalid comparator")
-
-	// ErrMissingMemberIDs indicates missing member ids.
-	ErrMissingMemberIDs = errors.New("missing member ids")
-
-	// ErrMissingMemberType indicates missing group member type.
-	ErrMissingMemberType = errors.New("missing group member type")
-
-	// ErrMissingMemberKind indicates missing group member kind.
-	ErrMissingMemberKind = errors.New("missing group member kind")
-
-	// ErrMissingRelation indicates missing relation.
-	ErrMissingRelation = errors.New("missing relation")
-
-	// ErrInvalidRelation indicates an invalid relation.
-	ErrInvalidRelation = errors.New("invalid relation")
-
-	// ErrInvalidAPIKey indicates an invalid API key type.
-	ErrInvalidAPIKey = errors.New("invalid api key type")
-
-	// ErrInvitationState indicates an invalid invitation state.
-	ErrInvitationState = errors.New("invalid invitation state")
-
-	// ErrMissingIdentity indicates missing entity Identity.
-	ErrMissingIdentity = errors.New("missing entity identity")
-
-	// ErrMissingSecret indicates missing secret.
-	ErrMissingSecret = errors.New("missing secret")
-
-	// ErrPasswordFormat indicates weak password.
-	ErrPasswordFormat = errors.New("password does not meet the requirements")
-
-	// ErrMissingName indicates missing identity name.
-	ErrMissingName = errors.New("missing identity name")
-
-	// ErrMissingRoute indicates missing route.
-	ErrMissingRoute = errors.New("missing route")
-
-	// ErrInvalidLevel indicates an invalid group level.
-	ErrInvalidLevel = errors.New("invalid group level (should be between 0 and 5)")
-
-	// ErrNotFoundParam indicates that the parameter was not found in the query.
-	ErrNotFoundParam = errors.New("parameter not found in the query")
-
-	// ErrInvalidQueryParams indicates invalid query parameters.
-	ErrInvalidQueryParams = errors.New("invalid query parameters")
-
-	// ErrInvalidVisibilityType indicates invalid visibility type.
-	ErrInvalidVisibilityType = errors.New("invalid visibility type")
-
-	// ErrUnsupportedContentType indicates unacceptable or lack of Content-Type.
-	ErrUnsupportedContentType = errors.New("unsupported content type")
-
-	// ErrRollbackTx indicates failed to rollback transaction.
-	ErrRollbackTx = errors.New("failed to rollback transaction")
-
-	// ErrInvalidAggregation indicates invalid aggregation value.
-	ErrInvalidAggregation = errors.New("invalid aggregation value")
-
-	// ErrInvalidInterval indicates invalid interval value.
-	ErrInvalidInterval = errors.New("invalid interval value")
-
-	// ErrMissingFrom indicates missing from value.
-	ErrMissingFrom = errors.New("missing from time value")
-
-	// ErrMissingTo indicates missing to value.
-	ErrMissingTo = errors.New("missing to time value")
-
-	// ErrEmptyMessage indicates empty message.
-	ErrEmptyMessage = errors.New("empty message")
-
-	// ErrMissingEntityType indicates missing entity type.
-	ErrMissingEntityType = errors.New("missing entity type")
-
-	// ErrInvalidEntityType indicates invalid entity type.
-	ErrInvalidEntityType = errors.New("invalid entity type")
-
-	// ErrInvalidTimeFormat indicates invalid time format i.e not unix time.
-	ErrInvalidTimeFormat = errors.New("invalid time format use unix time")
-
-	// ErrEmptySearchQuery indicates search query should not be empty.
-	ErrEmptySearchQuery = errors.New("search query must not be empty")
-
-	// ErrLenSearchQuery indicates search query length.
-	ErrLenSearchQuery = errors.New("search query must be at least 3 characters")
-
-	// ErrMissingDomainID indicates missing domainID.
-	ErrMissingDomainID = errors.New("missing domainID")
-
-	// ErrMissingUsername indicates missing user name.
-	ErrMissingUsername = errors.New("missing username")
-
-	// ErrInvalidUsername indicates invalid user name.
-	ErrInvalidUsername = errors.New("invalid username")
-
-	// ErrMissingFirstName indicates missing first name.
-	ErrMissingFirstName = errors.New("missing first name")
-
-	// ErrMissingLastName indicates missing last name.
-	ErrMissingLastName = errors.New("missing last name")
-
-	// ErrInvalidProfilePictureURL indicates that the profile picture url is invalid.
-	ErrInvalidProfilePictureURL = errors.New("invalid profile picture url")
-
-	ErrMultipleEntitiesFilter = errors.New("multiple entities are provided in filter are not supported")
-
-	// ErrMissingDescription indicates missing description.
-	ErrMissingDescription = errors.New("missing description")
-
-	// ErrUnsupportedTokenType indicates that this type of token is not supported.
-	ErrUnsupportedTokenType = errors.New("unsupported content token type")
-
-	// ErrMissingUserID indicates missing user ID.
-	ErrMissingUserID = errors.New("missing user id")
-
-	// ErrMissingPATID indicates missing pat ID.
-	ErrMissingPATID = errors.New("missing pat id")
-
-	// ErrInvalidNameFormat indicates invalid name format.
-	ErrInvalidNameFormat = errors.New("invalid name format")
-
-	// ErrInvalidRouteFormat indicates invalid route format.
-	ErrInvalidRouteFormat = errors.New("invalid route format")
-
-	// ErrMissingUsernameEmail indicates missing user name / email.
-	ErrMissingUsernameEmail = errors.New("missing username / email")
-
-	// ErrInvalidVerification indicates invalid email verification.
-	ErrInvalidVerification = errors.New("invalid verification")
-
-	// ErrEmailNotVerified indicates invalid email not verified.
-	ErrEmailNotVerified = errors.New("email not verified")
-)
@@ -1,10 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package util
-
-// ErrorRes represents the HTTP error response body.
-type ErrorRes struct {
-	Err string `json:"error"`
-	Msg string `json:"message"`
-}
@@ -1,37 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package util
-
-import (
-	"net/http"
-	"strings"
-)
-
-// BearerPrefix represents the token prefix for Bearer authentication scheme.
-const BearerPrefix = "Bearer "
-
-// ClientPrefix represents the key prefix for Client authentication scheme.
-const ClientPrefix = "Client "
-
-// ExtractBearerToken returns value of the bearer token. If there is no bearer token - an empty value is returned.
-func ExtractBearerToken(r *http.Request) string {
-	token := r.Header.Get("Authorization")
-
-	if !strings.HasPrefix(token, BearerPrefix) {
-		return ""
-	}
-
-	return strings.TrimPrefix(token, BearerPrefix)
-}
-
-// ExtractClientSecret returns value of the client secret. If it's not present - an empty value is returned.
-func ExtractClientSecret(r *http.Request) string {
-	token := r.Header.Get("Authorization")
-
-	if !strings.HasPrefix(token, ClientPrefix) {
-		return ""
-	}
-
-	return strings.TrimPrefix(token, ClientPrefix)
-}
@@ -1,112 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package util_test
-
-import (
-	"net/http"
-	"testing"
-
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestExtractBearerToken(t *testing.T) {
-	cases := []struct {
-		desc    string
-		request *http.Request
-		token   string
-	}{
-		{
-			desc: "valid bearer token",
-			request: &http.Request{
-				Header: map[string][]string{
-					"Authorization": {"Bearer 123"},
-				},
-			},
-			token: "123",
-		},
-		{
-			desc: "invalid bearer token",
-			request: &http.Request{
-				Header: map[string][]string{
-					"Authorization": {"123"},
-				},
-			},
-			token: "",
-		},
-		{
-			desc: "empty bearer token",
-			request: &http.Request{
-				Header: map[string][]string{
-					"Authorization": {""},
-				},
-			},
-			token: "",
-		},
-		{
-			desc: "empty header",
-			request: &http.Request{
-				Header: map[string][]string{},
-			},
-			token: "",
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.desc, func(t *testing.T) {
-			token := apiutil.ExtractBearerToken(c.request)
-			assert.Equal(t, c.token, token)
-		})
-	}
-}
-
-func TestExtractClientSecret(t *testing.T) {
-	cases := []struct {
-		desc    string
-		request *http.Request
-		token   string
-	}{
-		{
-			desc: "valid bearer token",
-			request: &http.Request{
-				Header: map[string][]string{
-					"Authorization": {"Client 123"},
-				},
-			},
-			token: "123",
-		},
-		{
-			desc: "invalid bearer token",
-			request: &http.Request{
-				Header: map[string][]string{
-					"Authorization": {"123"},
-				},
-			},
-			token: "",
-		},
-		{
-			desc: "empty bearer token",
-			request: &http.Request{
-				Header: map[string][]string{
-					"Authorization": {""},
-				},
-			},
-			token: "",
-		},
-		{
-			desc: "empty header",
-			request: &http.Request{
-				Header: map[string][]string{},
-			},
-			token: "",
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.desc, func(t *testing.T) {
-			token := apiutil.ExtractClientSecret(c.request)
-			assert.Equal(t, c.token, token)
-		})
-	}
-}
@@ -1,123 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package util
-
-import (
-	"context"
-	"encoding/json"
-	"log/slog"
-	"net/http"
-	"strconv"
-
-	"github.com/absmach/supermq/pkg/errors"
-	kithttp "github.com/go-kit/kit/transport/http"
-)
-
-// LoggingErrorEncoder is a go-kit error encoder logging decorator.
-func LoggingErrorEncoder(logger *slog.Logger, enc kithttp.ErrorEncoder) kithttp.ErrorEncoder {
-	return func(ctx context.Context, err error, w http.ResponseWriter) {
-		if errors.Contains(err, ErrValidation) {
-			logger.Error(err.Error())
-		}
-		enc(ctx, err, w)
-	}
-}
-
-// ReadStringQuery reads the value of string http query parameters for a given key.
-func ReadStringQuery(r *http.Request, key, def string) (string, error) {
-	vals := r.URL.Query()[key]
-	if len(vals) > 1 {
-		return "", ErrInvalidQueryParams
-	}
-
-	if len(vals) == 0 {
-		return def, nil
-	}
-
-	return vals[0], nil
-}
-
-// ReadMetadataQuery reads the value of json http query parameters for a given key.
-func ReadMetadataQuery(r *http.Request, key string, def map[string]any) (map[string]any, error) {
-	vals := r.URL.Query()[key]
-	if len(vals) > 1 {
-		return nil, ErrInvalidQueryParams
-	}
-
-	if len(vals) == 0 {
-		return def, nil
-	}
-
-	m := make(map[string]any)
-	err := json.Unmarshal([]byte(vals[0]), &m)
-	if err != nil {
-		return nil, errors.Wrap(ErrInvalidQueryParams, err)
-	}
-
-	return m, nil
-}
-
-// ReadBoolQuery reads boolean query parameters in a given http request.
-func ReadBoolQuery(r *http.Request, key string, def bool) (bool, error) {
-	vals := r.URL.Query()[key]
-	if len(vals) > 1 {
-		return false, ErrInvalidQueryParams
-	}
-
-	if len(vals) == 0 {
-		return def, nil
-	}
-
-	b, err := strconv.ParseBool(vals[0])
-	if err != nil {
-		return false, errors.Wrap(ErrInvalidQueryParams, err)
-	}
-
-	return b, nil
-}
-
-type number interface {
-	int64 | float64 | uint16 | uint64
-}
-
-// ReadNumQuery returns a numeric value.
-func ReadNumQuery[N number](r *http.Request, key string, def N) (N, error) {
-	vals := r.URL.Query()[key]
-	if len(vals) > 1 {
-		return 0, ErrInvalidQueryParams
-	}
-	if len(vals) == 0 {
-		return def, nil
-	}
-	val := vals[0]
-
-	switch any(def).(type) {
-	case int64:
-		v, err := strconv.ParseInt(val, 10, 64)
-		if err != nil {
-			return 0, errors.Wrap(ErrInvalidQueryParams, err)
-		}
-		return N(v), nil
-	case uint64:
-		v, err := strconv.ParseUint(val, 10, 64)
-		if err != nil {
-			return 0, errors.Wrap(ErrInvalidQueryParams, err)
-		}
-		return N(v), nil
-	case uint16:
-		v, err := strconv.ParseUint(val, 10, 16)
-		if err != nil {
-			return 0, errors.Wrap(ErrInvalidQueryParams, err)
-		}
-		return N(v), nil
-	case float64:
-		v, err := strconv.ParseFloat(val, 64)
-		if err != nil {
-			return 0, errors.Wrap(ErrInvalidQueryParams, err)
-		}
-		return N(v), nil
-	default:
-		return def, nil
-	}
-}
@@ -1,364 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package util_test
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"testing"
-
-	apiutil "github.com/absmach/supermq/api/http/util"
-	smqlog "github.com/absmach/supermq/logger"
-	"github.com/absmach/supermq/pkg/errors"
-	svcerr "github.com/absmach/supermq/pkg/errors/service"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestReadStringQuery(t *testing.T) {
-	cases := []struct {
-		desc string
-		url  string
-		key  string
-		ret  string
-		err  error
-	}{
-		{
-			desc: "valid string query",
-			url:  "http://localhost:8080/?key=test",
-			key:  "key",
-			ret:  "test",
-			err:  nil,
-		},
-		{
-			desc: "empty string query",
-			url:  "http://localhost:8080/",
-			key:  "key",
-			ret:  "",
-			err:  nil,
-		},
-		{
-			desc: "multiple string query",
-			url:  "http://localhost:8080/?key=test&key=random",
-			key:  "key",
-			ret:  "",
-			err:  apiutil.ErrInvalidQueryParams,
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.desc, func(t *testing.T) {
-			parsedURL, err := url.Parse(c.url)
-			assert.NoError(t, err)
-
-			r := &http.Request{URL: parsedURL}
-			ret, err := apiutil.ReadStringQuery(r, c.key, "")
-			assert.Equal(t, c.err, err)
-			assert.Equal(t, c.ret, ret)
-		})
-	}
-}
-
-func TestReadMetadataQuery(t *testing.T) {
-	cases := []struct {
-		desc string
-		url  string
-		key  string
-		ret  map[string]any
-		err  error
-	}{
-		{
-			desc: "valid metadata query",
-			url:  "http://localhost:8080/?key={\"test\":\"test\"}",
-			key:  "key",
-			ret:  map[string]any{"test": "test"},
-			err:  nil,
-		},
-		{
-			desc: "empty metadata query",
-			url:  "http://localhost:8080/",
-			key:  "key",
-			ret:  nil,
-			err:  nil,
-		},
-		{
-			desc: "multiple metadata query",
-			url:  "http://localhost:8080/?key={\"test\":\"test\"}&key={\"random\":\"random\"}",
-			key:  "key",
-			ret:  nil,
-			err:  apiutil.ErrInvalidQueryParams,
-		},
-		{
-			desc: "invalid metadata query",
-			url:  "http://localhost:8080/?key=abc",
-			key:  "key",
-			ret:  nil,
-			err:  apiutil.ErrInvalidQueryParams,
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.desc, func(t *testing.T) {
-			parsedURL, err := url.Parse(c.url)
-			assert.NoError(t, err)
-
-			r := &http.Request{URL: parsedURL}
-			ret, err := apiutil.ReadMetadataQuery(r, c.key, nil)
-			assert.True(t, errors.Contains(err, c.err), fmt.Sprintf("expected: %v, got: %v", c.err, err))
-			assert.Equal(t, c.ret, ret)
-		})
-	}
-}
-
-func TestReadBoolQuery(t *testing.T) {
-	cases := []struct {
-		desc string
-		url  string
-		key  string
-		ret  bool
-		err  error
-	}{
-		{
-			desc: "valid bool query",
-			url:  "http://localhost:8080/?key=true",
-			key:  "key",
-			ret:  true,
-			err:  nil,
-		},
-		{
-			desc: "valid bool query",
-			url:  "http://localhost:8080/?key=false",
-			key:  "key",
-			ret:  false,
-			err:  nil,
-		},
-		{
-			desc: "invalid bool query",
-			url:  "http://localhost:8080/?key=abc",
-			key:  "key",
-			ret:  false,
-			err:  apiutil.ErrInvalidQueryParams,
-		},
-		{
-			desc: "empty bool query",
-			url:  "http://localhost:8080/",
-			key:  "key",
-			ret:  false,
-			err:  nil,
-		},
-		{
-			desc: "multiple bool query",
-			url:  "http://localhost:8080/?key=true&key=false",
-			key:  "key",
-			ret:  false,
-			err:  apiutil.ErrInvalidQueryParams,
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.desc, func(t *testing.T) {
-			parsedURL, err := url.Parse(c.url)
-			assert.NoError(t, err)
-
-			r := &http.Request{URL: parsedURL}
-			ret, err := apiutil.ReadBoolQuery(r, c.key, false)
-			assert.True(t, errors.Contains(err, c.err), fmt.Sprintf("expected: %v, got: %v", c.err, err))
-			assert.Equal(t, c.ret, ret)
-		})
-	}
-}
-
-func TestReadNumQuery(t *testing.T) {
-	cases := []struct {
-		desc    string
-		url     string
-		key     string
-		numType string
-		ret     any
-		err     error
-	}{
-		{
-			desc:    "valid int64 query",
-			url:     "http://localhost:8080/?key=123",
-			key:     "key",
-			numType: "int64",
-			ret:     int64(123),
-			err:     nil,
-		},
-		{
-			desc:    "valid float64 query",
-			url:     "http://localhost:8080/?key=1.23",
-			key:     "key",
-			numType: "float64",
-			ret:     float64(1.23),
-			err:     nil,
-		},
-		{
-			desc:    "valid uint64 query",
-			url:     "http://localhost:8080/?key=123",
-			key:     "key",
-			numType: "uint64",
-			ret:     uint64(123),
-			err:     nil,
-		},
-		{
-			desc:    "valid uint16 query",
-			url:     "http://localhost:8080/?key=123",
-			key:     "key",
-			numType: "uint16",
-			ret:     uint16(123),
-			err:     nil,
-		},
-		{
-			desc:    "invalid int64 query",
-			url:     "http://localhost:8080/?key=abc",
-			key:     "key",
-			numType: "int64",
-			ret:     int64(0),
-			err:     apiutil.ErrInvalidQueryParams,
-		},
-		{
-			desc:    "invalid float64 query",
-			url:     "http://localhost:8080/?key=abc",
-			key:     "key",
-			numType: "float64",
-			ret:     float64(0),
-			err:     apiutil.ErrInvalidQueryParams,
-		},
-		{
-			desc:    "invalid uint64 query",
-			url:     "http://localhost:8080/?key=abc",
-			key:     "key",
-			numType: "uint64",
-			ret:     uint64(0),
-			err:     apiutil.ErrInvalidQueryParams,
-		},
-		{
-			desc:    "invalid uint16 query",
-			url:     "http://localhost:8080/?key=abc",
-			key:     "key",
-			numType: "uint16",
-			ret:     uint16(0),
-			err:     apiutil.ErrInvalidQueryParams,
-		},
-		{
-			desc:    "empty int64 query",
-			url:     "http://localhost:8080/",
-			key:     "key",
-			numType: "int64",
-			ret:     int64(0),
-			err:     nil,
-		},
-		{
-			desc:    "empty float64 query",
-			url:     "http://localhost:8080/",
-			key:     "key",
-			numType: "float64",
-			ret:     float64(0),
-			err:     nil,
-		},
-		{
-			desc:    "empty uint16 query",
-			url:     "http://localhost:8080/",
-			key:     "key",
-			numType: "uint16",
-			ret:     uint16(0),
-			err:     nil,
-		},
-		{
-			desc:    "empty uint64 query",
-			url:     "http://localhost:8080/",
-			key:     "key",
-			numType: "uint64",
-			ret:     uint64(0),
-			err:     nil,
-		},
-		{
-			desc:    "multiple int64 query",
-			url:     "http://localhost:8080/?key=123&key=456",
-			key:     "key",
-			numType: "int64",
-			ret:     int64(0),
-			err:     apiutil.ErrInvalidQueryParams,
-		},
-		{
-			desc:    "multiple float64 query",
-			url:     "http://localhost:8080/?key=1.23&key=4.56",
-			key:     "key",
-			numType: "float64",
-			ret:     float64(0),
-			err:     apiutil.ErrInvalidQueryParams,
-		},
-		{
-			desc:    "multiple uint16 query",
-			url:     "http://localhost:8080/?key=123&key=456",
-			key:     "key",
-			numType: "uint16",
-			ret:     uint16(0),
-			err:     apiutil.ErrInvalidQueryParams,
-		},
-		{
-			desc:    "multiple uint64 query",
-			url:     "http://localhost:8080/?key=123&key=456",
-			key:     "key",
-			numType: "uint64",
-			ret:     uint64(0),
-			err:     apiutil.ErrInvalidQueryParams,
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.desc, func(t *testing.T) {
-			parsedURL, err := url.Parse(c.url)
-			assert.NoError(t, err)
-
-			r := &http.Request{URL: parsedURL}
-			var ret any
-			switch c.numType {
-			case "int64":
-				ret, err = apiutil.ReadNumQuery[int64](r, c.key, 0)
-			case "float64":
-				ret, err = apiutil.ReadNumQuery[float64](r, c.key, 0)
-			case "uint64":
-				ret, err = apiutil.ReadNumQuery[uint64](r, c.key, 0)
-			case "uint16":
-				ret, err = apiutil.ReadNumQuery[uint16](r, c.key, 0)
-			}
-			assert.True(t, errors.Contains(err, c.err), fmt.Sprintf("expected: %v, got: %v", c.err, err))
-			assert.Equal(t, c.ret, ret)
-		})
-	}
-}
-
-func TestLoggingErrorEncoder(t *testing.T) {
-	cases := []struct {
-		desc string
-		err  error
-	}{
-		{
-			desc: "error contains ErrValidation",
-			err:  errors.Wrap(apiutil.ErrValidation, svcerr.ErrAuthentication),
-		},
-		{
-			desc: "error does not contain ErrValidation",
-			err:  svcerr.ErrAuthentication,
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.desc, func(t *testing.T) {
-			encCalled := false
-			encFunc := func(ctx context.Context, err error, w http.ResponseWriter) {
-				encCalled = true
-			}
-
-			errorEncoder := apiutil.LoggingErrorEncoder(smqlog.NewMock(), encFunc)
-			errorEncoder(context.Background(), c.err, httptest.NewRecorder())
-
-			assert.True(t, encCalled)
-		})
-	}
-}
@@ -1,119 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-asyncapi: '2.6.0'
-id: 'https://github.com/absmach/supermq/blob/main/api/asyncapi/mqtt.yaml'
-info:
-  title: SuperMQ MQTT Adapter
-  version: '0.18.0'
-  contact:
-    name: SuperMQ Team
-    url: 'https://github.com/absmach/supermq'
-    email: info@abstractmachines.fr
-  description: |
-    MQTT adapter provides an MQTT API for sending messages through the platform. MQTT adapter uses [mProxy](https://github.com/absmach/mproxy) for proxying traffic between client and MQTT broker.
-    Additionally, the MQTT adapter and the message broker are replicating the traffic between brokers.
-
-  license:
-    name: Apache 2.0
-    url: 'https://github.com/absmach/supermq/blob/main/LICENSE'
-
-
-defaultContentType: application/json
-
-servers:
-  dev:
-    url: localhost:{port}
-    protocol: mqtt
-    description: Test broker
-    variables:
-      port:
-        description: Secure connection (TLS) is available through port 8883.
-        default: '1883'
-        enum:
-          - '1883'
-          - '8883'
-    security:
-      - user-password: []
-
-channels:
-  /m/{domainPrefix}/c/{channelPrefix}/{subtopic}:
-    parameters:
-      domainPrefix:
-        $ref: '#/components/parameters/domainPrefix'
-        in: path
-        required: true
-      channelPrefix:
-        $ref: '#/components/parameters/channelPrefix'
-        in: path
-        required: true
-      subtopic:
-        $ref: '#/components/parameters/subtopic'
-        in: path
-        required: false
-
-    publish:
-      traits:
-        - $ref: '#/components/operationTraits/mqtt'
-      message:
-        $ref: '#/components/messages/jsonMsg'
-    subscribe:
-      traits:
-        - $ref: '#/components/operationTraits/mqtt'
-      message:
-        $ref: '#/components/messages/jsonMsg'
-
-components:
-  messages:
-    jsonMsg:
-      title: JSON Message
-      summary: Arbitrary JSON array or object.
-      contentType: application/json
-      payload:
-        $ref: "#/components/schemas/jsonMsg"
-
-  schemas:
-    jsonMsg:
-      type: object
-      description: Arbitrary JSON object or array. SenML format is recommended.
-      example: |
-        ### SenML
-        ```json
-        [{"bn":"some-base-name:","bt":1641646520, "bu":"A","bver":5, "n":"voltage","u":"V","v":120.1}, {"n":"current","t":-5,"v":1.2}, {"n":"current","t":-4,"v":1.3}]
-        ```
-        ### JSON
-        ```json
-        {"field_1":"val_1", "t": 1641646525}
-        ```
-        ### JSON Array
-        ```json
-        [{"field_1":"val_1", "t": 1641646520},{"field_2":"val_2", "t": 1641646522}]
-        ```
-
-  parameters:
-    domainPrefix:
-      description: ID or route of the domain associated with the channel and client.
-      schema:
-        type: string
-    channelPrefix:
-      description: ID or route of the channel connected to the Client ID defined in the username.
-      schema:
-        type: string
-    subtopic:
-      description: Arbitrary message subtopic.
-      schema:
-        type: string
-        default: ''
-
-  securitySchemes:
-    user-password:
-      type: userPassword
-      description: |
-        username is client ID connected to the channel defined in the mqtt topic and
-        password is client secret corresponding to the client ID
-
-  operationTraits:
-    mqtt:
-      bindings:
-        mqtt:
-          qos: 2
@@ -1,151 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-asyncapi: 2.6.0
-id: 'https://github.com/absmach/supermq/blob/main/api/asyncapi/websocket.yaml'
-info:
-  title: SuperMQ WebSocket adapter
-  description: WebSocket adapter provides a WebSocket API for sending messages through communication channels. WebSocket adapter uses [mProxy](https://github.com/absmach/mproxy) for proxying traffic between client and MQTT broker.
-  version: '0.18.0'
-  contact:
-    name: SuperMQ Team
-    url: 'https://github.com/absmach/supermq'
-    email: info@abstractmachines.fr
-  license:
-    name: Apache 2.0
-    url: 'https://github.com/absmach/supermq/blob/main/LICENSE'
-tags:
-  - name: WebSocket
-defaultContentType: application/json
-
-servers:
-  dev:
-    url: 'ws://{host}:{port}'
-    protocol: ws
-    description: Default WebSocket Adapter URL
-    variables:
-      host:
-        description: Hostname of the WebSocket adapter
-        default: localhost
-      port:
-        description: SuperMQ WebSocket Adapter port
-        default: '8186'
-
-channels:
-  'm/{domainPrefix}/c/{channelPrefix}/{subtopic}':
-    parameters:
-      domainPrefix:
-        $ref: '#/components/parameters/domainPrefix'
-        in: path
-        required: true
-      channelPrefix:
-        $ref: '#/components/parameters/channelPrefix'
-        in: path
-        required: true
-      subtopic:
-        $ref: '#/components/parameters/subtopic'
-        in: path
-        required: false
-    publish:
-      summary: Publish messages to a channel
-      operationId: publishToChannel
-      message:
-        $ref: '#/components/messages/jsonMsg'
-        messageId: publishMessage
-      bindings:
-        ws:
-          method: POST
-          query:
-            subtopic: '{$request.query.subtopic}'
-      security:
-        - bearerAuth: []
-    subscribe:
-      summary: Subscribe to receive messages from a channel
-      operationId: subscribeToChannel
-      message:
-        $ref: '#/components/messages/jsonMsg'
-        messageId: subscribeMessage
-      bindings:
-        ws:
-          method: GET
-          query:
-            subtopic: '{$request.query.subtopic}'
-      security:
-        - bearerAuth: []
-  /version:
-    subscribe:
-      summary: Get the version of the SuperMQ adapter
-      operationId: getVersion
-      bindings:
-        http:
-          method: GET
-  metrics:
-    description: Endpoint for getting service metrics.
-    subscribe:
-      operationId: metrics
-      summary: Service metrics
-    bindings:
-      http:
-        type: request
-        method: GET
-
-components:
-  messages:
-    jsonMsg:
-      title: JSON Message
-      summary: Arbitrary JSON array or object.
-      contentType: application/json
-      payload:
-        $ref: '#/components/schemas/jsonMsg'
-  schemas:
-    jsonMsg:
-      type: object
-      description: Arbitrary JSON object or array. SenML format is recommended.
-      example: >
-        ### SenML
-
-        ```json
-
-        [{"bn":"some-base-name:","bt":1641646520, "bu":"A","bver":5,
-        "n":"voltage","u":"V","v":120.1}, {"n":"current","t":-5,"v":1.2},
-        {"n":"current","t":-4,"v":1.3}]
-
-        ```
-
-        ### JSON
-
-        ```json
-
-        {"field_1":"val_1", "t": 1641646525}
-
-        ```
-
-        ### JSON Array
-
-        ```json
-
-        [{"field_1":"val_1", "t": 1641646520},{"field_2":"val_2", "t":
-        1641646522}]
-
-        ```
-  parameters:
-    domainPrefix:
-      description: ID or route of the domain associated with the channel and client.
-      schema:
-        type: string
-    channelPrefix:
-      description: ID or route of the channel connected to the Client ID defined in the username.
-      schema:
-        type: string
-    subtopic:
-      description: Arbitrary message subtopic.
-      schema:
-        type: string
-        default: ''
-  securitySchemes:
-    bearerAuth:
-      type: http
-      scheme: bearer
-      bearerFormat: uuid
-      description: |
-        * Client access: "Authorization: Client <client_key>"
@@ -1,5 +0,0 @@
-# SuperMQ OpenAPI Specification
-
-This folder contains an OpenAPI specifications for SuperMQ API.
-
-View specification in Swagger UI at [docs.api.supermq.abstractmachines.fr](https://docs.api.supermq.abstractmachines.fr)
@@ -1,840 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-openapi: 3.0.3
-info:
-  title: SuperMQ Auth Service
-  description: |
-    This is the Auth Server based on the OpenAPI 3.0 specification.  It is the HTTP API for managing platform users. You can now help us improve the API whether it's by making changes to the definition itself or to the code.
-    Some useful links:
-    - [The SuperMQ repository](https://github.com/absmach/supermq)
-  contact:
-    email: info@abstractmachines.fr
-  license:
-    name: Apache 2.0
-    url: https://github.com/absmach/supermq/blob/main/LICENSE
-  version: 0.18.0
-
-servers:
-  - url: http://localhost:9001
-  - url: https://localhost:9001
-
-tags:
-  - name: Keys
-    description: Everything about your Keys.
-    externalDocs:
-      description: Find out more about keys
-      url: https://docs.supermq.abstractmachines.fr/
-  - name: PATs
-    description: Everything about your Personal Access Tokens.
-    externalDocs:
-      description: Find out more about Personal Access Tokens
-      url: https://docs.supermq.abstractmachines.fr/
-  - name: Health
-    description: Service health check endpoint.
-    externalDocs:
-      description: Find out more about health check
-      url: https://docs.supermq.abstractmachines.fr/
-
-paths:
-  /keys:
-    post:
-      operationId: issueKey
-      tags:
-        - Keys
-      summary: Issue API key
-      description: |
-        Generates a new API key. Thew new API key will
-        be uniquely identified by its ID.
-      requestBody:
-        $ref: "#/components/requestBodies/KeyRequest"
-      responses:
-        "201":
-          description: Issued new key.
-        "400":
-          description: Failed due to malformed JSON.
-        "401":
-          description: Missing or invalid access token provided.
-        "409":
-          description: Failed due to using already existing ID.
-        "415":
-          description: Missing or invalid content type.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-  /keys/{keyID}:
-    get:
-      operationId: getKey
-      summary: Gets API key details.
-      description: |
-        Gets API key details for the given key.
-      tags:
-        - Keys
-      parameters:
-        - $ref: "#/components/parameters/ApiKeyId"
-      responses:
-        "200":
-          $ref: "#/components/responses/KeyRes"
-        "400":
-          description: Failed due to malformed query parameters.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: A non-existent entity request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-    delete:
-      operationId: revokeKey
-      summary: Revoke API key
-      description: |
-        Revoke API key identified by the given ID.
-      tags:
-        - Keys
-      parameters:
-        - $ref: "#/components/parameters/ApiKeyId"
-      responses:
-        "204":
-          description: Key revoked.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: A non-existent entity request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-  /pats:
-    post:
-      operationId: createPAT
-      tags:
-        - PATs
-      summary: Create a new Personal Access Token
-      description: |
-        Creates a new Personal Access Token (PAT) for the authenticated user.
-      requestBody:
-        $ref: "#/components/requestBodies/CreatePATRequest"
-      responses:
-        "201":
-          $ref: "#/components/responses/PATRes"
-        "400":
-          description: Failed due to malformed JSON or validation errors.
-        "401":
-          description: Missing or invalid access token provided.
-        "415":
-          description: Missing or invalid content type.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-    
-    get:
-      operationId: listPATs
-      tags:
-        - PATs
-      summary: List all Personal Access Tokens
-      description: |
-        Lists all Personal Access Tokens (PATs) for the authenticated user.
-      parameters:
-        - $ref: "#/components/parameters/Limit"
-        - $ref: "#/components/parameters/Offset"
-      responses:
-        "200":
-          $ref: "#/components/responses/PATsPageRes"
-        "400":
-          description: Failed due to malformed query parameters.
-        "401":
-          description: Missing or invalid access token provided.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-    
-    delete:
-      operationId: clearAllPATs
-      tags:
-        - PATs
-      summary: Remove all Personal Access Tokens
-      description: |
-        Removes all Personal Access Tokens (PATs) for the authenticated user.
-      responses:
-        "200":
-          description: All PATs removed successfully.
-        "401":
-          description: Missing or invalid access token provided.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-  
-  /pats/{patID}:
-    get:
-      operationId: retrievePAT
-      tags:
-        - PATs
-      summary: Retrieve a Personal Access Token
-      description: |
-        Retrieves details of a specific Personal Access Token (PAT).
-      parameters:
-        - $ref: "#/components/parameters/PatID"
-      responses:
-        "200":
-          $ref: "#/components/responses/PATRes"
-        "400":
-          description: Failed due to malformed query parameters.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: PAT not found.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-    
-    delete:
-      operationId: deletePAT
-      tags:
-        - PATs
-      summary: Delete a Personal Access Token
-      description: |
-        Deletes a specific Personal Access Token (PAT).
-      parameters:
-        - $ref: "#/components/parameters/PatID"
-      responses:
-        "204":
-          description: PAT deleted successfully.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: PAT not found.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-  
-  /pats/{patID}/name:
-    patch:
-      operationId: updatePATName
-      tags:
-        - PATs
-      summary: Update Personal Access Token name
-      description: |
-        Updates the name of a specific Personal Access Token (PAT).
-      parameters:
-        - $ref: "#/components/parameters/PatID"
-      requestBody:
-        $ref: "#/components/requestBodies/UpdatePATNameRequest"
-      responses:
-        "202":
-          $ref: "#/components/responses/PATRes"
-        "400":
-          description: Failed due to malformed JSON or validation errors.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: PAT not found.
-        "415":
-          description: Missing or invalid content type.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-  
-  /pats/{patID}/description:
-    patch:
-      operationId: updatePATDescription
-      tags:
-        - PATs
-      summary: Update Personal Access Token description
-      description: |
-        Updates the description of a specific Personal Access Token (PAT).
-      parameters:
-        - $ref: "#/components/parameters/PatID"
-      requestBody:
-        $ref: "#/components/requestBodies/UpdatePATDescriptionRequest"
-      responses:
-        "202":
-          $ref: "#/components/responses/PATRes"
-        "400":
-          description: Failed due to malformed JSON or validation errors.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: PAT not found.
-        "415":
-          description: Missing or invalid content type.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-  
-  /pats/{patID}/secret/reset:
-    patch:
-      operationId: resetPATSecret
-      tags:
-        - PATs
-      summary: Reset Personal Access Token secret
-      description: |
-        Resets the secret of a specific Personal Access Token (PAT).
-      parameters:
-        - $ref: "#/components/parameters/PatID"
-      requestBody:
-        $ref: "#/components/requestBodies/ResetPATSecretRequest"
-      responses:
-        "200":
-          $ref: "#/components/responses/PATRes"
-        "400":
-          description: Failed due to malformed JSON or validation errors.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: PAT not found.
-        "415":
-          description: Missing or invalid content type.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-  
-  /pats/{patID}/secret/revoke:
-    patch:
-      operationId: revokePATSecret
-      tags:
-        - PATs
-      summary: Revoke Personal Access Token secret
-      description: |
-        Revokes the secret of a specific Personal Access Token (PAT).
-      parameters:
-        - $ref: "#/components/parameters/PatID"
-      responses:
-        "204":
-          description: PAT secret revoked successfully.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: PAT not found.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-  
-  /pats/{patID}/scope:
-    get:
-      operationId: listScopes
-      tags:
-        - PATs
-      summary: List scopes for a Personal Access Token
-      description: |
-        Lists all scopes for a specific Personal Access Token (PAT).
-      parameters:
-        - $ref: "#/components/parameters/PatID"
-        - $ref: "#/components/parameters/Limit"
-        - $ref: "#/components/parameters/Offset"
-      responses:
-        "200":
-          $ref: "#/components/responses/ScopesPageRes"
-        "400":
-          description: Failed due to malformed query parameters.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: PAT not found.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-    
-    delete:
-      operationId: clearAllScopes
-      tags:
-        - PATs
-      summary: Remove all scopes from a Personal Access Token
-      description: |
-        Removes all scopes from a specific Personal Access Token (PAT).
-      parameters:
-        - $ref: "#/components/parameters/PatID"
-      responses:
-        "200":
-          description: All scopes removed successfully.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: PAT not found.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-  
-  /pats/{patID}/scope/add:
-    patch:
-      operationId: addScope
-      tags:
-        - PATs
-      summary: Add scope to a Personal Access Token
-      description: |
-        Adds a scope to a specific Personal Access Token (PAT).
-      parameters:
-        - $ref: "#/components/parameters/PatID"
-      requestBody:
-        $ref: "#/components/requestBodies/AddScopeRequest"
-      responses:
-        "200":
-          description: Scope added successfully.
-        "400":
-          description: Failed due to malformed JSON or validation errors.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: PAT not found.
-        "415":
-          description: Missing or invalid content type.
-        "422":
-          description: Database cannot process the request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-  
-  /pats/{patID}/scope/remove:
-    patch:
-      operationId: removeScope
-      tags:
-        - PATs
-      summary: Remove scope from a Personal Access Token
-      description: |
-        Removes a scope from a specific Personal Access Token (PAT).
-      parameters:
-        - $ref: "#/components/parameters/PatID"
-      requestBody:
-        $ref: "#/components/requestBodies/RemoveScopeRequest"
-      responses:
-        "200":
-          description: Scope removed successfully.
-        "400":
-          description: Failed due to malformed JSON or validation errors.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: PAT not found.
-        "415":
-          description: Missing or invalid content type.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-
-  /health:
-    get:
-      summary: Retrieves service health check info.
-      tags:
-        - Health
-      security: []
-      responses:
-        "200":
-          $ref: "#/components/responses/HealthRes"
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-components:
-  schemas:
-    PAT:
-      type: object
-      properties:
-        id:
-          type: string
-          format: uuid
-          example: "c5747f2f-2a7c-4fe1-b41a-51a5ae290945"
-          description: Personal Access Token unique identifier
-        user_id:
-          type: string
-          format: uuid
-          example: "9118de62-c680-46b7-ad0a-21748a52833a"
-          description: User ID of the PAT owner
-        name:
-          type: string
-          example: "My PAT"
-          description: Name of the Personal Access Token
-        description:
-          type: string
-          example: "Token for automation"
-          description: Description of the Personal Access Token
-        secret:
-          type: string
-          example: "pat_1234567890abcdef"
-          description: Secret value of the Personal Access Token
-        issued_at:
-          type: string
-          format: date-time
-          example: "2019-11-26T13:31:52Z"
-          description: Time when the PAT was issued
-        expires_at:
-          type: string
-          format: date-time
-          example: "2020-11-26T13:31:52Z"
-          description: Time when the PAT expires
-        updated_at:
-          type: string
-          format: date-time
-          example: "2019-11-26T13:31:52Z"
-          description: Time when the PAT was last updated
-        last_used_at:
-          type: string
-          format: date-time
-          example: "2019-11-26T13:31:52Z"
-          description: Time when the PAT was last used
-        revoked:
-          type: boolean
-          example: false
-          description: Whether the PAT is revoked
-        revoked_at:
-          type: string
-          format: date-time
-          example: "2019-11-26T13:31:52Z"
-          description: Time when the PAT was revoked
-    
-    PATsPage:
-      type: object
-      properties:
-        total:
-          type: integer
-          example: 10
-          description: Total number of PATs
-        offset:
-          type: integer
-          example: 0
-          description: Number of items to skip during retrieval
-        limit:
-          type: integer
-          example: 10
-          description: Size of the subset to retrieve
-        pats:
-          type: array
-          items:
-            $ref: "#/components/schemas/PAT"
-          description: List of Personal Access Tokens
-    
-    Scope:
-      type: object
-      properties:
-        id:
-          type: string
-          format: uuid
-          example: "c5747f2f-2a7c-4fe1-b41a-51a5ae290945"
-          description: Scope unique identifier
-        pat_id:
-          type: string
-          format: uuid
-          example: "9118de62-c680-46b7-ad0a-21748a52833a"
-          description: PAT ID this scope belongs to
-        optional_domain_id:
-          type: string
-          format: uuid
-          example: "bb7edb32-2eac-4aad-aebe-ed96fe073879"
-          description: Optional domain ID for the scope
-        entity_type:
-          type: string
-          enum: [groups, channels, clients, domains, users, dashboards, messages]
-          example: "groups"
-          description: Type of entity the scope applies to
-        entity_id:
-          type: string
-          example: "*"
-          description: ID of the entity the scope applies to. '*' means all entities of the specified type.
-        operation:
-          type: string
-          enum: [create, read, list, update, delete, share, unshare, publish, subscribe]
-          example: "read"
-          description: Operation allowed by this scope
-    
-    ScopesPage:
-      type: object
-      properties:
-        total:
-          type: integer
-          example: 10
-          description: Total number of scopes
-        offset:
-          type: integer
-          example: 0
-          description: Number of items to skip during retrieval
-        limit:
-          type: integer
-          example: 10
-          description: Size of the subset to retrieve
-        scopes:
-          type: array
-          items:
-            $ref: "#/components/schemas/Scope"
-          description: List of scopes
-    Key:
-      type: object
-      properties:
-        id:
-          type: string
-          format: uuid
-          example: "c5747f2f-2a7c-4fe1-b41a-51a5ae290945"
-          description: API key unique identifier
-        issuer_id:
-          type: string
-          format: uuid
-          example: "9118de62-c680-46b7-ad0a-21748a52833a"
-          description: In ID of the entity that issued the token.
-        type:
-          type: integer
-          example: 0
-          description: API key type. Keys of different type are processed differently.
-        subject:
-          type: string
-          format: string
-          example: "test@example.com"
-          description: User's email or service identifier of API key subject.
-        issued_at:
-          type: string
-          format: date-time
-          example: "2019-11-26 13:31:52"
-          description: Time when the key is generated.
-        expires_at:
-          type: string
-          format: date-time
-          example: "2019-11-26 13:31:52"
-          description: Time when the Key expires. If this field is missing,
-            that means that Key is valid indefinitely.
-
-  parameters:
-    PatID:
-      name: patID
-      description: Personal Access Token ID.
-      in: path
-      schema:
-        type: string
-        format: uuid
-      required: true
-    DomainID:
-      name: domainID
-      description: Unique domain identifier.
-      in: path
-      schema:
-        type: string
-        format: uuid
-      required: true
-      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-    Status:
-      name: status
-      description: Domain status.
-      in: query
-      schema:
-        type: string
-        default: enabled
-      required: false
-      example: enabled
-    DomainName:
-      name: name
-      description: Domain's name.
-      in: query
-      schema:
-        type: string
-      required: false
-      example: "domainName"
-    Permission:
-      name: permission
-      description: permission.
-      in: query
-      schema:
-        type: string
-      required: false
-      example: "edit"
-    ApiKeyId:
-      name: keyID
-      description: API Key ID.
-      in: path
-      schema:
-        type: string
-        format: uuid
-      required: true
-    Limit:
-      name: limit
-      description: Size of the subset to retrieve.
-      in: query
-      schema:
-        type: integer
-        default: 10
-        maximum: 100
-        minimum: 1
-      required: false
-    Offset:
-      name: offset
-      description: Number of items to skip during retrieval.
-      in: query
-      schema:
-        type: integer
-        default: 0
-        minimum: 0
-      required: false
-    Metadata:
-      name: metadata
-      description: Metadata filter. Filtering is performed matching the parameter with metadata on top level. Parameter is json.
-      in: query
-      required: false
-      schema:
-        type: object
-        additionalProperties: {}
-    Type:
-      name: type
-      description: The type of the API Key.
-      in: query
-      schema:
-        type: integer
-        default: 0
-        minimum: 0
-      required: false
-    Subject:
-      name: subject
-      description: The subject of an API Key
-      in: query
-      schema:
-        type: string
-      required: false
-
-  requestBodies:
-    CreatePATRequest:
-      description: JSON-formatted document describing PAT creation request.
-      required: true
-      content:
-        application/json:
-          schema:
-            type: object
-            required:
-              - name
-            properties:
-              name:
-                type: string
-                example: "My PAT"
-                description: Name of the Personal Access Token
-              description:
-                type: string
-                example: "Token for automation"
-                description: Description of the Personal Access Token
-              duration:
-                type: string
-                example: "30d"
-                description: Duration for which the PAT is valid. Format is a duration string (e.g. "30d", "24h", "1y").
-    
-    UpdatePATNameRequest:
-      description: JSON-formatted document describing PAT name update request.
-      required: true
-      content:
-        application/json:
-          schema:
-            type: object
-            required:
-              - name
-            properties:
-              name:
-                type: string
-                example: "New PAT Name"
-                description: New name for the Personal Access Token
-    
-    UpdatePATDescriptionRequest:
-      description: JSON-formatted document describing PAT description update request.
-      required: true
-      content:
-        application/json:
-          schema:
-            type: object
-            required:
-              - description
-            properties:
-              description:
-                type: string
-                example: "New PAT Description"
-                description: New description for the Personal Access Token
-    
-    ResetPATSecretRequest:
-      description: JSON-formatted document describing PAT secret reset request.
-      required: true
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              duration:
-                type: string
-                example: "30d"
-                description: Duration for which the new PAT secret is valid. Format is a duration string (e.g. "30d", "24h", "1y").
-    
-    AddScopeRequest:
-      description: JSON-formatted document describing add scope request.
-      required: true
-      content:
-        application/json:
-          schema:
-            type: object
-            required:
-              - scopes
-            properties:
-              scopes:
-                type: array
-                items:
-                  $ref: "#/components/schemas/Scope"
-                description: List of scopes to add
-    
-    RemoveScopeRequest:
-      description: JSON-formatted document describing remove scope request.
-      required: true
-      content:
-        application/json:
-          schema:
-            type: object
-            required:
-              - scopes_id
-            properties:
-              scopes_id:
-                type: array
-                items:
-                  type: string
-                  format: uuid
-                description: List of scope IDs to remove
-    KeyRequest:
-      description: JSON-formatted document describing key request.
-      required: true
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              type:
-                type: integer
-                example: 0
-                description: API key type. Keys of different type are processed differently.
-              duration:
-                type: number
-                format: integer
-                example: 23456
-                description: Number of seconds issued token is valid for.
-
-  responses:
-    PATRes:
-      description: Personal Access Token data.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/PAT"
-    
-    PATsPageRes:
-      description: Page of Personal Access Tokens.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/PATsPage"
-    
-    ScopesPageRes:
-      description: Page of scopes.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/ScopesPage"
-    ServiceError:
-      description: Unexpected server-side error occurred.
-    KeyRes:
-      description: Data retrieved.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/Key"
-      links:
-        revoke:
-          operationId: revokeKey
-          parameters:
-            keyID: $response.body#/id
-
-    HealthRes:
-      description: Service Health Check.
-      content:
-        application/health+json:
-          schema:
-            $ref: "./schemas/health_info.yaml"
-
-  securitySchemes:
-    bearerAuth:
-      type: http
-      scheme: bearer
-      bearerFormat: JWT
-      description: |
-        * Users access: "Authorization: Bearer <user_token>"
-
-security:
-  - bearerAuth: []
@@ -1,191 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-openapi: 3.0.1
-info:
-  title: SuperMQ http adapter
-  description: |
-    HTTP API for sending messages through communication channels.
-    Some useful links:
-    - [The SuperMQ repository](https://github.com/absmach/supermq)
-  contact:
-    email: info@abstractmachines.fr
-  license:
-    name: Apache 2.0
-    url: https://github.com/absmach/supermq/blob/main/LICENSE
-  version: 0.18.0
-
-servers:
-  - url: http://localhost:8008
-  - url: https://localhost:8008
-
-tags:
-  - name: messages
-    description: Everything about your Messages
-    externalDocs:
-      description: Find out more about messages
-      url: https://docs.supermq.abstractmachines.fr/
-
-paths:
-  /m/{domainPrefix}/c/{channelPrefix}:
-    post:
-      summary: Sends message to the communication channel
-      description: |
-        Sends message to the communication channel. Messages can be sent as
-        JSON formatted SenML or as blob.
-      tags:
-        - messages
-      parameters:
-        - $ref: "#/components/parameters/domainPrefix"
-        - $ref: "#/components/parameters/channelPrefix"
-      requestBody:
-        $ref: "#/components/requestBodies/MessageReq"
-      responses:
-        "202":
-          description: Message is accepted for processing.
-        "400":
-          description: Message discarded due to its malformed content.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: Message discarded due to invalid channel id.
-        "415":
-          description: Message discarded due to invalid or missing content type.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-  /health:
-    get:
-      summary: Retrieves service health check info.
-      tags:
-        - health
-      security: []
-      responses:
-        "200":
-          $ref: "#/components/responses/HealthRes"
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-components:
-  schemas:
-    SenMLRecord:
-      type: object
-      properties:
-        bn:
-          type: string
-          description: Base Name
-        bt:
-          type: number
-          format: double
-          description: Base Time
-        bu:
-          type: number
-          format: double
-          description: Base Unit
-        bv:
-          type: number
-          format: double
-          description: Base Value
-        bs:
-          type: number
-          format: double
-          description: Base Sum
-        bver:
-          type: number
-          format: double
-          description: Version
-        n:
-          type: string
-          description: Name
-        u:
-          type: string
-          description: Unit
-        v:
-          type: number
-          format: double
-          description: Value
-        vs:
-          type: string
-          description: String Value
-        vb:
-          type: boolean
-          description: Boolean Value
-        vd:
-          type: string
-          description: Data Value
-        s:
-          type: number
-          format: double
-          description: Value Sum
-        t:
-          type: number
-          format: double
-          description: Time
-        ut:
-          type: number
-          format: double
-          description: Update Time
-    SenMLArray:
-      type: array
-      items:
-        $ref: "#/components/schemas/SenMLRecord"
-
-  parameters:
-    domainPrefix:
-      name: domainPrefix
-      description: ID or route of the domain associated with the channel and client.
-      in: path
-      schema:
-        type: string
-      example: mydomain
-      required: true
-    channelPrefix:
-      name: channelPrefix
-      description: ID or route of the channel connected to the client.
-      in: path
-      schema:
-        type: string
-      example: mychannel
-      required: true
-
-  requestBodies:
-    MessageReq:
-      description: |
-        Message to be distributed. Since the platform expects messages to be
-        properly formatted SenML in order to be post-processed, clients are
-        obliged to specify Content-Type header for each published message.
-        Note that all messages that aren't SenML will be accepted and published,
-        but no post-processing will be applied.
-      required: true
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/SenMLArray"
-
-  responses:
-    ServiceError:
-      description: Unexpected server-side error occurred.
-
-    HealthRes:
-      description: Service Health Check.
-      content:
-        application/health+json:
-          schema:
-            $ref: "./schemas/health_info.yaml"
-
-  securitySchemes:
-    bearerAuth:
-      type: http
-      scheme: bearer
-      bearerFormat: uuid
-      description: |
-        * Client access: "Authorization: Client <client_key>"
-
-    basicAuth:
-      type: http
-      scheme: basic
-      description: |
-        * Clients access: "Authorization: Basic <base64-encoded_credentials>"
-
-security:
-  - bearerAuth: []
-  - basicAuth: []
@@ -1,426 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-openapi: 3.0.3
-info:
-  title: SuperMQ Journal Log Service
-  description: |
-    This is the Journal Log Server based on the OpenAPI 3.0 specification.  It is the HTTP API for viewing journal log history. You can now help us improve the API whether it's by making changes to the definition itself or to the code.
-    Some useful links:
-    - [The SuperMQ repository](https://github.com/absmach/supermq)
-  contact:
-    email: info@mainflux.com
-  license:
-    name: Apache 2.0
-    url: https://github.com/absmach/supermq/blob/main/LICENSE
-  version: 0.18.0
-
-servers:
-  - url: http://localhost:9021
-  - url: https://localhost:9021
-
-tags:
-  - name: journal-log
-    description: Everything about your Journal Log
-    externalDocs:
-      description: Find out more about Journal Log
-      url: http://docs.mainflux.io/
-
-paths:
-  /journal/user/{userID}:
-    get:
-      tags:
-        - journal-log
-      summary: List user journal log
-      description: |
-        Retrieves a list of journal. Due to performance concerns, data
-        is retrieved in subsets. The API must ensure that the entire
-        dataset is consumed either by making subsequent requests, or by
-        increasing the subset size of the initial request.
-      parameters:
-        - $ref: "#/components/parameters/user_id"
-        - $ref: "#/components/parameters/offset"
-        - $ref: "#/components/parameters/limit"
-        - $ref: "#/components/parameters/operation"
-        - $ref: "#/components/parameters/with_attributes"
-        - $ref: "#/components/parameters/with_metadata"
-        - $ref: "#/components/parameters/from"
-        - $ref: "#/components/parameters/to"
-        - $ref: "#/components/parameters/dir"
-      security:
-        - bearerAuth: []
-      responses:
-        "200":
-          $ref: "#/components/responses/JournalsPageRes"
-        "400":
-          description: Failed due to malformed query parameters.
-        "401":
-          description: Missing or invalid access token provided.
-        "403":
-          description: Failed to perform authorization over the entity.
-        "404":
-          description: A non-existent entity request.
-        "422":
-          description: Database can't process request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-  /{domainID}/journal/client/{clientID}/telemetry:
-    get:
-      tags:
-        - journal-log
-      summary: View client telemetry
-      description: |
-        Retrieves telemetry data for a specific client within a domain.
-        This includes connection status, messages sent/received, and other metrics.
-      parameters:
-        - $ref: "#/components/parameters/domain_id"
-        - $ref: '#/components/parameters/client_id'
-      security:
-        - bearerAuth: []
-      responses:
-        "200":
-          description: Client telemetry data retrieved successfully
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Telemetry"
-        "400":
-          description: Failed due to malformed request parameters.
-        "401":
-          description: Missing or invalid access token provided.
-        "403":
-          description: Failed to perform authorization over the entity.
-        "404":
-          description: Client not found.
-        "422":
-          description: Database can't process request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-  /{domainID}/journal/{entityType}/{id}:
-    get:
-      tags:
-        - journal-log
-      summary: List entity journal log
-      description: |
-        Retrieves a list of journal. Due to performance concerns, data
-        is retrieved in subsets. The API must ensure that the entire
-        dataset is consumed either by making subsequent requests, or by
-        increasing the subset size of the initial request.
-      parameters:
-        - $ref: "#/components/parameters/domain_id"
-        - $ref: "#/components/parameters/entity_type"
-        - $ref: "#/components/parameters/id"
-        - $ref: "#/components/parameters/offset"
-        - $ref: "#/components/parameters/limit"
-        - $ref: "#/components/parameters/operation"
-        - $ref: "#/components/parameters/with_attributes"
-        - $ref: "#/components/parameters/with_metadata"
-        - $ref: "#/components/parameters/from"
-        - $ref: "#/components/parameters/to"
-        - $ref: "#/components/parameters/dir"
-      security:
-        - bearerAuth: []
-      responses:
-        "200":
-          $ref: "#/components/responses/JournalsPageRes"
-        "400":
-          description: Failed due to malformed query parameters.
-        "401":
-          description: Missing or invalid access token provided.
-        "403":
-          description: Failed to perform authorization over the entity.
-        "404":
-          description: A non-existent entity request.
-        "422":
-          description: Database can't process request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-  /health:
-    get:
-      summary: Retrieves service health check info.
-      tags:
-        - health
-      security: []
-      responses:
-        "200":
-          $ref: "#/components/responses/HealthRes"
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-components:
-  schemas:
-    Telemetry:
-      type: object
-      properties:
-        client_id:
-          type: string
-          format: uuid
-          description: Unique identifier of the client
-          example: "bb7edb32-2eac-4aad-aebe-ed96fe073879"
-        domain_id:
-          type: string
-          format: uuid
-          description: Unique identifier of the domain
-          example: "29d425c8-542b-4614-8a4d-a5951945d720"
-        subscriptions:
-          type: integer
-          format: int64
-          description: Number of active subscriptions for the client
-          example: 5
-        inbound_messages:
-          type: integer
-          format: int64
-          description: Number of messages received by the client
-          example: 1234567
-        outbound_messages:
-          type: integer
-          format: int64
-          description: Number of messages sent by the client
-          example: 987654
-        first_seen:
-          type: string
-          format: date-time
-          description: Timestamp when the client was first seen
-          example: "2024-01-11T10:00:00.000Z"
-        last_seen:
-          type: string
-          format: date-time
-          description: Timestamp when the client was last seen
-          example: "2024-01-11T12:05:07.449053Z"
-
-    Journal:
-      type: object
-      properties:
-        operation:
-          type: string
-          example: user.create
-          description: Journal operation.
-        occurred_at:
-          type: string
-          format: date-time
-          example: "2024-01-11T12:05:07.449053Z"
-          description: Time when the journal occurred.
-        attributes:
-          type: object
-          description: Journal attributes.
-          example:
-            {
-              "created_at": "2024-06-12T11:34:32.991591Z",
-              "id": "29d425c8-542b-4614-8a4d-a5951945d720",
-              "identity": "Gawne-Havlicek@email.com",
-              "name": "Newgard-Frisina",
-              "status": "enabled",
-              "updated_at": "2024-06-12T11:34:33.116795Z",
-              "updated_by": "ad228f20-4741-47c5-bef7-d871b541c019",
-            }
-        metadata:
-          type: object
-          description: Journal payload.
-          example: { "Update": "Calvo-Felkins" }
-      xml:
-        name: journal
-
-    JournalPage:
-      type: object
-      properties:
-        journals:
-          type: array
-          minItems: 0
-          uniqueItems: true
-          items:
-            $ref: "#/components/schemas/Journal"
-        total:
-          type: integer
-          example: 1
-          description: Total number of items.
-        offset:
-          type: integer
-          description: Number of items to skip during retrieval.
-        limit:
-          type: integer
-          example: 10
-          description: Maximum number of items to return in one page.
-      required:
-        - journals
-        - total
-        - offset
-
-    Error:
-      type: object
-      properties:
-        error:
-          type: string
-          description: Error message
-      example: { "error": "malformed entity specification" }
-
-  parameters:
-    domain_id:
-      name: domainID
-      description: Unique identifier for a domain.
-      in: path
-      schema:
-        type: string
-        format: uuid
-      required: true
-      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-
-    client_id:
-      name: clientID
-      description: Unique identifier for a client
-      in: path
-      schema:
-        type: string
-        format: uuid
-      required: true
-      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-
-    entity_type:
-      name: entityType
-      description: Type of entity, e.g. group, client, channel.
-      in: path
-      schema:
-        type: string
-        enum:
-          - group
-          - client
-          - channel
-      required: true
-      example: group
-
-    user_id:
-      name: userID
-      description: Unique identifier for a user.
-      in: path
-      schema:
-        type: string
-        format: uuid
-      required: true
-      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-
-    id:
-      name: id
-      description: Unique identifier for an entity, e.g. group, channel or client. Used together with entity_type.
-      in: path
-      schema:
-        type: string
-        format: uuid
-      required: true
-      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-
-    offset:
-      name: offset
-      description: Number of items to skip during retrieval.
-      in: query
-      schema:
-        type: integer
-        default: 0
-        minimum: 0
-      required: false
-      example: "0"
-
-    limit:
-      name: limit
-      description: Size of the subset to retrieve.
-      in: query
-      schema:
-        type: integer
-        default: 10
-        maximum: 10
-        minimum: 1
-      required: false
-      example: "10"
-
-    operation:
-      name: operation
-      description: Journal operation.
-      in: query
-      schema:
-        type: string
-      required: false
-      example: user.create
-
-    with_attributes:
-      name: with_attributes
-      description: Include journal attributes.
-      in: query
-      schema:
-        type: boolean
-      required: false
-      example: true
-
-    with_metadata:
-      name: with_metadata
-      description: Include journal metadata.
-      in: query
-      schema:
-        type: boolean
-      required: false
-      example: true
-
-    from:
-      name: from
-      description: Start date in unix time.
-      in: query
-      schema:
-        type: string
-        format: int64
-      required: false
-      example: 1966777289
-
-    to:
-      name: to
-      description: End date in unix time.
-      in: query
-      schema:
-        type: string
-        format: int64
-      required: false
-      example: 1966777289
-
-    dir:
-      name: dir
-      description: Sort direction.
-      in: query
-      schema:
-        type: string
-        enum:
-          - asc
-          - desc
-      required: false
-      example: desc
-
-  responses:
-    JournalsPageRes:
-      description: Data retrieved.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/JournalPage"
-
-    HealthRes:
-      description: Service Health Check.
-      content:
-        application/health+json:
-          schema:
-            $ref: "./schemas/health_info.yaml"
-
-    ServiceError:
-      description: Unexpected server-side error occurred.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/Error"
-
-  securitySchemes:
-    bearerAuth:
-      type: http
-      scheme: bearer
-      bearerFormat: JWT
-      description: |
-        * User access: "Authorization: Bearer <user_access_token>"
-
-security:
-  - bearerAuth: []
@@ -1,30 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-type: object
-properties:
-  status:
-    type: string
-    description: Service status.
-    enum:
-      - pass
-  version:
-    type: string
-    description: Service version.
-    example: v0.18.0
-  commit:
-    type: string
-    description: Service commit hash.
-    example: 73362210dd2e04e389eaddb802cab3fe03976593
-  description:
-    type: string
-    description: Service description.
-    example: <service_name> service
-  build_time:
-    type: string
-    description: Service build time.
-    example: 2024-02-01_12:18:15
-  instance_id:
-    type: string
-    description: Service instance ID.
-    example: 8edbf8af-7db7-4218-bb4f-a8a929ff5266
@@ -1,395 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-components:
-  schemas:
-    NewRole:
-      type: object
-      properties:
-        id:
-          type: string
-          format: uuid
-          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-          description: Role unique identifier.
-        name:
-          type: string
-          description: Role's name.
-          example: "roleName"
-        entity_id:
-          type: string
-          format: uuid
-          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-          description: Entity unique identifier.
-        created_by:
-          type: string
-          format: uuid
-          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-          description: Role creator unique identifier.
-        created_at:
-          type: string
-          format: date-time
-          example: "2019-11-26 13:31:52"
-          description: Time when the channel was created.
-        updated_by:
-          type: string
-          format: uuid
-          example: ""
-          description: Role updater unique identifier.
-        updated_at:
-          type: string
-          format: date-time
-          example: ""
-          description: Time when the channel was created.
-
-    Role:
-      type: object
-      properties:
-        id:
-          type: string
-          format: uuid
-          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-          description: Role unique identifier.
-        name:
-          type: string
-          description: Role's name.
-          example: "roleName"
-        entity_id:
-          type: string
-          format: uuid
-          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-          description: Entity unique identifier.
-        created_by:
-          type: string
-          format: uuid
-          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-          description: Role creator unique identifier.
-        created_at:
-          type: string
-          format: date-time
-          example: "2019-11-26 13:31:52"
-          description: Time when the channel was created.
-        updated_by:
-          type: string
-          format: uuid
-          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-          description: Role updater unique identifier.
-        updated_at:
-          type: string
-          format: date-time
-          example: "2019-11-26 13:31:52"
-          description: Time when the channel was created.
-
-    CreateRoleObj:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Role's name.
-          example: "roleName"
-        optional_actions:
-          type: array
-          description: List of optional actions.
-          items:
-            type: string
-          example:
-            [
-              "read",
-              "update",
-            ]
-        optional_members:
-          type: array
-          minItems: 0
-          description: List of optional members.
-          items:
-            type: string
-          example:
-            [
-              "5dc1ce4b-7cc9-4f12-98a6-9d74cc4980bb",
-              "c01ed106-e52d-4aa4-bed3-39f360177cfa",
-            ]
-
-    UpdateRoleObj:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Role's name.
-
-    RolesPage:
-      type: object
-      properties:
-        roles:
-          type: array
-          items:
-            $ref: '#/components/schemas/Role'
-          description: List of roles.
-        total:
-          type: integer
-          description: Total number of roles.
-          example: 1
-        offset:
-          type: integer
-          description: Number of items to skip during retrieval.
-        limit:
-          type: integer
-          example: 10
-          description: Maximum number of items to return in one page.
-
-    EntityMembersPage:
-      type: object
-      properties:
-        groups:
-          type: array
-          minItems: 0
-          uniqueItems: true
-          items:
-            $ref: "#/components/schemas/EntityMembersObj"
-        total:
-          type: integer
-          example: 1
-          description: Total number of items.
-        offset:
-          type: integer
-          description: Number of items to skip during retrieval.
-        limit:
-          type: integer
-          example: 10
-          description: Maximum number of items to return in one page.
-      required:
-        - groups
-        - total
-        - offset
-
-    RoleActionsObj:
-      type: object
-      properties:
-        actions:
-          type: array
-          description: List of actions to be added to a role.
-          items:
-            type: string
-          example:
-            [
-              "read",
-              "update",
-            ]
-
-    RoleMembersObj:
-      type: object
-      properties:
-        members:
-          type: array
-          description: List of members to be added to a role.
-          items:
-            type: string
-          example:
-            [
-              "5dc1ce4b-7cc9-4f12-98a6-9d74cc4980bb",
-              "c01ed106-e52d-4aa4-bed3-39f360177cfa",
-            ]
-
-    EntityMembersObj:
-      type: object
-      properties:
-        members:
-          type: array
-          description: List of members with assigned roles and actions.
-          items:
-            type: object
-            properties:
-              id:
-                type: string
-                format: uuid
-                description: Unique identifier of the member.
-              roles:
-                type: array
-                description: List of roles assigned to the member.
-                items:
-                  type: object
-                  properties:
-                    id:
-                      type: string
-                      format: uuid
-                      description: Unique identifier of the role.
-                    name:
-                      type: string
-                      description: Name of the role.
-                    actions:
-                      type: array
-                      description: List of actions the member can perform.
-                      items:
-                        type: string
-                    access_type:
-                      type: string
-                      description: Type of access granted.
-                      enum: [read, write, admin] # Adjust based on your actual access types.
-          example:
-            members:
-              - id: "5dc1ce4b-7cc9-4f12-98a6-9d74cc4980bb"
-                roles:
-                  - id: "a1b2c3d4-e5f6-7890-1234-56789abcdef0"
-                    name: "Admin"
-                    actions: ["create", "update", "delete"]
-                    access_type: "admin"
-              - id: "c01ed106-e52d-4aa4-bed3-39f360177cfa"
-                roles:
-                  - id: "b2c3d4e5-f678-9012-3456-789abcdef012"
-                    name: "Editor"
-                    actions: ["read", "update"]
-                    access_type: "write"
-
-
-    AvailableActionsObj:
-      type: object
-      properties:
-        available_actions:
-          type: array
-          description: List of all available actions.
-          items:
-            type: string
-          example:
-            [
-              "read",
-              "update",
-            ]
-
-  parameters:
-    RoleName:
-      name: roleName
-      description: Role's name.
-      in: path
-      schema:
-        type: string
-      required: true
-      example: "roleName"
-    RoleID:
-      name: roleID
-      description: Role ID.
-      in: path
-      schema:
-        type: string
-      required: true
-      example: "roleID"
-    RoleIDQuery:
-      name: role_id
-      description: Filter by role ID.
-      in: query
-      schema:
-        type: string
-        format: uuid
-      required: false
-      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
-    RoleNameQuery:
-      name: role_name
-      description: Filter by role name.
-      in: query
-      schema:
-        type: string
-      required: false
-      example: admin
-    ActionsQuery:
-      name: actions
-      description: Filter by actions. Multiple actions can be specified separated by comma.
-      in: query
-      schema:
-        type: string
-      required: false
-      example: "action1,action2"
-
-  requestBodies:
-    CreateRoleReq:
-      description: JSON- formatted object decsribing a new role to be created.
-      required: true
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/CreateRoleObj'
-
-    UpdateRoleReq:
-      description: JSON- formatted object decsribing a role to be updated.
-      required: true
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/UpdateRoleObj'
-
-    AddRoleActionsReq:
-      description: JSON- formatted object decsribing an action to be added to a role.
-      required: true
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/RoleActionsObj'
-
-    AddRoleMembersReq:
-      description: JSON- formatted object decsribing a member to be added to a role.
-      required: true
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/RoleMembersObj'
-
-  responses:
-    CreateRoleRes:
-      description: Role created successfully.
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/NewRole'
-
-    ListRolesRes:
-      description: Role retrieved successfully.
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/RolesPage'
-
-    GetRoleRes:
-      description: Role retrieved successfully.
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/Role'
-
-    AddRoleActionsRes:
-      description: Action added to role successfully.
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/RoleActionsObj'
-
-    ListRoleActionsRes:
-      description: Role actions retrieved successfully.
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/RoleActionsObj'
-
-    AddRoleMembersRes:
-      description: Member added to role successfully.
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/RoleMembersObj'
-
-    ListRoleMembersRes:
-      description: Role members retrieved successfully.
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/RoleMembersObj'
-
-    ListAvailableActionsRes:
-      description: Available actions retrieved successfully.
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/AvailableActionsObj'
-
-
-    ListEntityMembersRes:
-      description: Entity members retrieved successfully.
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/EntityMembersObj'
@@ -1,431 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-openapi: 3.0.1
-info:
-  title: SuperMQ twins service
-  description: |
-    HTTP API for managing digital twins and their states.
-    Some useful links:
-    - [The SuperMQ repository](https://github.com/absmach/supermq)
-  contact:
-    email: info@abstractmachines.fr
-  license:
-    name: Apache 2.0
-    url: https://github.com/absmach/supermq/blob/main/LICENSE
-  version: 0.18.0
-
-servers:
-  - url: http://localhost:9018
-  - url: https://localhost:9018
-
-tags:
-  - name: twins
-    description: Everything about your Twins
-    externalDocs:
-      description: Find out more about twins
-      url: https://docs.supermq.abstractmachines.fr/
-
-paths:
-  /twins:
-    post:
-      operationId: createTwin
-      summary: Adds new twin
-      description: |
-        Adds new twin to the list of twins owned by user identified using
-        the provided access token.
-      tags:
-        - twins
-      requestBody:
-        $ref: "#/components/requestBodies/TwinReq"
-      responses:
-        "201":
-          $ref: "#/components/responses/TwinCreateRes"
-        "400":
-          description: Failed due to malformed JSON.
-        "401":
-          description: Missing or invalid access token provided.
-        "415":
-          description: Missing or invalid content type.
-        "422":
-          description: Database can't process request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-    get:
-      operationId: getTwins
-      summary: Retrieves twins
-      description: |
-        Retrieves a list of twins. Due to performance concerns, data
-        is retrieved in subsets.
-      tags:
-        - twins
-      parameters:
-        - $ref: "#/components/parameters/Limit"
-        - $ref: "#/components/parameters/Offset"
-        - $ref: "#/components/parameters/Name"
-        - $ref: "#/components/parameters/Metadata"
-      responses:
-        "200":
-          $ref: "#/components/responses/TwinsPageRes"
-        "400":
-          description: Failed due to malformed query parameters.
-        "401":
-          description: Missing or invalid access token provided.
-        "422":
-          description: Database can't process request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-  /twins/{twinID}:
-    get:
-      operationId: getTwin
-      summary: Retrieves twin info
-      tags:
-        - twins
-      parameters:
-        - $ref: "#/components/parameters/TwinID"
-      responses:
-        "200":
-          $ref: "#/components/responses/TwinRes"
-        "400":
-          description: Failed due to malformed twin's ID.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: Twin does not exist.
-        "422":
-          description: Database can't process request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-    put:
-      operationId: updateTwin
-      summary: Updates twin info
-      description: |
-        Update is performed by replacing the current resource data with values
-        provided in a request payload. Note that the twin's ID cannot be changed.
-      tags:
-        - twins
-      parameters:
-        - $ref: "#/components/parameters/TwinID"
-      requestBody:
-        $ref: "#/components/requestBodies/TwinReq"
-      responses:
-        "200":
-          description: Twin updated.
-        "400":
-          description: Failed due to malformed twin's ID or malformed JSON.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: Twin does not exist.
-        "415":
-          description: Missing or invalid content type.
-        "422":
-          description: Database can't process request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-    delete:
-      operationId: removeTwin
-      summary: Removes a twin
-      description: Removes a twin.
-      tags:
-        - twins
-      parameters:
-        - $ref: "#/components/parameters/TwinID"
-      responses:
-        "204":
-          description: Twin removed.
-        "400":
-          description: Failed due to malformed twin's ID.
-        "401":
-          description: Missing or invalid access token provided
-        "404":
-          description: Twin does not exist.
-        "415":
-          description: Missing or invalid content type.
-        "422":
-          description: Database can't process request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-  /states/{twinID}:
-    get:
-      operationId: getStates
-      summary: Retrieves states of twin with id twinID
-      description: |
-        Retrieves a list of states. Due to performance concerns, data
-        is retrieved in subsets.
-      tags:
-        - states
-      parameters:
-        - $ref: "#/components/parameters/TwinID"
-        - $ref: "#/components/parameters/Limit"
-        - $ref: "#/components/parameters/Offset"
-      responses:
-        "200":
-          $ref: "#/components/responses/StatesPageRes"
-        "400":
-          description: Failed due to malformed query parameters.
-        "401":
-          description: Missing or invalid access token provided.
-        "404":
-          description: Twin does not exist.
-        "422":
-          description: Database can't process request.
-        "500":
-          $ref: "#/components/responses/ServiceError"
-  /health:
-    get:
-      summary: Retrieves service health check info.
-      tags:
-        - health
-      security: []
-      responses:
-        "200":
-          $ref: "#/components/responses/HealthRes"
-        "500":
-          $ref: "#/components/responses/ServiceError"
-
-components:
-  parameters:
-    Limit:
-      name: limit
-      description: Size of the subset to retrieve.
-      in: query
-      schema:
-        type: integer
-        default: 10
-        maximum: 100
-        minimum: 1
-      required: false
-    Offset:
-      name: offset
-      description: Number of items to skip during retrieval.
-      in: query
-      schema:
-        type: integer
-        default: 0
-        minimum: 0
-      required: false
-    Name:
-      name: name
-      description: Twin name
-      in: query
-      schema:
-        type: string
-      required: false
-    Metadata:
-      name: metadata
-      description: |
-        Metadata filter. Filtering is performed matching the parameter with
-        metadata on top level. Parameter is json.
-      in: query
-      schema:
-        type: string
-        minimum: 0
-      required: false
-    TwinID:
-      name: twinID
-      description: Unique twin identifier.
-      in: path
-      schema:
-        type: string
-        format: uuid
-        minimum: 1
-      required: true
-
-  schemas:
-    Attribute:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Name of the attribute.
-        channel:
-          type: string
-          description: SuperMQ channel used by attribute.
-        subtopic:
-          type: string
-          description: Subtopic used by attribute.
-        persist_state:
-          type: boolean
-          description: Trigger state creation based on the attribute.
-    Definition:
-      type: object
-      properties:
-        delta:
-          type: number
-          description: Minimal time delay before new state creation.
-        attributes:
-          type: array
-          minItems: 0
-          items:
-            $ref: "#/components/schemas/Attribute"
-    TwinReqObj:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Free-form twin name.
-        metadata:
-          type: object
-          description: Arbitrary, object-encoded twin's data.
-        definition:
-          $ref: "#/components/schemas/Definition"
-    TwinResObj:
-      type: object
-      properties:
-        owner:
-          type: string
-          description: Email address of SuperMQ user that owns twin.
-        id:
-          type: string
-          format: uuid
-          description: Unique twin identifier generated by the service.
-        name:
-          type: string
-          description: Free-form twin name.
-        revision:
-          type: number
-          description: Oridnal revision number of twin.
-        created:
-          type: string
-          format: date
-          description: Twin creation date and time.
-        updated:
-          type: string
-          format: date
-          description: Twin update date and time.
-        definitions:
-          type: array
-          minItems: 0
-          items:
-            $ref: "#/components/schemas/Definition"
-        metadata:
-          type: object
-          description: Arbitrary, object-encoded twin's data.
-    TwinsPage:
-      type: object
-      properties:
-        twins:
-          type: array
-          minItems: 0
-          items:
-            $ref: "#/components/schemas/TwinResObj"
-        total:
-          type: integer
-          description: Total number of items.
-        offset:
-          type: integer
-          description: Number of items to skip during retrieval.
-        limit:
-          type: integer
-          description: Maximum number of items to return in one page.
-      required:
-        - twins
-    State:
-      type: object
-      properties:
-        twin_id:
-          type: string
-          format: uuid
-          description: ID of twin state belongs to.
-        id:
-          type: number
-          description: State position in a time row of states.
-        created:
-          type: string
-          format: date
-          description: State creation date.
-        payload:
-          type: object
-          description: Object-encoded states's payload.
-    StatesPage:
-      type: object
-      properties:
-        states:
-          type: array
-          minItems: 0
-          items:
-            $ref: "#/components/schemas/State"
-        total:
-          type: integer
-          description: Total number of items.
-        offset:
-          type: integer
-          description: Number of items to skip during retrieval.
-        limit:
-          type: integer
-          description: Maximum number of items to return in one page.
-      required:
-        - states
-
-  requestBodies:
-    TwinReq:
-      description: JSON-formatted document describing the twin to create or update.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/TwinReqObj"
-      required: true
-
-  responses:
-    TwinCreateRes:
-      description: Created twin's relative URL (i.e. /twins/{twinID}).
-      headers:
-        Location:
-          content:
-            text/plain:
-              schema:
-                type: string
-    TwinRes:
-      description: Data retrieved.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/TwinResObj"
-      links:
-        update:
-          operationId: updateTwin
-          parameters:
-            twinID: $response.body#/id
-        delete:
-          operationId: removeTwin
-          parameters:
-            twinID: $response.body#/id
-        states:
-          operationId: getStates
-          parameters:
-            twinID: $response.body#/id
-    TwinsPageRes:
-      description: Data retrieved.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/TwinsPage"
-    StatesPageRes:
-      description: Data retrieved.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/StatesPage"
-    ServiceError:
-      description: Unexpected server-side error occurred.
-    HealthRes:
-      description: Service Health Check.
-      content:
-        application/health+json:
-          schema:
-            $ref: "./schemas/health_info.yaml"
-
-  securitySchemes:
-    bearerAuth:
-      type: http
-      scheme: bearer
-      bearerFormat: JWT
-      description: |
-        * Users access: "Authorization: Bearer <user_token>"
-
-security:
-  - bearerAuth: []
@@ -1,449 +0,0 @@
-# Auth - Authentication and Authorization service
-
-Auth service provides authentication features as an API for managing authentication keys as well as administering groups of entities - `clients` and `users`.
-
-## Authentication
-
-User service is using Auth service gRPC API to obtain login token or password reset token. Authentication key consists of the following fields:
-
- ID - key ID
- Type - one of the three types described below
- IssuerID - an ID of the SuperMQ User who issued the key
- Subject - user ID for which the key is issued
- IssuedAt - the timestamp when the key is issued
- ExpiresAt - the timestamp after which the key is invalid
-
-There are four types of authentication keys:
-
- Access key - keys issued to the user upon login request
- Refresh key - keys used to generate new access keys
- Recovery key - password recovery key
- API key - keys issued upon the user request
- Invitation key - keys used to invite new users
-
-Authentication keys are represented and distributed by the corresponding [JWT](jwt.io).
-
-User keys are issued when user logs in. Each user request (other than `registration` and `login`) contains user key that is used to authenticate the user.
-
-API keys are similar to the User keys. The main difference is that API keys have configurable expiration time. If no time is set, the key will never expire. For that reason, API keys are _the only key type that can be revoked_. This also means that, despite being used as a JWT, it requires a query to the database to validate the API key. The user with API key can perform all the same actions as the user with login key (can act on behalf of the user for Client, Channel, or user profile management), _except issuing new API keys_.
-
-Recovery key is the password recovery key. It's short-lived token used for password recovery process.
-
-For in-depth explanation of the aforementioned scenarios, as well as thorough understanding of SuperMQ, please check out the [official documentation][doc].
-
-The following actions are supported:
-
- create (all key types)
- verify (all key types)
- obtain (API keys only)
- revoke (API keys only)
-
-## Domains
-
-Domains are used to group users and clients. Each domain has a unique route that is associated with the domain. Domains are used to group users and their entities.
-
-Domain consists of the following fields:
-
- ID - UUID uniquely representing domain
- Name - name of the domain
- Tags - array of tags
- Metadata - Arbitrary, object-encoded domain's data
- Route - unique route of the domain used in messaging
- CreatedAt - timestamp at which the domain is created
- UpdatedAt - timestamp at which the domain is updated
- UpdatedBy - user that updated the domain
- CreatedBy - user that created the domain
- Status - domain status
-
-## Configuration
-
-The service is configured using the environment variables presented in the following table. Note that any unset variables will be replaced with their default values.
-
-| Variable                            | Description                                                                          | Default                        |
-| ----------------------------------- | ------------------------------------------------------------------------------------ | ------------------------------ |
-| SMQ_AUTH_LOG_LEVEL                  | Log level for the Auth service (debug, info, warn, error)                            | info                           |
-| SMQ_AUTH_DB_HOST                    | Database host address                                                                | localhost                      |
-| SMQ_AUTH_DB_PORT                    | Database host port                                                                   | 5432                           |
-| SMQ_AUTH_DB_USER                    | Database user                                                                        | supermq                        |
-| SMQ_AUTH_DB_PASSWORD                | Database password                                                                    | supermq                        |
-| SMQ_AUTH_DB_NAME                    | Name of the database used by the service                                             | auth                           |
-| SMQ_AUTH_DB_SSL_MODE                | Database connection SSL mode (disable, require, verify-ca, verify-full)              | disable                        |
-| SMQ_AUTH_DB_SSL_CERT                | Path to the PEM encoded certificate file                                             | ""                             |
-| SMQ_AUTH_DB_SSL_KEY                 | Path to the PEM encoded key file                                                     | ""                             |
-| SMQ_AUTH_DB_SSL_ROOT_CERT           | Path to the PEM encoded root certificate file                                        | ""                             |
-| SMQ_AUTH_HTTP_HOST                  | Auth service HTTP host                                                               | ""                             |
-| SMQ_AUTH_HTTP_PORT                  | Auth service HTTP port                                                               | 8189                           |
-| SMQ_AUTH_HTTP_SERVER_CERT           | Path to the PEM encoded HTTP server certificate file                                 | ""                             |
-| SMQ_AUTH_HTTP_SERVER_KEY            | Path to the PEM encoded HTTP server key file                                         | ""                             |
-| SMQ_AUTH_GRPC_HOST                  | Auth service gRPC host                                                               | ""                             |
-| SMQ_AUTH_GRPC_PORT                  | Auth service gRPC port                                                               | 8181                           |
-| SMQ_AUTH_GRPC_SERVER_CERT           | Path to the PEM encoded gRPC server certificate file                                 | ""                             |
-| SMQ_AUTH_GRPC_SERVER_KEY            | Path to the PEM encoded gRPC server key file                                         | ""                             |
-| SMQ_AUTH_GRPC_SERVER_CA_CERTS       | Path to the PEM encoded gRPC server CA certificate file                              | ""                             |
-| SMQ_AUTH_GRPC_CLIENT_CA_CERTS       | Path to the PEM encoded gRPC client CA certificate file                              | ""                             |
-| SMQ_AUTH_SECRET_KEY                 | String used for signing tokens                                                       | secret                         |
-| SMQ_AUTH_ACCESS_TOKEN_DURATION      | The access token expiration period                                                   | 1h                             |
-| SMQ_AUTH_REFRESH_TOKEN_DURATION     | The refresh token expiration period                                                  | 24h                            |
-| SMQ_AUTH_INVITATION_DURATION        | The invitation token expiration period                                               | 168h                           |
-| SMQ_AUTH_CACHE_URL                  | Redis URL for caching PAT scopes                                                     | redis://localhost:6379/0       |
-| SMQ_AUTH_CACHE_KEY_DURATION         | Duration for which PAT scope cache keys are valid                                    | 10m                            |
-| SMQ_SPICEDB_HOST                    | SpiceDB host address                                                                 | localhost                      |
-| SMQ_SPICEDB_PORT                    | SpiceDB host port                                                                    | 50051                          |
-| SMQ_SPICEDB_PRE_SHARED_KEY          | SpiceDB pre-shared key                                                               | 12345678                       |
-| SMQ_SPICEDB_SCHEMA_FILE             | Path to SpiceDB schema file                                                          | ./docker/spicedb/schema.zed    |
-| SMQ_JAEGER_URL                      | Jaeger server URL                                                                    | <http://jaeger:4318/v1/traces> |
-| SMQ_JAEGER_TRACE_RATIO              | Jaeger sampling ratio                                                                | 1.0                            |
-| SMQ_SEND_TELEMETRY                  | Send telemetry to supermq call home server                                           | true                           |
-| SMQ_ADAPTER_INSTANCE_ID        | Adapter instance ID                                                                  | ""                             |
-| SMQ_CALLOUT_URLS               | Comma-separated list of callout URLs                                                 | ""                             |
-| SMQ_CALLOUT_METHOD             | Callout method                                                                       | POST                           |
-| SMQ_CALLOUT_TLS_VERIFICATION   | Enable TLS verification for callouts                                                 | true                           |
-| SMQ_CALLOUT_TIMEOUT            | Callout timeout                                                                      | 10s                            |
-| SMQ_CALLOUT_CA_CERT            | Path to CA certificate file                                                          | ""                             |
-| SMQ_CALLOUT_CERT               | Path to client certificate file                                                      | ""                             |
-| SMQ_CALLOUT_KEY                | Path to client key file                                                              | ""                             |
-| SMQ_CALLOUT_OPERATIONS | Invoke callout if the authorization permission matches any of the given permissions. | ""                             |
-
-## Deployment
-
-The service itself is distributed as Docker container. Check the [`auth`](https://github.com/absmach/supermq/blob/main/docker/docker-compose.yaml) service section in docker-compose file to see how service is deployed.
-
-Running this service outside of container requires working instance of the postgres database, SpiceDB, and Jaeger server.
-To start the service outside of the container, execute the following shell script:
-
-```bash
-# download the latest version of the service
-git clone https://github.com/absmach/supermq
-
-cd supermq
-
-# compile the service
-make auth
-
-# copy binary to bin
-make install
-
-# set the environment variables and run the service
-SMQ_AUTH_LOG_LEVEL=info \
-SMQ_AUTH_DB_HOST=localhost \
-SMQ_AUTH_DB_PORT=5432 \
-SMQ_AUTH_DB_USER=supermq \
-SMQ_AUTH_DB_PASSWORD=supermq \
-SMQ_AUTH_DB_NAME=auth \
-SMQ_AUTH_DB_SSL_MODE=disable \
-SMQ_AUTH_DB_SSL_CERT="" \
-SMQ_AUTH_DB_SSL_KEY="" \
-SMQ_AUTH_DB_SSL_ROOT_CERT="" \
-SMQ_AUTH_HTTP_HOST=localhost \
-SMQ_AUTH_HTTP_PORT=8189 \
-SMQ_AUTH_HTTP_SERVER_CERT="" \
-SMQ_AUTH_HTTP_SERVER_KEY="" \
-SMQ_AUTH_GRPC_HOST=localhost \
-SMQ_AUTH_GRPC_PORT=8181 \
-SMQ_AUTH_GRPC_SERVER_CERT="" \
-SMQ_AUTH_GRPC_SERVER_KEY="" \
-SMQ_AUTH_GRPC_SERVER_CA_CERTS="" \
-SMQ_AUTH_GRPC_CLIENT_CA_CERTS="" \
-SMQ_AUTH_SECRET_KEY=secret \
-SMQ_AUTH_ACCESS_TOKEN_DURATION=1h \
-SMQ_AUTH_REFRESH_TOKEN_DURATION=24h \
-SMQ_AUTH_INVITATION_DURATION=168h \
-SMQ_SPICEDB_HOST=localhost \
-SMQ_SPICEDB_PORT=50051 \
-SMQ_SPICEDB_PRE_SHARED_KEY=12345678 \
-SMQ_SPICEDB_SCHEMA_FILE=./docker/spicedb/schema.zed \
-SMQ_JAEGER_URL=http://localhost:14268/api/traces \
-SMQ_JAEGER_TRACE_RATIO=1.0 \
-SMQ_SEND_TELEMETRY=true \
-SMQ_AUTH_ADAPTER_INSTANCE_ID="" \
-SMQ_CALLOUT_URLS="" \
-SMQ_CALLOUT_METHOD="POST" \
-SMQ_CALLOUT_TLS_VERIFICATION=true \
-$GOBIN/supermq-auth
-```
-
-Setting `SMQ_AUTH_HTTP_SERVER_CERT` and `SMQ_AUTH_HTTP_SERVER_KEY` will enable TLS against the service. The service expects a file in PEM format for both the certificate and the key.
-Setting `SMQ_AUTH_GRPC_SERVER_CERT` and `SMQ_AUTH_GRPC_SERVER_KEY` will enable TLS against the service. The service expects a file in PEM format for both the certificate and the key. Setting `SMQ_AUTH_GRPC_SERVER_CA_CERTS` will enable TLS against the service trusting only those CAs that are provided. The service expects a file in PEM format of trusted CAs. Setting `SMQ_AUTH_GRPC_CLIENT_CA_CERTS` will enable TLS against the service trusting only those CAs that are provided. The service expects a file in PEM format of trusted CAs.
-
-## Personal Access Tokens (PATs)
-
-Personal Access Tokens (PATs) provide a secure way to authenticate with SuperMQ APIs without using your primary credentials. They are particularly useful for automation, CI/CD pipelines, and integrating with third-party services.
-
-### Overview
-
-PATs in SuperMQ are designed with the following features:
-
- **Scoped Access**: Each token can be limited to specific operations on specific resources
- **Expiration Control**: Set custom expiration times for tokens
- **Revocable**: Tokens can be revoked at any time
- **Auditable**: Track when tokens were last used
- **Secure**: Tokens are stored as hashes, not in plaintext
-
-### Token Structure
-
-A PAT consists of three parts separated by underscores:
-
-```
-pat_<encoded-user-and-pat-id>_<random-string>
-```
-
-Where:
-
- `pat` is a fixed prefix
- `<encoded-user-and-pat-id>` is a base64-encoded combination of the user ID and PAT ID
- `<random-string>` is a randomly generated string for additional security
-
-### PAT Operations
-
-SuperMQ supports the following operations for PATs:
-
-| Operation   | Description                          |
-| ----------- | ------------------------------------ |
-| `create`    | Create a new resource                |
-| `read`      | Read/view a resource                 |
-| `list`      | List resources                       |
-| `update`    | Update/modify a resource             |
-| `delete`    | Delete a resource                    |
-| `share`     | Share a resource with others         |
-| `unshare`   | Remove sharing permissions           |
-| `publish`   | Publish messages to a channel        |
-| `subscribe` | Subscribe to messages from a channel |
-
-### Entity Types
-
-PATs can be scoped to the following entity types:
-
-| Entity Type  | Description            |
-| ------------ | ---------------------- |
-| `groups`     | User groups            |
-| `channels`   | Communication channels |
-| `clients`    | Client applications    |
-| `domains`    | Organizational domains |
-| `users`      | User accounts          |
-| `dashboards` | Dashboard interfaces   |
-| `messages`   | Message content        |
-
-### API Examples
-
-#### Creating a PAT
-
-```bash
-curl --location 'http://localhost:9001/pats' \
--header 'Content-Type: application/json' \
--header 'Authorization: Bearer <access_token>' \
--data '{
-    "name": "test pat",
-    "description": "testing pat",
-    "duration": "24h"
-}'
-```
-
-Response:
-
-```json
-{
-  "id": "a2500226-95dc-4285-87e2-e693e4a0a976",
-  "user_id": "user123",
-  "name": "pat 1",
-  "description": "for creating any client or channel",
-  "secret": "pat_dXNlcjEyM19hMjUwMDIyNi05NWRjLTQyODUtODdlMi1lNjkzZTRhMGE5NzY=_randomstring...",
-  "issued_at": "2025-02-27T11:20:59Z",
-  "expires_at": "2025-02-28T11:20:59Z"
-}
-```
-
-#### Adding Scopes to a PAT
-
-```bash
-curl --location --request PATCH 'http://localhost:9001/pats/a2500226-95dc-4285-87e2-e693e4a0a976/scope/add' \
--header 'Content-Type: application/json' \
--header 'Authorization: Bearer <access_token>' \
--data '{
-    "scopes": [
-        {
-            "optional_domain_id": "c16c980a-9d4c-4793-8fb2-c81304cf1d9f",
-            "entity_type": "clients",
-            "operation": "create",
-            "entity_id": "*"
-        },
-        {
-            "optional_domain_id": "c16c980a-9d4c-4793-8fb2-c81304cf1d9f",
-            "entity_type": "channels",
-            "operation": "create",
-            "entity_id": "cfbc6936-5748-4339-a8ef-37b64b02bc96"
-        },
-        {
-            "entity_type": "dashboards",
-            "optional_domain_id": "c16c980a-9d4c-4793-8fb2-c81304cf1d9f",
-            "operation": "read",
-            "entity_id": "*"
-        }
-    ]
-}'
-```
-
-#### Listing PATs
-
-```bash
-curl --location 'http://localhost:9001/pats' \
--header 'Authorization: Bearer <access_token>'
-```
-
-#### Listing Scopes for a PAT
-
-```bash
-curl --location 'http://localhost:9001/pats/a2500226-95dc-4285-87e2-e693e4a0a976/scopes' \
--header 'Authorization: Bearer <access_token>'
-```
-
-#### Revoking a PAT
-
-```bash
-curl --location --request PATCH 'http://localhost:9001/pats/a2500226-95dc-4285-87e2-e693e4a0a976/revoke' \
--header 'Authorization: Bearer <access_token>'
-```
-
-#### Resetting a PAT Secret
-
-```bash
-curl --location --request PATCH 'http://localhost:9001/pats/a2500226-95dc-4285-87e2-e693e4a0a976/reset' \
--header 'Content-Type: application/json' \
--header 'Authorization: Bearer <access_token>' \
--data '{
-    "duration": "720h"
-}'
-```
-
-### Using PATs for Authentication
-
-When making API requests, include the PAT in the Authorization header:
-
-```
-Authorization: Bearer pat_<encoded-user-and-pat-id>_<random-string>
-```
-
-#### Example: Creating a Client Using PAT
-
-```bash
-curl --location 'http://localhost:9006/c16c980a-9d4c-4793-8fb2-c81304cf1d9f/clients' \
--header 'accept: application/json' \
--header 'Content-Type: application/json' \
--header 'Authorization: Bearer pat_etKoiXKTR6a0zdgsBHC00qJQAiaV3EKFh+Lmk+SgqXY=_u7@5fyjgti9V@#Bw^bS*SPmX3OnH=HTvKwmIbxIuyBjoI|6FASo9egjKD^u-M$b|2Dpt3CXZtv&4k+hmYYjk&C$57AV59P%-iDV0' \
--data '{
-  "name": "test client",
-  "tags": [
-    "tag1",
-    "tag2"
-  ],
-  "metadata":{"units":"km"},
-  "status": "enabled"
-}'
-```
-
-This example shows how to create a client in a specific domain (`c16c980a-9d4c-4793-8fb2-c81304cf1d9f`) using a PAT for authentication. The PAT must have the appropriate scope (e.g., `clients` entity type with `create` operation) for this domain.
-
-### Wildcard Entity IDs
-
-When defining scopes for PATs, you can use the wildcard character `*` for the `entity_id` field to grant permissions for all entities of a specific type. This is particularly useful for automation tasks that need to operate on multiple resources.
-
-For example:
-
- `"entity_id": "*"` - Grants permission for all entities of the specified type
- `"entity_id": "specific-id"` - Grants permission only for the entity with the specified ID
-
-Using wildcards should be done carefully, as they grant broader permissions. Always follow the principle of least privilege by granting only the permissions necessary for the intended use case.
-
-### Scope Examples
-
-#### Allow Creating Any Client in a Domain
-
-```json
-{
-  "optional_domain_id": "domain_id",
-  "entity_type": "clients",
-  "operation": "create",
-  "entity_id": "*"
-}
-```
-
-This scope allows the PAT to create any client within the specified domain. The wildcard `*` for `entity_id` means the token can create any client, not just a specific one.
-
-#### Allow Publishing to a Specific Channel
-
-```json
-{
-  "optional_domain_id": "domain_id",
-  "entity_type": "channels",
-  "operation": "publish",
-  "entity_id": "channel_id"
-}
-```
-
-This scope restricts the PAT to only publish to a specific channel (`channel_id`) within the specified domain. No wildcard is used, so the permission is limited to just this one channel.
-
-#### Allow Reading All Dashboards
-
-```json
-{
-  "optional_domain_id": "domain_id",
-  "entity_type": "dashboards",
-  "operation": "read",
-  "entity_id": "*"
-}
-```
-
-This scope allows the PAT to read all dashboards within the specified domain. The wildcard `*` for `entity_id` means the token can read any dashboard in that domain.
-
-### Best Practices
-
-1. **Limit Scope**: Always use the principle of least privilege when creating PATs
-2. **Set Expirations**: Use reasonable expiration times for tokens
-3. **Rotate Regularly**: Reset token secrets periodically
-4. **Audit Usage**: Monitor when tokens are used
-5. **Revoke Unused**: Remove tokens that are no longer needed
-
-### Implementation Details
-
-PATs are stored in the database with the following schema:
-
-```sql
-CREATE TABLE IF NOT EXISTS pats (
-    id              VARCHAR(36) PRIMARY KEY,
-    name            VARCHAR(254) NOT NULL,
-    user_id         VARCHAR(36),
-    description     TEXT,
-    secret          TEXT,
-    issued_at       TIMESTAMPTZ,
-    expires_at      TIMESTAMPTZ,
-    updated_at      TIMESTAMPTZ,
-    revoked         BOOLEAN,
-    revoked_at      TIMESTAMPTZ,
-    last_used_at    TIMESTAMPTZ,
-    UNIQUE          (id, name, secret)
-)
-
-CREATE TABLE IF NOT EXISTS pat_scopes (
-    id                  VARCHAR(36) PRIMARY KEY,
-    pat_id              VARCHAR(36) REFERENCES pats(id) ON DELETE CASCADE,
-    optional_domain_id  VARCHAR(36),
-    entity_type         VARCHAR(50) NOT NULL,
-    operation           VARCHAR(50) NOT NULL,
-    entity_id           VARCHAR(50) NOT NULL,
-    UNIQUE (pat_id, optional_domain_id, entity_type, operation, entity_id)
-)
-```
-
-### Authorization
-
-When a PAT is used for authentication:
-
-1. The system parses the token to extract the user ID and PAT ID
-2. It verifies the token hasn't been revoked or expired
-3. It checks if the requested operation is allowed by the token's scopes
-4. If all checks pass, the operation is authorized
-
-## Usage
-
-For more information about service capabilities and its usage, please check out the [API documentation](https://docs.api.supermq.abstractmachines.fr/?urls.primaryName=auth.yaml).
-
-[doc]: https://docs.supermq.abstractmachines.fr
@@ -1,5 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Package api contains implementation of Auth service HTTP API.
-package api
@@ -1,179 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package auth
-
-import (
-	"context"
-	"time"
-
-	grpcAuthV1 "github.com/absmach/supermq/api/grpc/auth/v1"
-	"github.com/absmach/supermq/auth"
-	grpcapi "github.com/absmach/supermq/auth/api/grpc"
-	"github.com/go-kit/kit/endpoint"
-	kitgrpc "github.com/go-kit/kit/transport/grpc"
-	"google.golang.org/grpc"
-)
-
-const authSvcName = "auth.v1.AuthService"
-
-type authGrpcClient struct {
-	authenticate    endpoint.Endpoint
-	authenticatePAT endpoint.Endpoint
-	authorize       endpoint.Endpoint
-	authorizePAT    endpoint.Endpoint
-	timeout         time.Duration
-}
-
-var _ grpcAuthV1.AuthServiceClient = (*authGrpcClient)(nil)
-
-// NewAuthClient returns new auth gRPC client instance.
-func NewAuthClient(conn *grpc.ClientConn, timeout time.Duration) grpcAuthV1.AuthServiceClient {
-	return &authGrpcClient{
-		authenticate: kitgrpc.NewClient(
-			conn,
-			authSvcName,
-			"Authenticate",
-			encodeIdentifyRequest,
-			decodeIdentifyResponse,
-			grpcAuthV1.AuthNRes{},
-		).Endpoint(),
-		authenticatePAT: kitgrpc.NewClient(
-			conn,
-			authSvcName,
-			"AuthenticatePAT",
-			encodeIdentifyRequest,
-			decodeIdentifyPATResponse,
-			grpcAuthV1.AuthNRes{},
-		).Endpoint(),
-		authorize: kitgrpc.NewClient(
-			conn,
-			authSvcName,
-			"Authorize",
-			encodeAuthorizeRequest,
-			decodeAuthorizeResponse,
-			grpcAuthV1.AuthZRes{},
-		).Endpoint(),
-		authorizePAT: kitgrpc.NewClient(
-			conn,
-			authSvcName,
-			"AuthorizePAT",
-			encodeAuthorizePATRequest,
-			decodeAuthorizeResponse,
-			grpcAuthV1.AuthZRes{},
-		).Endpoint(),
-		timeout: timeout,
-	}
-}
-
-func (client authGrpcClient) Authenticate(ctx context.Context, token *grpcAuthV1.AuthNReq, _ ...grpc.CallOption) (*grpcAuthV1.AuthNRes, error) {
-	ctx, cancel := context.WithTimeout(ctx, client.timeout)
-	defer cancel()
-
-	res, err := client.authenticate(ctx, authenticateReq{token: token.GetToken()})
-	if err != nil {
-		return &grpcAuthV1.AuthNRes{}, grpcapi.DecodeError(err)
-	}
-	ir := res.(authenticateRes)
-	return &grpcAuthV1.AuthNRes{Id: ir.id, UserId: ir.userID, UserRole: uint32(ir.userRole), Verified: ir.verified}, nil
-}
-
-func encodeIdentifyRequest(_ context.Context, grpcReq any) (any, error) {
-	req := grpcReq.(authenticateReq)
-	return &grpcAuthV1.AuthNReq{Token: req.token}, nil
-}
-
-func decodeIdentifyResponse(_ context.Context, grpcRes any) (any, error) {
-	res := grpcRes.(*grpcAuthV1.AuthNRes)
-	return authenticateRes{id: res.GetId(), userID: res.GetUserId(), userRole: auth.Role(res.UserRole), verified: res.GetVerified()}, nil
-}
-
-func (client authGrpcClient) AuthenticatePAT(ctx context.Context, token *grpcAuthV1.AuthNReq, _ ...grpc.CallOption) (*grpcAuthV1.AuthNRes, error) {
-	ctx, cancel := context.WithTimeout(ctx, client.timeout)
-	defer cancel()
-
-	res, err := client.authenticatePAT(ctx, authenticateReq{token: token.GetToken()})
-	if err != nil {
-		return &grpcAuthV1.AuthNRes{}, grpcapi.DecodeError(err)
-	}
-	ir := res.(authenticateRes)
-	return &grpcAuthV1.AuthNRes{Id: ir.id, UserId: ir.userID, UserRole: uint32(ir.userRole)}, nil
-}
-
-func decodeIdentifyPATResponse(_ context.Context, grpcRes any) (any, error) {
-	res := grpcRes.(*grpcAuthV1.AuthNRes)
-	return authenticateRes{id: res.GetId(), userID: res.GetUserId(), userRole: auth.Role(res.UserRole)}, nil
-}
-
-func (client authGrpcClient) Authorize(ctx context.Context, req *grpcAuthV1.AuthZReq, _ ...grpc.CallOption) (r *grpcAuthV1.AuthZRes, err error) {
-	ctx, cancel := context.WithTimeout(ctx, client.timeout)
-	defer cancel()
-
-	res, err := client.authorize(ctx, authReq{
-		Domain:      req.GetDomain(),
-		SubjectType: req.GetSubjectType(),
-		Subject:     req.GetSubject(),
-		SubjectKind: req.GetSubjectKind(),
-		Relation:    req.GetRelation(),
-		Permission:  req.GetPermission(),
-		ObjectType:  req.GetObjectType(),
-		Object:      req.GetObject(),
-	})
-	if err != nil {
-		return &grpcAuthV1.AuthZRes{}, grpcapi.DecodeError(err)
-	}
-
-	ar := res.(authorizeRes)
-	return &grpcAuthV1.AuthZRes{Authorized: ar.authorized, Id: ar.id}, nil
-}
-
-func decodeAuthorizeResponse(_ context.Context, grpcRes any) (any, error) {
-	res := grpcRes.(*grpcAuthV1.AuthZRes)
-	return authorizeRes{authorized: res.Authorized, id: res.Id}, nil
-}
-
-func encodeAuthorizeRequest(_ context.Context, grpcReq any) (any, error) {
-	req := grpcReq.(authReq)
-	return &grpcAuthV1.AuthZReq{
-		Domain:      req.Domain,
-		SubjectType: req.SubjectType,
-		Subject:     req.Subject,
-		SubjectKind: req.SubjectKind,
-		Relation:    req.Relation,
-		Permission:  req.Permission,
-		ObjectType:  req.ObjectType,
-		Object:      req.Object,
-	}, nil
-}
-
-func (client authGrpcClient) AuthorizePAT(ctx context.Context, req *grpcAuthV1.AuthZPatReq, _ ...grpc.CallOption) (r *grpcAuthV1.AuthZRes, err error) {
-	ctx, cancel := context.WithTimeout(ctx, client.timeout)
-	defer cancel()
-
-	res, err := client.authorizePAT(ctx, authPATReq{
-		userID:           req.GetUserId(),
-		patID:            req.GetPatId(),
-		entityType:       auth.EntityType(req.GetEntityType()),
-		optionalDomainID: req.GetOptionalDomainId(),
-		operation:        auth.Operation(req.GetOperation()),
-		entityID:         req.GetEntityId(),
-	})
-	if err != nil {
-		return &grpcAuthV1.AuthZRes{}, grpcapi.DecodeError(err)
-	}
-
-	ar := res.(authorizeRes)
-	return &grpcAuthV1.AuthZRes{Authorized: ar.authorized, Id: ar.id}, nil
-}
-
-func encodeAuthorizePATRequest(_ context.Context, grpcReq any) (any, error) {
-	req := grpcReq.(authPATReq)
-	return &grpcAuthV1.AuthZPatReq{
-		UserId:           req.userID,
-		PatId:            req.patID,
-		EntityType:       uint32(req.entityType),
-		OptionalDomainId: req.optionalDomainID,
-		Operation:        uint32(req.operation),
-		EntityId:         req.entityID,
-	}, nil
-}
@@ -1,5 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Package auth contains implementation of Auth service gRPC API.
-package auth
@@ -1,83 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package auth
-
-import (
-	"context"
-
-	"github.com/absmach/supermq/auth"
-	"github.com/absmach/supermq/pkg/policies"
-	"github.com/go-kit/kit/endpoint"
-)
-
-func authenticateEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(authenticateReq)
-		if err := req.validate(); err != nil {
-			return authenticateRes{}, err
-		}
-
-		key, err := svc.Identify(ctx, req.token)
-		if err != nil {
-			return authenticateRes{}, err
-		}
-
-		return authenticateRes{userID: key.Subject, userRole: key.Role, verified: key.Verified}, nil
-	}
-}
-
-func authenticatePATEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(authenticateReq)
-		if err := req.validate(); err != nil {
-			return authenticateRes{}, err
-		}
-
-		pat, err := svc.IdentifyPAT(ctx, req.token)
-		if err != nil {
-			return authenticateRes{}, err
-		}
-
-		return authenticateRes{id: pat.ID, userID: pat.User, userRole: pat.Role}, nil
-	}
-}
-
-func authorizeEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(authReq)
-
-		if err := req.validate(); err != nil {
-			return authorizeRes{}, err
-		}
-		err := svc.Authorize(ctx, policies.Policy{
-			Domain:      req.Domain,
-			SubjectType: req.SubjectType,
-			SubjectKind: req.SubjectKind,
-			Subject:     req.Subject,
-			Relation:    req.Relation,
-			Permission:  req.Permission,
-			ObjectType:  req.ObjectType,
-			Object:      req.Object,
-		})
-		if err != nil {
-			return authorizeRes{authorized: false}, err
-		}
-		return authorizeRes{authorized: true}, nil
-	}
-}
-
-func authorizePATEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(authPATReq)
-
-		if err := req.validate(); err != nil {
-			return authorizeRes{}, err
-		}
-		err := svc.AuthorizePAT(ctx, req.userID, req.patID, req.entityType, req.optionalDomainID, req.operation, req.entityID)
-		if err != nil {
-			return authorizeRes{authorized: false}, err
-		}
-		return authorizeRes{authorized: true}, nil
-	}
-}
@@ -1,374 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package auth_test
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"testing"
-	"time"
-
-	grpcAuthV1 "github.com/absmach/supermq/api/grpc/auth/v1"
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-	grpcapi "github.com/absmach/supermq/auth/api/grpc/auth"
-	"github.com/absmach/supermq/internal/testsutil"
-	"github.com/absmach/supermq/pkg/errors"
-	svcerr "github.com/absmach/supermq/pkg/errors/service"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-const (
-	port            = 8081
-	secret          = "secret"
-	email           = "test@example.com"
-	id              = "testID"
-	clientsType     = "clients"
-	usersType       = "users"
-	description     = "Description"
-	groupName       = "smqx"
-	adminPermission = "admin"
-
-	authoritiesObj  = "authorities"
-	memberRelation  = "member"
-	loginDuration   = 30 * time.Minute
-	refreshDuration = 24 * time.Hour
-	invalidDuration = 7 * 24 * time.Hour
-	validToken      = "valid"
-	inValidToken    = "invalid"
-	validPATToken   = "valid"
-	inValidPATToken = "invalid"
-	validPolicy     = "valid"
-)
-
-var (
-	domainID = testsutil.GenerateUUID(&testing.T{})
-	authAddr = fmt.Sprintf("localhost:%d", port)
-	clientID = testsutil.GenerateUUID(&testing.T{})
-)
-
-func startGRPCServer(svc auth.Service, port int) *grpc.Server {
-	listener, _ := net.Listen("tcp", fmt.Sprintf(":%d", port))
-	server := grpc.NewServer()
-	grpcAuthV1.RegisterAuthServiceServer(server, grpcapi.NewAuthServer(svc))
-	go func() {
-		err := server.Serve(listener)
-		assert.Nil(&testing.T{}, err, fmt.Sprintf(`"Unexpected error creating auth server %s"`, err))
-	}()
-
-	return server
-}
-
-func TestIdentify(t *testing.T) {
-	conn, err := grpc.NewClient(authAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	assert.Nil(t, err, fmt.Sprintf("Unexpected error creating client connection %s", err))
-	defer conn.Close()
-	grpcClient := grpcapi.NewAuthClient(conn, time.Second)
-
-	cases := []struct {
-		desc   string
-		token  string
-		idt    *grpcAuthV1.AuthNRes
-		svcErr error
-		err    error
-	}{
-		{
-			desc:  "authenticate user with valid user token",
-			token: validToken,
-			idt:   &grpcAuthV1.AuthNRes{UserId: id, UserRole: uint32(auth.UserRole)},
-			err:   nil,
-		},
-		{
-			desc:   "authenticate user with invalid user token",
-			token:  "invalid",
-			idt:    &grpcAuthV1.AuthNRes{},
-			svcErr: svcerr.ErrAuthentication,
-			err:    svcerr.ErrAuthentication,
-		},
-		{
-			desc:  "authenticate user with empty token",
-			token: "",
-			idt:   &grpcAuthV1.AuthNRes{},
-			err:   apiutil.ErrBearerToken,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.desc, func(t *testing.T) {
-			svcCall := svc.On("Identify", mock.Anything, mock.Anything).Return(auth.Key{Subject: id, Role: auth.UserRole}, tc.svcErr)
-			idt, err := grpcClient.Authenticate(context.Background(), &grpcAuthV1.AuthNReq{Token: tc.token})
-			if idt != nil {
-				assert.Equal(t, tc.idt, idt, fmt.Sprintf("%s: expected %v got %v", tc.desc, tc.idt, idt))
-			}
-			assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
-			svcCall.Unset()
-		})
-	}
-}
-
-func TestAuthorize(t *testing.T) {
-	conn, err := grpc.NewClient(authAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	assert.Nil(t, err, fmt.Sprintf("Unexpected error creating client connection %s", err))
-	defer conn.Close()
-
-	grpcClient := grpcapi.NewAuthClient(conn, time.Second)
-
-	cases := []struct {
-		desc         string
-		token        string
-		authRequest  *grpcAuthV1.AuthZReq
-		authResponse *grpcAuthV1.AuthZRes
-		err          error
-	}{
-		{
-			desc:  "authorize user with authorized token",
-			token: validToken,
-			authRequest: &grpcAuthV1.AuthZReq{
-				Subject:     id,
-				SubjectType: usersType,
-				Object:      authoritiesObj,
-				ObjectType:  usersType,
-				Relation:    memberRelation,
-				Permission:  adminPermission,
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: true},
-			err:          nil,
-		},
-		{
-			desc:  "authorize user with unauthorized token",
-			token: inValidToken,
-			authRequest: &grpcAuthV1.AuthZReq{
-				Subject:     id,
-				SubjectType: usersType,
-				Object:      authoritiesObj,
-				ObjectType:  usersType,
-				Relation:    memberRelation,
-				Permission:  adminPermission,
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: false},
-			err:          svcerr.ErrAuthorization,
-		},
-		{
-			desc:  "authorize user with empty subject",
-			token: validToken,
-			authRequest: &grpcAuthV1.AuthZReq{
-				Subject:     "",
-				SubjectType: usersType,
-				Object:      authoritiesObj,
-				ObjectType:  usersType,
-				Relation:    memberRelation,
-				Permission:  adminPermission,
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: false},
-			err:          apiutil.ErrMissingPolicySub,
-		},
-		{
-			desc:  "authorize user with empty subject type",
-			token: validToken,
-			authRequest: &grpcAuthV1.AuthZReq{
-				Subject:     id,
-				SubjectType: "",
-				Object:      authoritiesObj,
-				ObjectType:  usersType,
-				Relation:    memberRelation,
-				Permission:  adminPermission,
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: false},
-			err:          apiutil.ErrMissingPolicySub,
-		},
-		{
-			desc:  "authorize user with empty object",
-			token: validToken,
-			authRequest: &grpcAuthV1.AuthZReq{
-				Subject:     id,
-				SubjectType: usersType,
-				Object:      "",
-				ObjectType:  usersType,
-				Relation:    memberRelation,
-				Permission:  adminPermission,
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: false},
-			err:          apiutil.ErrMissingPolicyObj,
-		},
-		{
-			desc:  "authorize user with empty object type",
-			token: validToken,
-			authRequest: &grpcAuthV1.AuthZReq{
-				Subject:     id,
-				SubjectType: usersType,
-				Object:      authoritiesObj,
-				ObjectType:  "",
-				Relation:    memberRelation,
-				Permission:  adminPermission,
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: false},
-			err:          apiutil.ErrMissingPolicyObj,
-		},
-		{
-			desc:  "authorize user with empty permission",
-			token: validToken,
-			authRequest: &grpcAuthV1.AuthZReq{
-				Subject:     id,
-				SubjectType: usersType,
-				Object:      authoritiesObj,
-				ObjectType:  usersType,
-				Relation:    memberRelation,
-				Permission:  "",
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: false},
-			err:          apiutil.ErrMalformedPolicyPer,
-		},
-	}
-	for _, tc := range cases {
-		t.Run(tc.desc, func(t *testing.T) {
-			svcCall := svc.On("Authorize", mock.Anything, mock.Anything).Return(tc.err)
-			ar, err := grpcClient.Authorize(context.Background(), tc.authRequest)
-			if ar != nil {
-				assert.Equal(t, tc.authResponse, ar, fmt.Sprintf("%s: expected %v got %v", tc.desc, tc.authResponse, ar))
-			}
-			assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
-			svcCall.Unset()
-		})
-	}
-}
-
-func TestIdentifyPAT(t *testing.T) {
-	conn, err := grpc.NewClient(authAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	assert.Nil(t, err, fmt.Sprintf("Unexpected error creating client connection %s", err))
-	defer conn.Close()
-	grpcClient := grpcapi.NewAuthClient(conn, time.Second)
-
-	cases := []struct {
-		desc   string
-		token  string
-		idt    *grpcAuthV1.AuthNRes
-		svcErr error
-		err    error
-	}{
-		{
-			desc:  "authenticate user with valid user token",
-			token: validToken,
-			idt:   &grpcAuthV1.AuthNRes{Id: id, UserId: clientID},
-			err:   nil,
-		},
-		{
-			desc:   "authenticate user with invalid user token",
-			token:  "invalid",
-			idt:    &grpcAuthV1.AuthNRes{},
-			svcErr: svcerr.ErrAuthentication,
-			err:    svcerr.ErrAuthentication,
-		},
-		{
-			desc:  "authenticate user with empty token",
-			token: "",
-			idt:   &grpcAuthV1.AuthNRes{},
-			err:   apiutil.ErrBearerToken,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.desc, func(t *testing.T) {
-			svcCall := svc.On("IdentifyPAT", mock.Anything, tc.token).Return(auth.PAT{ID: id, User: clientID, IssuedAt: time.Now()}, tc.svcErr)
-			idt, err := grpcClient.AuthenticatePAT(context.Background(), &grpcAuthV1.AuthNReq{Token: tc.token})
-			if idt != nil {
-				assert.Equal(t, tc.idt, idt, fmt.Sprintf("%s: expected %v got %v", tc.desc, tc.idt, idt))
-			}
-			assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
-			svcCall.Unset()
-		})
-	}
-}
-
-func TestAuthorizePAT(t *testing.T) {
-	conn, err := grpc.NewClient(authAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	assert.Nil(t, err, fmt.Sprintf("Unexpected error creating client connection %s", err))
-	defer conn.Close()
-
-	grpcClient := grpcapi.NewAuthClient(conn, time.Second)
-	cases := []struct {
-		desc         string
-		token        string
-		authRequest  *grpcAuthV1.AuthZPatReq
-		authResponse *grpcAuthV1.AuthZRes
-		err          error
-	}{
-		{
-			desc:  "authorize user with authorized token",
-			token: validPATToken,
-			authRequest: &grpcAuthV1.AuthZPatReq{
-				UserId:           id,
-				PatId:            id,
-				EntityType:       uint32(auth.ClientsType),
-				OptionalDomainId: domainID,
-				Operation:        uint32(auth.CreateOp),
-				EntityId:         clientID,
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: true},
-			err:          nil,
-		},
-		{
-			desc:  "authorize user with unauthorized token",
-			token: inValidPATToken,
-			authRequest: &grpcAuthV1.AuthZPatReq{
-				UserId:           id,
-				PatId:            id,
-				EntityType:       uint32(auth.ClientsType),
-				OptionalDomainId: domainID,
-				Operation:        uint32(auth.CreateOp),
-				EntityId:         clientID,
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: false},
-			err:          svcerr.ErrAuthorization,
-		},
-		{
-			desc:  "authorize user with missing user id",
-			token: validPATToken,
-			authRequest: &grpcAuthV1.AuthZPatReq{
-				PatId:            id,
-				EntityType:       uint32(auth.ClientsType),
-				OptionalDomainId: domainID,
-				Operation:        uint32(auth.CreateOp),
-				EntityId:         clientID,
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: false},
-			err:          apiutil.ErrMissingUserID,
-		},
-		{
-			desc:  "authorize user with missing pat id",
-			token: validPATToken,
-			authRequest: &grpcAuthV1.AuthZPatReq{
-				UserId:           id,
-				EntityType:       uint32(auth.ClientsType),
-				OptionalDomainId: domainID,
-				Operation:        uint32(auth.CreateOp),
-				EntityId:         clientID,
-			},
-			authResponse: &grpcAuthV1.AuthZRes{Authorized: false},
-			err:          apiutil.ErrMissingPATID,
-		},
-	}
-	for _, tc := range cases {
-		t.Run(tc.desc, func(t *testing.T) {
-			svcCall := svc.On("AuthorizePAT",
-				mock.Anything,
-				tc.authRequest.UserId,
-				tc.authRequest.PatId,
-				mock.Anything,
-				tc.authRequest.OptionalDomainId,
-				mock.Anything,
-				mock.Anything,
-				mock.Anything).Return(tc.err)
-			ar, err := grpcClient.AuthorizePAT(context.Background(), tc.authRequest)
-			if ar != nil {
-				assert.Equal(t, tc.authResponse, ar, fmt.Sprintf("%s: expected %v got %v", tc.desc, tc.authResponse, ar))
-			}
-			assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
-			svcCall.Unset()
-		})
-	}
-}
@@ -1,71 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package auth
-
-import (
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-)
-
-type authenticateReq struct {
-	token string
-}
-
-func (req authenticateReq) validate() error {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-
-	return nil
-}
-
-// authReq represents authorization request. It contains:
-// 1. subject - an action invoker
-// 2. object - an entity over which action will be executed
-// 3. action - type of action that will be executed (read/write).
-type authReq struct {
-	Domain      string
-	SubjectType string
-	SubjectKind string
-	Subject     string
-	Relation    string
-	Permission  string
-	ObjectType  string
-	Object      string
-}
-
-func (req authReq) validate() error {
-	if req.Subject == "" || req.SubjectType == "" {
-		return apiutil.ErrMissingPolicySub
-	}
-
-	if req.Object == "" || req.ObjectType == "" {
-		return apiutil.ErrMissingPolicyObj
-	}
-
-	if req.Permission == "" {
-		return apiutil.ErrMalformedPolicyPer
-	}
-
-	return nil
-}
-
-type authPATReq struct {
-	userID           string
-	patID            string
-	entityType       auth.EntityType
-	optionalDomainID string
-	operation        auth.Operation
-	entityID         string
-}
-
-func (req authPATReq) validate() error {
-	if req.userID == "" {
-		return apiutil.ErrMissingUserID
-	}
-	if req.patID == "" {
-		return apiutil.ErrMissingPATID
-	}
-	return nil
-}
@@ -1,18 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package auth
-
-import smqauth "github.com/absmach/supermq/auth"
-
-type authenticateRes struct {
-	id       string
-	userID   string
-	userRole smqauth.Role
-	verified bool
-}
-
-type authorizeRes struct {
-	id         string
-	authorized bool
-}
@@ -1,130 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package auth
-
-import (
-	"context"
-
-	grpcAuthV1 "github.com/absmach/supermq/api/grpc/auth/v1"
-	"github.com/absmach/supermq/auth"
-	grpcapi "github.com/absmach/supermq/auth/api/grpc"
-	kitgrpc "github.com/go-kit/kit/transport/grpc"
-)
-
-var _ grpcAuthV1.AuthServiceServer = (*authGrpcServer)(nil)
-
-type authGrpcServer struct {
-	grpcAuthV1.UnimplementedAuthServiceServer
-	authorize       kitgrpc.Handler
-	authenticate    kitgrpc.Handler
-	authenticatePAT kitgrpc.Handler
-	authorizePAT    kitgrpc.Handler
-}
-
-// NewAuthServer returns new AuthnServiceServer instance.
-func NewAuthServer(svc auth.Service) grpcAuthV1.AuthServiceServer {
-	return &authGrpcServer{
-		authorize: kitgrpc.NewServer(
-			(authorizeEndpoint(svc)),
-			decodeAuthorizeRequest,
-			encodeAuthorizeResponse,
-		),
-
-		authenticate: kitgrpc.NewServer(
-			(authenticateEndpoint(svc)),
-			decodeAuthenticateRequest,
-			encodeAuthenticateResponse,
-		),
-
-		authenticatePAT: kitgrpc.NewServer(
-			(authenticatePATEndpoint(svc)),
-			decodeAuthenticateRequest,
-			encodeAuthenticatePATResponse,
-		),
-
-		authorizePAT: kitgrpc.NewServer(
-			(authorizePATEndpoint(svc)),
-			decodeAuthorizePATRequest,
-			encodeAuthorizeResponse,
-		),
-	}
-}
-
-func (s *authGrpcServer) Authenticate(ctx context.Context, req *grpcAuthV1.AuthNReq) (*grpcAuthV1.AuthNRes, error) {
-	_, res, err := s.authenticate.ServeGRPC(ctx, req)
-	if err != nil {
-		return nil, grpcapi.EncodeError(err)
-	}
-	return res.(*grpcAuthV1.AuthNRes), nil
-}
-
-func (s *authGrpcServer) AuthenticatePAT(ctx context.Context, req *grpcAuthV1.AuthNReq) (*grpcAuthV1.AuthNRes, error) {
-	_, res, err := s.authenticatePAT.ServeGRPC(ctx, req)
-	if err != nil {
-		return nil, grpcapi.EncodeError(err)
-	}
-	return res.(*grpcAuthV1.AuthNRes), nil
-}
-
-func (s *authGrpcServer) Authorize(ctx context.Context, req *grpcAuthV1.AuthZReq) (*grpcAuthV1.AuthZRes, error) {
-	_, res, err := s.authorize.ServeGRPC(ctx, req)
-	if err != nil {
-		return nil, grpcapi.EncodeError(err)
-	}
-	return res.(*grpcAuthV1.AuthZRes), nil
-}
-
-func decodeAuthenticateRequest(_ context.Context, grpcReq any) (any, error) {
-	req := grpcReq.(*grpcAuthV1.AuthNReq)
-	return authenticateReq{token: req.GetToken()}, nil
-}
-
-func encodeAuthenticateResponse(_ context.Context, grpcRes any) (any, error) {
-	res := grpcRes.(authenticateRes)
-	return &grpcAuthV1.AuthNRes{Id: res.id, UserId: res.userID, UserRole: uint32(res.userRole), Verified: res.verified}, nil
-}
-
-func encodeAuthenticatePATResponse(_ context.Context, grpcRes any) (any, error) {
-	res := grpcRes.(authenticateRes)
-	return &grpcAuthV1.AuthNRes{Id: res.id, UserId: res.userID, UserRole: uint32(res.userRole)}, nil
-}
-
-func decodeAuthorizeRequest(_ context.Context, grpcReq any) (any, error) {
-	req := grpcReq.(*grpcAuthV1.AuthZReq)
-	return authReq{
-		Domain:      req.GetDomain(),
-		SubjectType: req.GetSubjectType(),
-		SubjectKind: req.GetSubjectKind(),
-		Subject:     req.GetSubject(),
-		Relation:    req.GetRelation(),
-		Permission:  req.GetPermission(),
-		ObjectType:  req.GetObjectType(),
-		Object:      req.GetObject(),
-	}, nil
-}
-
-func encodeAuthorizeResponse(_ context.Context, grpcRes any) (any, error) {
-	res := grpcRes.(authorizeRes)
-	return &grpcAuthV1.AuthZRes{Authorized: res.authorized, Id: res.id}, nil
-}
-
-func decodeAuthorizePATRequest(_ context.Context, grpcReq any) (any, error) {
-	req := grpcReq.(*grpcAuthV1.AuthZPatReq)
-	return authPATReq{
-		userID:           req.GetUserId(),
-		patID:            req.GetPatId(),
-		entityType:       auth.EntityType(req.GetEntityType()),
-		optionalDomainID: req.GetOptionalDomainId(),
-		operation:        auth.Operation(req.GetOperation()),
-		entityID:         req.GetEntityId(),
-	}, nil
-}
-
-func (s *authGrpcServer) AuthorizePAT(ctx context.Context, req *grpcAuthV1.AuthZPatReq) (*grpcAuthV1.AuthZRes, error) {
-	_, res, err := s.authorizePAT.ServeGRPC(ctx, req)
-	if err != nil {
-		return nil, grpcapi.EncodeError(err)
-	}
-	return res.(*grpcAuthV1.AuthZRes), nil
-}
@@ -1,24 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package auth_test
-
-import (
-	"os"
-	"testing"
-
-	"github.com/absmach/supermq/auth/mocks"
-)
-
-var svc *mocks.Service
-
-func TestMain(m *testing.M) {
-	svc = new(mocks.Service)
-	server := startGRPCServer(svc, port)
-
-	code := m.Run()
-
-	server.GracefulStop()
-
-	os.Exit(code)
-}
@@ -1,99 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package token
-
-import (
-	"context"
-	"time"
-
-	grpcTokenV1 "github.com/absmach/supermq/api/grpc/token/v1"
-	"github.com/absmach/supermq/auth"
-	grpcapi "github.com/absmach/supermq/auth/api/grpc"
-	"github.com/go-kit/kit/endpoint"
-	kitgrpc "github.com/go-kit/kit/transport/grpc"
-	"google.golang.org/grpc"
-)
-
-const tokenSvcName = "token.v1.TokenService"
-
-type tokenGrpcClient struct {
-	issue   endpoint.Endpoint
-	refresh endpoint.Endpoint
-	timeout time.Duration
-}
-
-var _ grpcTokenV1.TokenServiceClient = (*tokenGrpcClient)(nil)
-
-// NewAuthClient returns new auth gRPC client instance.
-func NewTokenClient(conn *grpc.ClientConn, timeout time.Duration) grpcTokenV1.TokenServiceClient {
-	return &tokenGrpcClient{
-		issue: kitgrpc.NewClient(
-			conn,
-			tokenSvcName,
-			"Issue",
-			encodeIssueRequest,
-			decodeIssueResponse,
-			grpcTokenV1.Token{},
-		).Endpoint(),
-		refresh: kitgrpc.NewClient(
-			conn,
-			tokenSvcName,
-			"Refresh",
-			encodeRefreshRequest,
-			decodeRefreshResponse,
-			grpcTokenV1.Token{},
-		).Endpoint(),
-		timeout: timeout,
-	}
-}
-
-func (client tokenGrpcClient) Issue(ctx context.Context, req *grpcTokenV1.IssueReq, _ ...grpc.CallOption) (*grpcTokenV1.Token, error) {
-	ctx, cancel := context.WithTimeout(ctx, client.timeout)
-	defer cancel()
-
-	res, err := client.issue(ctx, issueReq{
-		userID:   req.GetUserId(),
-		userRole: auth.Role(req.GetUserRole()),
-		keyType:  auth.KeyType(req.GetType()),
-		verified: req.GetVerified(),
-	})
-	if err != nil {
-		return &grpcTokenV1.Token{}, grpcapi.DecodeError(err)
-	}
-	return res.(*grpcTokenV1.Token), nil
-}
-
-func encodeIssueRequest(_ context.Context, grpcReq any) (any, error) {
-	req := grpcReq.(issueReq)
-	return &grpcTokenV1.IssueReq{
-		UserId:   req.userID,
-		UserRole: uint32(req.userRole),
-		Type:     uint32(req.keyType),
-		Verified: req.verified,
-	}, nil
-}
-
-func decodeIssueResponse(_ context.Context, grpcRes any) (any, error) {
-	return grpcRes, nil
-}
-
-func (client tokenGrpcClient) Refresh(ctx context.Context, req *grpcTokenV1.RefreshReq, _ ...grpc.CallOption) (*grpcTokenV1.Token, error) {
-	ctx, cancel := context.WithTimeout(ctx, client.timeout)
-	defer cancel()
-
-	res, err := client.refresh(ctx, refreshReq{refreshToken: req.GetRefreshToken(), verified: req.GetVerified()})
-	if err != nil {
-		return &grpcTokenV1.Token{}, grpcapi.DecodeError(err)
-	}
-	return res.(*grpcTokenV1.Token), nil
-}
-
-func encodeRefreshRequest(_ context.Context, grpcReq any) (any, error) {
-	req := grpcReq.(refreshReq)
-	return &grpcTokenV1.RefreshReq{RefreshToken: req.refreshToken, Verified: req.verified}, nil
-}
-
-func decodeRefreshResponse(_ context.Context, grpcRes any) (any, error) {
-	return grpcRes, nil
-}
@@ -1,5 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Package grpc contains implementation of Auth service gRPC API.
-package token
@@ -1,58 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package token
-
-import (
-	"context"
-
-	"github.com/absmach/supermq/auth"
-	"github.com/go-kit/kit/endpoint"
-)
-
-func issueEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(issueReq)
-		if err := req.validate(); err != nil {
-			return issueRes{}, err
-		}
-
-		key := auth.Key{
-			Type:     req.keyType,
-			Subject:  req.userID,
-			Role:     req.userRole,
-			Verified: req.verified,
-		}
-		tkn, err := svc.Issue(ctx, "", key)
-		if err != nil {
-			return issueRes{}, err
-		}
-		ret := issueRes{
-			accessToken:  tkn.AccessToken,
-			refreshToken: tkn.RefreshToken,
-			accessType:   tkn.AccessType,
-		}
-		return ret, nil
-	}
-}
-
-func refreshEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(refreshReq)
-		if err := req.validate(); err != nil {
-			return issueRes{}, err
-		}
-
-		key := auth.Key{Type: auth.RefreshKey, Verified: req.verified}
-		tkn, err := svc.Issue(ctx, req.refreshToken, key)
-		if err != nil {
-			return issueRes{}, err
-		}
-		ret := issueRes{
-			accessToken:  tkn.AccessToken,
-			refreshToken: tkn.RefreshToken,
-			accessType:   tkn.AccessType,
-		}
-		return ret, nil
-	}
-}
@@ -1,169 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package token_test
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"testing"
-	"time"
-
-	grpcTokenV1 "github.com/absmach/supermq/api/grpc/token/v1"
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-	grpcapi "github.com/absmach/supermq/auth/api/grpc/token"
-	"github.com/absmach/supermq/internal/testsutil"
-	"github.com/absmach/supermq/pkg/errors"
-	svcerr "github.com/absmach/supermq/pkg/errors/service"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-const (
-	port            = 8082
-	secret          = "secret"
-	email           = "test@example.com"
-	id              = "testID"
-	clientsType     = "clients"
-	usersType       = "users"
-	description     = "Description"
-	groupName       = "smqx"
-	adminPermission = "admin"
-
-	authoritiesObj  = "authorities"
-	memberRelation  = "member"
-	loginDuration   = 30 * time.Minute
-	refreshDuration = 24 * time.Hour
-	invalidDuration = 7 * 24 * time.Hour
-	validToken      = "valid"
-	inValidToken    = "invalid"
-	validPolicy     = "valid"
-)
-
-var (
-	validID  = testsutil.GenerateUUID(&testing.T{})
-	authAddr = fmt.Sprintf("localhost:%d", port)
-)
-
-func startGRPCServer(svc auth.Service, port int) *grpc.Server {
-	listener, _ := net.Listen("tcp", fmt.Sprintf(":%d", port))
-	server := grpc.NewServer()
-	grpcTokenV1.RegisterTokenServiceServer(server, grpcapi.NewTokenServer(svc))
-	go func() {
-		err := server.Serve(listener)
-		assert.Nil(&testing.T{}, err, fmt.Sprintf(`"Unexpected error creating auth server %s"`, err))
-	}()
-
-	return server
-}
-
-func TestIssue(t *testing.T) {
-	conn, err := grpc.NewClient(authAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	defer conn.Close()
-	assert.Nil(t, err, fmt.Sprintf("Unexpected error creating client connection %s", err))
-	grpcClient := grpcapi.NewTokenClient(conn, time.Second)
-
-	cases := []struct {
-		desc          string
-		userId        string
-		kind          auth.KeyType
-		issueResponse auth.Token
-		err           error
-	}{
-		{
-			desc:   "issue for user with valid token",
-			userId: validID,
-			kind:   auth.AccessKey,
-			issueResponse: auth.Token{
-				AccessToken:  validToken,
-				RefreshToken: validToken,
-			},
-			err: nil,
-		},
-		{
-			desc:   "issue recovery key",
-			userId: validID,
-			kind:   auth.RecoveryKey,
-			issueResponse: auth.Token{
-				AccessToken:  validToken,
-				RefreshToken: validToken,
-			},
-			err: nil,
-		},
-		{
-			desc:          "issue API key unauthenticated",
-			userId:        validID,
-			kind:          auth.APIKey,
-			issueResponse: auth.Token{},
-			err:           svcerr.ErrAuthentication,
-		},
-		{
-			desc:          "issue for invalid key type",
-			userId:        validID,
-			kind:          32,
-			issueResponse: auth.Token{},
-			err:           errors.ErrMalformedEntity,
-		},
-		{
-			desc:          "issue for user that does notexist",
-			userId:        "",
-			kind:          auth.APIKey,
-			issueResponse: auth.Token{},
-			err:           svcerr.ErrAuthentication,
-		},
-	}
-
-	for _, tc := range cases {
-		svcCall := svc.On("Issue", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.issueResponse, tc.err)
-		_, err := grpcClient.Issue(context.Background(), &grpcTokenV1.IssueReq{UserId: tc.userId, Type: uint32(tc.kind)})
-		assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
-		svcCall.Unset()
-	}
-}
-
-func TestRefresh(t *testing.T) {
-	conn, err := grpc.NewClient(authAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	defer conn.Close()
-	assert.Nil(t, err, fmt.Sprintf("Unexpected error creating client connection %s", err))
-	grpcClient := grpcapi.NewTokenClient(conn, time.Second)
-
-	cases := []struct {
-		desc          string
-		token         string
-		issueResponse auth.Token
-		err           error
-	}{
-		{
-			desc:  "refresh token with valid token",
-			token: validToken,
-			issueResponse: auth.Token{
-				AccessToken:  validToken,
-				RefreshToken: validToken,
-			},
-			err: nil,
-		},
-		{
-			desc:          "refresh token with invalid token",
-			token:         inValidToken,
-			issueResponse: auth.Token{},
-			err:           svcerr.ErrAuthentication,
-		},
-		{
-			desc:          "refresh token with empty token",
-			token:         "",
-			issueResponse: auth.Token{},
-			err:           apiutil.ErrMissingSecret,
-		},
-	}
-
-	for _, tc := range cases {
-		svcCall := svc.On("Issue", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.issueResponse, tc.err)
-		_, err := grpcClient.Refresh(context.Background(), &grpcTokenV1.RefreshReq{RefreshToken: tc.token})
-		assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
-		svcCall.Unset()
-	}
-}
@@ -1,40 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package token
-
-import (
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-)
-
-type issueReq struct {
-	userID   string
-	userRole auth.Role
-	keyType  auth.KeyType
-	verified bool
-}
-
-func (req issueReq) validate() error {
-	if req.keyType != auth.AccessKey &&
-		req.keyType != auth.APIKey &&
-		req.keyType != auth.RecoveryKey &&
-		req.keyType != auth.InvitationKey {
-		return apiutil.ErrInvalidAuthKey
-	}
-
-	return nil
-}
-
-type refreshReq struct {
-	refreshToken string
-	verified     bool
-}
-
-func (req refreshReq) validate() error {
-	if req.refreshToken == "" {
-		return apiutil.ErrMissingSecret
-	}
-
-	return nil
-}
@@ -1,10 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package token
-
-type issueRes struct {
-	accessToken  string
-	refreshToken string
-	accessType   string
-}
@@ -1,78 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package token
-
-import (
-	"context"
-
-	grpcTokenV1 "github.com/absmach/supermq/api/grpc/token/v1"
-	"github.com/absmach/supermq/auth"
-	grpcapi "github.com/absmach/supermq/auth/api/grpc"
-	kitgrpc "github.com/go-kit/kit/transport/grpc"
-)
-
-var _ grpcTokenV1.TokenServiceServer = (*tokenGrpcServer)(nil)
-
-type tokenGrpcServer struct {
-	grpcTokenV1.UnimplementedTokenServiceServer
-	issue   kitgrpc.Handler
-	refresh kitgrpc.Handler
-}
-
-// NewAuthServer returns new AuthnServiceServer instance.
-func NewTokenServer(svc auth.Service) grpcTokenV1.TokenServiceServer {
-	return &tokenGrpcServer{
-		issue: kitgrpc.NewServer(
-			(issueEndpoint(svc)),
-			decodeIssueRequest,
-			encodeIssueResponse,
-		),
-		refresh: kitgrpc.NewServer(
-			(refreshEndpoint(svc)),
-			decodeRefreshRequest,
-			encodeIssueResponse,
-		),
-	}
-}
-
-func (s *tokenGrpcServer) Issue(ctx context.Context, req *grpcTokenV1.IssueReq) (*grpcTokenV1.Token, error) {
-	_, res, err := s.issue.ServeGRPC(ctx, req)
-	if err != nil {
-		return nil, grpcapi.EncodeError(err)
-	}
-	return res.(*grpcTokenV1.Token), nil
-}
-
-func (s *tokenGrpcServer) Refresh(ctx context.Context, req *grpcTokenV1.RefreshReq) (*grpcTokenV1.Token, error) {
-	_, res, err := s.refresh.ServeGRPC(ctx, req)
-	if err != nil {
-		return nil, grpcapi.EncodeError(err)
-	}
-	return res.(*grpcTokenV1.Token), nil
-}
-
-func decodeIssueRequest(_ context.Context, grpcReq any) (any, error) {
-	req := grpcReq.(*grpcTokenV1.IssueReq)
-	return issueReq{
-		userID:   req.GetUserId(),
-		userRole: auth.Role(req.GetUserRole()),
-		keyType:  auth.KeyType(req.GetType()),
-		verified: req.Verified,
-	}, nil
-}
-
-func decodeRefreshRequest(_ context.Context, grpcReq any) (any, error) {
-	req := grpcReq.(*grpcTokenV1.RefreshReq)
-	return refreshReq{refreshToken: req.GetRefreshToken(), verified: req.Verified}, nil
-}
-
-func encodeIssueResponse(_ context.Context, grpcRes any) (any, error) {
-	res := grpcRes.(issueRes)
-
-	return &grpcTokenV1.Token{
-		AccessToken:  res.accessToken,
-		RefreshToken: &res.refreshToken,
-		AccessType:   res.accessType,
-	}, nil
-}
@@ -1,24 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package token_test
-
-import (
-	"os"
-	"testing"
-
-	"github.com/absmach/supermq/auth/mocks"
-)
-
-var svc *mocks.Service
-
-func TestMain(m *testing.M) {
-	svc = new(mocks.Service)
-	server := startGRPCServer(svc, port)
-
-	code := m.Run()
-
-	server.GracefulStop()
-
-	os.Exit(code)
-}
@@ -1,74 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package grpc
-
-import (
-	"fmt"
-
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-	"github.com/absmach/supermq/pkg/errors"
-	svcerr "github.com/absmach/supermq/pkg/errors/service"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-func EncodeError(err error) error {
-	switch {
-	case errors.Contains(err, nil):
-		return nil
-	case errors.Contains(err, errors.ErrMalformedEntity),
-		errors.Contains(err, svcerr.ErrInvalidPolicy),
-		err == apiutil.ErrInvalidAuthKey,
-		err == apiutil.ErrMissingID,
-		err == apiutil.ErrMissingMemberType,
-		err == apiutil.ErrMissingPolicySub,
-		err == apiutil.ErrMissingPolicyObj,
-		err == apiutil.ErrMalformedPolicyAct,
-		err == apiutil.ErrMissingUserID,
-		err == apiutil.ErrMissingPATID:
-		return status.Error(codes.InvalidArgument, err.Error())
-	case errors.Contains(err, svcerr.ErrAuthentication),
-		errors.Contains(err, auth.ErrKeyExpired),
-		err == apiutil.ErrMissingEmail,
-		err == apiutil.ErrBearerToken:
-		return status.Error(codes.Unauthenticated, err.Error())
-	case errors.Contains(err, svcerr.ErrAuthorization),
-		errors.Contains(err, svcerr.ErrDomainAuthorization):
-		return status.Error(codes.PermissionDenied, err.Error())
-	case errors.Contains(err, svcerr.ErrNotFound):
-		return status.Error(codes.NotFound, err.Error())
-	case errors.Contains(err, svcerr.ErrConflict):
-		return status.Error(codes.AlreadyExists, err.Error())
-	default:
-		return status.Error(codes.Internal, err.Error())
-	}
-}
-
-func DecodeError(err error) error {
-	if st, ok := status.FromError(err); ok {
-		switch st.Code() {
-		case codes.NotFound:
-			return errors.Wrap(svcerr.ErrNotFound, errors.New(st.Message()))
-		case codes.InvalidArgument:
-			return errors.Wrap(errors.ErrMalformedEntity, errors.New(st.Message()))
-		case codes.AlreadyExists:
-			return errors.Wrap(svcerr.ErrConflict, errors.New(st.Message()))
-		case codes.Unauthenticated:
-			return errors.Wrap(svcerr.ErrAuthentication, errors.New(st.Message()))
-		case codes.OK:
-			if msg := st.Message(); msg != "" {
-				return errors.Wrap(errors.ErrUnidentified, errors.New(msg))
-			}
-			return nil
-		case codes.FailedPrecondition:
-			return errors.Wrap(errors.ErrMalformedEntity, errors.New(st.Message()))
-		case codes.PermissionDenied:
-			return errors.Wrap(svcerr.ErrAuthorization, errors.New(st.Message()))
-		default:
-			return errors.Wrap(fmt.Errorf("unexpected gRPC status: %s (status code:%v)", st.Code().String(), st.Code()), errors.New(st.Message()))
-		}
-	}
-	return err
-}
@@ -1,3 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-package http
@@ -1,87 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package keys
-
-import (
-	"context"
-	"time"
-
-	"github.com/absmach/supermq/auth"
-	"github.com/go-kit/kit/endpoint"
-)
-
-func issueEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(issueKeyReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		now := time.Now().UTC()
-		newKey := auth.Key{
-			IssuedAt: now,
-			Type:     req.Type,
-		}
-
-		duration := time.Duration(req.Duration * time.Second)
-		if duration != 0 {
-			exp := now.Add(duration)
-			newKey.ExpiresAt = exp
-		}
-
-		tkn, err := svc.Issue(ctx, req.token, newKey)
-		if err != nil {
-			return nil, err
-		}
-
-		res := issueKeyRes{
-			Value: tkn.AccessToken,
-		}
-
-		return res, nil
-	}
-}
-
-func retrieveEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(keyReq)
-
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		key, err := svc.RetrieveKey(ctx, req.token, req.id)
-		if err != nil {
-			return nil, err
-		}
-		ret := retrieveKeyRes{
-			ID:       key.ID,
-			IssuerID: key.Issuer,
-			Subject:  key.Subject,
-			Type:     key.Type,
-			IssuedAt: key.IssuedAt,
-		}
-		if !key.ExpiresAt.IsZero() {
-			ret.ExpiresAt = &key.ExpiresAt
-		}
-
-		return ret, nil
-	}
-}
-
-func revokeEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(keyReq)
-
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		if err := svc.Revoke(ctx, req.token, req.id); err != nil {
-			return nil, err
-		}
-
-		return revokeKeyRes{}, nil
-	}
-}
@@ -1,354 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package keys_test
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"time"
-
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-	httpapi "github.com/absmach/supermq/auth/api/http"
-	"github.com/absmach/supermq/auth/jwt"
-	"github.com/absmach/supermq/auth/mocks"
-	smqlog "github.com/absmach/supermq/logger"
-	svcerr "github.com/absmach/supermq/pkg/errors/service"
-	policymocks "github.com/absmach/supermq/pkg/policies/mocks"
-	"github.com/absmach/supermq/pkg/uuid"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-)
-
-const (
-	secret          = "secret"
-	contentType     = "application/json"
-	id              = "123e4567-e89b-12d3-a456-000000000001"
-	email           = "user@example.com"
-	loginDuration   = 30 * time.Minute
-	refreshDuration = 24 * time.Hour
-	invalidDuration = 7 * 24 * time.Hour
-)
-
-var (
-	krepo      *mocks.KeyRepository
-	pEvaluator *policymocks.Evaluator
-)
-
-type issueRequest struct {
-	Duration time.Duration `json:"duration,omitempty"`
-	Type     uint32        `json:"type,omitempty"`
-}
-
-type testRequest struct {
-	client      *http.Client
-	method      string
-	url         string
-	contentType string
-	token       string
-	body        io.Reader
-}
-
-func (tr testRequest) make() (*http.Response, error) {
-	req, err := http.NewRequest(tr.method, tr.url, tr.body)
-	if err != nil {
-		return nil, err
-	}
-	if tr.token != "" {
-		req.Header.Set("Authorization", apiutil.BearerPrefix+tr.token)
-	}
-	if tr.contentType != "" {
-		req.Header.Set("Content-Type", tr.contentType)
-	}
-
-	req.Header.Set("Referer", "http://localhost")
-	return tr.client.Do(req)
-}
-
-func newService() auth.Service {
-	krepo = new(mocks.KeyRepository)
-	pRepo := new(mocks.PATSRepository)
-	cache := new(mocks.Cache)
-	hash := new(mocks.Hasher)
-	idProvider := uuid.NewMock()
-	pService := new(policymocks.Service)
-	pEvaluator = new(policymocks.Evaluator)
-	t := jwt.New([]byte(secret))
-
-	return auth.New(krepo, pRepo, cache, hash, idProvider, t, pEvaluator, pService, loginDuration, refreshDuration, invalidDuration)
-}
-
-func newServer(svc auth.Service) *httptest.Server {
-	mux := httpapi.MakeHandler(svc, smqlog.NewMock(), "")
-	return httptest.NewServer(mux)
-}
-
-func toJSON(data any) string {
-	jsonData, err := json.Marshal(data)
-	if err != nil {
-		return ""
-	}
-	return string(jsonData)
-}
-
-func TestIssue(t *testing.T) {
-	svc := newService()
-	policyCall := pEvaluator.On("CheckPolicy", mock.Anything, mock.Anything).Return(nil)
-	token, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.AccessKey, Role: auth.UserRole, IssuedAt: time.Now(), Subject: id})
-	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
-	policyCall.Unset()
-
-	ts := newServer(svc)
-	defer ts.Close()
-	client := ts.Client()
-
-	lk := issueRequest{Type: uint32(auth.AccessKey)}
-	ak := issueRequest{Type: uint32(auth.APIKey), Duration: time.Hour}
-	rk := issueRequest{Type: uint32(auth.RecoveryKey)}
-
-	cases := []struct {
-		desc   string
-		req    string
-		ct     string
-		token  string
-		status int
-	}{
-		{
-			desc:   "issue login key with empty token",
-			req:    toJSON(lk),
-			ct:     contentType,
-			token:  "",
-			status: http.StatusUnauthorized,
-		},
-		{
-			desc:   "issue API key",
-			req:    toJSON(ak),
-			ct:     contentType,
-			token:  token.AccessToken,
-			status: http.StatusCreated,
-		},
-		{
-			desc:   "issue recovery key",
-			req:    toJSON(rk),
-			ct:     contentType,
-			token:  token.AccessToken,
-			status: http.StatusCreated,
-		},
-		{
-			desc:   "issue login key wrong content type",
-			req:    toJSON(lk),
-			ct:     "",
-			token:  token.AccessToken,
-			status: http.StatusUnsupportedMediaType,
-		},
-		{
-			desc:   "issue recovery key wrong content type",
-			req:    toJSON(rk),
-			ct:     "",
-			token:  token.AccessToken,
-			status: http.StatusUnsupportedMediaType,
-		},
-		{
-			desc:   "issue key with an invalid token",
-			req:    toJSON(ak),
-			ct:     contentType,
-			token:  "wrong",
-			status: http.StatusUnauthorized,
-		},
-		{
-			desc:   "issue recovery key with empty token",
-			req:    toJSON(rk),
-			ct:     contentType,
-			token:  "",
-			status: http.StatusUnauthorized,
-		},
-		{
-			desc:   "issue key with invalid request",
-			req:    "{",
-			ct:     contentType,
-			token:  token.AccessToken,
-			status: http.StatusBadRequest,
-		},
-		{
-			desc:   "issue key with invalid JSON",
-			req:    "{invalid}",
-			ct:     contentType,
-			token:  token.AccessToken,
-			status: http.StatusBadRequest,
-		},
-		{
-			desc:   "issue key with invalid JSON content",
-			req:    `{"Type":{"key":"AccessToken"}}`,
-			ct:     contentType,
-			token:  token.AccessToken,
-			status: http.StatusBadRequest,
-		},
-	}
-
-	for _, tc := range cases {
-		req := testRequest{
-			client:      client,
-			method:      http.MethodPost,
-			url:         fmt.Sprintf("%s/keys", ts.URL),
-			contentType: tc.ct,
-			token:       tc.token,
-			body:        strings.NewReader(tc.req),
-		}
-		repoCall := krepo.On("Save", mock.Anything, mock.Anything).Return("", nil)
-		policyCall := pEvaluator.On("CheckPolicy", mock.Anything, mock.Anything).Return(nil)
-		res, err := req.make()
-		assert.Nil(t, err, fmt.Sprintf("%s: unexpected error %s", tc.desc, err))
-		assert.Equal(t, tc.status, res.StatusCode, fmt.Sprintf("%s: expected status code %d got %d", tc.desc, tc.status, res.StatusCode))
-		repoCall.Unset()
-		policyCall.Unset()
-	}
-}
-
-func TestRetrieve(t *testing.T) {
-	svc := newService()
-	policyCall := pEvaluator.On("CheckPolicy", mock.Anything, mock.Anything).Return(nil)
-	token, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.AccessKey, Role: auth.UserRole, IssuedAt: time.Now(), Subject: id})
-	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
-	key := auth.Key{Type: auth.APIKey, IssuedAt: time.Now(), Subject: id}
-
-	repoCall := krepo.On("Save", mock.Anything, mock.Anything).Return(mock.Anything, nil)
-	k, err := svc.Issue(context.Background(), token.AccessToken, key)
-	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
-	repoCall.Unset()
-	policyCall.Unset()
-
-	ts := newServer(svc)
-	defer ts.Close()
-	client := ts.Client()
-
-	cases := []struct {
-		desc   string
-		id     string
-		token  string
-		key    auth.Key
-		status int
-		err    error
-	}{
-		{
-			desc:  "retrieve an existing key",
-			id:    k.AccessToken,
-			token: token.AccessToken,
-			key: auth.Key{
-				Subject:   id,
-				Type:      auth.AccessKey,
-				IssuedAt:  time.Now(),
-				ExpiresAt: time.Now().Add(refreshDuration),
-			},
-			status: http.StatusOK,
-			err:    nil,
-		},
-		{
-			desc:   "retrieve a non-existing key",
-			id:     "non-existing",
-			token:  token.AccessToken,
-			status: http.StatusBadRequest,
-			err:    svcerr.ErrNotFound,
-		},
-		{
-			desc:   "retrieve a key with an invalid token",
-			id:     k.AccessToken,
-			token:  "wrong",
-			status: http.StatusUnauthorized,
-			err:    svcerr.ErrAuthentication,
-		},
-		{
-			desc:   "retrieve a key with an empty token",
-			token:  "",
-			id:     k.AccessToken,
-			status: http.StatusUnauthorized,
-			err:    svcerr.ErrAuthentication,
-		},
-	}
-
-	for _, tc := range cases {
-		req := testRequest{
-			client: client,
-			method: http.MethodGet,
-			url:    fmt.Sprintf("%s/keys/%s", ts.URL, tc.id),
-			token:  tc.token,
-		}
-		policyCall := pEvaluator.On("CheckPolicy", mock.Anything, mock.Anything).Return(nil)
-		repoCall := krepo.On("Retrieve", mock.Anything, mock.Anything, mock.Anything).Return(tc.key, tc.err)
-		res, err := req.make()
-		assert.Nil(t, err, fmt.Sprintf("%s: unexpected error %s", tc.desc, err))
-		assert.Equal(t, tc.status, res.StatusCode, fmt.Sprintf("%s: expected status code %d got %d", tc.desc, tc.status, res.StatusCode))
-		repoCall.Unset()
-		policyCall.Unset()
-	}
-}
-
-func TestRevoke(t *testing.T) {
-	svc := newService()
-	policyCall := pEvaluator.On("CheckPolicy", mock.Anything, mock.Anything).Return(nil)
-	token, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.AccessKey, Role: auth.UserRole, IssuedAt: time.Now(), Subject: id})
-	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
-	key := auth.Key{Type: auth.APIKey, IssuedAt: time.Now(), Subject: id}
-
-	repoCall := krepo.On("Save", mock.Anything, mock.Anything).Return(mock.Anything, nil)
-	k, err := svc.Issue(context.Background(), token.AccessToken, key)
-	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
-	repoCall.Unset()
-	policyCall.Unset()
-
-	ts := newServer(svc)
-	defer ts.Close()
-	client := ts.Client()
-
-	cases := []struct {
-		desc   string
-		id     string
-		token  string
-		status int
-	}{
-		{
-			desc:   "revoke an existing key",
-			id:     k.AccessToken,
-			token:  token.AccessToken,
-			status: http.StatusNoContent,
-		},
-		{
-			desc:   "revoke a non-existing key",
-			id:     "non-existing",
-			token:  token.AccessToken,
-			status: http.StatusNoContent,
-		},
-		{
-			desc:   "revoke key with invalid token",
-			id:     k.AccessToken,
-			token:  "wrong",
-			status: http.StatusUnauthorized,
-		},
-		{
-			desc:   "revoke key with empty token",
-			id:     k.AccessToken,
-			token:  "",
-			status: http.StatusUnauthorized,
-		},
-	}
-
-	for _, tc := range cases {
-		req := testRequest{
-			client: client,
-			method: http.MethodDelete,
-			url:    fmt.Sprintf("%s/keys/%s", ts.URL, tc.id),
-			token:  tc.token,
-		}
-		repoCall := krepo.On("Remove", mock.Anything, mock.Anything, mock.Anything).Return(nil)
-		res, err := req.make()
-		assert.Nil(t, err, fmt.Sprintf("%s: unexpected error %s", tc.desc, err))
-		assert.Equal(t, tc.status, res.StatusCode, fmt.Sprintf("%s: expected status code %d got %d", tc.desc, tc.status, res.StatusCode))
-		repoCall.Unset()
-	}
-}
@@ -1,48 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package keys
-
-import (
-	"time"
-
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-)
-
-type issueKeyReq struct {
-	token    string
-	Type     auth.KeyType  `json:"type,omitempty"`
-	Duration time.Duration `json:"duration,omitempty"`
-}
-
-// It is not possible to issue Reset key using HTTP API.
-func (req issueKeyReq) validate() error {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-
-	if req.Type != auth.AccessKey &&
-		req.Type != auth.RecoveryKey &&
-		req.Type != auth.APIKey {
-		return apiutil.ErrInvalidAPIKey
-	}
-
-	return nil
-}
-
-type keyReq struct {
-	token string
-	id    string
-}
-
-func (req keyReq) validate() error {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-
-	if req.id == "" {
-		return apiutil.ErrMissingID
-	}
-	return nil
-}
@@ -1,88 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package keys
-
-import (
-	"testing"
-
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-	"github.com/stretchr/testify/assert"
-)
-
-var valid = "valid"
-
-func TestIssueKeyReqValidate(t *testing.T) {
-	cases := []struct {
-		desc string
-		req  issueKeyReq
-		err  error
-	}{
-		{
-			desc: "valid request",
-			req: issueKeyReq{
-				token: valid,
-				Type:  auth.AccessKey,
-			},
-			err: nil,
-		},
-		{
-			desc: "empty token",
-			req: issueKeyReq{
-				token: "",
-				Type:  auth.AccessKey,
-			},
-			err: apiutil.ErrBearerToken,
-		},
-		{
-			desc: "invalid key type",
-			req: issueKeyReq{
-				token: valid,
-				Type:  auth.KeyType(100),
-			},
-			err: apiutil.ErrInvalidAPIKey,
-		},
-	}
-	for _, tc := range cases {
-		err := tc.req.validate()
-		assert.Equal(t, tc.err, err)
-	}
-}
-
-func TestKeyReqValidate(t *testing.T) {
-	cases := []struct {
-		desc string
-		req  keyReq
-		err  error
-	}{
-		{
-			desc: "valid request",
-			req: keyReq{
-				token: valid,
-				id:    valid,
-			},
-			err: nil,
-		},
-		{
-			desc: "empty token",
-			req: keyReq{
-				token: "",
-				id:    valid,
-			},
-			err: apiutil.ErrBearerToken,
-		},
-		{
-			desc: "empty id",
-			req: keyReq{
-				token: valid,
-				id:    "",
-			},
-			err: apiutil.ErrMissingID,
-		},
-	}
-	for _, tc := range cases {
-		err := tc.req.validate()
-		assert.Equal(t, tc.err, err)
-	}
-}
@@ -1,71 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package keys
-
-import (
-	"net/http"
-	"time"
-
-	"github.com/absmach/supermq"
-	"github.com/absmach/supermq/auth"
-)
-
-var (
-	_ supermq.Response = (*issueKeyRes)(nil)
-	_ supermq.Response = (*revokeKeyRes)(nil)
-)
-
-type issueKeyRes struct {
-	ID        string     `json:"id,omitempty"`
-	Value     string     `json:"value,omitempty"`
-	IssuedAt  time.Time  `json:"issued_at,omitempty"`
-	ExpiresAt *time.Time `json:"expires_at,omitempty"`
-}
-
-func (res issueKeyRes) Code() int {
-	return http.StatusCreated
-}
-
-func (res issueKeyRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res issueKeyRes) Empty() bool {
-	return res.Value == ""
-}
-
-type retrieveKeyRes struct {
-	ID        string       `json:"id,omitempty"`
-	IssuerID  string       `json:"issuer_id,omitempty"`
-	Subject   string       `json:"subject,omitempty"`
-	Type      auth.KeyType `json:"type,omitempty"`
-	IssuedAt  time.Time    `json:"issued_at,omitempty"`
-	ExpiresAt *time.Time   `json:"expires_at,omitempty"`
-}
-
-func (res retrieveKeyRes) Code() int {
-	return http.StatusOK
-}
-
-func (res retrieveKeyRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res retrieveKeyRes) Empty() bool {
-	return false
-}
-
-type revokeKeyRes struct{}
-
-func (res revokeKeyRes) Code() int {
-	return http.StatusNoContent
-}
-
-func (res revokeKeyRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res revokeKeyRes) Empty() bool {
-	return true
-}
@@ -1,72 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package keys
-
-import (
-	"context"
-	"encoding/json"
-	"log/slog"
-	"net/http"
-	"strings"
-
-	api "github.com/absmach/supermq/api/http"
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-	"github.com/absmach/supermq/pkg/errors"
-	"github.com/go-chi/chi/v5"
-	kithttp "github.com/go-kit/kit/transport/http"
-)
-
-const contentType = "application/json"
-
-// MakeHandler returns a HTTP handler for API endpoints.
-func MakeHandler(svc auth.Service, mux *chi.Mux, logger *slog.Logger) *chi.Mux {
-	opts := []kithttp.ServerOption{
-		kithttp.ServerErrorEncoder(apiutil.LoggingErrorEncoder(logger, api.EncodeError)),
-	}
-	mux.Route("/keys", func(r chi.Router) {
-		r.Post("/", kithttp.NewServer(
-			issueEndpoint(svc),
-			decodeIssue,
-			api.EncodeResponse,
-			opts...,
-		).ServeHTTP)
-
-		r.Get("/{id}", kithttp.NewServer(
-			(retrieveEndpoint(svc)),
-			decodeKeyReq,
-			api.EncodeResponse,
-			opts...,
-		).ServeHTTP)
-
-		r.Delete("/{id}", kithttp.NewServer(
-			(revokeEndpoint(svc)),
-			decodeKeyReq,
-			api.EncodeResponse,
-			opts...,
-		).ServeHTTP)
-	})
-	return mux
-}
-
-func decodeIssue(_ context.Context, r *http.Request) (any, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, apiutil.ErrUnsupportedContentType
-	}
-
-	req := issueKeyReq{token: apiutil.ExtractBearerToken(r)}
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(errors.ErrMalformedEntity, err)
-	}
-
-	return req, nil
-}
-
-func decodeKeyReq(_ context.Context, r *http.Request) (any, error) {
-	req := keyReq{
-		token: apiutil.ExtractBearerToken(r),
-		id:    chi.URLParam(r, "id"),
-	}
-	return req, nil
-}
@@ -1,225 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package pats
-
-import (
-	"context"
-
-	"github.com/absmach/supermq/auth"
-	"github.com/go-kit/kit/endpoint"
-)
-
-func createPATEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(createPatReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		pat, err := svc.CreatePAT(ctx, req.token, req.Name, req.Description, req.Duration)
-		if err != nil {
-			return nil, err
-		}
-
-		return createPatRes{pat}, nil
-	}
-}
-
-func retrievePATEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(retrievePatReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		pat, err := svc.RetrievePAT(ctx, req.token, req.id)
-		if err != nil {
-			return nil, err
-		}
-
-		return retrievePatRes{pat}, nil
-	}
-}
-
-func updatePATNameEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(updatePatNameReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		pat, err := svc.UpdatePATName(ctx, req.token, req.id, req.Name)
-		if err != nil {
-			return nil, err
-		}
-
-		return updatePatNameRes{pat}, nil
-	}
-}
-
-func updatePATDescriptionEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(updatePatDescriptionReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		pat, err := svc.UpdatePATDescription(ctx, req.token, req.id, req.Description)
-		if err != nil {
-			return nil, err
-		}
-
-		return updatePatDescriptionRes{pat}, nil
-	}
-}
-
-func listPATSEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(listPatsReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		pm := auth.PATSPageMeta{
-			Limit:  req.limit,
-			Offset: req.offset,
-			Name:   req.name,
-			ID:     req.id,
-			Status: req.status,
-		}
-		patsPage, err := svc.ListPATS(ctx, req.token, pm)
-		if err != nil {
-			return nil, err
-		}
-
-		return listPatsRes{patsPage}, nil
-	}
-}
-
-func deletePATEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(deletePatReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		if err := svc.DeletePAT(ctx, req.token, req.id); err != nil {
-			return nil, err
-		}
-
-		return deletePatRes{}, nil
-	}
-}
-
-func resetPATSecretEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(resetPatSecretReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		pat, err := svc.ResetPATSecret(ctx, req.token, req.id, req.Duration)
-		if err != nil {
-			return nil, err
-		}
-
-		return resetPatSecretRes{pat}, nil
-	}
-}
-
-func revokePATSecretEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(revokePatSecretReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		if err := svc.RevokePATSecret(ctx, req.token, req.id); err != nil {
-			return nil, err
-		}
-
-		return revokePatSecretRes{}, nil
-	}
-}
-
-func clearAllPATEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(clearAllPATReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		if err := svc.RemoveAllPAT(ctx, req.token); err != nil {
-			return nil, err
-		}
-
-		return clearAllRes{}, nil
-	}
-}
-
-func addScopeEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(addScopeReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-		err := svc.AddScope(ctx, req.token, req.id, req.Scopes)
-		if err != nil {
-			return nil, err
-		}
-
-		return scopeRes{}, nil
-	}
-}
-
-func removeScopeEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(removeScopeReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		err := svc.RemoveScope(ctx, req.token, req.id, req.ScopesID...)
-		if err != nil {
-			return nil, err
-		}
-		return scopeRes{}, nil
-	}
-}
-
-func clearAllScopeEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(clearAllScopeReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		if err := svc.RemovePATAllScope(ctx, req.token, req.id); err != nil {
-			return nil, err
-		}
-
-		return clearAllRes{}, nil
-	}
-}
-
-func listScopesEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request any) (any, error) {
-		req := request.(listScopesReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		pm := auth.ScopesPageMeta{
-			Limit:  req.limit,
-			Offset: req.offset,
-			PatID:  req.patID,
-		}
-		scopesPage, err := svc.ListScopes(ctx, req.token, pm)
-		if err != nil {
-			return nil, err
-		}
-
-		return listScopeRes{scopesPage}, nil
-	}
-}
@@ -1,287 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package pats
-
-import (
-	"encoding/json"
-	"strings"
-	"time"
-
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-	"github.com/absmach/supermq/pkg/errors"
-)
-
-type createPatReq struct {
-	token       string
-	Name        string        `json:"name,omitempty"`
-	Description string        `json:"description,omitempty"`
-	Duration    time.Duration `json:"duration,omitempty"`
-}
-
-func (cpr *createPatReq) UnmarshalJSON(data []byte) error {
-	var temp struct {
-		Name        string `json:"name,omitempty"`
-		Description string `json:"description,omitempty"`
-		Duration    string `json:"duration,omitempty"`
-	}
-	if err := json.Unmarshal(data, &temp); err != nil {
-		return err
-	}
-	duration, err := time.ParseDuration(temp.Duration)
-	if err != nil {
-		return err
-	}
-	cpr.Name = temp.Name
-	cpr.Description = temp.Description
-	cpr.Duration = duration
-	return nil
-}
-
-func (req createPatReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-
-	if strings.TrimSpace(req.Name) == "" {
-		return apiutil.ErrMissingName
-	}
-
-	return nil
-}
-
-type retrievePatReq struct {
-	token string
-	id    string
-}
-
-func (req retrievePatReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	if req.id == "" {
-		return apiutil.ErrMissingPATID
-	}
-	return nil
-}
-
-type updatePatNameReq struct {
-	token string
-	id    string
-	Name  string `json:"name,omitempty"`
-}
-
-func (req updatePatNameReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	if req.id == "" {
-		return apiutil.ErrMissingPATID
-	}
-	if strings.TrimSpace(req.Name) == "" {
-		return apiutil.ErrMissingName
-	}
-	return nil
-}
-
-type updatePatDescriptionReq struct {
-	token       string
-	id          string
-	Description string `json:"description,omitempty"`
-}
-
-func (req updatePatDescriptionReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	if req.id == "" {
-		return apiutil.ErrMissingPATID
-	}
-	if strings.TrimSpace(req.Description) == "" {
-		return apiutil.ErrMissingDescription
-	}
-	return nil
-}
-
-type listPatsReq struct {
-	token  string
-	offset uint64
-	limit  uint64
-	name   string
-	id     string
-	status auth.Status
-}
-
-func (req listPatsReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	return nil
-}
-
-type deletePatReq struct {
-	token string
-	id    string
-}
-
-func (req deletePatReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	if req.id == "" {
-		return apiutil.ErrMissingPATID
-	}
-	return nil
-}
-
-type resetPatSecretReq struct {
-	token    string
-	id       string
-	Duration time.Duration `json:"duration,omitempty"`
-}
-
-func (rspr *resetPatSecretReq) UnmarshalJSON(data []byte) error {
-	var temp struct {
-		Duration string `json:"duration,omitempty"`
-	}
-
-	err := json.Unmarshal(data, &temp)
-	if err != nil {
-		return err
-	}
-	rspr.Duration, err = time.ParseDuration(temp.Duration)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (req resetPatSecretReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	if req.id == "" {
-		return apiutil.ErrMissingPATID
-	}
-	return nil
-}
-
-type revokePatSecretReq struct {
-	token string
-	id    string
-}
-
-func (req revokePatSecretReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	if req.id == "" {
-		return apiutil.ErrMissingPATID
-	}
-	return nil
-}
-
-type clearAllPATReq struct {
-	token string
-}
-
-func (req clearAllPATReq) validate() error {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	return nil
-}
-
-type addScopeReq struct {
-	token  string
-	id     string
-	Scopes []auth.Scope `json:"scopes,omitempty"`
-}
-
-func (req *addScopeReq) UnmarshalJSON(data []byte) error {
-	type Alias addScopeReq
-	aux := &struct {
-		*Alias
-	}{
-		Alias: (*Alias)(req),
-	}
-
-	if err := json.Unmarshal(data, aux); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (req addScopeReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	if req.id == "" {
-		return apiutil.ErrMissingPATID
-	}
-
-	if len(req.Scopes) == 0 {
-		return apiutil.ErrValidation
-	}
-
-	for _, scope := range req.Scopes {
-		if err := scope.Validate(); err != nil {
-			return errors.Wrap(apiutil.ErrValidation, err)
-		}
-	}
-
-	return nil
-}
-
-type removeScopeReq struct {
-	token    string
-	id       string
-	ScopesID []string `json:"scopes_id,omitempty"`
-}
-
-func (req removeScopeReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	if req.id == "" {
-		return apiutil.ErrMissingPATID
-	}
-	if len(req.ScopesID) == 0 {
-		return apiutil.ErrValidation
-	}
-	return nil
-}
-
-type clearAllScopeReq struct {
-	token string
-	id    string
-}
-
-func (req clearAllScopeReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	if req.id == "" {
-		return apiutil.ErrMissingPATID
-	}
-	return nil
-}
-
-type listScopesReq struct {
-	token  string
-	offset uint64
-	limit  uint64
-	patID  string
-}
-
-func (req listScopesReq) validate() (err error) {
-	if req.token == "" {
-		return apiutil.ErrBearerToken
-	}
-	if req.patID == "" {
-		return apiutil.ErrMissingPATID
-	}
-	return nil
-}
@@ -1,191 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package pats
-
-import (
-	"net/http"
-
-	"github.com/absmach/supermq"
-	"github.com/absmach/supermq/auth"
-)
-
-var (
-	_ supermq.Response = (*createPatRes)(nil)
-	_ supermq.Response = (*retrievePatRes)(nil)
-	_ supermq.Response = (*updatePatNameRes)(nil)
-	_ supermq.Response = (*updatePatDescriptionRes)(nil)
-	_ supermq.Response = (*deletePatRes)(nil)
-	_ supermq.Response = (*resetPatSecretRes)(nil)
-	_ supermq.Response = (*revokePatSecretRes)(nil)
-	_ supermq.Response = (*scopeRes)(nil)
-	_ supermq.Response = (*clearAllRes)(nil)
-)
-
-type createPatRes struct {
-	auth.PAT `json:",inline"`
-}
-
-func (res createPatRes) Code() int {
-	return http.StatusCreated
-}
-
-func (res createPatRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res createPatRes) Empty() bool {
-	return false
-}
-
-type retrievePatRes struct {
-	auth.PAT `json:",inline"`
-}
-
-func (res retrievePatRes) Code() int {
-	return http.StatusOK
-}
-
-func (res retrievePatRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res retrievePatRes) Empty() bool {
-	return false
-}
-
-type updatePatNameRes struct {
-	auth.PAT `json:",inline"`
-}
-
-func (res updatePatNameRes) Code() int {
-	return http.StatusAccepted
-}
-
-func (res updatePatNameRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res updatePatNameRes) Empty() bool {
-	return false
-}
-
-type updatePatDescriptionRes struct {
-	auth.PAT `json:",inline"`
-}
-
-func (res updatePatDescriptionRes) Code() int {
-	return http.StatusAccepted
-}
-
-func (res updatePatDescriptionRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res updatePatDescriptionRes) Empty() bool {
-	return false
-}
-
-type listPatsRes struct {
-	auth.PATSPage `json:",inline"`
-}
-
-func (res listPatsRes) Code() int {
-	return http.StatusOK
-}
-
-func (res listPatsRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res listPatsRes) Empty() bool {
-	return false
-}
-
-type deletePatRes struct{}
-
-func (res deletePatRes) Code() int {
-	return http.StatusNoContent
-}
-
-func (res deletePatRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res deletePatRes) Empty() bool {
-	return true
-}
-
-type resetPatSecretRes struct {
-	auth.PAT `json:",inline"`
-}
-
-func (res resetPatSecretRes) Code() int {
-	return http.StatusOK
-}
-
-func (res resetPatSecretRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res resetPatSecretRes) Empty() bool {
-	return false
-}
-
-type revokePatSecretRes struct{}
-
-func (res revokePatSecretRes) Code() int {
-	return http.StatusNoContent
-}
-
-func (res revokePatSecretRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res revokePatSecretRes) Empty() bool {
-	return true
-}
-
-type scopeRes struct{}
-
-func (res scopeRes) Code() int {
-	return http.StatusOK
-}
-
-func (res scopeRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res scopeRes) Empty() bool {
-	return true
-}
-
-type clearAllRes struct{}
-
-func (res clearAllRes) Code() int {
-	return http.StatusOK
-}
-
-func (res clearAllRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res clearAllRes) Empty() bool {
-	return true
-}
-
-type listScopeRes struct {
-	auth.ScopesPage `json:",inline"`
-}
-
-func (res listScopeRes) Code() int {
-	return http.StatusOK
-}
-
-func (res listScopeRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res listScopeRes) Empty() bool {
-	return false
-}
@@ -1,366 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package pats
-
-import (
-	"context"
-	"encoding/json"
-	"log/slog"
-	"net/http"
-	"strings"
-
-	api "github.com/absmach/supermq/api/http"
-	apiutil "github.com/absmach/supermq/api/http/util"
-	"github.com/absmach/supermq/auth"
-	"github.com/absmach/supermq/pkg/errors"
-	"github.com/go-chi/chi/v5"
-	kithttp "github.com/go-kit/kit/transport/http"
-)
-
-const (
-	contentType = "application/json"
-	defInterval = "30d"
-	patPrefix   = "pat_"
-)
-
-// MakeHandler returns a HTTP handler for API endpoints.
-func MakeHandler(svc auth.Service, mux *chi.Mux, logger *slog.Logger) *chi.Mux {
-	opts := []kithttp.ServerOption{
-		kithttp.ServerErrorEncoder(apiutil.LoggingErrorEncoder(logger, api.EncodeError)),
-	}
-	mux.Route("/pats", func(r chi.Router) {
-		r.Post("/", kithttp.NewServer(
-			createPATEndpoint(svc),
-			decodeCreatePATRequest,
-			api.EncodeResponse,
-			opts...,
-		).ServeHTTP)
-
-		r.Get("/", kithttp.NewServer(
-			listPATSEndpoint(svc),
-			decodeListPATSRequest,
-			api.EncodeResponse,
-			opts...,
-		).ServeHTTP)
-
-		r.Delete("/", kithttp.NewServer(
-			clearAllPATEndpoint(svc),
-			decodeClearAllPATRequest,
-			api.EncodeResponse,
-			opts...,
-		).ServeHTTP)
-
-		r.Route("/{id}", func(r chi.Router) {
-			r.Get("/", kithttp.NewServer(
-				retrievePATEndpoint(svc),
-				decodeRetrievePATRequest,
-				api.EncodeResponse,
-				opts...,
-			).ServeHTTP)
-
-			r.Patch("/name", kithttp.NewServer(
-				updatePATNameEndpoint(svc),
-				decodeUpdatePATNameRequest,
-				api.EncodeResponse,
-				opts...,
-			).ServeHTTP)
-
-			r.Patch("/description", kithttp.NewServer(
-				updatePATDescriptionEndpoint(svc),
-				decodeUpdatePATDescriptionRequest,
-				api.EncodeResponse,
-				opts...,
-			).ServeHTTP)
-
-			r.Delete("/", kithttp.NewServer(
-				deletePATEndpoint(svc),
-				decodeDeletePATRequest,
-				api.EncodeResponse,
-				opts...,
-			).ServeHTTP)
-
-			r.Route("/secret", func(r chi.Router) {
-				r.Patch("/reset", kithttp.NewServer(
-					resetPATSecretEndpoint(svc),
-					decodeResetPATSecretRequest,
-					api.EncodeResponse,
-					opts...,
-				).ServeHTTP)
-
-				r.Patch("/revoke", kithttp.NewServer(
-					revokePATSecretEndpoint(svc),
-					decodeRevokePATSecretRequest,
-					api.EncodeResponse,
-					opts...,
-				).ServeHTTP)
-			})
-
-			r.Route("/scope", func(r chi.Router) {
-				r.Patch("/add", kithttp.NewServer(
-					addScopeEndpoint(svc),
-					decodeAddScopeRequest,
-					api.EncodeResponse,
-					opts...,
-				).ServeHTTP)
-
-				r.Get("/", kithttp.NewServer(
-					listScopesEndpoint(svc),
-					decodeListScopeRequest,
-					api.EncodeResponse,
-					opts...,
-				).ServeHTTP)
-
-				r.Patch("/remove", kithttp.NewServer(
-					removeScopeEndpoint(svc),
-					decodeRemoveScopeRequest,
-					api.EncodeResponse,
-					opts...,
-				).ServeHTTP)
-
-				r.Delete("/", kithttp.NewServer(
-					clearAllScopeEndpoint(svc),
-					decodeClearAllScopeRequest,
-					api.EncodeResponse,
-					opts...,
-				).ServeHTTP)
-			})
-		})
-	})
-	return mux
-}
-
-func decodeCreatePATRequest(_ context.Context, r *http.Request) (any, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, apiutil.ErrUnsupportedContentType
-	}
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-	req := createPatReq{token: token}
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, errors.Wrap(err, errors.ErrMalformedEntity))
-	}
-	return req, nil
-}
-
-func decodeRetrievePATRequest(_ context.Context, r *http.Request) (any, error) {
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-
-	req := retrievePatReq{
-		token: token,
-		id:    chi.URLParam(r, "id"),
-	}
-	return req, nil
-}
-
-func decodeUpdatePATNameRequest(_ context.Context, r *http.Request) (any, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, apiutil.ErrUnsupportedContentType
-	}
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-	req := updatePatNameReq{
-		token: token,
-		id:    chi.URLParam(r, "id"),
-	}
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(errors.ErrMalformedEntity, err)
-	}
-	return req, nil
-}
-
-func decodeUpdatePATDescriptionRequest(_ context.Context, r *http.Request) (any, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, apiutil.ErrUnsupportedContentType
-	}
-
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-	req := updatePatDescriptionReq{
-		token: token,
-		id:    chi.URLParam(r, "id"),
-	}
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(errors.ErrMalformedEntity, err)
-	}
-	return req, nil
-}
-
-func decodeListPATSRequest(_ context.Context, r *http.Request) (any, error) {
-	l, err := apiutil.ReadNumQuery[uint64](r, api.LimitKey, api.DefLimit)
-	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
-	}
-	o, err := apiutil.ReadNumQuery[uint64](r, api.OffsetKey, api.DefOffset)
-	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
-	}
-	n, err := apiutil.ReadStringQuery(r, api.NameKey, "")
-	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
-	}
-	i, err := apiutil.ReadStringQuery(r, api.IDOrder, "")
-	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
-	}
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-	s, err := apiutil.ReadStringQuery(r, api.StatusKey, "")
-	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
-	}
-	patStatus, err := auth.ToStatus(s)
-	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
-	}
-
-	req := listPatsReq{
-		token:  token,
-		limit:  l,
-		offset: o,
-		name:   n,
-		id:     i,
-		status: patStatus,
-	}
-
-	return req, nil
-}
-
-func decodeDeletePATRequest(_ context.Context, r *http.Request) (any, error) {
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-	return deletePatReq{
-		token: token,
-		id:    chi.URLParam(r, "id"),
-	}, nil
-}
-
-func decodeResetPATSecretRequest(_ context.Context, r *http.Request) (any, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, apiutil.ErrUnsupportedContentType
-	}
-
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-	req := resetPatSecretReq{
-		token: token,
-		id:    chi.URLParam(r, "id"),
-	}
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(errors.ErrMalformedEntity, err)
-	}
-	return req, nil
-}
-
-func decodeRevokePATSecretRequest(_ context.Context, r *http.Request) (any, error) {
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-	return revokePatSecretReq{
-		token: token,
-		id:    chi.URLParam(r, "id"),
-	}, nil
-}
-
-func decodeClearAllPATRequest(_ context.Context, r *http.Request) (any, error) {
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-
-	return clearAllPATReq{
-		token: token,
-	}, nil
-}
-
-func decodeAddScopeRequest(_ context.Context, r *http.Request) (any, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, apiutil.ErrUnsupportedContentType
-	}
-
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-
-	req := addScopeReq{
-		token: token,
-		id:    chi.URLParam(r, "id"),
-	}
-
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(errors.ErrMalformedEntity, err)
-	}
-
-	return req, nil
-}
-
-func decodeListScopeRequest(_ context.Context, r *http.Request) (any, error) {
-	l, err := apiutil.ReadNumQuery[uint64](r, api.LimitKey, api.DefLimit)
-	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
-	}
-	o, err := apiutil.ReadNumQuery[uint64](r, api.OffsetKey, api.DefOffset)
-	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
-	}
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-	req := listScopesReq{
-		token:  token,
-		limit:  l,
-		offset: o,
-		patID:  chi.URLParam(r, "id"),
-	}
-	return req, nil
-}
-
-func decodeRemoveScopeRequest(_ context.Context, r *http.Request) (any, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, apiutil.ErrUnsupportedContentType
-	}
-
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-
-	req := removeScopeReq{
-		token: token,
-		id:    chi.URLParam(r, "id"),
-	}
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(errors.ErrMalformedEntity, err)
-	}
-	return req, nil
-}
-
-func decodeClearAllScopeRequest(_ context.Context, r *http.Request) (any, error) {
-	token := apiutil.ExtractBearerToken(r)
-	if strings.HasPrefix(token, patPrefix) {
-		return nil, apiutil.ErrUnsupportedTokenType
-	}
-
-	return clearAllScopeReq{
-		token: token,
-		id:    chi.URLParam(r, "id"),
-	}, nil
-}
@@ -1,28 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-package http
-
-import (
-	"log/slog"
-	"net/http"
-
-	"github.com/absmach/supermq"
-	"github.com/absmach/supermq/auth"
-	"github.com/absmach/supermq/auth/api/http/keys"
-	"github.com/absmach/supermq/auth/api/http/pats"
-	"github.com/go-chi/chi/v5"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-)
-
-// MakeHandler returns a HTTP handler for API endpoints.
-func MakeHandler(svc auth.Service, logger *slog.Logger, instanceID string) http.Handler {
-	mux := chi.NewRouter()
-
-	mux = keys.MakeHandler(svc, mux, logger)
-	mux = pats.MakeHandler(svc, mux, logger)
-
-	mux.Get("/health", supermq.Health("auth", instanceID))
-	mux.Handle("/metrics", promhttp.Handler())
-
-	return mux
-}
@@ -1,4 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package cache
@@ -1,120 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package cache
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/absmach/supermq/auth"
-	"github.com/absmach/supermq/pkg/errors"
-	repoerr "github.com/absmach/supermq/pkg/errors/repository"
-	"github.com/redis/go-redis/v9"
-)
-
-type patCache struct {
-	client   *redis.Client
-	duration time.Duration
-}
-
-func NewPatsCache(client *redis.Client, duration time.Duration) auth.Cache {
-	return &patCache{
-		client:   client,
-		duration: duration,
-	}
-}
-
-func (pc *patCache) Save(ctx context.Context, userID string, scopes []auth.Scope) error {
-	for _, sc := range scopes {
-		key := generateKey(userID, sc.PatID, sc.OptionalDomainID, sc.EntityType, sc.Operation, sc.EntityID)
-		if err := pc.client.Set(ctx, key, sc.ID, pc.duration).Err(); err != nil {
-			return errors.Wrap(repoerr.ErrCreateEntity, err)
-		}
-	}
-
-	return nil
-}
-
-func (pc *patCache) CheckScope(ctx context.Context, userID, patID, optionalDomainID string, entityType auth.EntityType, operation auth.Operation, entityID string) bool {
-	exactKey := fmt.Sprintf("pat:%s:%s:%s:%s:%s:%s", userID, patID, entityType, optionalDomainID, operation, entityID)
-	wildcardKey := fmt.Sprintf("pat:%s:%s:%s:%s:%s:*", userID, patID, entityType, operation, operation)
-
-	res, err := pc.client.Exists(ctx, exactKey, wildcardKey).Result()
-	if err != nil {
-		return false
-	}
-
-	return res > 0
-}
-
-func (pc *patCache) Remove(ctx context.Context, userID string, scopeIDs []string) error {
-	if len(scopeIDs) == 0 {
-		return repoerr.ErrRemoveEntity
-	}
-
-	pattern := fmt.Sprintf("pat:%s:*", userID)
-	iter := pc.client.Scan(ctx, 0, pattern, 0).Iterator()
-
-	for iter.Next(ctx) {
-		key := iter.Val()
-		val, err := pc.client.Get(ctx, key).Result()
-		if err != nil {
-			if err == redis.Nil {
-				continue
-			}
-			return errors.Wrap(repoerr.ErrRemoveEntity, err)
-		}
-
-		for _, scopeID := range scopeIDs {
-			if val == scopeID {
-				if err := pc.client.Del(ctx, key).Err(); err != nil {
-					return errors.Wrap(repoerr.ErrRemoveEntity, err)
-				}
-				break
-			}
-		}
-	}
-
-	if err := iter.Err(); err != nil {
-		return errors.Wrap(repoerr.ErrRemoveEntity, err)
-	}
-
-	return nil
-}
-
-func (pc *patCache) RemoveUserAllScope(ctx context.Context, userID string) error {
-	pattern := fmt.Sprintf("pat:%s:*", userID)
-	iter := pc.client.Scan(ctx, 0, pattern, 0).Iterator()
-	for iter.Next(ctx) {
-		if err := pc.client.Del(ctx, iter.Val()).Err(); err != nil {
-			return errors.Wrap(repoerr.ErrRemoveEntity, err)
-		}
-	}
-	if err := iter.Err(); err != nil {
-		return errors.Wrap(repoerr.ErrRemoveEntity, err)
-	}
-	return nil
-}
-
-func (pc *patCache) RemoveAllScope(ctx context.Context, userID, patID string) error {
-	pattern := fmt.Sprintf("pat:%s:%s", userID, patID)
-
-	iter := pc.client.Scan(ctx, 0, pattern, 0).Iterator()
-	for iter.Next(ctx) {
-		if err := pc.client.Del(ctx, iter.Val()).Err(); err != nil {
-			return errors.Wrap(repoerr.ErrRemoveEntity, err)
-		}
-	}
-
-	if err := iter.Err(); err != nil {
-		return errors.Wrap(repoerr.ErrRemoveEntity, err)
-	}
-
-	return nil
-}
-
-func generateKey(userID, patID, optionalDomainId string, entityType auth.EntityType, operation auth.Operation, entityID string) string {
-	return fmt.Sprintf("pat:%s:%s:%s:%s:%s:%s", userID, patID, entityType, optionalDomainId, operation, entityID)
-}
@@ -1,15 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package auth
-
-// Hasher specifies an API for generating hashes of an arbitrary textual
-// content.
-type Hasher interface {
-	// Hash generates the hashed string from plain-text.
-	Hash(string) (string, error)
-
-	// Compare compares plain-text version to the hashed one. An error should
-	// indicate failed comparison.
-	Compare(string, string) error
-}
@@ -1,6 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-// Package hasher contains the domain concept definitions needed to
-// support Supermq users password hasher sub-service functionality.
-package hasher
@@ -1,86 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package hasher
-
-import (
-	"encoding/base64"
-	"fmt"
-	"math/rand"
-	"strings"
-	"time"
-
-	"github.com/absmach/supermq/auth"
-	"github.com/absmach/supermq/pkg/errors"
-	"golang.org/x/crypto/scrypt"
-)
-
-var (
-	errHashToken        = errors.New("failed to generate hash for token")
-	errHashCompare      = errors.New("failed to generate hash for given compare string")
-	errToken            = errors.New("given token and hash are not same")
-	errSalt             = errors.New("failed to generate salt")
-	errInvalidHashStore = errors.New("invalid stored hash format")
-	errDecode           = errors.New("failed to decode")
-)
-
-var _ auth.Hasher = (*bcryptHasher)(nil)
-
-type bcryptHasher struct{}
-
-// New instantiates a bcrypt-based hasher implementation.
-func New() auth.Hasher {
-	return &bcryptHasher{}
-}
-
-func (bh *bcryptHasher) Hash(token string) (string, error) {
-	salt, err := generateSalt(25)
-	if err != nil {
-		return "", err
-	}
-	// N is kept 16384 to make faster and added large salt, since PAT will be access by automation scripts in high frequency.
-	hash, err := scrypt.Key([]byte(token), salt, 16384, 8, 1, 32)
-	if err != nil {
-		return "", errors.Wrap(errHashToken, err)
-	}
-
-	return fmt.Sprintf("%s.%s", base64.StdEncoding.EncodeToString(hash), base64.StdEncoding.EncodeToString(salt)), nil
-}
-
-func (bh *bcryptHasher) Compare(plain, hashed string) error {
-	parts := strings.Split(hashed, ".")
-	if len(parts) != 2 {
-		return errInvalidHashStore
-	}
-
-	actHash, err := base64.StdEncoding.DecodeString(parts[0])
-	if err != nil {
-		return errors.Wrap(errDecode, err)
-	}
-
-	salt, err := base64.StdEncoding.DecodeString(parts[1])
-	if err != nil {
-		return errors.Wrap(errDecode, err)
-	}
-
-	derivedHash, err := scrypt.Key([]byte(plain), salt, 16384, 8, 1, 32)
-	if err != nil {
-		return errors.Wrap(errHashCompare, err)
-	}
-
-	if string(derivedHash) == string(actHash) {
-		return nil
-	}
-
-	return errToken
-}
-
-func generateSalt(length int) ([]byte, error) {
-	rand.New(rand.NewSource(time.Now().UTC().UnixNano()))
-	salt := make([]byte, length)
-	_, err := rand.Read(salt)
-	if err != nil {
-		return nil, errors.Wrap(errSalt, err)
-	}
-	return salt, nil
-}
@@ -1,241 +0,0 @@
-// Copyright (c) Abstract Machines
-// SPDX-License-Identifier: Apache-2.0
-
-package jwt_test
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/absmach/supermq/auth"
-	authjwt "github.com/absmach/supermq/auth/jwt"
-	"github.com/absmach/supermq/internal/testsutil"
-	"github.com/absmach/supermq/pkg/errors"
-	svcerr "github.com/absmach/supermq/pkg/errors/service"
-	"github.com/lestrrat-go/jwx/v2/jwa"
-	"github.com/lestrrat-go/jwx/v2/jwt"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-const (
-	tokenType  = "type"
-	roleField  = "role"
-	issuerName = "supermq.auth"
-	secret     = "test"
-)
-
-var (
-	errInvalidIssuer = errors.New("invalid token issuer value")
-	reposecret       = []byte("test")
-)
-
-func newToken(issuerName string, key auth.Key) string {
-	builder := jwt.NewBuilder()
-	builder.
-		Issuer(issuerName).
-		IssuedAt(key.IssuedAt).
-		Claim(tokenType, "r").
-		Expiration(key.ExpiresAt)
-	builder.Claim(roleField, key.Role)
-	if key.Subject != "" {
-		builder.Subject(key.Subject)
-	}
-	if key.ID != "" {
-		builder.JwtID(key.ID)
-	}
-	tkn, _ := builder.Build()
-	tokn, _ := jwt.Sign(tkn, jwt.WithKey(jwa.HS512, reposecret))
-	return string(tokn)
-}
-
-func TestIssue(t *testing.T) {
-	tokenizer := authjwt.New([]byte(secret))
-
-	cases := []struct {
-		desc string
-		key  auth.Key
-		err  error
-	}{
-		{
-			desc: "issue new token",
-			key:  key(),
-			err:  nil,
-		},
-		{
-			desc: "issue token with OAuth token",
-			key: auth.Key{
-				ID:        testsutil.GenerateUUID(t),
-				Type:      auth.AccessKey,
-				Subject:   testsutil.GenerateUUID(t),
-				IssuedAt:  time.Now().Add(-10 * time.Second).Round(time.Second),
-				ExpiresAt: time.Now().Add(10 * time.Minute).Round(time.Second),
-			},
-			err: nil,
-		},
-		{
-			desc: "issue token without a domain",
-			key: auth.Key{
-				ID:       testsutil.GenerateUUID(t),
-				Type:     auth.AccessKey,
-				Subject:  testsutil.GenerateUUID(t),
-				IssuedAt: time.Now().Add(-10 * time.Second).Round(time.Second),
-			},
-			err: nil,
-		},
-		{
-			desc: "issue token without a subject",
-			key: auth.Key{
-				ID:       testsutil.GenerateUUID(t),
-				Type:     auth.AccessKey,
-				Subject:  "",
-				IssuedAt: time.Now().Add(-10 * time.Second).Round(time.Second),
-			},
-			err: nil,
-		},
-		{
-			desc: "issue token without type",
-			key: auth.Key{
-				ID:       testsutil.GenerateUUID(t),
-				Type:     auth.KeyType(auth.InvitationKey + 1),
-				Subject:  testsutil.GenerateUUID(t),
-				IssuedAt: time.Now().Add(-10 * time.Second).Round(time.Second),
-			},
-			err: nil,
-		},
-		{
-			desc: "issue token without a domain and subject",
-			key: auth.Key{
-				ID:        testsutil.GenerateUUID(t),
-				Type:      auth.AccessKey,
-				Subject:   "",
-				IssuedAt:  time.Now().Add(-10 * time.Second).Round(time.Second),
-				ExpiresAt: time.Now().Add(10 * time.Minute).Round(time.Second),
-			},
-			err: nil,
-		},
-	}
-	for _, tc := range cases {
-		t.Run(tc.desc, func(t *testing.T) {
-			tkn, err := tokenizer.Issue(tc.key)
-			assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s expected %s, got %s", tc.desc, tc.err, err))
-			if err != nil {
-				assert.NotEmpty(t, tkn, fmt.Sprintf("%s expected token, got empty string", tc.desc))
-			}
-		})
-	}
-}
-
-func TestParse(t *testing.T) {
-	tokenizer := authjwt.New([]byte(secret))
-
-	token, err := tokenizer.Issue(key())
-	require.Nil(t, err, fmt.Sprintf("issuing key expected to succeed: %s", err))
-
-	apiKey := key()
-	apiKey.Type = auth.APIKey
-	apiKey.ExpiresAt = time.Now().UTC().Add(-1 * time.Minute).Round(time.Second)
-	apiToken, err := tokenizer.Issue(apiKey)
-	require.Nil(t, err, fmt.Sprintf("issuing user key expected to succeed: %s", err))
-
-	expKey := key()
-	expKey.ExpiresAt = time.Now().UTC().Add(-1 * time.Minute).Round(time.Second)
-	expToken, err := tokenizer.Issue(expKey)
-	require.Nil(t, err, fmt.Sprintf("issuing expired key expected to succeed: %s", err))
-
-	emptySubjectKey := key()
-	emptySubjectKey.Subject = ""
-	emptySubjectToken, err := tokenizer.Issue(emptySubjectKey)
-	require.Nil(t, err, fmt.Sprintf("issuing user key expected to succeed: %s", err))
-
-	emptyTypeKey := key()
-	emptyTypeKey.Type = auth.KeyType(auth.InvitationKey + 1)
-	emptyTypeToken, err := tokenizer.Issue(emptyTypeKey)
-	require.Nil(t, err, fmt.Sprintf("issuing user key expected to succeed: %s", err))
-
-	emptyKey := key()
-	emptyKey.Subject = ""
-	require.Nil(t, err, fmt.Sprintf("issuing user key expected to succeed: %s", err))
-
-	inValidToken := newToken("invalid", key())
-
-	cases := []struct {
-		desc  string
-		key   auth.Key
-		token string
-		err   error
-	}{
-		{
-			desc:  "parse valid key",
-			key:   key(),
-			token: token,
-			err:   nil,
-		},
-		{
-			desc:  "parse invalid key",
-			key:   auth.Key{},
-			token: "invalid",
-			err:   svcerr.ErrAuthentication,
-		},
-		{
-			desc:  "parse expired key",
-			key:   auth.Key{},
-			token: expToken,
-			err:   auth.ErrExpiry,
-		},
-		{
-			desc:  "parse expired API key",
-			key:   apiKey,
-			token: apiToken,
-			err:   auth.ErrExpiry,
-		},
-		{
-			desc:  "parse token with invalid issuer",
-			key:   auth.Key{},
-			token: inValidToken,
-			err:   errInvalidIssuer,
-		},
-		{
-			desc:  "parse token with invalid content",
-			key:   auth.Key{},
-			token: newToken(issuerName, key()),
-			err:   authjwt.ErrJSONHandle,
-		},
-		{
-			desc:  "parse token with empty subject",
-			key:   emptySubjectKey,
-			token: emptySubjectToken,
-			err:   nil,
-		},
-		{
-			desc:  "parse token with empty type",
-			key:   emptyTypeKey,
-			token: emptyTypeToken,
-			err:   errors.ErrAuthentication,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.desc, func(t *testing.T) {
-			key, err := tokenizer.Parse(tc.token)
-			assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s expected %s, got %s", tc.desc, tc.err, err))
-			if err == nil {
-				assert.Equal(t, tc.key, key, fmt.Sprintf("%s expected %v, got %v", tc.desc, tc.key, key))
-			}
-		})
-	}
-}
-
-func key() auth.Key {
-	exp := time.Now().UTC().Add(10 * time.Minute).Round(time.Second)
-	return auth.Key{
-		ID:        "66af4a67-3823-438a-abd7-efdb613eaef6",
-		Type:      auth.AccessKey,
-		Issuer:    "supermq.auth",
-		Role:      auth.UserRole,
-		Subject:   "66af4a67-3823-438a-abd7-efdb613eaef6",
-		IssuedAt:  time.Now().UTC().Add(-10 * time.Second).Round(time.Second),
-		ExpiresAt: exp,
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dusanb94	436db8877d	Fix comments Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com>	2020-10-14 11:03:39 +02:00
dusanb94	4da66aecbf	Use shorten messaging API Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com>	2020-10-14 10:41:46 +02:00