SMQ-2570 - Update user and groups api docs (#2581)

Signed-off-by: Felix Gateru <felix.gateru@gmail.com>

.dockerignore

@@ -1,3 +1,6 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identifier: Apache-2.0
+
 .git
 .github
 build

.github/CODEOWNERS

@@ -1 +1 @@
-*   @mainflux/maintainers
+*   @absmach/supermq

.github/ISSUE_TEMPLATE.md

@@ -1,40 +0,0 @@
-<!--
-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:
-
-**ENHANCEMENT**
-1. Describe the enhancement you are requesting. Enhancements include:
-   - tests
-   - code refactor
-   - documentation
-   - research
-   - tooling
-
-2. Indicate the importance of this enhancement to you (must-have, should-have, nice-to-have).

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,52 @@
+# 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

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+# 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.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,39 @@
+# 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

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,69 @@
-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.
+<!-- Copyright (c) Abstract Machines
+SPDX-License-Identifier: Apache-2.0 -->
 
-### What does this do?
+<!--
 
-### Which issue(s) does this PR fix/relate to?
-Put here `Resolves #XXX` to auto-close the issue that your PR fixes (if such)
+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.
 
-### List any changes that modify/break current functionality
+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.
 
-### Have you included tests for your changes?
+For a timely review/response, please avoid force-pushing additional commits if your PR already received reviews or comments.
 
-### Did you document any new/modified functionality?
+- 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.
+-->
 
 ### Notes
+
+<!--Please provide any additional information you feel is important.-->

.github/dependabot.yml

@@ -0,0 +1,33 @@
+# 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:
+          - "*"

.github/workflows/api-tests.yml

@@ -0,0 +1,294 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identifier: Apache-2.0
+
+name: Property Based Tests
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - ".github/workflows/api-tests.yml"
+      - "api/**"
+      - "auth/api/http/**"
+      - "bootstrap/api**"
+      - "certs/api/**"
+      - "channels/api/http/**"
+      - "clients/api/http/**"
+      - "consumers/notifiers/api/**"
+      - "domains/api/http/**"
+      - "groups/api/http/**"
+      - "http/api/**"
+      - "invitations/api/**"
+      - "journal/api/**"
+      - "provision/api/**"
+      - "readers/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
+  INVITATIONS_URL: http://localhost:9020
+  AUTH_URL: http://localhost:9001
+  BOOTSTRAP_URL: http://localhost:9013
+  CERTS_URL: http://localhost:9019
+  PROVISION_URL: http://localhost:9016
+  POSTGRES_READER_URL: http://localhost:9009
+  TIMESCALE_READER_URL: http://localhost:9011
+  JOURNAL_URL: http://localhost:9021
+
+jobs:
+  api-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.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\",\"alias\":\"$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.yml"
+              - "api/openapi/journal.yml"
+              - "journal/api/**"
+
+            auth:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/auth.yml"
+              - "auth/api/http/**"
+
+            bootstrap:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/bootstrap.yml"
+              - "bootstrap/api/**"
+
+            certs:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/certs.yml"
+              - "certs/api/**"
+            
+            domains:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/domains.yml"
+              - "domains/api/http/**"
+
+            http:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/http.yml"
+              - "http/api/**"
+
+            invitations:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/invitations.yml"
+              - "invitations/api/**"
+
+            provision:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/provision.yml"
+              - "provision/api/**"
+
+            readers:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/readers.yml"
+              - "readers/api/**"
+
+            clients:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/clients.yml"
+              - "clients/api/http/**"
+            
+            channels:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/channels.yml"
+              - "channels/api/http/**"
+            
+            groups:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/groups.yml"
+              - "groups/api/http/**"
+
+            users:
+              - ".github/workflows/api-tests.yml"
+              - "api/openapi/users.yml"
+              - "users/api/**"
+
+      - name: Run Users API tests
+        if: steps.changes.outputs.users == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/users.yml
+          base-url: ${{ env.USERS_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+      
+      - name: Run Groups API tests
+        if: steps.changes.outputs.groups == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/groups.yml
+          base-url: ${{ env.GROUPS_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+          
+      - name: Run Clients API tests
+        if: steps.changes.outputs.clients == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/clients.yml
+          base-url: ${{ env.CLIENTS_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+      
+      - name: Run Channels API tests
+        if: steps.changes.outputs.channels == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/channels.yml
+          base-url: ${{ env.CHANNELS_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+
+      - name: Run HTTP Adapter API tests
+        if: steps.changes.outputs.http == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/http.yml
+          base-url: ${{ env.HTTP_ADAPTER_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Client ${{ env.CLIENT_SECRET }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+
+      - name: Run Invitations API tests
+        if: steps.changes.outputs.invitations == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/invitations.yml
+          base-url: ${{ env.INVITATIONS_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+
+      - name: Run Auth API tests
+        if: steps.changes.outputs.auth == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/auth.yml
+          base-url: ${{ env.AUTH_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+      
+      - name: Run Domains API tests
+        if: steps.changes.outputs.domains == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/domains.yml
+          base-url: ${{ env.DOMAIN_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+          
+      - name: Run Journal API tests
+        if: steps.changes.outputs.journal == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/journal.yml
+          base-url: ${{ env.JOURNAL_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+
+      - name: Run Bootstrap API tests
+        if: steps.changes.outputs.bootstrap == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/bootstrap.yml
+          base-url: ${{ env.BOOTSTRAP_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+
+      - name: Run Certs API tests
+        if: steps.changes.outputs.certs == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/certs.yml
+          base-url: ${{ env.CERTS_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+
+      - name: Run Provision API tests
+        if: steps.changes.outputs.provision == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/provision.yml
+          base-url: ${{ env.PROVISION_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+
+      - name: Seed Messages
+        if: steps.changes.outputs.readers == 'true'
+        run: |
+          make cli
+          ./build/cli provision test
+
+      - name: Run Postgres Reader API tests
+        if: steps.changes.outputs.readers == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/readers.yml
+          base-url: ${{ env.POSTGRES_READER_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+
+      - name: Run Timescale Reader API tests
+        if: steps.changes.outputs.readers == 'true'
+        uses: schemathesis/action@v1
+        with:
+          schema: api/openapi/readers.yml
+          base-url: ${{ env.TIMESCALE_READER_URL }}
+          checks: all
+          report: false
+          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+
+      - name: Stop containers
+        if: always()
+        run: make run down args="-v" && make run_addons down args="-v"

.github/workflows/build.yml

@@ -0,0 +1,62 @@
+# 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
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Fetch tags for the build
+        run: |
+          git fetch --prune --unshallow --tags
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.x
+          cache-dependency-path: "go.sum"
+
+      - name: Run tests
+        run: |
+          make test
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV }}
+          files: ./coverage/*.out
+          codecov_yml_path: tools/config/codecov.yml
+          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=rabbitmq make mqtt
+
+      - name: Compile check for redis
+        run: |
+          SMQ_ES_TYPE=redis make mqtt
+
+      - name: Build and push Dockers
+        run: |
+          make latest -j $(nproc)

.github/workflows/check-generated-files.yml

@@ -0,0 +1,243 @@
+# 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@v4
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.x
+          cache-dependency-path: "go.sum"
+
+      - 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.yml"
+              - "auth.proto"
+              - "auth/*.pb.go"
+              - "pkg/messaging/message.proto"
+              - "pkg/messaging/*.pb.go"
+
+            mocks:
+              - ".github/workflows/check-generated-files.yml"
+              - "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"
+              - "provision/service.go"
+              - "pkg/groups/groups.go"
+              - "bootstrap/service.go"
+              - "bootstrap/configs.go"
+              - "invitations/invitations.go"
+              - "users/emailer.go"
+              - "users/hasher.go"
+              - "mqtt/events/streams.go"
+              - "readers/messages.go"
+              - "consumers/notifiers/notifier.go"
+              - "consumers/notifiers/service.go"
+              - "consumers/notifiers/subscriptions.go"
+              - "certs/certs.go"
+              - "certs/pki/vault.go"
+              - "certs/service.go"
+              - "journal/journal.go"
+
+      - name: Set up protoc
+        if: steps.changes.outputs.proto == 'true'
+        run: |
+          PROTOC_VERSION=29.0
+          PROTOC_GEN_VERSION=v1.35.2
+          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: |
+          MOCKERY_VERSION=v2.43.2
+          go install github.com/vektra/mockery/v2@$MOCKERY_VERSION
+
+          mv ./invitations/mocks/repository.go ./invitations/mocks/repository.go.tmp
+          mv ./invitations/mocks/service.go ./invitations/mocks/service.go.tmp
+          mv ./auth/mocks/token_client.go ./auth/mocks/token_client.go.tmp
+          mv ./auth/mocks/authz.go ./auth/mocks/authz.go.tmp
+          mv ./auth/mocks/keys.go ./auth/mocks/keys.go.tmp
+          mv ./auth/mocks/service.go ./auth/mocks/service.go.tmp
+          mv ./bootstrap/mocks/configs.go ./bootstrap/mocks/configs.go.tmp
+          mv ./bootstrap/mocks/config_reader.go ./bootstrap/mocks/config_reader.go.tmp
+          mv ./bootstrap/mocks/service.go ./bootstrap/mocks/service.go.tmp
+          mv ./domains/mocks/domains_client.go ./domains/mocks/domains_client.go.tmp
+          mv ./domains/mocks/repository.go ./domains/mocks/repository.go.tmp
+          mv ./domains/mocks/service.go ./domains/mocks/service.go.tmp
+          mv ./channels/mocks/repository.go ./channels/mocks/repository.go.tmp
+          mv ./channels/mocks/channels_client.go ./channels/mocks/channels_client.go.tmp
+          mv ./channels/mocks/service.go ./channels/mocks/service.go.tmp
+          mv ./groups/private/mocks/service.go ./groups/private/mocks/service.go.tmp
+          mv ./groups/mocks/repository.go ./groups/mocks/repository.go.tmp
+          mv ./groups/mocks/groups_client.go ./groups/mocks/groups_client.go.tmp
+          mv ./groups/mocks/service.go ./groups/mocks/service.go.tmp
+          mv ./users/mocks/hasher.go ./users/mocks/hasher.go.tmp
+          mv ./users/mocks/emailer.go ./users/mocks/emailer.go.tmp
+          mv ./users/mocks/repository.go ./users/mocks/repository.go.tmp
+          mv ./users/mocks/service.go ./users/mocks/service.go.tmp
+          mv ./journal/mocks/repository.go ./journal/mocks/repository.go.tmp
+          mv ./journal/mocks/service.go ./journal/mocks/service.go.tmp
+          mv ./consumers/notifiers/mocks/notifier.go ./consumers/notifiers/mocks/notifier.go.tmp
+          mv ./consumers/notifiers/mocks/repository.go ./consumers/notifiers/mocks/repository.go.tmp
+          mv ./consumers/notifiers/mocks/service.go ./consumers/notifiers/mocks/service.go.tmp
+          mv ./certs/mocks/pki.go ./certs/mocks/pki.go.tmp
+          mv ./certs/mocks/service.go ./certs/mocks/service.go.tmp
+          mv ./provision/mocks/service.go ./provision/mocks/service.go.tmp
+          mv ./clients/private/mocks/service.go ./clients/private/mocks/service.go.tmp
+          mv ./clients/mocks/repository.go ./clients/mocks/repository.go.tmp
+          mv ./clients/mocks/clients_client.go ./clients/mocks/clients_client.go.tmp
+          mv ./clients/mocks/cache.go ./clients/mocks/cache.go.tmp
+          mv ./clients/mocks/service.go ./clients/mocks/service.go.tmp
+          mv ./mqtt/mocks/events.go ./mqtt/mocks/events.go.tmp
+          mv ./readers/mocks/messages.go ./readers/mocks/messages.go.tmp
+          mv ./pkg/sdk/mocks/sdk.go ./pkg/sdk/mocks/sdk.go.tmp
+          mv ./pkg/messaging/mocks/pubsub.go ./pkg/messaging/mocks/pubsub.go.tmp
+          mv ./pkg/authn/mocks/authn.go ./pkg/authn/mocks/authn.go.tmp
+          mv ./pkg/roles/mocks/rolesRepo.go ./pkg/roles/mocks/rolesRepo.go.tmp
+          mv ./pkg/roles/mocks/provisioner.go ./pkg/roles/mocks/provisioner.go.tmp
+          mv ./pkg/roles/mocks/rolemanager.go ./pkg/roles/mocks/rolemanager.go.tmp
+          mv ./pkg/oauth2/mocks/provider.go ./pkg/oauth2/mocks/provider.go.tmp
+          mv ./pkg/authz/mocks/authz.go ./pkg/authz/mocks/authz.go.tmp
+          mv ./pkg/events/mocks/subscriber.go ./pkg/events/mocks/subscriber.go.tmp
+          mv ./pkg/events/mocks/publisher.go ./pkg/events/mocks/publisher.go.tmp
+          mv ./pkg/policies/mocks/evaluator.go ./pkg/policies/mocks/evaluator.go.tmp
+          mv ./pkg/policies/mocks/service.go ./pkg/policies/mocks/service.go.tmp
+
+          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
+          }
+
+          check_mock_changes ./invitations/mocks/repository.go " ./invitations/mocks/repository.go"
+          check_mock_changes ./invitations/mocks/service.go " ./invitations/mocks/service.go"
+          check_mock_changes ./auth/mocks/token_client.go " ./auth/mocks/token_client.go"
+          check_mock_changes ./auth/mocks/authz.go " ./auth/mocks/authz.go"
+          check_mock_changes ./auth/mocks/keys.go " ./auth/mocks/keys.go"
+          check_mock_changes ./auth/mocks/service.go " ./auth/mocks/service.go"
+          check_mock_changes ./bootstrap/mocks/configs.go " ./bootstrap/mocks/configs.go"
+          check_mock_changes ./bootstrap/mocks/config_reader.go " ./bootstrap/mocks/config_reader.go"
+          check_mock_changes ./bootstrap/mocks/service.go " ./bootstrap/mocks/service.go"
+          check_mock_changes ./domains/mocks/domains_client.go " ./domains/mocks/domains_client.go"
+          check_mock_changes ./domains/mocks/repository.go " ./domains/mocks/repository.go"
+          check_mock_changes ./domains/mocks/service.go " ./domains/mocks/service.go"
+          check_mock_changes ./channels/mocks/repository.go " ./channels/mocks/repository.go"
+          check_mock_changes ./channels/mocks/channels_client.go " ./channels/mocks/channels_client.go"
+          check_mock_changes ./channels/mocks/service.go " ./channels/mocks/service.go"
+          check_mock_changes ./groups/private/mocks/service.go " ./groups/private/mocks/service.go"
+          check_mock_changes ./groups/mocks/repository.go " ./groups/mocks/repository.go"
+          check_mock_changes ./groups/mocks/groups_client.go " ./groups/mocks/groups_client.go"
+          check_mock_changes ./groups/mocks/service.go " ./groups/mocks/service.go"
+          check_mock_changes ./users/mocks/hasher.go " ./users/mocks/hasher.go"
+          check_mock_changes ./users/mocks/emailer.go " ./users/mocks/emailer.go"
+          check_mock_changes ./users/mocks/repository.go " ./users/mocks/repository.go"
+          check_mock_changes ./users/mocks/service.go " ./users/mocks/service.go"
+          check_mock_changes ./journal/mocks/repository.go " ./journal/mocks/repository.go"
+          check_mock_changes ./journal/mocks/service.go " ./journal/mocks/service.go"
+          check_mock_changes ./consumers/notifiers/mocks/notifier.go " ./consumers/notifiers/mocks/notifier.go"
+          check_mock_changes ./consumers/notifiers/mocks/repository.go " ./consumers/notifiers/mocks/repository.go"
+          check_mock_changes ./consumers/notifiers/mocks/service.go " ./consumers/notifiers/mocks/service.go"
+          check_mock_changes ./certs/mocks/pki.go " ./certs/mocks/pki.go"
+          check_mock_changes ./certs/mocks/service.go " ./certs/mocks/service.go"
+          check_mock_changes ./provision/mocks/service.go " ./provision/mocks/service.go"
+          check_mock_changes ./clients/private/mocks/service.go " ./clients/private/mocks/service.go"
+          check_mock_changes ./clients/mocks/repository.go " ./clients/mocks/repository.go"
+          check_mock_changes ./clients/mocks/clients_client.go " ./clients/mocks/clients_client.go"
+          check_mock_changes ./clients/mocks/cache.go " ./clients/mocks/cache.go"
+          check_mock_changes ./clients/mocks/service.go " ./clients/mocks/service.go"
+          check_mock_changes ./mqtt/mocks/events.go " ./mqtt/mocks/events.go"
+          check_mock_changes ./readers/mocks/messages.go " ./readers/mocks/messages.go"
+          check_mock_changes ./pkg/sdk/mocks/sdk.go " ./pkg/sdk/mocks/sdk.go"
+          check_mock_changes ./pkg/messaging/mocks/pubsub.go " ./pkg/messaging/mocks/pubsub.go"
+          check_mock_changes ./pkg/authn/mocks/authn.go " ./pkg/authn/mocks/authn.go"
+          check_mock_changes ./pkg/roles/mocks/rolesRepo.go " ./pkg/roles/mocks/rolesRepo.go"
+          check_mock_changes ./pkg/roles/mocks/provisioner.go " ./pkg/roles/mocks/provisioner.go"
+          check_mock_changes ./pkg/roles/mocks/rolemanager.go " ./pkg/roles/mocks/rolemanager.go"
+          check_mock_changes ./pkg/oauth2/mocks/provider.go " ./pkg/oauth2/mocks/provider.go"
+          check_mock_changes ./pkg/authz/mocks/authz.go " ./pkg/authz/mocks/authz.go"
+          check_mock_changes ./pkg/events/mocks/subscriber.go " ./pkg/events/mocks/subscriber.go"
+          check_mock_changes ./pkg/events/mocks/publisher.go " ./pkg/events/mocks/publisher.go"
+          check_mock_changes ./pkg/policies/mocks/evaluator.go " ./pkg/policies/mocks/evaluator.go"
+          check_mock_changes ./pkg/policies/mocks/service.go " ./pkg/policies/mocks/service.go"

.github/workflows/check-license.yaml

@@ -0,0 +1,40 @@
+# 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@v4
+
+      - name: Check License Header
+        run: |
+          CHECK=""
+          for file in $(grep -rl --exclude-dir={.git,build,**vernemq**} \
+            --exclude=\*.{crt,key,pem,zed,hcl,md,json,csv,mod,sum,tmpl,args} \
+            --exclude={CODEOWNERS,LICENSE,MAINTAINERS} \
+            .); 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

.github/workflows/swagger-ui.yaml

@@ -0,0 +1,31 @@
+# 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@v4
+
+      - name: Swagger UI action
+        id: swagger-ui-action
+        uses: blokovi/swagger-ui-action@main
+        with:
+          dir: "./api/openapi"
+          pattern: "*.yml"
+          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.magistrala.abstractmachines.fr

.github/workflows/tests.yml

@@ -0,0 +1,390 @@
+# 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@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.x
+          cache-dependency-path: "go.sum"
+
+      - name: Install protolint
+        run: |
+          go install github.com/yoheimuta/protolint/cmd/protolint@latest
+
+      - name: Lint Protobuf Files
+        run: |
+          protolint . 
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.60.3
+          args: --config ./tools/config/golangci.yml
+
+      - name: Build all Binaries
+        run: |
+          make all -j $(nproc)
+
+      - name: Compile check for rabbitmq
+        run: |
+          SMQ_MESSAGE_BROKER_TYPE=rabbitmq make mqtt
+
+      - name: Compile check for redis
+        run: |
+          SMQ_ES_TYPE=redis make mqtt
+
+  run-tests:
+    name: Run tests
+    runs-on: ubuntu-latest
+    needs: lint-and-build
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.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.yml"
+
+            auth:
+              - "auth/**"
+              - "cmd/auth/**"
+              - "auth.proto"
+              - "auth.pb.go"
+              - "auth_grpc.pb.go"
+              - "pkg/ulid/**"
+              - "pkg/uuid/**"
+
+            bootstrap:
+              - "bootstrap/**"
+              - "cmd/bootstrap/**"
+              - "auth.pb.go"
+              - "auth_grpc.pb.go"
+              - "auth/**"
+              - "pkg/sdk/**"
+              - "pkg/events/**"
+
+            certs:
+              - "certs/**"
+              - "cmd/certs/**"
+              - "auth.pb.go"
+              - "auth_grpc.pb.go"
+              - "auth/**"
+              - "pkg/sdk/**"
+
+            cli:
+              - "cli/**"
+              - "cmd/cli/**"
+              - "pkg/sdk/**"
+
+            coap:
+              - "coap/**"
+              - "cmd/coap/**"
+              - "auth.pb.go"
+              - "auth_grpc.pb.go"
+              - "clients/**"
+              - "pkg/messaging/**"
+
+            consumers:
+              - "consumers/**"
+              - "cmd/postgres-writer/**"
+              - "cmd/timescale-writer/**"
+              - "cmd/smpp-notifier/**"
+              - "cmd/smtp-notifier/**"
+              - "auth.pb.go"
+              - "auth_grpc.pb.go"
+              - "auth/**"
+              - "pkg/ulid/**"
+              - "pkg/uuid/**"
+              - "pkg/messaging/**"
+
+            journal:
+              - "journal/**"
+              - "cmd/journal/**"
+              - "auth.pb.go"
+              - "auth_grpc.pb.go"
+              - "auth/**"
+              - "pkg/events/**"
+
+            http:
+              - "http/**"
+              - "cmd/http/**"
+              - "auth.pb.go"
+              - "auth_grpc.pb.go"
+              - "clients/**"
+              - "pkg/messaging/**"
+              - "logger/**"
+
+            internal:
+              - "internal/**"
+
+            invitations:
+              - "invitations/**"
+              - "cmd/invitations/**"
+              - "auth.pb.go"
+              - "auth_grpc.pb.go"
+              - "auth/**"
+              - "pkg/sdk/**"
+
+            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/**"
+              - "bootstrap/**"
+              - "certs/**"
+              - "consumers/**"
+              - "http/**"
+              - "internal/*"
+              - "internal/api/**"
+              - "internal/apiutil/**"
+              - "internal/groups/**"
+              - "invitations/**"
+              - "provision/**"
+              - "readers/**"
+              - "clients/**"
+              - "users/**"
+
+            pkg-transformers:
+              - "pkg/transformers/**"
+
+            pkg-ulid:
+              - "pkg/ulid/**"
+
+            pkg-uuid:
+              - "pkg/uuid/**"
+
+            provision:
+              - "provision/**"
+              - "cmd/provision/**"
+              - "logger/**"
+              - "pkg/sdk/**"
+
+            readers:
+              - "readers/**"
+              - "cmd/postgres-reader/**"
+              - "cmd/timescale-reader/**"
+              - "auth.pb.go"
+              - "auth_grpc.pb.go"
+              - "clients/**"
+              - "auth/**"
+
+            clients:
+              - "clients/**"
+              - "cmd/clients/**"
+              - "auth.pb.go"
+              - "auth_grpc.pb.go"
+              - "auth/**"
+              - "pkg/ulid/**"
+              - "pkg/uuid/**"
+              - "pkg/events/**"
+
+            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 bootstrap tests
+        if: steps.changes.outputs.bootstrap == 'true' || steps.changes.outputs.workflow == 'true'
+        run: |
+          go test --race -v -count=1 -coverprofile=coverage/bootstrap.out ./bootstrap/...
+
+      - name: Run certs tests
+        if: steps.changes.outputs.certs == 'true' || steps.changes.outputs.workflow == 'true'
+        run: |
+          go test --race -v -count=1 -coverprofile=coverage/certs.out ./certs/...
+
+      - 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 consumers tests
+        if: steps.changes.outputs.consumers == 'true' || steps.changes.outputs.workflow == 'true'
+        run: |
+          go test --race -v -count=1 -coverprofile=coverage/consumers.out ./consumers/...
+
+      - 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 invitations tests
+        if: steps.changes.outputs.invitations == 'true' || steps.changes.outputs.workflow == 'true'
+        run: |
+          go test --race -v -count=1 -coverprofile=coverage/invitations.out ./invitations/...
+
+      - 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 provision tests
+        if: steps.changes.outputs.provision == 'true' || steps.changes.outputs.workflow == 'true'
+        run: |
+          go test --race -v -count=1 -coverprofile=coverage/provision.out ./provision/...
+
+      - name: Run readers tests
+        if: steps.changes.outputs.readers == 'true' || steps.changes.outputs.workflow == 'true'
+        run: |
+          go test --race -v -count=1 -coverprofile=coverage/readers.out ./readers/...
+
+      - 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 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 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
+          codecov_yml_path: tools/config/codecov.yml
+          verbose: true

.gitignore

@@ -1,8 +1,20 @@
-# Copyright (c) Mainflux
+# Copyright (c) Abstract Machines
 # SPDX-License-Identifier: Apache-2.0
 
-# Set your private global .gitignore:
-# https://digitalfortress.tech/tricks/creating-a-global-gitignore/
-
+# build dirs
 build
 
+# tools
+tools/e2e/e2e
+tools/mqtt-bench/mqtt-bench
+tools/provision/provision
+tools/provision/mgconn.toml
+
+# coverage files
+coverage
+
+# Schemathesis
+.hypothesis
+
+# Ignore Vault data directory as it contains runtime-generated data
+docker/addons/vault/data/

ADOPTERS.md

@@ -1,12 +1,12 @@
 # Adopters
 
-As Mainflux Community grows, we'd like to keep track of Mainflux adopters to grow the community, contact other users, share experiences and best practices.
+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 Mainflux adopters and that **publicly/officially** shared information and/or details of their adoption journey(optional).
+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 Mainflux, 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 Mainflux technology.
+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**
 
@@ -25,12 +25,12 @@ Pull request commit must be [signed](https://docs.github.com/en/github/authentic
 * 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 Mainflux:**
+**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 Mainflux Community members.
+**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/mainflux/mainflux/blob/master/MAINTAINERS) and you will be permanently removed from the list.
+**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.

CHANGELOG.md

@@ -1,616 +0,0 @@
-# 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.12.0 - 29. MAR 2021.
-### Features and Bugfixes
-- MF-1394 - SDK groups (#1396)
-- NOISSUE - fix response for passwd endpoints (#1393)
-- NOISSUE - dont retrieve groups (#1392)
-- MF-1368 - Add internal http api package for query params reading  (#1384)
-- MF-1390 - Fix docker-compose env_file (#1391)
-- NOISSUE - put order direction in response body (#1387)
-- NOISSUE - Certs service refactor (#1369)
-- MF-1357 - Add new endpoint for searching things (#1383)
-- NOISSUE - Add missing auth port in nginx enrypoint.sh (#1380)
-- MF-1346 - Create Groups API - add grouping of entities (#1334)
-- NOISSUE - Fix certs and vault deployment, reorganize and remove unnecessary vars (#1368)
-- MF-1317 - Configurable regexp rule for password (#1355)
-- Fix CoAP Adapter README (#1376)
-- NOISSUE - Fix default values for port and x509 provision (#1367)
-- NOISSUE - Added missing endpoints for users service (#1372)
-- MF-1365 - Add ADOPTERS.md file (#1371)
-- Fix grpc endpoint parameter permutation (#1370)
-- NOISSUE - Add IsChannelOwner grpc endpoint (#1366)
-- MF-1362 - Sort Things and Channels connections by name  (#1363)
-- MF-1314 - Add value comparison filters for readers (#1353)
-- Fix env configuration and documentation (#1360)
-- NOISSUE - Support disabling Email Agent authentication (#1356)
-- NOISSUE - Upgrade Mongo, Cassandra and Influx docker images (#1354)
-- NOISSUE - Add READMEs to pkg packages (#1352)
-- NOISSUE - Correct README (#1349)
-- MF-1342 - Use environment variables in docker-compose to use tagged version of image (#1343)
-- MF-1311 - Add Notifications service (#1324)
-- MF-1344 - Fix links to API documentations #1345
-- NOISSUE - Upgrade influxdb and postgres docker images (#1341)
-- NOISSUE - Revert cli to use user token from command args (#1339)
-- MF-1276 - Fix openapi IDs and Keys format (#1338)
-- MF-1061 - Add PageMetadata to readers (#1333)
-- NOISSUE - Fix run script and compiler warnings (#1336)
-- Fix Postgres writer transaction handling (#1335)
-- Make Transformer type configurable (#1331)
-- MF-1061 - Implement v, vb, vs, vd and from/to mongodb-reader filters (#1326)
-- NOISSUE - Rename package aliases uuidProvider into uuid (#1323)
-- MF-1034 - Wrapping MQTT client (#1318)
-- MF-1061 - Fix cassandra-reader count for json format (#1327)
-- MF-1061 - Implement v, vb, vs, vd and from/to cassandra-reader filters (#1325)
-- NOISSUE - Switch to Consumers interface (#1316)
-- MF-1061 - Implement protocol, name, v, vb, vs, vd and from/to Postgres reader… (#1322)
-- MF-1061 - Add name, protocol and publisher tests to influxdb-reader (#1320)
-- NOISSUE - Fix Auth typo (#1319)
-- NOISSUE - Add health check for MQTT broker (#1305)
-- MF-1264 - Add support for JSON readers (#1295)
-- NOISSUE - Merge authz and authn into new service auth (#1313)
-- MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
-- NOISSUE - Correct readers openapi.yml (#1310)
-- NOISSUE - Fix MQTT Forwarder client id (#1309)
-- NOISSUE - Fix dates not being init properly on save, change path construction, replace UUID with ULID for group ID (#1300)
-- NOISSUE - Remove authz from docker comp (#1307)
-- Shorten descriptions and add formats (#1306)
-- NOISSUE - remove owner id from user table and object (#1303)
-- NOISSUE - Add missing fields to openapi specs and enclose http codes in single quotes (#1302)
-- MF-1290 - Sort Things and Channels by name (#1293)
-- MF-1248 - Add access policies for users (#1246)
-- Fixes, without spaces. (#1296)
-- Add different CNs for CA and certs (#1292)
-- MF-397 - Introduce Thing Groups (#1259)
-- Add Enhancement section to the issue template (#1284)
-- Fix hardcoded env var values (#1283)
-- NOISSUE - Improve AuthN service docs (#1282)
-- MF-1268 - CLI improvements (#1274)
-- NOISSSUE - Vault integration as an addon. (#1266)
-- Fix naming in Authn API tests (#1275)
-- MF-1244 - Return UserID alongside with user Email in Identify response (#1245)
-- NOISSUE - Fix ViewGroup and UpdateGroup (#1269)
-- NOISSUE - Add ListUsers, ViewUser and ViewProfile methods  (#1262)
-- NOISSUE - Rm users http package (#1256)
-- NOISSUE - Remove content-type check from decodeListUserGroupsRequest (#1255)
-- NOISSUE - Migrate swaggers to openapi 3 spec (#1250)
-- Update MQTT Broker Docker scripts (#1253)
-- update mproxy version (#1251)
-- NOISSUE - Fix group retrieval when parent id is not specified (#1247)
-- NOISSUE - Add new endpoint to retrieve configuration to be used as a template. (#1242)
-- NOISSUE - Add user groups (#1228)
-- MF-1237 - Return to transport only things service errors (#1236)
-- MF-928 - Change CoAP lib (#1233)
-- NOISSUE - Simplify make cleandocker (#1230)
-- NOISSUE - Fix malformed Swagger API specs (#1229)
-- MF-435 - Add support for env file loading (#1223)
-- update certs docs (#1227)
-- NOISSUE - Fix certs update in bootstrap config and make content handling in config.toml user friendly (#1221)
-- NOISSUE - Fix typo in authorization.js (#1226)
-- MF-983 - Add HTTP query param to connections list endpoints to fetch disconnected Things or Channels (#1217)
-- MF-1179 - Add a certificate service and certs endpoint to SDK (#1188)
-- NOISUE - Fix cache error when key is not in Redis (#1220)
-- MF-1199 - Add NATS messaging tests (#1209)
-- NOISSUE: Fix emailer (#1219)
-- NOISSUE - Update dependencies (#1218)
-- NOISSUE - Add subtopic wildcard for twin attribute's definition (#1214)
-- fix envs for nginx (#1215)
-- Remove twin mqtt related obsolete var and fix es-redis address (#1213)
-- NOISSUE - Remove unused `MF_THINGS_SECRET` env var (#1211)
-- NOISSUE - Fix some typos (#1212)
-- NOISSUE - Remove unknown Bootstrap requests (#1210)
-- NOISSUE - Use `pgcrypto` instead `uuid-ossp` for UUIDs generation (version 4) (#1208)
-- MF-1198 - Add errors package tests (#1207)
-- MF-1025 - timeout env in sec, use parseduration (#1206)
-- MF-1201 - Fix MF_THINGS_AUTH_GRPC_URL mongo reader ENVAR (#1203)
-- NOISSUE - Fix CI (#1204)
-- MF-1180 - Add redis based twins and states cache (#1184)
-- MF-739 - Add ID to the User entity (#1152)
-- NOISSUE - Fix default db name for storage databases (#1194)
-- NOISSUE - Add `MF_DOCKER_IMAGE_NAME_PREFIX` to Makefile (#1173)
-- MF-1154 - Move UUID provider to project root (#1172)
-- Fix typo in error messages (#1193)
-- MF-1190 - Add pkg for library packages (#1191)
-- MF-1177 - Implement caching in MQTT adapter (#1187)
-- NOISSUE - Refactor provision tool (#1189)
-
-## 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)

CONTRIBUTING.md

@@ -1,11 +1,11 @@
-# Contributing to Mainflux
+# Contributing to SuperMQ
 
-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.
+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.
 
 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@mainflux.com](mailto:abuse@mainflux.com).
+[abuse@abstractmachines.fr](mailto:abuse@abstractmachines.fr).
 
 ## 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/mainflux/mainflux/issues) to determine if it already contains the
+list](https://github.com/absmach/supermq/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>/mainflux.git
-cd mainflux
-git remote add upstream https://github.com/mainflux/mainflux.git
+git clone https://github.com/<your-username>/supermq.git
+cd supermq
+git remote add upstream https://github.com/absmach/supermq.git
 ```
 
 If your cloned repository is behind the upstream commits, then get the latest changes from upstream:
 
 ```
-git checkout master
-git pull --rebase upstream master
+git checkout main
+git pull --rebase upstream main
 ```
 
-Create a new topic branch from `master` using the naming convention `MF-[issue-number]`
+Create a new topic branch from `main` using the naming convention `SMQ-[issue-number]`
 to help us keep track of your contribution scope:
 
 ```
-git checkout -b MF-[issue-number]
+git checkout -b SMQ-[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 master
+git pull --rebase upstream main
 ```
 
 Push your topic branch up to your fork:
 
 ```
-git push origin MF-[issue-number]
+git push origin SMQ-[issue-number]
 ```
 
 [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title

LICENSE

@@ -176,7 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2015-2020 Mainflux
+   Copyright 2015-2020 SuperMQ
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

MAINTAINERS

@@ -1,4 +1,4 @@
-# Mainflux follows the timeless, highly efficient and totally unfair system
+# SuperMQ 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@mainflux.com"
+	Name	= "Drasko Draskovic"
+	Email	= "draasko.draskovic@abstractmachines.fr"
 	GitHub	= "drasko"
 
 # However, this role serves only in dead-lock events, or in a special and very rare cases
@@ -18,29 +18,13 @@
 # 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 Mainflux project.
+# A reference list of all maintainers of the SuperMQ project.
 
 # ADD YOURSELF HERE IN ALPHABETICAL ORDER
 
 [maintainers]
-
-	[[aleksandar]]
-	Name	= "Aleksandar NOVAKOVIC"
-	Email	= "aleksandar@mainflux.com"
-	GitHub	= "anovakovic01"
  
  	[[dusan]]
-	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"
-
+	Name	= "Dusan Borovcanin"
+	Email	= "dusan.borovcanin@abstractmachines.fr"
+	GitHub	= "dborovcanin"

Makefile

@@ -1,18 +1,51 @@
-# Copyright (c) Mainflux
+# Copyright (c) Abstract Machines
 # SPDX-License-Identifier: Apache-2.0
 
-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 auth twins mqtt provision certs smtp-notifier
+SMQ_DOCKER_IMAGE_NAME_PREFIX ?= supermq
+BUILD_DIR ?= build
+SERVICES = auth users clients groups channels domains http coap ws postgres-writer postgres-reader timescale-writer \
+	timescale-reader cli bootstrap mqtt provision certs invitations journal
+TEST_API_SERVICES = journal auth bootstrap certs http invitations notifiers provision readers clients users channels groups domains
+TEST_API = $(addprefix test_api_,$(TEST_API_SERVICES))
 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/.*\/\([^/]*\)\/\([^/]*\).*/\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)) | tr -c -s '[:alnum:][=-=]' '_' | tr '[:upper:]' '[:lower:]')
+DOCKER_COMPOSE_COMMANDS_SUPPORTED := up down config restart
+DEFAULT_DOCKER_COMPOSE_COMMAND  := up
+GRPC_MTLS_CERT_FILES_EXISTS = 0
+MOCKERY_VERSION=v2.43.2
+INTERNAL_PROTO_GEN_OUT_DIR=internal/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=nats
+endif
+
+ifneq ($(SMQ_ES_TYPE),)
+    SMQ_ES_TYPE := $(SMQ_ES_TYPE)
+else
+    SMQ_ES_TYPE=nats
+endif
 
 define compile_service
-	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
+	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
 endef
 
 define make_docker
@@ -23,7 +56,10 @@ define make_docker
 		--build-arg SVC=$(svc) \
 		--build-arg GOARCH=$(GOARCH) \
 		--build-arg GOARM=$(GOARM) \
-		--tag=$(MF_DOCKER_IMAGE_NAME_PREFIX)/$(svc) \
+		--build-arg VERSION=$(VERSION) \
+		--build-arg COMMIT=$(COMMIT) \
+		--build-arg TIME=$(TIME) \
+		--tag=$(SMQ_DOCKER_IMAGE_NAME_PREFIX)/$(svc) \
 		-f docker/Dockerfile .
 endef
 
@@ -33,37 +69,127 @@ define make_docker_dev
 	docker build \
 		--no-cache \
 		--build-arg SVC=$(svc) \
-		--tag=$(MF_DOCKER_IMAGE_NAME_PREFIX)/$(svc) \
+		--tag=$(SMQ_DOCKER_IMAGE_NAME_PREFIX)/$(svc) \
 		-f docker/Dockerfile.dev ./build
 endef
 
+ADDON_SERVICES = bootstrap journal provision certs timescale-reader timescale-writer postgres-reader postgres-writer
+
+EXTERNAL_SERVICES = vault 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
+.PHONY: all $(SERVICES) dockers dockers_dev latest release run run_addons grpc_mtls_certs check_mtls check_certs test_api mocks
 
 clean:
 	rm -rf ${BUILD_DIR}
 
 cleandocker:
 	# Stops containers and removes containers, networks, volumes, and images created by up
-	docker-compose -f docker/docker-compose.yml down --rmi all -v --remove-orphans
+	docker compose -f docker/docker-compose.yml -p $(DOCKER_PROJECT) down --rmi all -v --remove-orphans
 
 ifdef pv
 	# Remove unused volumes
-	docker volume ls -f name=$(MF_DOCKER_IMAGE_NAME_PREFIX) -f dangling=true -q | xargs -r docker volume rm
+	docker volume ls -f name=$(SMQ_DOCKER_IMAGE_NAME_PREFIX) -f dangling=true -q | xargs -r docker volume rm
 endif
 
 install:
-	cp ${BUILD_DIR}/* $(GOBIN)
+	for file in $(BUILD_DIR)/*; do \
+		cp $$file $(GOBIN)/supermq-`basename $$file`; \
+	done
 
-test:
-	go test -mod=vendor -v -race -count 1 -tags test $(shell go list ./... | grep -v 'vendor\|cmd')
+mocks:
+	@which mockery > /dev/null || go install github.com/vektra/mockery/v2@$(MOCKERY_VERSION)
+	@unset MOCKERY_VERSION && go generate ./...
+	mockery --config ./tools/config/mockery.yaml
+
+
+DIRS = consumers readers postgres internal
+test: mocks
+	mkdir -p coverage
+	@for dir in $(DIRS); do \
+        go test -v --race -count 1 -tags test -coverprofile=coverage/$$dir.out $$(go list ./... | grep $$dir | grep -v 'cmd'); \
+    done
+	go test -v --race -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 st > /dev/null || (echo "schemathesis not found, please install it from https://github.com/schemathesis/schemathesis#getting-started" && 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 \
+		st run api/openapi/$(svc).yml \
+		--checks all \
+		--base-url $(2) \
+		--header "Authorization: Client $(CLIENT_SECRET)" \
+		--contrib-openapi-formats-uuid \
+		--hypothesis-suppress-health-check=filter_too_much \
+		--stateful=links; \
+	else \
+		st run api/openapi/$(svc).yml \
+		--checks all \
+		--base-url $(2) \
+		--header "Authorization: Bearer $(USER_TOKEN)" \
+		--contrib-openapi-formats-uuid \
+		--hypothesis-suppress-health-check=filter_too_much \
+		--stateful=links; \
+	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_invitations: TEST_API_URL := http://localhost:9020
+test_api_auth: TEST_API_URL := http://localhost:9001
+test_api_bootstrap: TEST_API_URL := http://localhost:9013
+test_api_certs: TEST_API_URL := http://localhost:9019
+test_api_provision: TEST_API_URL := http://localhost:9016
+test_api_readers: TEST_API_URL := http://localhost:9009 # This can be the URL of any reader service.
+test_api_journal: TEST_API_URL := http://localhost:9021
+
+$(TEST_API):
+	$(call test_api_service,$(@),$(TEST_API_URL))
 
 proto:
-	protoc --gofast_out=plugins=grpc:. *.proto
-	protoc --gofast_out=plugins=grpc:. pkg/messaging/*.proto
+	protoc -I. --go_out=. --go_opt=paths=source_relative pkg/messaging/*.proto
+	mkdir -p $(INTERNAL_PROTO_GEN_OUT_DIR)
+	protoc -I $(INTERNAL_PROTO_DIR) --go_out=$(INTERNAL_PROTO_GEN_OUT_DIR) --go_opt=paths=source_relative --go-grpc_out=$(INTERNAL_PROTO_GEN_OUT_DIR) --go-grpc_opt=paths=source_relative $(INTERNAL_PROTO_FILES)
 
-$(SERVICES):
+$(FILTERED_SERVICES):
 	$(call compile_service,$(@))
 
 $(DOCKERS):
@@ -77,7 +203,7 @@ dockers_dev: $(DOCKERS_DEV)
 
 define docker_push
 	for svc in $(SERVICES); do \
-		docker push $(MF_DOCKER_IMAGE_NAME_PREFIX)/$$svc:$(1); \
+		docker push $(SMQ_DOCKER_IMAGE_NAME_PREFIX)/$$svc:$(1); \
 	done
 endef
 
@@ -92,22 +218,53 @@ release:
 	git checkout $(version)
 	$(MAKE) dockers
 	for svc in $(SERVICES); do \
-		docker tag $(MF_DOCKER_IMAGE_NAME_PREFIX)/$$svc $(MF_DOCKER_IMAGE_NAME_PREFIX)/$$svc:$(version); \
+		docker tag $(SMQ_DOCKER_IMAGE_NAME_PREFIX)/$$svc $(SMQ_DOCKER_IMAGE_NAME_PREFIX)/$$svc:$(version); \
 	done
 	$(call docker_push,$(version))
 
 rundev:
 	cd scripts && ./run.sh
 
-run:
-	docker-compose -f docker/docker-compose.yml up
+grpc_mtls_certs:
+	$(MAKE) -C docker/ssl auth_grpc_certs clients_grpc_certs
 
-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_tls:
+ifeq ($(GRPC_TLS),true)
+	@unset GRPC_MTLS
+	@echo "gRPC TLS is enabled"
+	GRPC_MTLS=
+else
+	@unset GRPC_TLS
+	GRPC_TLS=
+endif
 
-# 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
+check_mtls:
+ifeq ($(GRPC_MTLS),true)
+	@unset GRPC_TLS
+	@echo "gRPC MTLS is enabled"
+	GRPC_TLS=
+else
+	@unset GRPC_MTLS
+	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
+
+run: check_certs
+	docker compose -f docker/docker-compose.yml --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))))
+	@for SVC in $(RUN_ADDON_ARGS); do \
+		SMQ_ADDONS_CERTS_PATH_PREFIX="../."  docker compose -f docker/addons/$$SVC/docker-compose.yml -p $(DOCKER_PROJECT) --env-file ./docker/.env $(DOCKER_COMPOSE_COMMAND) $(args) & \
+	done
+
+run_live: check_certs
+	GOPATH=$(go env GOPATH) docker compose  -f docker/docker-compose.yml -f docker/docker-compose-live.yaml --env-file docker/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)

README.md

@@ -1,6 +1,8 @@
-# Mainflux
+# SuperMQ
 
-[![build][ci-badge]][ci-url]
+[![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 the consistency of generated files](https://github.com/absmach/supermq/actions/workflows/check-generated-files.yml/badge.svg?branch=main)](https://github.com/absmach/supermq/actions/workflows/check-generated-files.yml)
+[![Continuous Delivery](https://github.com/absmach/supermq/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/absmach/supermq/actions/workflows/build.yml)
 [![go report card][grc-badge]][grc-url]
 [![coverage][cov-badge]][cov-url]
 [![license][license]](LICENSE)
@@ -8,31 +10,24 @@
 
 ![banner][banner]
 
-Mainflux is modern, scalable, secure, open-source, and patent-free IoT cloud platform written in Go.
+SuperMQ is modern, scalable, secure, open-source, and patent-free cloud platform for messaging and event-driven architecture (EDA) written in Go.
 
-It accepts user and thing (sensor, actuator, application) 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.
+It accepts user and client (device, user, application) connections over various network protocols (i.e. HTTP, MQTT, WebSocket, CoAP), thus making a seamless bridge between them. It is used as the architecture backbone for building complex distributed solutions.
 
 For more details, check out the [official documentation][docs].
-
-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.
+For extra bits and services see [our contrib repository][contrib].
 
 ## Features
 
-- Multi-protocol connectivity and bridging (HTTP, MQTT, WebSocket and CoAP)
+- Multi-protocol connectivity and bridging (HTTP, MQTT, WebSocket and CoAP; see [contrib repository][contrib] for LoRa and OPC UA)
 - Device management and provisioning (Zero Touch provisioning)
 - Mutual TLS Authentication (mTLS) using X.509 Certificates
 - Fine-grained access control (policies, ABAC/RBAC)
-- Message persistence (Cassandra, InfluxDB, MongoDB and PostgresSQL)
-- Platform logging and instrumentation support (Grafana, Prometheus and OpenTracing)
+- Message persistence (Timescale and PostgresSQL - see [contrib repository][contrib] for Cassandra, InfluxDB, and MongoDB support)
+- Platform logging and instrumentation support (Prometheus and OpenTelemetry)
 - Event sourcing
 - Container-based deployment using [Docker][docker] and [Kubernetes][kubernetes]
-- [LoRaWAN][lora] network integration
-- [OPC UA](opcua) integration
-- Edge [Agent](agent) and [Export](export) services for remote IoT gateway management and edge computing
+- Edge [Agent][agent] and [Export][export] services for remote IoT gateway management and edge computing
 - SDK
 - CLI
 - Small memory footprint and fast execution
@@ -40,99 +35,97 @@ which maintains the project and offers professional services around it.
 
 ## Prerequisites
 
-The following are needed to run Mainflux:
+The following are needed to run SuperMQ:
 
-- [Docker](https://docs.docker.com/install/) (version 20.10)
-- [Docker compose](https://docs.docker.com/compose/install/) (version 1.28)
+- [Docker](https://docs.docker.com/install/) (version 26.0.0)
 
-Developing Mainflux will also require:
+Developing SuperMQ 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)
+- [Go](https://golang.org/doc/install) (version 1.21)
+- [Protobuf](https://github.com/protocolbuffers/protobuf#protocol-compiler-installation) (version 25.1)
 
 ## Install
 
 Once the prerequisites are installed, execute the following commands from the project's root:
 
 ```bash
-docker-compose -f docker/docker-compose.yml up
+docker compose -f docker/docker-compose.yml --env-file docker/.env -p git_github_com_absmach_supermq_git_  up
 ```
 
-This will bring up the Mainflux docker services and interconnect them. This command can also be executed using the project's included Makefile:
+This will bring up the SuperMQ docker services and interconnect them. This command can also be executed using the project's included Makefile:
 
 ```bash
 make run
 ```
 
 If you want to run services from specific release checkout code from github and make sure that
-`MF_RELEASE_TAG` in [.env](.env) is being set to match the release version
+`SMQ_RELEASE_TAG` in [.env](.env) is being set to match the release version
 
 ```bash
 git checkout tags/<release_number> -b <release_number>
-# e.g. `git checkout tags/0.12.0 -b 0.12.0`
+# e.g. `git checkout tags/0.13.0 -b 0.13.0`
 ```
 
 Check that `.env` file contains:
 
 ```bash
-MF_RELEASE_TAG=<release_number>
+SMQ_RELEASE_TAG=<release_number>
 ```
 
->`docker-compose` should be used for development and testing deployments. For production we suggest using [Kubernetes](https://mainflux.readthedocs.io/en/latest/kubernetes/).
+> `docker-compose` should be used for development and testing deployments. For production we suggest using [Kubernetes](https://docs.supermq.abstractmachines.fr/kubernetes).
 
 ## Usage
 
-The quickest way to start using Mainflux is via the CLI. The latest version can be downloaded from the [official releases page][rel].
+The quickest way to start using SuperMQ is via the CLI. The latest version can be downloaded from the [official releases page][releases].
 
 It can also be built and used from the project's root directory:
 
 ```bash
 make cli
-./build/mainflux-cli version
+./build/cli version
 ```
 
-Additional details on using the CLI can be found in the [CLI documentation](https://mainflux.readthedocs.io/en/latest/cli/).
+Additional details on using the CLI can be found in the [CLI documentation](https://docs.supermq.abstractmachines.fr/cli).
 
 ## Documentation
 
-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):
+Official documentation is hosted at [SuperMQ official docs page][docs]. Documentation is auto-generated, checkout the instructions on [official 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.
 
-Additional practical information, news and tutorials can be found on the [Mainflux blog][blog].
-
 ## Authors
 
-Main architect and BDFL of Mainflux project is [@drasko][drasko].
+Main architect and BDFL of SuperMQ project is [@drasko][drasko].
 
-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.
+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.
 
-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.
+Besides them, SuperMQ is constantly improved and actively developed by [@anovakovic01][alex], [@dusanb94][dusan], [@srados][sava], [@gsaleh][george], [@blokovi][iva], [@chombium][kole], [@mteodor][mirko], [@rodneyosodo][rodneyosodo] and a large set of contributors.
 
 Maintainers are listed in [MAINTAINERS](MAINTAINERS) file.
 
-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.
+The SuperMQ 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.
+
+## Professional Support
+
+There are many companies offering professional support for the SuperMQ system.
+
+If you need this kind of support, best is to reach out to [@drasko][drasko] directly, and he will point you out to the best-matching support team.
 
 ## Contributing
 
-Thank you for your interest in Mainflux and the desire to contribute!
+Thank you for your interest in SuperMQ 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.
+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.
 2. Checkout the [contribution guide](CONTRIBUTING.md) to learn more about our style and conventions.
 3. Make your changes compatible to our workflow.
 
+Also, explore our [contrib][contrib] repository for extra services such as Cassandra, InfluxDB, MongoDB readers and writers, LoRa, OPC UA support, Digital Twins, and more. If you have a contribution that is not a good fit for the core monorepo (it's specific to your use case, it's an additional feature or a new service, it's optional or an add-on), this is a great place to submit the pull request.
+
 ### We're Hiring
 
-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>.
+You like SuperMQ and you would like to make it your day job? We're always looking for talented engineers interested in open-source, IoT and distributed systems. If you recognize yourself, reach out to [@drasko][drasko] - he will contact you back.
 
->The best way to grab our attention is by sending PRs :sunglasses:.
+> The best way to grab our attention is, of course, by sending PRs :sunglasses:.
 
 ## Community
 
@@ -144,33 +137,42 @@ please head to company's [careers page][careers] or shoot us an e-mail at <caree
 
 [Apache-2.0](LICENSE)
 
-[![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)
+[![FOSSA Status][FOSSA]][FOSSA]
 
-[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
+## Data Collection for SuperMQ
+
+SuperMQ is committed to continuously improving its services and ensuring a seamless experience for its users. To achieve this, we collect certain data from your deployments. Rest assured, this data is collected solely for the purpose of enhancing SuperMQ and is not used with any malicious intent. The deployment summary can be found on our [website][callhome].
+
+The collected data includes:
+
+- **IP Address** - Used for approximate location information on deployments.
+- **Services Used** - To understand which features are popular and prioritize future developments.
+- **Last Seen Time** - To ensure the stability and availability of SuperMQ.
+- **SuperMQ Version** - To track the software version and deliver relevant updates.
+
+We take your privacy and data security seriously. All data collected is handled in accordance with our stringent privacy policies and industry best practices.
+
+Data collection is on by default and can be disabled by setting the env variable:
+`SMQ_SEND_TELEMETRY=false`
+
+By utilizing SuperMQ, you actively contribute to its improvement. Together, we can build a more robust and efficient platform. Thank you for your trust in SuperMQ!
+
+[banner]: https://github.com/absmach/supermq-docs/blob/main/docs/img/gopherBanner.jpg
+[docs]: https://docs.supermq.abstractmachines.fr
 [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]: https://gitter.im/absmach/supermq?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
+[grc-badge]: https://goreportcard.com/badge/github.com/absmach/supermq
+[grc-url]: https://goreportcard.com/report/github.com/absmach/supermq
+[cov-badge]: https://codecov.io/gh/absmach/supermq/graph/badge.svg?token=nPCEr5nW8S
+[cov-url]: https://codecov.io/gh/absmach/supermq
 [license]: https://img.shields.io/badge/license-Apache%20v2.0-blue.svg
-[twitter]: https://twitter.com/mainflux
-[lora]: https://lora-alliance.org/
-[opcua]: https://opcfoundation.org/about/opc-technologies/opc-ua/
-[agent]: https://github.com/mainflux/agent
-[export]: https://github.com/mainflux/export
+[twitter]: https://twitter.com/absmach
+[agent]: https://github.com/absmach/agent
+[export]: https://github.com/absmach/export
 [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
+[releases]: https://github.com/absmach/supermq/releases
 [drasko]: https://github.com/drasko
 [nikola]: https://github.com/nmarcetic
 [dejan]: https://github.com/mijicd
@@ -178,10 +180,14 @@ please head to company's [careers page][careers] or shoot us an e-mail at <caree
 [darko]: https://github.com/darkodraskovic
 [janko]: https://github.com/janko-isidorovic
 [alex]: https://github.com/anovakovic01
-[dusan]: https://github.com/dusanb94
+[dusan]: https://github.com/dborovcanin
 [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
+[rodneyosodo]: https://github.com/rodneyosodo
+[callhome]: https://deployments.magistrala.abstractmachines.fr/
+[contrib]: https://www.github.com/absmach/mg-contrib
+[FOSSA]: https://app.fossa.com/api/projects/git%2Bgithub.com%2Fabsmach%2Fsupermq.svg?type=small

api.go

@@ -1,7 +1,7 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
-package mainflux
+package supermq
 
 // Response contains HTTP response specific methods.
 type Response interface {

api/asyncapi/mqtt.yml

@@ -0,0 +1,112 @@
+# 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.yml'
+info:
+  title: SuperMQ MQTT Adapter
+  version: '1.0.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:
+  channels/{channelID}/messages/{subtopic}:
+    parameters:
+      channelID:
+        $ref: '#/components/parameters/channelID'
+        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:
+    channelID:
+      description: Channel ID connected to the Client ID defined in the username.
+      schema:
+        type: string
+        format: uuid
+    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

api/asyncapi/websocket.yml

@@ -0,0 +1,144 @@
+# 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.yml'
+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: '1.0.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:
+  'channels/{channelID}/messages/{subtopic}':
+    parameters:
+      channelID:
+        $ref: '#/components/parameters/channelID'
+        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:
+    channelID:
+      description: Channel ID connected to the Client ID defined in the username.
+      schema:
+        type: string
+        format: uuid
+    subtopic:
+      description: Arbitrary message subtopic.
+      schema:
+        type: string
+        default: ''
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: uuid
+      description: |
+        * Client access: "Authorization: Client <client_key>"

api/openapi/README.md

@@ -0,0 +1,5 @@
+# SuperMQ OpenAPI Specification
+
+This folder contains an OpenAPI specifications for SuperMQ API.
+
+View specification in Swagger UI at [docs.api.magistrala.abstractmachines.fr](https://docs.api.supermq.abstractmachines.fr)

api/openapi/auth.yml

@@ -0,0 +1,285 @@
+# 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.15.1
+
+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: 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"
+  /health:
+    get:
+      summary: Retrieves service health check info.
+      tags:
+        - Health
+      security: []
+      responses:
+        "200":
+          $ref: "#/components/responses/HealthRes"
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+components:
+  schemas:
+    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:
+    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:
+    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:
+    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.yml"
+
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: |
+        * Users access: "Authorization: Bearer <user_token>"
+
+security:
+  - bearerAuth: []

api/openapi/bootstrap.yml

@@ -0,0 +1,690 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identifier: Apache-2.0
+
+openapi: 3.0.1
+info:
+  title: SuperMQ Bootstrap service
+  description: |
+    HTTP API for managing platform clients configuration.
+    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.15.1
+
+servers:
+  - url: http://localhost:9013
+  - url: https://localhost:9013
+
+tags:
+  - name: configs
+    description: Everything about your Configs
+    externalDocs:
+      description: Find out more about Configs
+      url: https://docs.supermq.abstractmachines.fr/
+
+paths:
+  /{domainID}/clients/configs:
+    post:
+      operationId: createConfig
+      summary: Adds new config
+      description: |
+        Adds new config to the list of config owned by user identified using
+        the provided access token.
+      tags:
+        - configs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+      requestBody:
+        $ref: "#/components/requestBodies/ConfigCreateReq"
+      responses:
+        "201":
+          $ref: "#/components/responses/ConfigCreateRes"
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "404":
+          description: A non-existent entity request.
+        "409":
+          description: Failed due to using an existing identity.
+        "415":
+          description: Missing or invalid content type.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+        "503":
+          description: Failed to receive response from the clients service.
+    get:
+      operationId: getConfigs
+      summary: Retrieves managed configs
+      description: |
+        Retrieves a list of managed configs. Due to performance concerns, data
+        is retrieved in subsets. The API configs must ensure that the entire
+        dataset is consumed either by making subsequent requests, or by
+        increasing the subset size of the initial request.
+      tags:
+        - configs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/Limit"
+        - $ref: "#/components/parameters/Offset"
+        - $ref: "#/components/parameters/State"
+        - $ref: "#/components/parameters/Name"
+      responses:
+        "200":
+          $ref: "#/components/responses/ConfigListRes"
+        "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"
+
+  /{domainID}/clients/configs/{configId}:
+    get:
+      operationId: getConfig
+      summary: Retrieves config info (with channels).
+      tags:
+        - configs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/ConfigId"
+      responses:
+        "200":
+          $ref: "#/components/responses/ConfigRes"
+        "400":
+          description: Missing or invalid config.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "404":
+          description: Config does not exist.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+    put:
+      operationId: updateConfig
+      summary: Updates config info
+      description: |
+        Update is performed by replacing the current resource data with values
+        provided in a request payload. Note that the owner, ID, external ID,
+        external key, SuperMQ Client ID and key cannot be changed.
+      tags:
+        - configs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/ConfigId"
+      requestBody:
+        $ref: "#/components/requestBodies/ConfigUpdateReq"
+      responses:
+        "200":
+          description: Config updated.
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "404":
+          description: Config does not exist.
+        "415":
+          description: Missing or invalid content type.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+    delete:
+      operationId: removeConfig
+      summary: Removes a Config
+      description: |
+        Removes a Config. In case of successful removal the service will ensure
+        that the removed config is disconnected from all of the SuperMQ channels.
+      tags:
+        - configs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/ConfigId"
+      responses:
+        "204":
+          description: Config removed.
+        "400":
+          description: Failed due to malformed config ID.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /{domainID}/clients/configs/certs/{configId}:
+    patch:
+      operationId: updateConfigCerts
+      summary: Updates certs
+      description: |
+        Update is performed by replacing the current certificate data with values
+        provided in a request payload.
+      tags:
+        - configs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/ConfigId"
+      requestBody:
+        $ref: "#/components/requestBodies/ConfigCertUpdateReq"
+      responses:
+        "200":
+          description: Config updated.
+          $ref: "#/components/responses/ConfigUpdateCertsRes"
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "404":
+          description: Config does not exist.
+        "415":
+          description: Missing or invalid content type.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /{domainID}/clients/configs/connections/{configId}:
+    put:
+      operationId: updateConfigConnections
+      summary: Updates channels the client is connected to
+      description: |
+        Update connections performs update of the channel list corresponding
+        Client is connected to.
+      tags:
+        - configs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/ConfigId"
+      requestBody:
+        $ref: "#/components/requestBodies/ConfigConnUpdateReq"
+      responses:
+        "200":
+          description: Config updated.
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "404":
+          description: Config does not exist.
+        "415":
+          description: Missing or invalid content type.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /clients/bootstrap/{externalId}:
+    get:
+      operationId: getBootstrapConfig
+      summary: Retrieves configuration.
+      description: |
+        Retrieves a configuration with given external ID and external key.
+      tags:
+        - configs
+      security:
+        - bootstrapAuth: []
+      parameters:
+        - $ref: "#/components/parameters/ExternalId"
+      responses:
+        "200":
+          $ref: "#/components/responses/BootstrapConfigRes"
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid external key provided.
+        "404":
+          description: Failed to retrieve corresponding config.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /clients/bootstrap/secure/{externalId}:
+    get:
+      operationId: getSecureBootstrapConfig
+      summary: Retrieves configuration.
+      description: |
+        Retrieves a configuration with given external ID and encrypted external key.
+      tags:
+        - configs
+      security:
+        - bootstrapEncAuth: []
+      parameters:
+        - $ref: "#/components/parameters/ExternalId"
+      responses:
+        "200":
+          $ref: "#/components/responses/BootstrapConfigRes"
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.
+        "404":
+          description: |
+            Failed to retrieve corresponding config.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /{domainID}/clients/state/{configId}:
+    put:
+      operationId: updateConfigState
+      summary: Updates Config state.
+      description: |
+        Updating state represents enabling/disabling Config, i.e. connecting
+        and disconnecting corresponding SuperMQ Client to the list of Channels.
+      tags:
+        - configs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/ConfigId"
+      requestBody:
+        $ref: "#/components/requestBodies/ConfigStateUpdateReq"
+      responses:
+        "204":
+          description: Config removed.
+        "400":
+          description: Failed due to malformed config's ID.
+        "401":
+          description: Missing or invalid access token provided.
+        "404":
+          description: A non-existent entity request.
+        "415":
+          description: Missing or invalid content type.
+        "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:
+    State:
+      type: integer
+      enum: [0, 1]
+    Config:
+      type: object
+      properties:
+        client_id:
+          type: string
+          format: uuid
+          description: Corresponding SuperMQ Client ID.
+        magistrala_secret:
+          type: string
+          format: uuid
+          description: Corresponding SuperMQ Client key.
+        channels:
+          type: array
+          minItems: 0
+          items:
+            type: object
+            properties:
+              id:
+                type: string
+                format: uuid
+                description: Channel unique identifier.
+              name:
+                type: string
+                description: Name of the Channel.
+              metadata:
+                type: object
+                description: Custom metadata related to the Channel.
+        external_id:
+          type: string
+          description: External ID (MAC address or some unique identifier).
+        external_key:
+          type: string
+          description: External key.
+        content:
+          type: string
+          description: Free-form custom configuration.
+        state:
+          $ref: "#/components/schemas/State"
+        client_cert:
+          type: string
+          description: Client certificate.
+        ca_cert:
+          type: string
+          description: Issuing CA certificate.
+      required:
+        - external_id
+        - external_key
+    ConfigList:
+      type: object
+      properties:
+        total:
+          type: integer
+          description: Total number of results.
+          minimum: 0
+        offset:
+          type: integer
+          description: Number of items to skip during retrieval.
+          minimum: 0
+          default: 0
+        limit:
+          type: integer
+          description: Size of the subset to retrieve.
+          maximum: 100
+          default: 10
+        configs:
+          type: array
+          minItems: 0
+          uniqueItems: true
+          items:
+            $ref: "#/components/schemas/Config"
+      required:
+        - configs
+    BootstrapConfig:
+      type: object
+      properties:
+        client_id:
+          type: string
+          format: uuid
+          description: Corresponding SuperMQ Client ID.
+        client_key:
+          type: string
+          format: uuid
+          description: Corresponding SuperMQ Client key.
+        channels:
+          type: array
+          minItems: 0
+          items:
+            type: string
+        content:
+          type: string
+          description: Free-form custom configuration.
+        client_cert:
+          type: string
+          description: Client certificate.
+      required:
+        - client_id
+        - client_key
+        - channels
+        - content
+    ConfigUpdateCerts:
+      type: object
+      properties:
+        client_id:
+          type: string
+          format: uuid
+          description: Corresponding SuperMQ Client ID.
+        client_cert:
+          type: string
+          description: Client certificate.
+        client_key:
+          type: string
+          description: Key for the client_cert.
+        ca_cert:
+          type: string
+          description: Issuing CA certificate.
+      required:
+        - client_id
+        - client_key
+        - channels
+        - content
+
+  parameters:
+    ConfigId:
+      name: configId
+      description: Unique Config identifier. It's the ID of the corresponding Client.
+      in: path
+      schema:
+        type: string
+        format: uuid
+      required: true
+    ExternalId:
+      name: externalId
+      description: Unique Config identifier provided by external entity.
+      in: path
+      schema:
+        type: string
+      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
+    State:
+      name: state
+      description: A state of items
+      in: query
+      schema:
+        $ref: "#/components/schemas/State"
+      required: false
+    Name:
+      name: name
+      description: Name of the config. Search by name is partial-match and case-insensitive.
+      in: query
+      schema:
+        type: string
+      required: false
+
+  requestBodies:
+    ConfigCreateReq:
+      description: JSON-formatted document describing the new config.
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              external_id:
+                type: string
+                description: External ID (MAC address or some unique identifier).
+              external_key:
+                type: string
+                description: External key.
+              client_id:
+                type: string
+                format: uuid
+                description: ID of the corresponding SuperMQ Client.
+              channels:
+                type: array
+                minItems: 0
+                items:
+                  type: string
+                  format: uuid
+              content:
+                type: string
+              name:
+                type: string
+              client_cert:
+                type: string
+                description: Client Certificate.
+              client_key:
+                type: string
+                description: Client Private Key.
+              ca_cert:
+                type: string
+            required:
+              - external_id
+              - external_key
+    ConfigUpdateReq:
+      description: JSON-formatted document describing the updated client.
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              content:
+                type: string
+              name:
+                type: string
+            required:
+              - content
+              - name
+    ConfigCertUpdateReq:
+      description: JSON-formatted document describing the updated client.
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              client_cert:
+                type: string
+              client_key:
+                type: string
+              ca_cert:
+                type: string
+    ConfigConnUpdateReq:
+      description: Array if IDs the client is be connected to.
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              channels:
+                type: array
+                minItems: 0
+                items:
+                  type: string
+                  format: uuid
+    ConfigStateUpdateReq:
+      description: Update the state of the Config.
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              state:
+                $ref: "#/components/schemas/State"
+
+  responses:
+    ConfigCreateRes:
+      description: Config registered.
+      headers:
+        Location:
+          content:
+            text/plain:
+              schema:
+                type: string
+                description: Created configuration's relative URL (i.e. /clients/configs/{configId}).
+    ConfigListRes:
+      description: Data retrieved. Configs from this list don't contain channels.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/ConfigList"
+    ConfigRes:
+      description: Data retrieved.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Config"
+      links:
+        update:
+          operationId: updateConfig
+          parameters:
+            configId: $response.body#/id
+        updateCerts:
+          operationId: updateConfigCerts
+          parameters:
+            configId: $response.body#/id
+        updateConnections:
+          operationId: updateConfigConnections
+          parameters:
+            configId: $response.body#/id
+        updateState:
+          operationId: updateConfigState
+          parameters:
+            configId: $response.body#/id
+        delete:
+          operationId: removeConfig
+          parameters:
+            configId: $response.body#/id
+    BootstrapConfigRes:
+      description: |
+        Data retrieved. If secure, a response is encrypted using
+        the secret key, so the response is in the binary form.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/BootstrapConfig"
+    ServiceError:
+      description: Unexpected server-side error occurred.
+    HealthRes:
+      description: Service Health Check.
+      content:
+        application/health+json:
+          schema:
+            $ref: "./schemas/health_info.yml"
+    ConfigUpdateCertsRes:
+      description: Data retrieved. Config certs updated.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/ConfigUpdateCerts"
+
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: |
+        * Users access: "Authorization: Bearer <user_token>"
+
+    bootstrapAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: string
+      description: |
+        * Clients access: "Authorization: Client <external_key>"
+
+    bootstrapEncAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: aes-sha256-uuid
+      description: |
+        * Clients access: "Authorization: Client <external_enc_key>"
+        Hex-encoded configuration external key encrypted using
+        the AES algorithm and SHA256 sum of the external key
+        itself as an encryption key.
+
+security:
+  - bearerAuth: []

api/openapi/certs.yml

@@ -0,0 +1,316 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identifier: Apache-2.0
+
+openapi: 3.0.1
+info:
+  title: SuperMQ Certs service
+  description: |
+    HTTP API for Certs service
+    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.15.1
+
+servers:
+  - url: http://localhost:9019
+  - url: https://localhost:9019
+
+tags:
+  - name: certs
+    description: Everything about your Certs
+    externalDocs:
+      description: Find out more about certs
+      url: https://docs.supermq.abstractmachines.fr/
+
+paths:
+  /{domainID}/certs:
+    post:
+      operationId: createCert
+      summary: Creates a certificate for client
+      description: Creates a certificate for client
+      tags:
+        - certs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+      requestBody:
+        $ref: "#/components/requestBodies/CertReq"
+      responses:
+        "201":
+          description: Created
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "415":
+          description: Missing or invalid content type.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /{domainID}/certs/{certID}:
+    get:
+      operationId: getCert
+      summary: Retrieves a certificate
+      description: |
+        Retrieves a certificate for a given cert ID.
+      tags:
+        - certs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/CertID"
+      responses:
+        "200":
+          $ref: "#/components/responses/CertRes"
+        "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: |
+            Failed to retrieve corresponding certificate.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+    delete:
+      operationId: revokeCert
+      summary: Revokes a certificate
+      description: |
+        Revokes a certificate for a given cert ID.
+      tags:
+        - certs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/CertID"
+      responses:
+        "200":
+          $ref: "#/components/responses/RevokeRes"
+        "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: |
+            Failed to revoke corresponding certificate.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /{domainID}/serials/{clientID}:
+    get:
+      operationId: getSerials
+      summary: Retrieves certificates' serial IDs
+      description: |
+        Retrieves a list of certificates' serial IDs for a given client ID.
+      tags:
+        - certs
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/ClientID"
+      responses:
+        "200":
+          $ref: "#/components/responses/SerialsPageRes"
+        "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: |
+            Failed to retrieve corresponding certificates.
+        "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:
+    ClientID:
+      name: clientID
+      description: Client ID
+      in: path
+      schema:
+        type: string
+        format: uuid
+      required: true
+    CertID:
+      name: certID
+      description: Serial of certificate
+      in: path
+      schema:
+        type: string
+        format: uuid
+      required: true
+
+  schemas:
+    Cert:
+      type: object
+      properties:
+        client_id:
+          type: string
+          format: uuid
+          description: Corresponding SuperMQ Client ID.
+        client_cert:
+          type: string
+          description: Client Certificate.
+        client_key:
+          type: string
+          description: Key for the client_cert.
+        issuing_ca:
+          type: string
+          description: CA Certificate that is used to issue client certs, usually intermediate.
+        serial:
+          type: string
+          description: Certificate serial
+        expire:
+          type: string
+          description: Certificate expiry date
+    Serial:
+      type: object
+      properties:
+        serial:
+          type: string
+          description: Certificate serial
+    CertsPage:
+      type: object
+      properties:
+        certs:
+          type: array
+          minItems: 0
+          uniqueItems: true
+          items:
+            $ref: "#/components/schemas/Cert"
+        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.
+    SerialsPage:
+      type: object
+      properties:
+        serials:
+          type: array
+          description: Certificate serials IDs.
+          minItems: 0
+          uniqueItems: true
+          items:
+            type: string
+        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.
+    Revoke:
+      type: object
+      properties:
+        revocation_time:
+          type: string
+          description: Certificate revocation time
+
+  requestBodies:
+    CertReq:
+      description: |
+        Issues a certificate that is required for mTLS. To create a certificate for a client
+        provide a client id, data identifying particular client will be embedded into the Certificate.
+        x509 and ECC certificates are supported when using when Vault is used as PKI.
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - client_id
+              - ttl
+            properties:
+              client_id:
+                type: string
+                format: uuid
+              ttl:
+                type: string
+                example: "10h"
+
+  responses:
+    ServiceError:
+      description: Unexpected server-side error occurred.
+    CertRes:
+      description: Certificate data.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Cert"
+      links:
+        serial:
+          operationId: getSerials
+          parameters:
+            clientID: $response.body#/client_id
+        delete:
+          operationId: revokeCert
+          parameters:
+            certID: $response.body#/serial
+    CertsPageRes:
+      description: Certificates page.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/CertsPage"
+    SerialsPageRes:
+      description: Serials page.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/SerialsPage"
+    RevokeRes:
+      description: Certificate revoked.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Revoke"
+    HealthRes:
+      description: Service Health Check.
+      content:
+        application/health+json:
+          schema:
+            $ref: "./schemas/health_info.yml"
+
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: |
+        * Users access: "Authorization: Bearer <user_token>"
+
+security:
+  - bearerAuth: []

api/openapi/domains.yml

@@ -0,0 +1,959 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identified: Apache-2.0
+
+openapi: 3.0.3
+info:
+  title: Magistrala Domains Service
+  description: |
+    This is the Domains Server based on the OpenAPI 3.0 specification.  It is the HTTP API for managing platform domains. 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 Magistrala repository](https://github.com/absmach/magistrala)
+  contact:
+    email: info@abstractmachines.fr
+  license:
+    name: Apache 2.0
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
+  version: 0.15.1
+
+servers:
+  - url: http://localhost:9003
+  - url: https://localhost:9003
+
+tags:
+  - name: Domains
+    description: CRUD operations for your domains
+    externalDocs:
+      description: Find out more about domains
+      url: https://docs.magistrala.abstractmachines.fr/
+  - name: Roles
+    description: All operations involving roles for clients
+    externalDocs:
+       description: Find out more about roles
+       url: https://docs.supermq.abstractmachines.fr/
+  - name: Health
+    description: Service health check endpoint.
+    externalDocs:
+      description: Find out more about health check
+      url: https://docs.magistrala.abstractmachines.fr/
+
+paths:
+  /domains:
+    post:
+      tags:
+        - Domains
+      summary: Adds new domain
+      description: |
+        Adds new domain.
+      requestBody:
+        $ref: "#/components/requestBodies/DomainCreateReq"
+      responses:
+        "201":
+          $ref: "#/components/responses/DomainCreateRes"
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.
+        "409":
+          description: Failed due to using an existing alias.
+        "415":
+          description: Missing or invalid content type.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+    get:
+      summary: Retrieves list of domains.
+      description: |
+        Retrieves list of domains that the user have access.
+      parameters:
+        - $ref: "#/components/parameters/Limit"
+        - $ref: "#/components/parameters/Offset"
+        - $ref: "#/components/parameters/Metadata"
+        - $ref: "#/components/parameters/Status"
+        - $ref: "#/components/parameters/DomainName"
+        - $ref: "#/components/parameters/Permission"
+      tags:
+        - Domains
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "#/components/responses/DomainsPageRes"
+        "400":
+          description: Failed due to malformed query parameters.
+        "401":
+          description: Missing or invalid access token provided.
+        "404":
+          description: A non-existent entity request.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /domains/{domainID}:
+    get:
+      summary: Retrieves domain information
+      description: |
+        Retrieves a specific domain that is identified by the domain ID.
+      tags:
+        - Domains
+      parameters:
+        - $ref: "#/components/parameters/DomainID"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "#/components/responses/DomainRes"
+        "400":
+          description: Failed due to malformed query parameters.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Unauthorized access to domain id.
+        "404":
+          description: A non-existent entity request.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+    patch:
+      summary: Updates name, metadata, tags and alias of the domain.
+      description: |
+        Updates name, metadata, tags and alias of the domain.
+      tags:
+        - Domains
+      parameters:
+        - $ref: "#/components/parameters/DomainID"
+      requestBody:
+        $ref: "#/components/requestBodies/DomainUpdateReq"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "#/components/responses/DomainRes"
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Unauthorized access to domain id.
+        "404":
+          description: Failed due to non existing domain.
+        "415":
+          description: Missing or invalid content type.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /domains/{domainID}/enable:
+    post:
+      summary: Enables a domain
+      description: |
+        Enables a specific domain that is identified by the domain ID.
+      tags:
+        - Domains
+      parameters:
+        - $ref: "#/components/parameters/DomainID"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          description: Successfully enabled domain.
+        "400":
+          description: Failed due to malformed domain's ID.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Unauthorized access the domain ID.
+        "404":
+          description: A non-existent entity request.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /domains/{domainID}/disable:
+    post:
+      summary: Disable a domain
+      description: |
+        Disable a specific domain that is identified by the domain ID.
+      tags:
+        - Domains
+      parameters:
+        - $ref: "#/components/parameters/DomainID"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          description: Successfully disabled domain.
+        "400":
+          description: Failed due to malformed domain's ID.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Unauthorized access the domain ID.
+        "404":
+          description: A non-existent entity request.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+  /domains/{domainID}/freeze:
+    post:
+      summary: Freeze a domain
+      description: |
+        Freeze a specific domain that is identified by the domain ID.
+      tags:
+        - Domains
+      parameters:
+        - $ref: "#/components/parameters/DomainID"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          description: Successfully freezed domain.
+        "400":
+          description: Failed due to malformed domain's ID.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Unauthorized access the domain ID.
+        "404":
+          description: A non-existent entity request.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+  
+  /domains/{domainID}/roles:
+    post:
+      operationId: createDomainRole
+      summary: Creates a role for a domain
+      description: |
+        Creates a role for a specific domain that is identified by the domain ID.
+      tags:
+        - Roles
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+      requestBody:
+        $ref: "./schemas/roles.yml#/components/requestBodies/CreateRoleReq"
+      security:
+        - bearerAuth: []
+      responses:
+        "201":
+            $ref: "./schemas/roles.yml#/components/responses/CreateRoleRes"
+        "400":
+          description: Failed due to malformed domain's ID.
+        "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"
+    
+    get:
+      operationId: listDomainRoles
+      tags:
+        - Roles
+      summary: Retrieves domains roles.
+      description: |
+        Retrieves a list of domain roles. Due to performance concerns, data
+        is retrieved in subsets. The API domains 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: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/Limit"
+        - $ref: "#/components/parameters/Offset"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "./schemas/roles.yml#/components/responses/ListRolesRes"
+        "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"
+
+  /domains/{domainID}/roles/{roleName}:
+    get:
+      operationId: getDomainRole
+      tags:
+        - Roles
+      summary: Retrieves domain role.
+      description: |
+        Retrieves a specific domain role that is identified by the role name.
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "./schemas/roles.yml#/components/responses/GetRoleRes"
+        "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"
+      
+    put:
+      operationId: updateDomainRole
+      summary: Updates domain role.
+      description: |
+        Updates a specific domain role that is identified by the role name.
+      tags:
+        - Roles
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      requestBody:
+        $ref: "./schemas/roles.yml#/components/requestBodies/UpdateRoleReq"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "./schemas/roles.yml#/components/responses/GetRoleRes"
+        "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"
+      
+    delete:
+      operationId: deleteDomainRole
+      summary: Deletes domain role.
+      description: |
+        Deletes a specific domain role that is identified by the role name.
+      tags:
+        - Roles
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      security:
+        - bearerAuth: []
+      responses:
+        "204":
+          description: Role deleted.
+        "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"
+  
+  /domains/{domainID}/roles/{roleName}/actions:
+    post:
+      operationId: addDomainRoleAction
+      summary: Adds a role action for a domain role.
+      description: |
+        Adds a role action for a specific domain role that is identified by the role name.
+      tags:
+        - Roles
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      requestBody:
+        $ref: "./schemas/roles.yml#/components/requestBodies/AddRoleActionsReq"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "./schemas/roles.yml#/components/responses/AddRoleActionsRes"
+        "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"
+  
+    get:
+      operationId: listDomainRoleActions
+      tags:
+        - Roles
+      summary: Lists domain role actions.
+      description: |
+        Retrieves a list of domain role actions. 
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "./schemas/roles.yml#/components/responses/ListRoleActionsRes"
+        "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"
+  
+  /domains/{domainID}/roles/{roleName}/actions/delete:
+    post:
+      operationId: deleteDomainRoleAction
+      summary: Deletes role actions for a domain role.
+      description: |
+        Deletes a role action for a specific domain role that is identified by the role name.
+      tags:
+        - Roles
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      requestBody:
+        $ref: "./schemas/roles.yml#/components/requestBodies/AddRoleActionsReq"
+      security:
+        - bearerAuth: []
+      responses:
+        "204":
+          description: Role actions deleted.
+        "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"
+    
+  /domains/{domainID}/roles/{roleName}/actions/delete-all:
+    post:
+      operationId: deleteAllDomainRoleActions
+      summary: Deletes all role actions for a domain role.
+      description: |
+        Deletes all role actions for a specific domain role that is identified by the role name.
+      tags:
+        - Roles
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      security:
+        - bearerAuth: []
+      responses:
+        "204":
+          description: All role actions deleted.
+        "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"
+  
+  /domains/{domainID}/roles/{roleName}/members:
+    post:
+      operationId: addDomainRoleMember
+      summary: Adds a member to a domain role.
+      description: |
+        Adds a member to a specific domain role that is identified by the role name.
+      tags:
+        - Roles
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      requestBody:
+        $ref: "./schemas/roles.yml#/components/requestBodies/AddRoleMembersReq"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "./schemas/roles.yml#/components/responses/AddRoleMembersRes"
+        "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"
+    
+    get:
+      operationId: listDomainRoleMembers
+      tags:
+        - Roles
+      summary: Lists domain role members.
+      description: |
+        Retrieves a list of domain role members. 
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "./schemas/roles.yml#/components/responses/ListRoleMembersRes"
+        "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"
+    
+  /domains/{domainID}/roles/{roleName}/members/delete:
+    post:
+      operationId: deleteDomainRoleMembers
+      summary: Deletes members from a domain role.
+      description: |
+        Deletes a member from a specific domain role that is identified by the role name.
+      tags:
+        - Roles
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      requestBody:
+        $ref: "./schemas/roles.yml#/components/requestBodies/AddRoleMembersReq"
+      security:
+        - bearerAuth: []
+      responses:
+        "204":
+          description: Role members deleted.
+        "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"
+  
+  /domains/{domainID}/roles/{roleName}/members/delete-all:
+    post:
+      operationId: deleteAllDomainRoleMembers
+      summary: Deletes all members from a domain role.
+      description: |
+        Deletes all members from a specific domain role that is identified by the role name.
+      tags:
+        - Roles
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "./schemas/roles.yml#/components/parameters/RoleName"
+      security:
+        - bearerAuth: []
+      responses:
+        "204":
+          description: All role members deleted.
+        "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"
+  
+  /domains/roles/available-actions:
+    get:
+      operationId: listAvailableActions
+      tags:
+        - Roles
+      summary: Retrieves available actions.
+      description: |
+        Retrieves a list of available actions. 
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "./schemas/roles.yml#/components/responses/ListAvailableActionsRes"
+        "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:
+    DomainReqObj:
+      type: object
+      properties:
+        name:
+          type: string
+          example: domainName
+          description: Domain name.
+        tags:
+          type: array
+          minItems: 0
+          items:
+            type: string
+          example: ["tag1", "tag2"]
+          description: domain tags.
+        metadata:
+          type: object
+          example: { "domain": "example.com" }
+          description: Arbitrary, object-encoded domain's data.
+        alias:
+          type: string
+          example: domain alias
+          description: Domain alias.
+      required:
+        - name
+        - alias
+    Domain:
+      type: object
+      properties:
+        id:
+          type: string
+          format: uuid
+          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+          description: Domain unique identified.
+        name:
+          type: string
+          example: domainName
+          description: Domain name.
+        tags:
+          type: array
+          minItems: 0
+          items:
+            type: string
+          example: ["tag1", "tag2"]
+          description: domain tags.
+        metadata:
+          type: object
+          example: { "domain": "example.com" }
+          description: Arbitrary, object-encoded domain's data.
+        alias:
+          type: string
+          example: domain alias
+          description: Domain alias.
+        status:
+          type: string
+          description: Domain Status
+          format: string
+          example: enabled
+        created_by:
+          type: string
+          format: uuid
+          example: "0d837f56-3f8a-4e2a-9359-6347d0fc9f06 "
+          description: User ID of the user who created the domain.
+        created_at:
+          type: string
+          format: date-time
+          example: "2019-11-26 13:31:52"
+          description: Time when the domain was created.
+        updated_by:
+          type: string
+          format: uuid
+          example: "80f66b77-ed74-4e74-9f88-6cce9a0a3049"
+          description: User ID of the user who last updated the domain.
+        updated_at:
+          type: string
+          format: date-time
+          example: "2019-11-26 13:31:52"
+          description: Time when the domain was last updated.
+      xml:
+        name: domain
+
+    DomainsPage:
+      type: object
+      properties:
+        domains:
+          type: array
+          minItems: 0
+          uniqueItems: true
+          items:
+            $ref: "#/components/schemas/Domain"
+        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:
+        - domains
+        - total
+        - offset
+    DomainUpdate:
+      type: object
+      properties:
+        name:
+          type: string
+          example: domainName
+          description: Domain name.
+        tags:
+          type: array
+          minItems: 0
+          items:
+            type: string
+          example: ["tag1", "tag2"]
+          description: domain tags.
+        metadata:
+          type: object
+          example: { "domain": "example.com" }
+          description: Arbitrary, object-encoded domain's data.
+        alias:
+          type: string
+          example: domain alias
+          description: Domain alias.
+
+  parameters:
+    DomainID:
+      name: domainID
+      description: Unique domain identified.
+      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:
+    DomainCreateReq:
+      description: JSON-formatted document describing the new domain to be registered
+      required: true
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/DomainReqObj"
+    DomainUpdateReq:
+      description: JSON-formated document describing the name, alias, tags, and metadata of the domain to be updated
+      required: true
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/DomainUpdate"
+
+  responses:
+    ServiceError:
+      description: Unexpected server-side error occurred.
+
+    DomainCreateRes:
+      description: Create new domain.
+      headers:
+        Location:
+          schema:
+            type: string
+            format: url
+          description: Registered domain relative URL in the format `/domains/<domainID_id>`
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Domain"
+
+    DomainRes:
+      description: Data retrieved.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Domain"
+    DomainsPageRes:
+      description: Data retrieved.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/DomainsPage"
+    HealthRes:
+      description: Service Health Check.
+      content:
+        application/health+json:
+          schema:
+            $ref: "./schemas/health_info.yml"
+
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: |
+        * Users access: "Authorization: Bearer <user_token>"
+
+security:
+  - bearerAuth: []

api/openapi/http.yml

@@ -0,0 +1,182 @@
+# 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.15.1
+
+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:
+  /channels/{id}/messages:
+    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/ID"
+      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:
+    ID:
+      name: id
+      description: Unique channel identifier.
+      in: path
+      schema:
+        type: string
+        format: uuid
+      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.yml"
+
+  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: []

api/openapi/invitations.yml

@@ -0,0 +1,537 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identifier: Apache-2.0
+
+openapi: 3.0.3
+info:
+  title: SuperMQ Invitations Service
+  description: |
+    This is the Invitations Server based on the OpenAPI 3.0 specification.  It is the HTTP API for managing platform invitations. 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.15.1
+
+servers:
+  - url: http://localhost:9020
+  - url: https://localhost:9020
+
+tags:
+  - name: Invitations
+    description: Everything about your Invitations
+    externalDocs:
+      description: Find out more about Invitations
+      url: https://docs.supermq.abstractmachines.fr/
+
+paths:
+  /invitations:
+    post:
+      operationId: sendInvitation
+      tags:
+        - Invitations
+      summary: Send invitation
+      description: |
+        Send invitation to user to join domain.
+      requestBody:
+        $ref: "#/components/requestBodies/SendInvitationReq"
+      security:
+        - bearerAuth: []
+      responses:
+        "201":
+          description: Invitation sent.
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "404":
+          description: A non-existent entity request.
+        "409":
+          description: Failed due to using an existing identity.
+        "415":
+          description: Missing or invalid content type.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+    get:
+      operationId: listInvitations
+      tags:
+        - Invitations
+      summary: List invitations
+      description: |
+        Retrieves a list of invitations. 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/Limit"
+        - $ref: "#/components/parameters/Offset"
+        - $ref: "#/components/parameters/UserID"
+        - $ref: "#/components/parameters/InvitedBy"
+        - $ref: "#/components/parameters/DomainID"
+        - $ref: "#/components/parameters/Relation"
+        - $ref: "#/components/parameters/State"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "#/components/responses/InvitationPageRes"
+        "400":
+          description: Failed due to malformed query parameters.
+        "401":
+          description: |
+            Missing or invalid access token provided.
+            This endpoint is available only for administrators.
+        "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"
+
+  /invitations/accept:
+    post:
+      operationId: acceptInvitation
+      summary: Accept invitation
+      description: |
+        Current logged in user accepts invitation to join domain.
+      tags:
+        - Invitations
+      security:
+        - bearerAuth: []
+      requestBody:
+        $ref: "#/components/requestBodies/AcceptInvitationReq"
+      responses:
+        "204":
+          description: Invitation accepted.
+        "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"
+
+  /invitations/reject:
+    post:
+      operationId: rejectInvitation
+      summary: Reject invitation
+      description: |
+        Current logged in user rejects invitation to join domain.
+      tags:
+        - Invitations
+      security:
+        - bearerAuth: []
+      requestBody:
+        $ref: "#/components/requestBodies/AcceptInvitationReq"
+      responses:
+        "204":
+          description: Invitation rejected.
+        "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"
+
+  /invitations/{user_id}/{domain_id}:
+    get:
+      operationId: getInvitation
+      summary: Retrieves a specific invitation
+      description: |
+        Retrieves a specific invitation that is identifier by the user ID and domain ID.
+      tags:
+        - Invitations
+      parameters:
+        - $ref: "#/components/parameters/user_id"
+        - $ref: "#/components/parameters/domain_id"
+      security:
+        - bearerAuth: []
+      responses:
+        "200":
+          $ref: "#/components/responses/InvitationRes"
+        "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"
+
+    delete:
+      operationId: deleteInvitation
+      summary: Deletes a specific invitation
+      description: |
+        Deletes a specific invitation that is identifier by the user ID and domain ID.
+      tags:
+        - Invitations
+      parameters:
+        - $ref: "#/components/parameters/user_id"
+        - $ref: "#/components/parameters/domain_id"
+      security:
+        - bearerAuth: []
+      responses:
+        "204":
+          description: Invitation deleted.
+        "400":
+          description: Failed due to malformed JSON.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "404":
+          description: Failed due to non existing user.
+        "401":
+          description: Missing or invalid access token provided.
+        "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:
+    SendInvitationReqObj:
+      type: object
+      properties:
+        user_id:
+          type: string
+          format: uuid
+          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+          description: User unique identifier.
+        domain_id:
+          type: string
+          format: uuid
+          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+          description: Domain unique identifier.
+        relation:
+          type: string
+          enum:
+            - administrator
+            - editor
+            - contributor
+            - member
+            - guest
+            - domain
+            - parent_group
+            - role_group
+            - group
+            - platform
+          example: editor
+          description: Relation between user and domain.
+        resend:
+          type: boolean
+          example: true
+          description: Resend invitation.
+      required:
+        - user_id
+        - domain_id
+        - relation
+
+    Invitation:
+      type: object
+      properties:
+        invited_by:
+          type: string
+          format: uuid
+          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+          description: User unique identifier.
+        user_id:
+          type: string
+          format: uuid
+          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+          description: User unique identifier.
+        domain_id:
+          type: string
+          format: uuid
+          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+          description: Domain unique identifier.
+        relation:
+          type: string
+          enum:
+            - administrator
+            - editor
+            - contributor
+            - member
+            - guest
+            - domain
+            - parent_group
+            - role_group
+            - group
+            - platform
+          example: editor
+          description: Relation between user and domain.
+        created_at:
+          type: string
+          format: date-time
+          example: "2019-11-26 13:31:52"
+          description: Time when the group was created.
+        updated_at:
+          type: string
+          format: date-time
+          example: "2019-11-26 13:31:52"
+          description: Time when the group was created.
+        confirmed_at:
+          type: string
+          format: date-time
+          example: "2019-11-26 13:31:52"
+          description: Time when the group was created.
+      xml:
+        name: invitation
+
+    InvitationPage:
+      type: object
+      properties:
+        invitations:
+          type: array
+          minItems: 0
+          uniqueItems: true
+          items:
+            $ref: "#/components/schemas/Invitation"
+        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:
+        - invitations
+        - total
+        - offset
+
+    Error:
+      type: object
+      properties:
+        error:
+          type: string
+          description: Error message
+      example: { "error": "malformed entity specification" }
+
+    HealthRes:
+      type: object
+      properties:
+        status:
+          type: string
+          description: Service status.
+          enum:
+            - pass
+        version:
+          type: string
+          description: Service version.
+          example: 0.14.0
+        commit:
+          type: string
+          description: Service commit hash.
+          example: 7d6f4dc4f7f0c1fa3dc24eddfb18bb5073ff4f62
+        description:
+          type: string
+          description: Service description.
+          example: <service_name> service
+        build_time:
+          type: string
+          description: Service build time.
+          example: 1970-01-01_00:00:00
+
+  parameters:
+    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"
+
+    UserID:
+      name: user_id
+      description: Unique user identifier.
+      in: query
+      schema:
+        type: string
+        format: uuid
+      required: true
+      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+
+    user_id:
+      name: user_id
+      description: Unique user identifier.
+      in: path
+      schema:
+        type: string
+        format: uuid
+      required: true
+      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+
+    DomainID:
+      name: domain_id
+      description: Unique identifier for a domain.
+      in: query
+      schema:
+        type: string
+        format: uuid
+      required: false
+      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+
+    domain_id:
+      name: domain_id
+      description: Unique identifier for a domain.
+      in: path
+      schema:
+        type: string
+        format: uuid
+      required: true
+      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+
+    InvitedBy:
+      name: invited_by
+      description: Unique identifier for a user that invited the user.
+      in: query
+      schema:
+        type: string
+        format: uuid
+      required: false
+      example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+
+    Relation:
+      name: relation
+      description: Relation between user and domain.
+      in: query
+      schema:
+        type: string
+        enum:
+          - administrator
+          - editor
+          - contributor
+          - member
+          - guest
+          - domain
+          - parent_group
+          - role_group
+          - group
+          - platform
+      required: false
+      example: editor
+
+    State:
+      name: state
+      description: Invitation state.
+      in: query
+      schema:
+        type: string
+        enum:
+          - pending
+          - accepted
+          - all
+      required: false
+      example: accepted
+
+  requestBodies:
+    SendInvitationReq:
+      description: JSON-formatted document describing request for sending invitation
+      required: true
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/SendInvitationReqObj"
+
+    AcceptInvitationReq:
+      description: JSON-formatted document describing request for accepting invitation
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              domain_id:
+                type: string
+                format: uuid
+                example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+                description: Domain unique identifier.
+            required:
+              - domain_id
+
+  responses:
+    InvitationRes:
+      description: Data retrieved.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Invitation"
+      links:
+        delete:
+          operationId: deleteInvitation
+          parameters:
+            user_id: $response.body#/user_id
+            domain_id: $response.body#/domain_id
+
+    InvitationPageRes:
+      description: Data retrieved.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/InvitationPage"
+
+    HealthRes:
+      description: Service Health Check.
+      content:
+        application/health+json:
+          schema:
+            $ref: "#/components/schemas/HealthRes"
+
+    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: []

api/openapi/journal.yml

@@ -0,0 +1,344 @@
+# 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.15.1
+
+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/{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:
+    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
+
+    entity_type:
+      name: entityType
+      description: Type of entity, e.g. user, group, client, etc.entityType
+      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 thing.  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.yml"
+
+    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: []

api/openapi/notifiers.yml

@@ -0,0 +1,292 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identifier: Apache-2.0
+
+openapi: 3.0.1
+info:
+  title: SuperMQ Notifiers service
+  description: |
+    HTTP API for Notifiers service.
+    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.15.1
+
+servers:
+  - url: http://localhost:9014
+  - url: https://localhost:9014
+  - url: http://localhost:9015
+  - url: https://localhost:9015
+
+tags:
+  - name: notifiers
+    description: Everything about your Notifiers
+    externalDocs:
+      description: Find out more about notifiers
+      url: https://docs.supermq.abstractmachines.fr/
+
+paths:
+  /subscriptions:
+    post:
+      operationId: createSubscription
+      summary: Create subscription
+      description: Creates a new subscription give a topic and contact.
+      tags:
+        - notifiers
+      requestBody:
+        $ref: "#/components/requestBodies/Create"
+      responses:
+        "201":
+          $ref: "#/components/responses/Create"
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.          
+        "403":
+          description: Failed to perform authorization over the entity.
+        "409":
+          description: Failed due to using an existing topic and contact.
+        "415":
+          description: Missing or invalid content type.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+    get:
+      operationId: listSubscriptions
+      summary: List subscriptions
+      description: List subscriptions given list parameters.
+      tags:
+        - notifiers
+      parameters:
+        - $ref: "#/components/parameters/Topic"
+        - $ref: "#/components/parameters/Contact"
+        - $ref: "#/components/parameters/Offset"
+        - $ref: "#/components/parameters/Limit"
+      responses:
+        "200":
+          $ref: "#/components/responses/Page"
+        "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"
+  /subscriptions/{id}:
+    get:
+      operationId: viewSubscription
+      summary: Get subscription with the provided id
+      description: Retrieves a subscription with the provided id.
+      tags:
+        - notifiers
+      parameters:
+        - $ref: "#/components/parameters/Id"
+      responses:
+        "200":
+          $ref: "#/components/responses/View"
+        "400":
+          description: Failed due to malformed ID.
+        "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"
+    delete:
+      operationId: removeSubscription
+      summary: Delete subscription with the provided id
+      description: Removes a subscription with the provided id.
+      tags:
+        - notifiers
+      parameters:
+        - $ref: "#/components/parameters/Id"
+      responses:
+        "204":
+          description: Subscription removed
+        "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:
+    Subscription:
+      type: object
+      properties:
+        id:
+          type: string
+          format: ulid
+          example: 01EWDVKBQSG80B6PQRS9PAAY35
+          description: ULID id of the subscription.
+        owner_id:
+          type: string
+          format: uuid
+          example: 18167738-f7a8-4e96-a123-58c3cd14de3a
+          description: An id of the owner who created subscription.
+        topic:
+          type: string
+          example: topic.subtopic
+          description: Topic to which the user subscribes.
+        contact:
+          type: string
+          example: user@example.com
+          description: The contact of the user to which the notification will be sent.
+    CreateSubscription:
+      type: object
+      properties:
+        topic:
+          type: string
+          example: topic.subtopic
+          description: Topic to which the user subscribes.
+        contact:
+          type: string
+          example: user@example.com
+          description: The contact of the user to which the notification will be sent.
+    Page:
+      type: object
+      properties:
+        subscriptions:
+          type: array
+          minItems: 0
+          uniqueItems: true
+          items:
+            $ref: "#/components/schemas/Subscription"
+        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.
+
+  parameters:
+    Id:
+      name: id
+      description: Unique identifier.
+      in: path
+      schema:
+        type: string
+        format: ulid
+      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
+    Topic:
+      name: topic
+      description: Topic name.
+      in: query
+      schema:
+        type: string
+      required: false
+    Contact:
+      name: contact
+      description: Subscription contact.
+      in: query
+      schema:
+        type: string
+      required: false
+
+  requestBodies:
+    Create:
+      description: JSON-formatted document describing the new subscription to be created
+      required: true
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/CreateSubscription"
+
+  responses:
+    Create:
+      description: Created a new subscription.
+      headers:
+        Location:
+          content:
+            text/plain:
+              schema:
+                type: string
+                description: Created subscription relative URL
+                example: /subscriptions/{id}
+    View:
+      description: View subscription.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Subscription"
+      links:
+        delete:
+          operationId: removeSubscription
+          parameters:
+            id: $response.body#/id
+    Page:
+      description: Data retrieved.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Page"
+    ServiceError:
+      description: Unexpected server-side error occurred.
+    HealthRes:
+      description: Service Health Check.
+      content:
+        application/health+json:
+          schema:
+            $ref: "./schemas/health_info.yml"
+
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: |
+        * Users access: "Authorization: Bearer <user_token>"
+
+security:
+  - bearerAuth: []

api/openapi/provision.yml

@@ -0,0 +1,133 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identifier: Apache-2.0
+
+openapi: 3.0.1
+info:
+  title: SuperMQ Provision service
+  description: |
+    HTTP API for Provision service
+    Some useful links:
+    - [The SuperMQ repository](https://github.com/absmach/supermq)
+  contact:
+    email: info@abstracmachines.fr
+  license:
+    name: Apache 2.0
+    url: https://github.com/absmach/supermq/blob/main/LICENSE
+  version: 0.15.1
+
+servers:
+  - url: http://localhost:9016
+  - url: https://localhost:9016
+
+tags:
+  - name: provision
+    description: Everything about your Provision
+    externalDocs:
+      description: Find out more about provision
+      url: https://docs.supermq.abstractmachines.fr/
+
+paths:
+  /{domainID}/mapping:
+    post:
+      summary: Adds new device to proxy
+      description: Adds new device to proxy
+      tags:
+        - provision
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+      requestBody:
+        $ref: "#/components/requestBodies/ProvisionReq"
+      responses:
+        "201":
+          description: Created
+        "400":
+          description: Failed due to malformed JSON.
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "415":
+          description: Missing or invalid content type.
+        "422":
+          description: Database can't process request.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+    get:
+      summary: Gets current mapping.
+      description: Gets current mapping. This can be used in UI
+        so that when bootstrap config is created from UI matches
+        configuration created with provision service.
+      tags:
+        - provision
+      parameters:
+        - $ref: "auth.yml#/components/parameters/DomainID"
+      responses:
+        "200":
+          $ref: "#/components/responses/ProvisionRes"
+        "401":
+          description: Missing or invalid access token provided.
+        "403":
+          description: Failed to perform authorization over the entity.
+        "415":
+          description: Missing or invalid content type.
+        "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:
+  requestBodies:
+    ProvisionReq:
+      description: MAC address of device or other identifier
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - external_id
+              - external_key
+            properties:
+              external_id:
+                type: string
+              external_key:
+                type: string
+              name:
+                type: string
+
+  responses:
+    ServiceError:
+      description: Unexpected server-side error occurred.
+    ProvisionRes:
+      description: Current mapping JSON representation.
+      content:
+        application/json:
+          schema:
+            type: object
+    HealthRes:
+      description: Service Health Check.
+      content:
+        application/health+json:
+          schema:
+            $ref: "./schemas/health_info.yml"
+
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: |
+        * Users access: "Authorization: Bearer <user_token>"
+
+security:
+  - bearerAuth: []

api/openapi/readers.yml

@@ -0,0 +1,313 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identifier: Apache-2.0
+
+openapi: 3.0.1
+info:
+  title: SuperMQ reader service
+  description: |
+    HTTP API for reading messages.
+    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.15.1
+
+servers:
+  - url: http://localhost:9003
+  - url: https://localhost:9003
+  - url: http://localhost:9005
+  - url: https://localhost:9005
+  - url: http://localhost:9007
+  - url: https://localhost:9007
+  - url: http://localhost:9009
+  - url: https://localhost:9009
+  - url: http://localhost:9011
+  - url: https://localhost:9011
+
+tags:
+  - name: readers
+    description: Everything about your Readers
+    externalDocs:
+      description: Find out more about readers
+      url: https://docs.supermq.abstractmachines.fr/
+
+paths:
+  /channels/{chanId}/messages:
+    get:
+      operationId: getMessages
+      summary: Retrieves messages sent to single channel
+      description: |
+        Retrieves a list of messages sent to specific channel. Due to
+        performance concerns, data is retrieved in subsets. The API readers must
+        ensure that the entire dataset is consumed either by making subsequent
+        requests, or by increasing the subset size of the initial request.
+      tags:
+        - readers
+      parameters:
+        - $ref: "#/components/parameters/ChanId"
+        - $ref: "#/components/parameters/Limit"
+        - $ref: "#/components/parameters/Offset"
+        - $ref: "#/components/parameters/Publisher"
+        - $ref: "#/components/parameters/Name"
+        - $ref: "#/components/parameters/Value"
+        - $ref: "#/components/parameters/BoolValue"
+        - $ref: "#/components/parameters/StringValue"
+        - $ref: "#/components/parameters/DataValue"
+        - $ref: "#/components/parameters/From"
+        - $ref: "#/components/parameters/To"
+        - $ref: "#/components/parameters/Aggregation"
+        - $ref: "#/components/parameters/Interval"
+      responses:
+        "200":
+          $ref: "#/components/responses/MessagesPageRes"
+        "400":
+          description: Failed due to malformed query parameters.
+        "401":
+          description: Missing or invalid access token provided.
+        "500":
+          $ref: "#/components/responses/ServiceError"
+  /health:
+    get:
+      operationId: health
+      summary: Retrieves service health check info.
+      tags:
+        - health
+      security: []
+      responses:
+        "200":
+          $ref: "#/components/responses/HealthRes"
+        "500":
+          $ref: "#/components/responses/ServiceError"
+
+components:
+  schemas:
+    MessagesPage:
+      type: object
+      properties:
+        total:
+          type: number
+          description: Total number of items that are present on the system.
+        offset:
+          type: number
+          description: Number of items that were skipped during retrieval.
+        limit:
+          type: number
+          description: Size of the subset that was retrieved.
+        messages:
+          type: array
+          minItems: 0
+          uniqueItems: true
+          items:
+            type: object
+            properties:
+              channel:
+                type: integer
+                description: Unique channel id.
+              publisher:
+                type: integer
+                description: Unique publisher id.
+              protocol:
+                type: string
+                description: Protocol name.
+              name:
+                type: string
+                description: Measured parameter name.
+              unit:
+                type: string
+                description: Value unit.
+              value:
+                type: number
+                description: Measured value in number.
+              stringValue:
+                type: string
+                description: Measured value in string format.
+              boolValue:
+                type: boolean
+                description: Measured value in boolean format.
+              dataValue:
+                type: string
+                description: Measured value in binary format.
+              valueSum:
+                type: number
+                description: Sum value.
+              time:
+                type: number
+                description: Time of measurement.
+              updateTime:
+                type: number
+                description: Time of updating measurement.
+
+  parameters:
+    DomainID:
+      name: domainID
+      description: Unique domain identifier.
+      in: path
+      schema:
+        type: string
+        format: uuid
+      required: true
+    ChanId:
+      name: chanId
+      description: Unique channel identifier.
+      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
+    Publisher:
+      name: Publisher
+      description: Unique client identifier.
+      in: query
+      schema:
+        type: string
+        format: uuid
+      required: false
+    Name:
+      name: name
+      description: SenML message name.
+      in: query
+      schema:
+        type: string
+      required: false
+    Value:
+      name: v
+      description: SenML message value.
+      in: query
+      schema:
+        type: string
+      required: false
+    BoolValue:
+      name: vb
+      description: SenML message bool value.
+      in: query
+      schema:
+        type: boolean
+      required: false
+    StringValue:
+      name: vs
+      description: SenML message string value.
+      in: query
+      schema:
+        type: string
+      required: false
+    DataValue:
+      name: vd
+      description: SenML message data value.
+      in: query
+      schema:
+        type: string
+      required: false
+    Comparator:
+      name: comparator
+      description: Value comparison operator.
+      in: query
+      schema:
+        type: string
+        default: eq
+        enum:
+          - eq
+          - lt
+          - le
+          - gt
+          - ge
+      required: false
+    From:
+      name: from
+      description: SenML message time in nanoseconds (integer part represents seconds).
+      in: query
+      schema:
+        type: number
+      example: 1709218556069
+      required: false
+    To:
+      name: to
+      description: SenML message time in nanoseconds (integer part represents seconds).
+      in: query
+      schema:
+        type: number
+      example: 1709218757503
+      required: false
+    Aggregation:
+      name: aggregation
+      description: Aggregation function.
+      in: query
+      schema:
+        type: string
+        enum:
+          - MAX
+          - AVG
+          - MIN
+          - SUM
+          - COUNT
+          - max
+          - min
+          - sum
+          - avg
+          - count
+      example: MAX
+      required: false
+    Interval:
+      name: interval
+      description: Aggregation interval.
+      in: query
+      schema:
+        type: string
+      example: 10s
+      required: false
+
+  responses:
+    MessagesPageRes:
+      description: Data retrieved.
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/MessagesPage"
+    ServiceError:
+      description: Unexpected server-side error occurred.
+    HealthRes:
+      description: Service Health Check.
+      content:
+        application/health+json:
+          schema:
+            $ref: "./schemas/health_info.yml"
+
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: |
+        * Users access: "Authorization: Bearer <user_token>"
+
+    clientAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: uuid
+      description: |
+        * Clients access: "Authorization: Client <client_key>"
+
+security:
+  - bearerAuth: []
+  - clientAuth: []

api/openapi/schemas/health_info.yml

@@ -0,0 +1,30 @@
+# 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.14.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

api/openapi/schemas/roles.yml

@@ -0,0 +1,278 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identifier: Apache-2.0
+
+components:
+  schemas:
+    NewRole:
+      type: object
+      properties:
+        role_id:
+          type: string
+          format: uuid
+          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+          description: Role unique identifier.
+        role_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:
+        role_id:
+          type: string
+          format: uuid
+          example: bb7edb32-2eac-4aad-aebe-ed96fe073879
+          description: Role unique identifier.
+        role_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:
+        role_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.
+
+    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",
+            ]
+    
+    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"
+
+  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'

api/openapi/twins.yml

@@ -0,0 +1,431 @@
+# 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.15.1
+
+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.yml"
+
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: |
+        * Users access: "Authorization: Bearer <user_token>"
+
+security:
+  - bearerAuth: []

auth.proto

@@ -1,96 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-syntax = "proto3";
-
-package mainflux;
-
-import "google/protobuf/empty.proto";
-
-service ThingsService {
-    rpc CanAccessByKey(AccessByKeyReq) returns (ThingID) {}
-    rpc IsChannelOwner(ChannelOwnerReq) returns (google.protobuf.Empty) {}
-    rpc CanAccessByID(AccessByIDReq) returns (google.protobuf.Empty) {}
-    rpc Identify(Token) returns (ThingID) {}
-}
-
-service AuthService {
-    rpc Issue(IssueReq) returns (Token) {}
-    rpc Identify(Token) returns (UserIdentity) {}
-    rpc Authorize(AuthorizeReq) returns (AuthorizeRes) {}
-    rpc Assign(Assignment) returns(google.protobuf.Empty) {}
-    rpc Members(MembersReq) returns (MembersRes) {}
-}
-
-message AccessByKeyReq {
-    string token  = 1;
-    string chanID = 2;
-}
-
-message ChannelOwnerReq {
-    string owner  = 1;
-    string chanID = 2;
-}
-
-message ThingID {
-    string value = 1;
-}
-
-message ChannelID {
-    string value = 1;
-}
-
-message AccessByIDReq {
-    string thingID = 1;
-    string chanID  = 2;
-}
-
-// 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.
-message Token {
-    string value = 1;
-}
-
-message UserIdentity {
-    string id    = 1;
-    string email = 2;
-}
-
-message IssueReq {
-    string id    = 1;
-    string email = 2;
-    uint32 type  = 3;
-}
-
-message AuthorizeReq {
-    string sub = 1;
-    string obj = 2;
-    string act = 3;
-}
-
-message AuthorizeRes {
-    bool authorized = 1;
-}
-
-message Assignment {
-    string token    = 1;
-    string groupID  = 2;
-    string memberID = 3;
-}
-
-message MembersReq {
-    string token    = 1;
-    string groupID  = 2;
-    uint64 offset   = 3;
-    uint64 limit    = 4;
-    string type     = 5;
-}
-
-message MembersRes {
-    uint64 total            = 1;
-    uint64 offset           = 2;
-    uint64 limit            = 3;
-    string type             = 4;
-    repeated string members = 5;
-}

auth/README.md

@@ -1,32 +1,35 @@
 # Auth - Authentication and Authorization service
 
-Auth service provides authentication features as an API for managing authentication keys as well as administering groups of entities - `things` and `users`. 
+Auth service provides authentication features as an API for managing authentication keys as well as administering groups of entities - `clients` and `users`.
+
+## Authentication
 
-# 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 Mainflux User who issued the key
-- Subject - user email
+- 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 *three types of authentication keys*:
+There are four types of authentication keys:
 
-- User key - keys issued to the user upon login request
-- API key - keys issued upon the user request
+- 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 Thing, Channel, or user profile management), *except issuing new API keys*.
+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 Mainflux, please check out the [official documentation][doc].
+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:
 
@@ -35,58 +38,74 @@ The following actions are supported:
 - obtain (API keys only)
 - revoke (API keys only)
 
-# Groups
-User and Things service are using Auth gRPC API to get the list of ids that are part of a group. Groups can be organized as tree structure.
-Group consists of the following fields:
+## Domains
 
-- ID - ULID id uniquely representing group
-- Name - name of the group, name of the group is unique at the same level of tree hierarchy for a given tree.
-- ParentID - id of the parent group
-- OwnerID - id of the user that created a group
-- Description - free form text, up to 1024 characters
-- Metadata - Arbitrary, object-encoded group's data
-- Path - tree path consisting of group ids
-- CreatedAt - timestamp at which the group is created
-- UpdatedAt - timestamp at which the group is updated
+Domains are used to group users and clients. Each domain has a unique alias that is used to identify 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
+- Alias - unique alias of the domain
+- 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.
+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       |
-|---------------------------|--------------------------------------------------------------------------|---------------|
-| MF_AUTH_LOG_LEVEL         | Service level (debug, info, warn, error)                                 | error         |
-| MF_AUTH_DB_HOST           | Database host address                                                    | localhost     |
-| MF_AUTH_DB_PORT           | Database host port                                                       | 5432          |
-| MF_AUTH_DB_USER           | Database user                                                            | mainflux      |
-| MF_AUTH_DB_PASSWORD       | Database password                                                        | mainflux      |
-| MF_AUTH_DB                | Name of the database used by the service                                 | auth          |
-| MF_AUTH_DB_SSL_MODE       | Database connection SSL mode (disable, require, verify-ca, verify-full)  | disable       |
-| MF_AUTH_DB_SSL_CERT       | Path to the PEM encoded certificate file                                 |               |
-| MF_AUTH_DB_SSL_KEY        | Path to the PEM encoded key file                                         |               |
-| MF_AUTH_DB_SSL_ROOT_CERT  | Path to the PEM encoded root certificate file                            |               |
-| MF_AUTH_HTTP_PORT         | Auth service HTTP port                                                   | 8180          |
-| MF_AUTH_GRPC_PORT         | Auth service gRPC port                                                   | 8181          |
-| MF_AUTH_SERVER_CERT       | Path to server certificate in pem format                                 |               |
-| MF_AUTH_SERVER_KEY        | Path to server key in pem format                                         |               |
-| MF_AUTH_SECRET            | String used for signing tokens                                           | auth          |
-| MF_JAEGER_URL             | Jaeger server URL                                                        | localhost:6831|
+| 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_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_AUTH_ADAPTER_INSTANCE_ID    | Adapter instance ID                                                     | ""                             |
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`auth`](https://github.com/mainflux/mainflux/blob/master/docker/docker-compose.yml#L71-L94) service section in 
-docker-compose to see how service is deployed.
-
+The service itself is distributed as Docker container. Check the [`auth`](https://github.com/absmach/supermq/blob/main/docker/docker-compose.yml) 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
-go get github.com/mainflux/mainflux
+git clone https://github.com/absmach/supermq
 
-cd $GOPATH/src/github.com/mainflux/mainflux
+cd supermq
 
 # compile the service
 make auth
@@ -95,14 +114,46 @@ make auth
 make install
 
 # set the environment variables and run the service
-MF_AUTH_LOG_LEVEL=[Service log level] MF_AUTH_DB_HOST=[Database host address] MF_AUTH_DB_PORT=[Database host port] MF_AUTH_DB_USER=[Database user] MF_AUTH_DB_PASS=[Database password] MF_AUTH_DB=[Name of the database used by the service] MF_AUTH_DB_SSL_MODE=[SSL mode to connect to the database with] MF_AUTH_DB_SSL_CERT=[Path to the PEM encoded certificate file] MF_AUTH_DB_SSL_KEY=[Path to the PEM encoded key file] MF_AUTH_DB_SSL_ROOT_CERT=[Path to the PEM encoded root certificate file] MF_AUTH_HTTP_PORT=[Service HTTP port] MF_AUTH_GRPC_PORT=[Service gRPC port] MF_AUTH_SECRET=[String used for signing tokens] MF_AUTH_SERVER_CERT=[Path to server certificate] MF_AUTH_SERVER_KEY=[Path to server key] MF_JAEGER_URL=[Jaeger server URL] $GOBIN/mainflux-auth
+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="" \
+$GOBIN/supermq-auth
 ```
 
-If `MF_EMAIL_TEMPLATE` doesn't point to any file service will function but password reset functionality will not work.
+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.
 
 ## Usage
 
-For more information about service capabilities and its usage, please check out
-the [API documentation](openapi.yml).
+For more information about service capabilities and its usage, please check out the [API documentation](https://docs.api.supermq.abstractmachines.fr/?urls.primaryName=auth.yml).
 
-[doc]: http://mainflux.readthedocs.io
+[doc]: https://docs.supermq.abstractmachines.fr

auth/api/doc.go

@@ -1,4 +1,4 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 // Package api contains implementation of Auth service HTTP API.

auth/api/grpc/auth/client.go

@@ -0,0 +1,111 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package auth
+
+import (
+	"context"
+	"time"
+
+	grpcapi "github.com/absmach/supermq/auth/api/grpc"
+	grpcAuthV1 "github.com/absmach/supermq/internal/grpc/auth/v1"
+	"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
+	authorize    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(),
+		authorize: kitgrpc.NewClient(
+			conn,
+			authSvcName,
+			"Authorize",
+			encodeAuthorizeRequest,
+			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, DomainId: ir.domainID}, nil
+}
+
+func encodeIdentifyRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
+	req := grpcReq.(authenticateReq)
+	return &grpcAuthV1.AuthNReq{Token: req.token}, nil
+}
+
+func decodeIdentifyResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
+	res := grpcRes.(*grpcAuthV1.AuthNRes)
+	return authenticateRes{id: res.GetId(), userID: res.GetUserId(), domainID: res.GetDomainId()}, 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 interface{}) (interface{}, error) {
+	res := grpcRes.(*grpcAuthV1.AuthZRes)
+	return authorizeRes{authorized: res.Authorized, id: res.Id}, nil
+}
+
+func encodeAuthorizeRequest(_ context.Context, grpcReq interface{}) (interface{}, 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
+}

auth/api/grpc/auth/doc.go

@@ -0,0 +1,5 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+// Package auth contains implementation of Auth service gRPC API.
+package auth

auth/api/grpc/auth/endpoint.go

@@ -0,0 +1,52 @@
+// 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 interface{}) (interface{}, 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{id: key.Subject, userID: key.User, domainID: key.Domain}, nil
+	}
+}
+
+func authorizeEndpoint(svc auth.Service) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (interface{}, 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
+	}
+}

auth/api/grpc/auth/endpoint_test.go

@@ -0,0 +1,230 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package auth_test
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"testing"
+	"time"
+
+	"github.com/absmach/supermq/auth"
+	grpcapi "github.com/absmach/supermq/auth/api/grpc/auth"
+	grpcAuthV1 "github.com/absmach/supermq/internal/grpc/auth/v1"
+	"github.com/absmach/supermq/internal/testsutil"
+	"github.com/absmach/supermq/pkg/apiutil"
+	"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"
+	validPolicy     = "valid"
+)
+
+var (
+	domainID = 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()
+	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()))
+	defer conn.Close()
+	assert.Nil(t, err, fmt.Sprintf("Unexpected error creating client connection %s", err))
+	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: email, DomainId: domainID},
+			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 {
+		svcCall := svc.On("Identify", mock.Anything, mock.Anything, mock.Anything).Return(auth.Key{Subject: id, User: email, Domain: domainID}, 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()))
+	defer conn.Close()
+	assert.Nil(t, err, fmt.Sprintf("Unexpected error creating client connection %s", err))
+	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 {
+		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()
+	}
+}

auth/api/grpc/auth/requests.go

@@ -0,0 +1,51 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package auth
+
+import (
+	"github.com/absmach/supermq/pkg/apiutil"
+)
+
+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
+}

auth/api/grpc/auth/responses.go

@@ -0,0 +1,15 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package auth
+
+type authenticateRes struct {
+	id       string
+	userID   string
+	domainID string
+}
+
+type authorizeRes struct {
+	id         string
+	authorized bool
+}

auth/api/grpc/auth/server.go

@@ -0,0 +1,83 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package auth
+
+import (
+	"context"
+
+	"github.com/absmach/supermq/auth"
+	grpcapi "github.com/absmach/supermq/auth/api/grpc"
+	grpcAuthV1 "github.com/absmach/supermq/internal/grpc/auth/v1"
+	kitgrpc "github.com/go-kit/kit/transport/grpc"
+)
+
+var _ grpcAuthV1.AuthServiceServer = (*authGrpcServer)(nil)
+
+type authGrpcServer struct {
+	grpcAuthV1.UnimplementedAuthServiceServer
+	authorize    kitgrpc.Handler
+	authenticate 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,
+		),
+	}
+}
+
+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) 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 interface{}) (interface{}, error) {
+	req := grpcReq.(*grpcAuthV1.AuthNReq)
+	return authenticateReq{token: req.GetToken()}, nil
+}
+
+func encodeAuthenticateResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
+	res := grpcRes.(authenticateRes)
+	return &grpcAuthV1.AuthNRes{Id: res.id, UserId: res.userID, DomainId: res.domainID}, nil
+}
+
+func decodeAuthorizeRequest(_ context.Context, grpcReq interface{}) (interface{}, 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 interface{}) (interface{}, error) {
+	res := grpcRes.(authorizeRes)
+	return &grpcAuthV1.AuthZRes{Authorized: res.authorized, Id: res.id}, nil
+}

auth/api/grpc/auth/setup_test.go

@@ -0,0 +1,24 @@
+// 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)
+}

auth/api/grpc/client.go

@@ -1,226 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-package grpc
-
-import (
-	"context"
-	"time"
-
-	"github.com/go-kit/kit/endpoint"
-	kitot "github.com/go-kit/kit/tracing/opentracing"
-	kitgrpc "github.com/go-kit/kit/transport/grpc"
-	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/mainflux/mainflux"
-	opentracing "github.com/opentracing/opentracing-go"
-	"google.golang.org/grpc"
-)
-
-const (
-	svcName = "mainflux.AuthService"
-)
-
-var _ mainflux.AuthServiceClient = (*grpcClient)(nil)
-
-type grpcClient struct {
-	issue     endpoint.Endpoint
-	identify  endpoint.Endpoint
-	authorize endpoint.Endpoint
-	assign    endpoint.Endpoint
-	members   endpoint.Endpoint
-	timeout   time.Duration
-}
-
-// NewClient returns new gRPC client instance.
-func NewClient(tracer opentracing.Tracer, conn *grpc.ClientConn, timeout time.Duration) mainflux.AuthServiceClient {
-	return &grpcClient{
-		issue: kitot.TraceClient(tracer, "issue")(kitgrpc.NewClient(
-			conn,
-			svcName,
-			"Issue",
-			encodeIssueRequest,
-			decodeIssueResponse,
-			mainflux.UserIdentity{},
-		).Endpoint()),
-		identify: kitot.TraceClient(tracer, "identify")(kitgrpc.NewClient(
-			conn,
-			svcName,
-			"Identify",
-			encodeIdentifyRequest,
-			decodeIdentifyResponse,
-			mainflux.UserIdentity{},
-		).Endpoint()),
-		authorize: kitot.TraceClient(tracer, "authorize")(kitgrpc.NewClient(
-			conn,
-			svcName,
-			"Authorize",
-			encodeAuthorizeRequest,
-			decodeAuthorizeResponse,
-			mainflux.AuthorizeRes{},
-		).Endpoint()),
-		assign: kitot.TraceClient(tracer, "assign")(kitgrpc.NewClient(
-			conn,
-			svcName,
-			"Assign",
-			encodeAssignRequest,
-			decodeAssignResponse,
-			mainflux.AuthorizeRes{},
-		).Endpoint()),
-		members: kitot.TraceClient(tracer, "members")(kitgrpc.NewClient(
-			conn,
-			svcName,
-			"Members",
-			encodeMembersRequest,
-			decodeMembersResponse,
-			mainflux.MembersRes{},
-		).Endpoint()),
-
-		timeout: timeout,
-	}
-}
-
-func (client grpcClient) Issue(ctx context.Context, req *mainflux.IssueReq, _ ...grpc.CallOption) (*mainflux.Token, error) {
-	ctx, close := context.WithTimeout(ctx, client.timeout)
-	defer close()
-
-	res, err := client.issue(ctx, issueReq{id: req.GetId(), email: req.GetEmail(), keyType: req.Type})
-	if err != nil {
-		return nil, err
-	}
-
-	ir := res.(identityRes)
-	return &mainflux.Token{Value: ir.id}, nil
-}
-
-func encodeIssueRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(issueReq)
-	return &mainflux.IssueReq{Id: req.id, Email: req.email, Type: req.keyType}, nil
-}
-
-func decodeIssueResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
-	res := grpcRes.(*mainflux.UserIdentity)
-	return identityRes{id: res.GetId(), email: res.GetEmail()}, nil
-}
-
-func (client grpcClient) Identify(ctx context.Context, token *mainflux.Token, _ ...grpc.CallOption) (*mainflux.UserIdentity, error) {
-	ctx, close := context.WithTimeout(ctx, client.timeout)
-	defer close()
-
-	res, err := client.identify(ctx, identityReq{token: token.GetValue()})
-	if err != nil {
-		return nil, err
-	}
-
-	ir := res.(identityRes)
-	return &mainflux.UserIdentity{Id: ir.id, Email: ir.email}, nil
-}
-
-func encodeIdentifyRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(identityReq)
-	return &mainflux.Token{Value: req.token}, nil
-}
-
-func decodeIdentifyResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
-	res := grpcRes.(*mainflux.UserIdentity)
-	return identityRes{id: res.GetId(), email: res.GetEmail()}, nil
-}
-
-func (client grpcClient) Authorize(ctx context.Context, req *mainflux.AuthorizeReq, _ ...grpc.CallOption) (r *mainflux.AuthorizeRes, err error) {
-	ctx, close := context.WithTimeout(ctx, client.timeout)
-	defer close()
-
-	res, err := client.authorize(ctx, authReq{Act: req.Act, Obj: req.Obj, Sub: req.Sub})
-	if err != nil {
-		return &mainflux.AuthorizeRes{Authorized: false}, err
-	}
-
-	ar := res.(authorizeRes)
-	return &mainflux.AuthorizeRes{Authorized: ar.authorized}, err
-}
-
-func decodeAuthorizeResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
-	res := grpcRes.(*mainflux.AuthorizeRes)
-	return authorizeRes{authorized: res.Authorized}, nil
-}
-
-func encodeAuthorizeRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(authReq)
-	return &mainflux.AuthorizeReq{
-		Sub: req.Sub,
-		Obj: req.Obj,
-		Act: req.Act,
-	}, nil
-}
-
-func (client grpcClient) Members(ctx context.Context, req *mainflux.MembersReq, _ ...grpc.CallOption) (r *mainflux.MembersRes, err error) {
-	ctx, close := context.WithTimeout(ctx, client.timeout)
-	defer close()
-
-	res, err := client.members(ctx, membersReq{
-		token:      req.GetToken(),
-		groupID:    req.GetGroupID(),
-		memberType: req.GetType(),
-		offset:     req.GetOffset(),
-		limit:      req.GetLimit(),
-	})
-	if err != nil {
-		return &mainflux.MembersRes{}, err
-	}
-
-	mr := res.(membersRes)
-
-	return &mainflux.MembersRes{
-		Offset:  mr.offset,
-		Limit:   mr.limit,
-		Total:   mr.total,
-		Type:    mr.groupType,
-		Members: mr.members,
-	}, err
-}
-
-func encodeMembersRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(membersReq)
-	return &mainflux.MembersReq{
-		Token:   req.token,
-		Offset:  req.offset,
-		Limit:   req.limit,
-		GroupID: req.groupID,
-		Type:    req.memberType,
-	}, nil
-}
-
-func decodeMembersResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
-	res := grpcRes.(*mainflux.MembersRes)
-	return membersRes{
-		offset:  res.Offset,
-		limit:   res.Limit,
-		total:   res.Total,
-		members: res.Members,
-	}, nil
-}
-
-func (client grpcClient) Assign(ctx context.Context, req *mainflux.Assignment, _ ...grpc.CallOption) (r *empty.Empty, err error) {
-	ctx, close := context.WithTimeout(ctx, client.timeout)
-	defer close()
-
-	_, err = client.assign(ctx, assignReq{token: req.GetToken(), groupID: req.GetGroupID(), memberID: req.GetMemberID()})
-	if err != nil {
-		return &empty.Empty{}, err
-	}
-
-	return &empty.Empty{}, err
-}
-
-func encodeAssignRequest(_ context.Context, grpcRes interface{}) (interface{}, error) {
-	res := grpcRes.(*mainflux.AuthorizeRes)
-	return authorizeRes{authorized: res.Authorized}, nil
-}
-
-func decodeAssignResponse(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(authReq)
-	return &mainflux.AuthorizeReq{
-		Sub: req.Sub,
-		Obj: req.Obj,
-		Act: req.Act,
-	}, nil
-}

auth/api/grpc/doc.go

@@ -1,5 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-// Package grpc contains implementation of Auth service gRPC API.
-package grpc

auth/api/grpc/endpoint.go

@@ -1,127 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-package grpc
-
-import (
-	"context"
-	"time"
-
-	"github.com/go-kit/kit/endpoint"
-	"github.com/mainflux/mainflux/auth"
-)
-
-func issueEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(issueReq)
-		if err := req.validate(); err != nil {
-			return issueRes{}, err
-		}
-
-		key := auth.Key{
-			Type:     req.keyType,
-			Subject:  req.email,
-			IssuerID: req.id,
-			IssuedAt: time.Now().UTC(),
-		}
-
-		_, secret, err := svc.Issue(ctx, "", key)
-		if err != nil {
-			return issueRes{}, err
-		}
-
-		return issueRes{secret}, nil
-	}
-}
-
-func identifyEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(identityReq)
-		if err := req.validate(); err != nil {
-			return identityRes{}, err
-		}
-
-		id, err := svc.Identify(ctx, req.token)
-		if err != nil {
-			return identityRes{}, err
-		}
-
-		ret := identityRes{
-			id:    id.ID,
-			email: id.Email,
-		}
-		return ret, nil
-	}
-}
-
-func authorizeEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(authReq)
-
-		if err := req.validate(); err != nil {
-			return authorizeRes{}, err
-		}
-
-		_, err := svc.Identify(ctx, req.token)
-		if err != nil {
-			return authorizeRes{}, err
-		}
-
-		authorized, err := svc.Authorize(ctx, req.token, req.Sub, req.Obj, req.Obj)
-		if err != nil {
-			return authorizeRes{}, err
-		}
-
-		return authorizeRes{authorized: authorized}, err
-	}
-}
-
-func assignEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(assignReq)
-
-		if err := req.validate(); err != nil {
-			return emptyRes{}, err
-		}
-
-		_, err := svc.Identify(ctx, req.token)
-		if err != nil {
-			return emptyRes{}, err
-		}
-
-		err = svc.Assign(ctx, req.token, req.memberID, req.groupID, req.groupType)
-		if err != nil {
-			return emptyRes{}, err
-		}
-		return emptyRes{}, nil
-
-	}
-}
-
-func membersEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(membersReq)
-		if err := req.validate(); err != nil {
-			return membersRes{}, err
-		}
-
-		pm := auth.PageMetadata{
-			Offset: req.offset,
-			Limit:  req.limit,
-		}
-		mp, err := svc.ListMembers(ctx, req.token, req.groupID, req.memberType, pm)
-		if err != nil {
-			return membersRes{}, err
-		}
-		var members []string
-		for _, m := range mp.Members {
-			members = append(members, m.ID)
-		}
-		return membersRes{
-			offset:  req.offset,
-			limit:   req.limit,
-			total:   mp.PageMetadata.Total,
-			members: members,
-		}, nil
-	}
-}

auth/api/grpc/endpoint_test.go

@@ -1,262 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-package grpc_test
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"testing"
-	"time"
-
-	"github.com/mainflux/mainflux"
-	"github.com/mainflux/mainflux/auth"
-	grpcapi "github.com/mainflux/mainflux/auth/api/grpc"
-	"github.com/mainflux/mainflux/auth/jwt"
-	"github.com/mainflux/mainflux/auth/mocks"
-	"github.com/mainflux/mainflux/pkg/uuid"
-	"github.com/opentracing/opentracing-go/mocktracer"
-	"github.com/stretchr/testify/assert"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-const (
-	port        = 8081
-	secret      = "secret"
-	email       = "test@example.com"
-	id          = "testID"
-	thingsType  = "things"
-	usersType   = "users"
-	description = "Description"
-
-	numOfThings = 5
-	numOfUsers  = 5
-)
-
-var svc auth.Service
-
-func newService() auth.Service {
-	repo := mocks.NewKeyRepository()
-	groupRepo := mocks.NewGroupRepository()
-	idProvider := uuid.NewMock()
-	t := jwt.New(secret)
-
-	return auth.New(repo, groupRepo, idProvider, t)
-}
-
-func startGRPCServer(svc auth.Service, port int) {
-	listener, _ := net.Listen("tcp", fmt.Sprintf(":%d", port))
-	server := grpc.NewServer()
-	mainflux.RegisterAuthServiceServer(server, grpcapi.NewServer(mocktracer.New(), svc))
-	go server.Serve(listener)
-}
-
-func TestIssue(t *testing.T) {
-	authAddr := fmt.Sprintf("localhost:%d", port)
-	conn, _ := grpc.Dial(authAddr, grpc.WithInsecure())
-	client := grpcapi.NewClient(mocktracer.New(), conn, time.Second)
-
-	cases := []struct {
-		desc  string
-		id    string
-		email string
-		kind  uint32
-		err   error
-		code  codes.Code
-	}{
-		{
-			desc:  "issue for user with valid token",
-			id:    id,
-			email: email,
-			kind:  auth.UserKey,
-			err:   nil,
-			code:  codes.OK,
-		},
-		{
-			desc:  "issue recovery key",
-			id:    id,
-			email: email,
-			kind:  auth.RecoveryKey,
-			err:   nil,
-			code:  codes.OK,
-		},
-		{
-			desc:  "issue API key unauthenticated",
-			id:    id,
-			email: email,
-			kind:  auth.APIKey,
-			err:   nil,
-			code:  codes.Unauthenticated,
-		},
-		{
-			desc:  "issue for invalid key type",
-			id:    id,
-			email: email,
-			kind:  32,
-			err:   status.Error(codes.InvalidArgument, "received invalid token request"),
-			code:  codes.InvalidArgument,
-		},
-		{
-			desc: "issue for user that  exist",
-			id:   "",
-			kind: auth.APIKey,
-			err:  status.Error(codes.Unauthenticated, "unauthorized access"),
-			code: codes.Unauthenticated,
-		},
-	}
-
-	for _, tc := range cases {
-		_, err := client.Issue(context.Background(), &mainflux.IssueReq{Id: tc.id, Email: tc.email, Type: tc.kind})
-		e, ok := status.FromError(err)
-		assert.True(t, ok, "gRPC status can't be extracted from the error")
-		assert.Equal(t, tc.code, e.Code(), fmt.Sprintf("%s: expected %s got %s", tc.desc, tc.code, e.Code()))
-	}
-}
-
-func TestIdentify(t *testing.T) {
-	_, loginSecret, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.UserKey, IssuedAt: time.Now(), IssuerID: id, Subject: email})
-	assert.Nil(t, err, fmt.Sprintf("Issuing user key expected to succeed: %s", err))
-
-	_, recoverySecret, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.RecoveryKey, IssuedAt: time.Now(), IssuerID: id, Subject: email})
-	assert.Nil(t, err, fmt.Sprintf("Issuing recovery key expected to succeed: %s", err))
-
-	_, apiSecret, err := svc.Issue(context.Background(), loginSecret, auth.Key{Type: auth.APIKey, IssuedAt: time.Now(), ExpiresAt: time.Now().Add(time.Minute), IssuerID: id, Subject: email})
-	assert.Nil(t, err, fmt.Sprintf("Issuing API key expected to succeed: %s", err))
-
-	authAddr := fmt.Sprintf("localhost:%d", port)
-	conn, _ := grpc.Dial(authAddr, grpc.WithInsecure())
-	client := grpcapi.NewClient(mocktracer.New(), conn, time.Second)
-
-	cases := []struct {
-		desc  string
-		token string
-		idt   mainflux.UserIdentity
-		err   error
-		code  codes.Code
-	}{
-		{
-			desc:  "identify user with user token",
-			token: loginSecret,
-			idt:   mainflux.UserIdentity{Email: email, Id: id},
-			err:   nil,
-			code:  codes.OK,
-		},
-		{
-			desc:  "identify user with recovery token",
-			token: recoverySecret,
-			idt:   mainflux.UserIdentity{Email: email, Id: id},
-			err:   nil,
-			code:  codes.OK,
-		},
-		{
-			desc:  "identify user with API token",
-			token: apiSecret,
-			idt:   mainflux.UserIdentity{Email: email, Id: id},
-			err:   nil,
-			code:  codes.OK,
-		},
-		{
-			desc:  "identify user with invalid user token",
-			token: "invalid",
-			idt:   mainflux.UserIdentity{},
-			err:   status.Error(codes.Unauthenticated, "unauthorized access"),
-			code:  codes.Unauthenticated,
-		},
-		{
-			desc:  "identify user that doesn't exist",
-			token: "",
-			idt:   mainflux.UserIdentity{},
-			err:   status.Error(codes.InvalidArgument, "received invalid token request"),
-			code:  codes.InvalidArgument,
-		},
-	}
-
-	for _, tc := range cases {
-		idt, err := client.Identify(context.Background(), &mainflux.Token{Value: tc.token})
-		if idt != nil {
-			assert.Equal(t, tc.idt, *idt, fmt.Sprintf("%s: expected %v got %v", tc.desc, tc.idt, *idt))
-		}
-		e, ok := status.FromError(err)
-		assert.True(t, ok, "gRPC status can't be extracted from the error")
-		assert.Equal(t, tc.code, e.Code(), fmt.Sprintf("%s: expected %s got %s", tc.desc, tc.code, e.Code()))
-	}
-}
-
-func TestMembers(t *testing.T) {
-	_, token, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.UserKey, IssuedAt: time.Now(), IssuerID: id, Subject: email})
-	assert.Nil(t, err, fmt.Sprintf("Issuing user key expected to succeed: %s", err))
-
-	group := auth.Group{
-		Name:        "Mainflux",
-		Description: description,
-	}
-
-	var things []string
-	for i := 0; i < numOfThings; i++ {
-		id, err := uuid.New().ID()
-		assert.Nil(t, err, fmt.Sprintf("Generate thing id expected to succeed: %s", err))
-
-		things = append(things, id)
-	}
-
-	var users []string
-	for i := 0; i < numOfUsers; i++ {
-		id, err := uuid.New().ID()
-		assert.Nil(t, err, fmt.Sprintf("Generate thing id expected to succeed: %s", err))
-
-		users = append(users, id)
-	}
-
-	group, err = svc.CreateGroup(context.Background(), token, group)
-	assert.Nil(t, err, fmt.Sprintf("Creating group expected to succeed: %s", err))
-
-	err = svc.Assign(context.Background(), token, group.ID, thingsType, things...)
-	assert.Nil(t, err, fmt.Sprintf("Assign members to  expected to succeed: %s", err))
-
-	err = svc.Assign(context.Background(), token, group.ID, usersType, users...)
-	assert.Nil(t, err, fmt.Sprintf("Assign members to group expected to succeed: %s", err))
-
-	cases := []struct {
-		desc      string
-		token     string
-		groupID   string
-		groupType string
-		size      int
-		err       error
-		code      codes.Code
-	}{
-		{
-			desc:      "get all things with user token",
-			groupID:   group.ID,
-			token:     token,
-			groupType: thingsType,
-			size:      numOfThings,
-			err:       nil,
-			code:      codes.OK,
-		},
-		{
-			desc:      "get all users with user token",
-			groupID:   group.ID,
-			token:     token,
-			groupType: usersType,
-			size:      numOfUsers,
-			err:       nil,
-			code:      codes.OK,
-		},
-	}
-
-	authAddr := fmt.Sprintf("localhost:%d", port)
-	conn, _ := grpc.Dial(authAddr, grpc.WithInsecure())
-	client := grpcapi.NewClient(mocktracer.New(), conn, time.Second)
-
-	for _, tc := range cases {
-		m, err := client.Members(context.Background(), &mainflux.MembersReq{Token: tc.token, GroupID: tc.groupID, Type: tc.groupType, Offset: 0, Limit: 10})
-		e, ok := status.FromError(err)
-		assert.Equal(t, tc.size, len(m.Members), fmt.Sprintf("%s: expected %d got %d", tc.desc, tc.size, len(m.Members)))
-		assert.Equal(t, tc.code, e.Code(), fmt.Sprintf("%s: expected %s got %s", tc.desc, tc.code, e.Code()))
-		assert.True(t, ok, "OK expected to be true")
-	}
-}

auth/api/grpc/requests.go

@@ -1,114 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-package grpc
-
-import (
-	"github.com/mainflux/mainflux/auth"
-)
-
-type identityReq struct {
-	token string
-	kind  uint32
-}
-
-func (req identityReq) validate() error {
-	if req.token == "" {
-		return auth.ErrMalformedEntity
-	}
-	if req.kind != auth.UserKey &&
-		req.kind != auth.APIKey &&
-		req.kind != auth.RecoveryKey {
-		return auth.ErrMalformedEntity
-	}
-
-	return nil
-}
-
-type issueReq struct {
-	id      string
-	email   string
-	keyType uint32
-}
-
-func (req issueReq) validate() error {
-	if req.email == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-	if req.keyType != auth.UserKey &&
-		req.keyType != auth.APIKey &&
-		req.keyType != auth.RecoveryKey {
-		return auth.ErrMalformedEntity
-	}
-
-	return nil
-}
-
-type assignReq struct {
-	token     string
-	groupID   string
-	memberID  string
-	groupType string
-}
-
-func (req assignReq) validate() error {
-	if req.token == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-	if req.groupID == "" || req.memberID == "" {
-		return auth.ErrMalformedEntity
-	}
-	return nil
-}
-
-type membersReq struct {
-	token      string
-	groupID    string
-	offset     uint64
-	limit      uint64
-	memberType string
-}
-
-func (req membersReq) validate() error {
-	if req.token == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-	if req.groupID == "" {
-		return auth.ErrMalformedEntity
-	}
-	if req.memberType == "" {
-		return auth.ErrMalformedEntity
-	}
-	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 {
-	token string
-	Sub   string
-	Obj   string
-	Act   string
-}
-
-func (req authReq) validate() error {
-	if req.token == "" {
-		return auth.ErrMalformedEntity
-	}
-
-	if req.Sub == "" {
-		return auth.ErrMalformedEntity
-	}
-
-	if req.Obj == "" {
-		return auth.ErrMalformedEntity
-	}
-
-	if req.Act == "" {
-		return auth.ErrMalformedEntity
-	}
-
-	return nil
-}

auth/api/grpc/responses.go

@@ -1,27 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-package grpc
-
-type identityRes struct {
-	id    string
-	email string
-}
-
-type issueRes struct {
-	value string
-}
-
-type authorizeRes struct {
-	authorized bool
-}
-type membersRes struct {
-	total     uint64
-	offset    uint64
-	limit     uint64
-	groupType string
-	members   []string
-}
-type emptyRes struct {
-	err error
-}

auth/api/grpc/server.go

@@ -1,176 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-package grpc
-
-import (
-	"context"
-
-	kitot "github.com/go-kit/kit/tracing/opentracing"
-	kitgrpc "github.com/go-kit/kit/transport/grpc"
-	"github.com/golang/protobuf/ptypes/empty"
-	mainflux "github.com/mainflux/mainflux"
-	"github.com/mainflux/mainflux/auth"
-	"github.com/mainflux/mainflux/pkg/errors"
-	opentracing "github.com/opentracing/opentracing-go"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-var _ mainflux.AuthServiceServer = (*grpcServer)(nil)
-
-type grpcServer struct {
-	issue     kitgrpc.Handler
-	identify  kitgrpc.Handler
-	authorize kitgrpc.Handler
-	assign    kitgrpc.Handler
-	members   kitgrpc.Handler
-}
-
-// NewServer returns new AuthServiceServer instance.
-func NewServer(tracer opentracing.Tracer, svc auth.Service) mainflux.AuthServiceServer {
-	return &grpcServer{
-		issue: kitgrpc.NewServer(
-			kitot.TraceServer(tracer, "issue")(issueEndpoint(svc)),
-			decodeIssueRequest,
-			encodeIssueResponse,
-		),
-		identify: kitgrpc.NewServer(
-			kitot.TraceServer(tracer, "identify")(identifyEndpoint(svc)),
-			decodeIdentifyRequest,
-			encodeIdentifyResponse,
-		),
-		authorize: kitgrpc.NewServer(
-			kitot.TraceServer(tracer, "authorize")(authorizeEndpoint(svc)),
-			decodeAuthorizeRequest,
-			encodeAuthorizeResponse,
-		),
-		assign: kitgrpc.NewServer(
-			kitot.TraceServer(tracer, "assign")(assignEndpoint(svc)),
-			decodeAssignRequest,
-			encodeEmptyResponse,
-		),
-		members: kitgrpc.NewServer(
-			kitot.TraceServer(tracer, "members")(membersEndpoint(svc)),
-			decodeMembersRequest,
-			encodeMembersResponse,
-		),
-	}
-}
-
-func (s *grpcServer) Issue(ctx context.Context, req *mainflux.IssueReq) (*mainflux.Token, error) {
-	_, res, err := s.issue.ServeGRPC(ctx, req)
-	if err != nil {
-		return nil, encodeError(err)
-	}
-	return res.(*mainflux.Token), nil
-}
-
-func (s *grpcServer) Identify(ctx context.Context, token *mainflux.Token) (*mainflux.UserIdentity, error) {
-	_, res, err := s.identify.ServeGRPC(ctx, token)
-	if err != nil {
-		return nil, encodeError(err)
-	}
-	return res.(*mainflux.UserIdentity), nil
-}
-
-func (s *grpcServer) Authorize(ctx context.Context, token *mainflux.AuthorizeReq) (*mainflux.AuthorizeRes, error) {
-	_, res, err := s.authorize.ServeGRPC(ctx, token)
-	if err != nil {
-		return nil, encodeError(err)
-	}
-	return res.(*mainflux.AuthorizeRes), nil
-}
-
-func (s *grpcServer) Assign(ctx context.Context, token *mainflux.Assignment) (*empty.Empty, error) {
-	_, res, err := s.assign.ServeGRPC(ctx, token)
-	if err != nil {
-		return nil, encodeError(err)
-	}
-	return res.(*empty.Empty), nil
-}
-
-func (s *grpcServer) Members(ctx context.Context, req *mainflux.MembersReq) (*mainflux.MembersRes, error) {
-	_, res, err := s.members.ServeGRPC(ctx, req)
-	if err != nil {
-		return nil, encodeError(err)
-	}
-	return res.(*mainflux.MembersRes), nil
-}
-
-func decodeIssueRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(*mainflux.IssueReq)
-	return issueReq{id: req.GetId(), email: req.GetEmail(), keyType: req.GetType()}, nil
-}
-
-func encodeIssueResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
-	res := grpcRes.(issueRes)
-	return &mainflux.Token{Value: res.value}, nil
-}
-
-func decodeIdentifyRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(*mainflux.Token)
-	return identityReq{token: req.GetValue()}, nil
-}
-
-func encodeIdentifyResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
-	res := grpcRes.(identityRes)
-	return &mainflux.UserIdentity{Id: res.id, Email: res.email}, nil
-}
-
-func decodeAuthorizeRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(*mainflux.AuthorizeReq)
-	return authReq{Act: req.Act, Obj: req.Obj, Sub: req.Sub}, nil
-}
-
-func encodeAuthorizeResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
-	res := grpcRes.(*mainflux.AuthorizeRes)
-	return res, nil
-}
-
-func decodeAssignRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(*mainflux.Token)
-	return assignReq{token: req.GetValue()}, nil
-}
-
-func decodeMembersRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(*mainflux.MembersReq)
-	return membersReq{
-		token:      req.GetToken(),
-		groupID:    req.GetGroupID(),
-		memberType: req.GetType(),
-		offset:     req.Offset,
-		limit:      req.Limit,
-	}, nil
-}
-
-func encodeMembersResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
-	res := grpcRes.(membersRes)
-	return &mainflux.MembersRes{
-		Total:   res.total,
-		Offset:  res.offset,
-		Limit:   res.limit,
-		Type:    res.groupType,
-		Members: res.members,
-	}, nil
-}
-
-func encodeEmptyResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
-	res := grpcRes.(emptyRes)
-	return &empty.Empty{}, encodeError(res.err)
-}
-
-func encodeError(err error) error {
-	switch {
-	case errors.Contains(err, nil):
-		return nil
-	case errors.Contains(err, auth.ErrMalformedEntity):
-		return status.Error(codes.InvalidArgument, "received invalid token request")
-	case errors.Contains(err, auth.ErrUnauthorizedAccess):
-		return status.Error(codes.Unauthenticated, err.Error())
-	case errors.Contains(err, auth.ErrKeyExpired):
-		return status.Error(codes.Unauthenticated, err.Error())
-	default:
-		return status.Error(codes.Internal, "internal server error")
-	}
-}

auth/api/grpc/setup_test.go

@@ -1,18 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-package grpc_test
-
-import (
-	"os"
-	"testing"
-)
-
-func TestMain(m *testing.M) {
-	svc = newService()
-	startGRPCServer(svc, port)
-
-	code := m.Run()
-
-	os.Exit(code)
-}

auth/api/grpc/token/client.go

@@ -0,0 +1,95 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package token
+
+import (
+	"context"
+	"time"
+
+	"github.com/absmach/supermq/auth"
+	grpcapi "github.com/absmach/supermq/auth/api/grpc"
+	grpcTokenV1 "github.com/absmach/supermq/internal/grpc/token/v1"
+	"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(),
+		keyType: auth.KeyType(req.GetType()),
+	})
+	if err != nil {
+		return &grpcTokenV1.Token{}, grpcapi.DecodeError(err)
+	}
+	return res.(*grpcTokenV1.Token), nil
+}
+
+func encodeIssueRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
+	req := grpcReq.(issueReq)
+	return &grpcTokenV1.IssueReq{
+		UserId: req.userID,
+		Type:   uint32(req.keyType),
+	}, nil
+}
+
+func decodeIssueResponse(_ context.Context, grpcRes interface{}) (interface{}, 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()})
+	if err != nil {
+		return &grpcTokenV1.Token{}, grpcapi.DecodeError(err)
+	}
+	return res.(*grpcTokenV1.Token), nil
+}
+
+func encodeRefreshRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
+	req := grpcReq.(refreshReq)
+	return &grpcTokenV1.RefreshReq{RefreshToken: req.refreshToken}, nil
+}
+
+func decodeRefreshResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
+	return grpcRes, nil
+}

auth/api/grpc/token/doc.go

@@ -0,0 +1,5 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+// Package grpc contains implementation of Auth service gRPC API.
+package token

auth/api/grpc/token/endpoint.go

@@ -0,0 +1,56 @@
+// 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 interface{}) (interface{}, error) {
+		req := request.(issueReq)
+		if err := req.validate(); err != nil {
+			return issueRes{}, err
+		}
+
+		key := auth.Key{
+			Type: req.keyType,
+			User: req.userID,
+		}
+		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 interface{}) (interface{}, error) {
+		req := request.(refreshReq)
+		if err := req.validate(); err != nil {
+			return issueRes{}, err
+		}
+
+		key := auth.Key{Type: auth.RefreshKey}
+		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
+	}
+}

auth/api/grpc/token/endpoint_test.go

@@ -0,0 +1,169 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package token_test
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"testing"
+	"time"
+
+	"github.com/absmach/supermq/auth"
+	grpcapi "github.com/absmach/supermq/auth/api/grpc/token"
+	grpcTokenV1 "github.com/absmach/supermq/internal/grpc/token/v1"
+	"github.com/absmach/supermq/internal/testsutil"
+	"github.com/absmach/supermq/pkg/apiutil"
+	"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()
+	}
+}

auth/api/grpc/token/requests.go

@@ -0,0 +1,37 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package token
+
+import (
+	"github.com/absmach/supermq/auth"
+	"github.com/absmach/supermq/pkg/apiutil"
+)
+
+type issueReq struct {
+	userID  string
+	keyType auth.KeyType
+}
+
+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
+}
+
+func (req refreshReq) validate() error {
+	if req.refreshToken == "" {
+		return apiutil.ErrMissingSecret
+	}
+
+	return nil
+}

auth/api/grpc/token/responses.go

@@ -0,0 +1,10 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package token
+
+type issueRes struct {
+	accessToken  string
+	refreshToken string
+	accessType   string
+}

auth/api/grpc/token/server.go

@@ -0,0 +1,76 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package token
+
+import (
+	"context"
+
+	"github.com/absmach/supermq/auth"
+	grpcapi "github.com/absmach/supermq/auth/api/grpc"
+	grpcTokenV1 "github.com/absmach/supermq/internal/grpc/token/v1"
+	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 interface{}) (interface{}, error) {
+	req := grpcReq.(*grpcTokenV1.IssueReq)
+	return issueReq{
+		userID:  req.GetUserId(),
+		keyType: auth.KeyType(req.GetType()),
+	}, nil
+}
+
+func decodeRefreshRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
+	req := grpcReq.(*grpcTokenV1.RefreshReq)
+	return refreshReq{refreshToken: req.GetRefreshToken()}, nil
+}
+
+func encodeIssueResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
+	res := grpcRes.(issueRes)
+
+	return &grpcTokenV1.Token{
+		AccessToken:  res.accessToken,
+		RefreshToken: &res.refreshToken,
+		AccessType:   res.accessType,
+	}, nil
+}

auth/api/grpc/token/setup_test.go

@@ -0,0 +1,24 @@
+// 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)
+}

auth/api/grpc/utils.go

@@ -0,0 +1,72 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package grpc
+
+import (
+	"fmt"
+
+	"github.com/absmach/supermq/auth"
+	"github.com/absmach/supermq/pkg/apiutil"
+	"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:
+		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
+}

auth/api/http/doc.go

@@ -1,3 +1,3 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 package http

auth/api/http/groups/endpoint.go

@@ -1,359 +0,0 @@
-package groups
-
-import (
-	"context"
-
-	"github.com/go-kit/kit/endpoint"
-	"github.com/mainflux/mainflux/auth"
-)
-
-func createGroupEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(createGroupReq)
-		if err := req.validate(); err != nil {
-			return groupRes{}, err
-		}
-
-		group := auth.Group{
-			Name:        req.Name,
-			Description: req.Description,
-			ParentID:    req.ParentID,
-			Metadata:    req.Metadata,
-		}
-
-		group, err := svc.CreateGroup(ctx, req.token, group)
-		if err != nil {
-			return groupRes{}, err
-		}
-
-		return groupRes{created: true, id: group.ID}, nil
-	}
-}
-
-func viewGroupEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(groupReq)
-		if err := req.validate(); err != nil {
-			return viewGroupRes{}, err
-		}
-
-		group, err := svc.ViewGroup(ctx, req.token, req.id)
-		if err != nil {
-			return viewGroupRes{}, err
-		}
-
-		res := viewGroupRes{
-			ID:          group.ID,
-			Name:        group.Name,
-			Description: group.Description,
-			Metadata:    group.Metadata,
-			ParentID:    group.ParentID,
-			OwnerID:     group.OwnerID,
-			CreatedAt:   group.CreatedAt,
-			UpdatedAt:   group.UpdatedAt,
-		}
-
-		return res, nil
-	}
-}
-
-func updateGroupEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(updateGroupReq)
-		if err := req.validate(); err != nil {
-			return groupRes{}, err
-		}
-
-		group := auth.Group{
-			ID:          req.id,
-			Name:        req.Name,
-			Description: req.Description,
-			Metadata:    req.Metadata,
-		}
-
-		_, err := svc.UpdateGroup(ctx, req.token, group)
-		if err != nil {
-			return groupRes{}, err
-		}
-
-		res := groupRes{created: false}
-		return res, nil
-	}
-}
-
-func deleteGroupEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(groupReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		if err := svc.RemoveGroup(ctx, req.token, req.id); err != nil {
-			return nil, err
-		}
-
-		return deleteRes{}, nil
-	}
-}
-
-func listGroupsEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(listGroupsReq)
-		if err := req.validate(); err != nil {
-			return groupPageRes{}, err
-		}
-		pm := auth.PageMetadata{
-			Level:    req.level,
-			Metadata: req.metadata,
-		}
-		page, err := svc.ListGroups(ctx, req.token, pm)
-		if err != nil {
-			return groupPageRes{}, err
-		}
-
-		if req.tree {
-			return buildGroupsResponseTree(page), nil
-		}
-
-		return buildGroupsResponse(page), nil
-	}
-}
-
-func listMemberships(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(listMembershipsReq)
-		if err := req.validate(); err != nil {
-			return memberPageRes{}, err
-		}
-
-		pm := auth.PageMetadata{
-			Offset:   req.offset,
-			Limit:    req.limit,
-			Metadata: req.metadata,
-		}
-
-		page, err := svc.ListMemberships(ctx, req.token, req.id, pm)
-		if err != nil {
-			return memberPageRes{}, err
-		}
-
-		if req.tree {
-			return buildGroupsResponseTree(page), nil
-		}
-
-		return buildGroupsResponse(page), nil
-	}
-}
-
-func listChildrenEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(listGroupsReq)
-		if err := req.validate(); err != nil {
-			return groupPageRes{}, err
-		}
-
-		pm := auth.PageMetadata{
-			Level:    req.level,
-			Metadata: req.metadata,
-		}
-		page, err := svc.ListChildren(ctx, req.token, req.id, pm)
-		if err != nil {
-			return groupPageRes{}, err
-		}
-
-		if req.tree {
-			return buildGroupsResponseTree(page), nil
-		}
-
-		return buildGroupsResponse(page), nil
-	}
-}
-
-func listParentsEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(listGroupsReq)
-		if err := req.validate(); err != nil {
-			return groupPageRes{}, err
-		}
-		pm := auth.PageMetadata{
-			Level:    req.level,
-			Metadata: req.metadata,
-		}
-
-		page, err := svc.ListParents(ctx, req.token, req.id, pm)
-		if err != nil {
-			return groupPageRes{}, err
-		}
-
-		if req.tree {
-			return buildGroupsResponseTree(page), nil
-		}
-
-		return buildGroupsResponse(page), nil
-	}
-}
-
-func assignEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(assignReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		if err := svc.Assign(ctx, req.token, req.groupID, req.Type, req.Members...); err != nil {
-			return nil, err
-		}
-
-		return assignRes{}, nil
-	}
-}
-
-func unassignEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(unassignReq)
-		if err := req.validate(); err != nil {
-			return nil, err
-		}
-
-		if err := svc.Unassign(ctx, req.token, req.groupID, req.Members...); err != nil {
-			return nil, err
-		}
-
-		return unassignRes{}, nil
-	}
-}
-
-func listMembersEndpoint(svc auth.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(listMembersReq)
-		if err := req.validate(); err != nil {
-			return memberPageRes{}, err
-		}
-
-		pm := auth.PageMetadata{
-			Offset:   req.offset,
-			Limit:    req.limit,
-			Metadata: req.metadata,
-		}
-		page, err := svc.ListMembers(ctx, req.token, req.id, req.groupType, pm)
-		if err != nil {
-			return memberPageRes{}, err
-		}
-
-		return buildUsersResponse(page), nil
-	}
-}
-
-func buildGroupsResponseTree(page auth.GroupPage) groupPageRes {
-	groupsMap := map[string]*auth.Group{}
-	// Parents' map keeps its array of children.
-	parentsMap := map[string][]*auth.Group{}
-	for i := range page.Groups {
-		if _, ok := groupsMap[page.Groups[i].ID]; !ok {
-			groupsMap[page.Groups[i].ID] = &page.Groups[i]
-			parentsMap[page.Groups[i].ID] = make([]*auth.Group, 0)
-		}
-	}
-
-	for _, group := range groupsMap {
-		if children, ok := parentsMap[group.ParentID]; ok {
-			children = append(children, group)
-			parentsMap[group.ParentID] = children
-		}
-	}
-
-	res := groupPageRes{
-		pageRes: pageRes{
-			Limit:  page.Limit,
-			Offset: page.Offset,
-			Total:  page.Total,
-			Level:  page.Level,
-		},
-		Groups: []viewGroupRes{},
-	}
-
-	for _, group := range groupsMap {
-		if children, ok := parentsMap[group.ID]; ok {
-			group.Children = children
-		}
-
-	}
-
-	for _, group := range groupsMap {
-		view := toViewGroupRes(*group)
-		if children, ok := parentsMap[group.ParentID]; len(children) == 0 || !ok {
-			res.Groups = append(res.Groups, view)
-		}
-	}
-
-	return res
-}
-
-func toViewGroupRes(group auth.Group) viewGroupRes {
-	view := viewGroupRes{
-		ID:          group.ID,
-		ParentID:    group.ParentID,
-		OwnerID:     group.OwnerID,
-		Name:        group.Name,
-		Description: group.Description,
-		Metadata:    group.Metadata,
-		Level:       group.Level,
-		Path:        group.Path,
-		Children:    make([]*viewGroupRes, 0),
-		CreatedAt:   group.CreatedAt,
-		UpdatedAt:   group.UpdatedAt,
-	}
-
-	for _, ch := range group.Children {
-		child := toViewGroupRes(*ch)
-		view.Children = append(view.Children, &child)
-	}
-
-	return view
-}
-
-func buildGroupsResponse(gp auth.GroupPage) groupPageRes {
-	res := groupPageRes{
-		pageRes: pageRes{
-			Total: gp.Total,
-			Level: gp.Level,
-		},
-		Groups: []viewGroupRes{},
-	}
-
-	for _, group := range gp.Groups {
-		view := viewGroupRes{
-			ID:          group.ID,
-			ParentID:    group.ParentID,
-			OwnerID:     group.OwnerID,
-			Name:        group.Name,
-			Description: group.Description,
-			Metadata:    group.Metadata,
-			Level:       group.Level,
-			Path:        group.Path,
-			CreatedAt:   group.CreatedAt,
-			UpdatedAt:   group.UpdatedAt,
-		}
-		res.Groups = append(res.Groups, view)
-	}
-
-	return res
-}
-
-func buildUsersResponse(mp auth.MemberPage) memberPageRes {
-	res := memberPageRes{
-		pageRes: pageRes{
-			Total:  mp.Total,
-			Offset: mp.Offset,
-			Limit:  mp.Limit,
-			Name:   mp.Name,
-		},
-		Members: []interface{}{},
-	}
-
-	for _, m := range mp.Members {
-		res.Members = append(res.Members, m)
-	}
-
-	return res
-}

auth/api/http/groups/requests.go

@@ -1,162 +0,0 @@
-package groups
-
-import (
-	"github.com/mainflux/mainflux/auth"
-	"github.com/mainflux/mainflux/pkg/errors"
-)
-
-type createGroupReq struct {
-	token       string
-	Name        string                 `json:"name,omitempty"`
-	ParentID    string                 `json:"parent_id,omitempty"`
-	Description string                 `json:"description,omitempty"`
-	Metadata    map[string]interface{} `json:"metadata,omitempty"`
-}
-
-func (req createGroupReq) validate() error {
-	if req.token == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-	if len(req.Name) > maxNameSize || req.Name == "" {
-		return errors.Wrap(auth.ErrMalformedEntity, auth.ErrBadGroupName)
-	}
-
-	return nil
-}
-
-type updateGroupReq struct {
-	token       string
-	id          string
-	Name        string                 `json:"name,omitempty"`
-	Description string                 `json:"description,omitempty"`
-	Metadata    map[string]interface{} `json:"metadata,omitempty"`
-}
-
-func (req updateGroupReq) validate() error {
-	if req.token == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-
-	if req.id == "" {
-		return auth.ErrMalformedEntity
-	}
-
-	return nil
-}
-
-type listGroupsReq struct {
-	token string
-	id    string
-	level uint64
-	// - `true`  - result is JSON tree representing groups hierarchy,
-	// - `false` - result is JSON array of groups.
-	tree     bool
-	metadata auth.GroupMetadata
-}
-
-func (req listGroupsReq) validate() error {
-	if req.token == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-
-	if req.level > auth.MaxLevel || req.level < auth.MinLevel {
-		return auth.ErrMaxLevelExceeded
-	}
-
-	return nil
-}
-
-type listMembersReq struct {
-	token     string
-	id        string
-	groupType string
-	offset    uint64
-	limit     uint64
-	tree      bool
-	metadata  auth.GroupMetadata
-}
-
-func (req listMembersReq) validate() error {
-	if req.token == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-
-	if req.id == "" {
-		return auth.ErrMalformedEntity
-	}
-
-	return nil
-}
-
-type listMembershipsReq struct {
-	token    string
-	id       string
-	offset   uint64
-	limit    uint64
-	tree     bool
-	metadata auth.GroupMetadata
-}
-
-func (req listMembershipsReq) validate() error {
-	if req.token == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-
-	if req.id == "" {
-		return auth.ErrMalformedEntity
-	}
-
-	return nil
-}
-
-type assignReq struct {
-	token   string
-	groupID string
-	Type    string   `json:"type,omitempty"`
-	Members []string `json:"members"`
-}
-
-func (req assignReq) validate() error {
-	if req.token == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-
-	if req.Type == "" || req.groupID == "" || len(req.Members) == 0 {
-		return auth.ErrMalformedEntity
-	}
-
-	return nil
-}
-
-type unassignReq struct {
-	assignReq
-}
-
-func (req unassignReq) validate() error {
-	if req.token == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-
-	if req.groupID == "" || len(req.Members) == 0 {
-		return auth.ErrMalformedEntity
-	}
-
-	return nil
-}
-
-type groupReq struct {
-	token string
-	id    string
-}
-
-func (req groupReq) validate() error {
-	if req.token == "" {
-		return auth.ErrUnauthorizedAccess
-	}
-
-	if req.id == "" {
-		return auth.ErrMalformedEntity
-	}
-
-	return nil
-}

auth/api/http/groups/responses.go

@@ -1,162 +0,0 @@
-package groups
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/mainflux/mainflux"
-)
-
-var (
-	_ mainflux.Response = (*memberPageRes)(nil)
-	_ mainflux.Response = (*groupRes)(nil)
-	_ mainflux.Response = (*deleteRes)(nil)
-	_ mainflux.Response = (*assignRes)(nil)
-	_ mainflux.Response = (*unassignRes)(nil)
-)
-
-type memberPageRes struct {
-	pageRes
-	Members []interface{}
-}
-
-func (res memberPageRes) Code() int {
-	return http.StatusOK
-}
-
-func (res memberPageRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res memberPageRes) Empty() bool {
-	return false
-}
-
-type viewGroupRes struct {
-	ID          string                 `json:"id"`
-	Name        string                 `json:"name"`
-	OwnerID     string                 `json:"owner_id"`
-	ParentID    string                 `json:"parent_id,omitempty"`
-	Description string                 `json:"description,omitempty"`
-	Metadata    map[string]interface{} `json:"metadata,omitempty"`
-	// Indicates a level in tree hierarchy from first group node - root.
-	Level int `json:"level"`
-	// Path in a tree consisting of group ids
-	// parentID1.parentID2.childID1
-	// e.g. 01EXPM5Z8HRGFAEWTETR1X1441.01EXPKW2TVK74S5NWQ979VJ4PJ.01EXPKW2TVK74S5NWQ979VJ4PJ
-	Path      string          `json:"path"`
-	Children  []*viewGroupRes `json:"children,omitempty"`
-	CreatedAt time.Time       `json:"created_at"`
-	UpdatedAt time.Time       `json:"updated_at"`
-}
-
-func (res viewGroupRes) Code() int {
-	return http.StatusOK
-}
-
-func (res viewGroupRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res viewGroupRes) Empty() bool {
-	return false
-}
-
-type groupRes struct {
-	id      string
-	created bool
-}
-
-func (res groupRes) Code() int {
-	if res.created {
-		return http.StatusCreated
-	}
-
-	return http.StatusOK
-}
-
-func (res groupRes) Headers() map[string]string {
-	if res.created {
-		return map[string]string{
-			"Location": fmt.Sprintf("/groups/%s", res.id),
-		}
-	}
-
-	return map[string]string{}
-}
-
-func (res groupRes) Empty() bool {
-	return true
-}
-
-type groupPageRes struct {
-	pageRes
-	Groups []viewGroupRes `json:"groups"`
-}
-
-type pageRes struct {
-	Limit  uint64 `json:"limit,omitempty"`
-	Offset uint64 `json:"offset,omitempty"`
-	Total  uint64 `json:"total"`
-	Level  uint64 `json:"level"`
-	Name   string `json:"name"`
-}
-
-func (res groupPageRes) Code() int {
-	return http.StatusOK
-}
-
-func (res groupPageRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res groupPageRes) Empty() bool {
-	return false
-}
-
-type deleteRes struct{}
-
-func (res deleteRes) Code() int {
-	return http.StatusNoContent
-}
-
-func (res deleteRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res deleteRes) Empty() bool {
-	return true
-}
-
-type assignRes struct{}
-
-func (res assignRes) Code() int {
-	return http.StatusOK
-}
-
-func (res assignRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res assignRes) Empty() bool {
-	return true
-}
-
-type unassignRes struct{}
-
-func (res unassignRes) Code() int {
-	return http.StatusNoContent
-}
-
-func (res unassignRes) Headers() map[string]string {
-	return map[string]string{}
-}
-
-func (res unassignRes) Empty() bool {
-	return true
-}
-
-type errorRes struct {
-	Err string `json:"error"`
-}

auth/api/http/groups/transport.go

@@ -1,346 +0,0 @@
-package groups
-
-import (
-	"context"
-	"encoding/json"
-	"io"
-	"net/http"
-	"strings"
-
-	kitot "github.com/go-kit/kit/tracing/opentracing"
-	kithttp "github.com/go-kit/kit/transport/http"
-	"github.com/go-zoo/bone"
-	"github.com/mainflux/mainflux"
-	"github.com/mainflux/mainflux/auth"
-	"github.com/mainflux/mainflux/internal/httputil"
-	"github.com/mainflux/mainflux/pkg/errors"
-	"github.com/opentracing/opentracing-go"
-)
-
-var (
-	errInvalidQueryParams     = errors.New("invalid query params")
-	errUnsupportedContentType = errors.New("unsupported content type")
-)
-
-const (
-	contentType = "application/json"
-	maxNameSize = 254
-	offsetKey   = "offset"
-	limitKey    = "limit"
-	levelKey    = "level"
-	metadataKey = "metadata"
-	treeKey     = "tree"
-	groupType   = "type"
-	defOffset   = 0
-	defLimit    = 10
-	defLevel    = 1
-)
-
-// MakeHandler returns a HTTP handler for API endpoints.
-func MakeHandler(svc auth.Service, mux *bone.Mux, tracer opentracing.Tracer) *bone.Mux {
-	opts := []kithttp.ServerOption{
-		kithttp.ServerErrorEncoder(encodeError),
-	}
-	mux.Post("/groups", kithttp.NewServer(
-		kitot.TraceServer(tracer, "create_group")(createGroupEndpoint(svc)),
-		decodeGroupCreate,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Get("/groups/:groupID", kithttp.NewServer(
-		kitot.TraceServer(tracer, "view_group")(viewGroupEndpoint(svc)),
-		decodeGroupRequest,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Put("/groups/:groupID", kithttp.NewServer(
-		kitot.TraceServer(tracer, "update_group")(updateGroupEndpoint(svc)),
-		decodeGroupUpdate,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Delete("/groups/:groupID", kithttp.NewServer(
-		kitot.TraceServer(tracer, "delete_group")(deleteGroupEndpoint(svc)),
-		decodeGroupRequest,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Get("/groups", kithttp.NewServer(
-		kitot.TraceServer(tracer, "list_groups")(listGroupsEndpoint(svc)),
-		decodeListGroupsRequest,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Get("/groups/:groupID/children", kithttp.NewServer(
-		kitot.TraceServer(tracer, "list_children")(listChildrenEndpoint(svc)),
-		decodeListGroupsRequest,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Get("/groups/:groupID/parents", kithttp.NewServer(
-		kitot.TraceServer(tracer, "list_parents_groups")(listParentsEndpoint(svc)),
-		decodeListGroupsRequest,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Post("/groups/:groupID/members", kithttp.NewServer(
-		kitot.TraceServer(tracer, "assign")(assignEndpoint(svc)),
-		decodeAssignRequest,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Delete("/groups/:groupID/members", kithttp.NewServer(
-		kitot.TraceServer(tracer, "unassign")(unassignEndpoint(svc)),
-		decodeUnassignRequest,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Get("/groups/:groupID/members", kithttp.NewServer(
-		kitot.TraceServer(tracer, "list_members")(listMembersEndpoint(svc)),
-		decodeListMembersRequest,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Get("/members/:memberID/groups", kithttp.NewServer(
-		kitot.TraceServer(tracer, "list_memberships")(listMemberships(svc)),
-		decodeListMembershipsRequest,
-		encodeResponse,
-		opts...,
-	))
-
-	return mux
-
-}
-
-func decodeListGroupsRequest(_ context.Context, r *http.Request) (interface{}, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, auth.ErrUnsupportedContentType
-	}
-
-	l, err := httputil.ReadUintQuery(r, levelKey, defLevel)
-	if err != nil {
-		return nil, err
-	}
-
-	m, err := httputil.ReadMetadataQuery(r, metadataKey, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	t, err := httputil.ReadBoolQuery(r, treeKey, false)
-	if err != nil {
-		return nil, err
-	}
-
-	req := listGroupsReq{
-		token:    r.Header.Get("Authorization"),
-		level:    l,
-		metadata: m,
-		tree:     t,
-		id:       bone.GetValue(r, "groupID"),
-	}
-	return req, nil
-}
-
-func decodeListMembersRequest(_ context.Context, r *http.Request) (interface{}, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, auth.ErrUnsupportedContentType
-	}
-
-	o, err := httputil.ReadUintQuery(r, offsetKey, defOffset)
-	if err != nil {
-		return nil, err
-	}
-
-	l, err := httputil.ReadUintQuery(r, limitKey, defLimit)
-	if err != nil {
-		return nil, err
-	}
-
-	m, err := httputil.ReadMetadataQuery(r, metadataKey, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	tree, err := httputil.ReadBoolQuery(r, treeKey, false)
-	if err != nil {
-		return nil, err
-	}
-
-	t, err := httputil.ReadStringQuery(r, groupType, "")
-	if err != nil {
-		return nil, err
-	}
-
-	req := listMembersReq{
-		token:     r.Header.Get("Authorization"),
-		id:        bone.GetValue(r, "groupID"),
-		groupType: t,
-		offset:    o,
-		limit:     l,
-		metadata:  m,
-		tree:      tree,
-	}
-	return req, nil
-}
-
-func decodeListMembershipsRequest(_ context.Context, r *http.Request) (interface{}, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, auth.ErrUnsupportedContentType
-	}
-
-	o, err := httputil.ReadUintQuery(r, offsetKey, defOffset)
-	if err != nil {
-		return nil, err
-	}
-
-	l, err := httputil.ReadUintQuery(r, limitKey, defLimit)
-	if err != nil {
-		return nil, err
-	}
-
-	m, err := httputil.ReadMetadataQuery(r, metadataKey, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	tree, err := httputil.ReadBoolQuery(r, treeKey, false)
-	if err != nil {
-		return nil, err
-	}
-
-	req := listMembershipsReq{
-		token:    r.Header.Get("Authorization"),
-		id:       bone.GetValue(r, "memberID"),
-		offset:   o,
-		limit:    l,
-		metadata: m,
-		tree:     tree,
-	}
-
-	return req, nil
-}
-
-func decodeGroupCreate(_ context.Context, r *http.Request) (interface{}, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, auth.ErrUnsupportedContentType
-	}
-
-	var req createGroupReq
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(auth.ErrFailedDecode, err)
-	}
-
-	req.token = r.Header.Get("Authorization")
-	return req, nil
-}
-
-func decodeGroupUpdate(_ context.Context, r *http.Request) (interface{}, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, auth.ErrUnsupportedContentType
-	}
-
-	var req updateGroupReq
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(auth.ErrFailedDecode, err)
-	}
-
-	req.id = bone.GetValue(r, "groupID")
-	req.token = r.Header.Get("Authorization")
-	return req, nil
-}
-
-func decodeGroupRequest(_ context.Context, r *http.Request) (interface{}, error) {
-	req := groupReq{
-		token: r.Header.Get("Authorization"),
-		id:    bone.GetValue(r, "groupID"),
-	}
-
-	return req, nil
-}
-
-func decodeAssignRequest(_ context.Context, r *http.Request) (interface{}, error) {
-	req := assignReq{
-		token:   r.Header.Get("Authorization"),
-		groupID: bone.GetValue(r, "groupID"),
-	}
-
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(auth.ErrMalformedEntity, err)
-	}
-
-	return req, nil
-}
-
-func decodeUnassignRequest(_ context.Context, r *http.Request) (interface{}, error) {
-	req := unassignReq{
-		assignReq{
-			token:   r.Header.Get("Authorization"),
-			groupID: bone.GetValue(r, "groupID"),
-		},
-	}
-
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(auth.ErrMalformedEntity, err)
-	}
-
-	return req, nil
-}
-
-func encodeResponse(_ context.Context, w http.ResponseWriter, response interface{}) error {
-	w.Header().Set("Content-Type", contentType)
-
-	if ar, ok := response.(mainflux.Response); ok {
-		for k, v := range ar.Headers() {
-			w.Header().Set(k, v)
-		}
-
-		w.WriteHeader(ar.Code())
-
-		if ar.Empty() {
-			return nil
-		}
-	}
-
-	return json.NewEncoder(w).Encode(response)
-}
-
-func encodeError(_ context.Context, err error, w http.ResponseWriter) {
-	switch {
-	case errors.Contains(err, auth.ErrMalformedEntity):
-		w.WriteHeader(http.StatusBadRequest)
-	case errors.Contains(err, auth.ErrUnauthorizedAccess):
-		w.WriteHeader(http.StatusForbidden)
-	case errors.Contains(err, auth.ErrNotFound):
-		w.WriteHeader(http.StatusNotFound)
-	case errors.Contains(err, auth.ErrConflict):
-		w.WriteHeader(http.StatusConflict)
-	case errors.Contains(err, auth.ErrMemberAlreadyAssigned):
-		w.WriteHeader(http.StatusConflict)
-	case errors.Contains(err, io.EOF):
-		w.WriteHeader(http.StatusBadRequest)
-	case errors.Contains(err, io.ErrUnexpectedEOF):
-		w.WriteHeader(http.StatusBadRequest)
-	case errors.Contains(err, errUnsupportedContentType):
-		w.WriteHeader(http.StatusUnsupportedMediaType)
-	default:
-		w.WriteHeader(http.StatusInternalServerError)
-	}
-	errorVal, ok := err.(errors.Error)
-	if ok {
-		if err := json.NewEncoder(w).Encode(errorRes{Err: errorVal.Msg()}); err != nil {
-			w.Header().Set("Content-Type", contentType)
-			w.WriteHeader(http.StatusInternalServerError)
-		}
-	}
-}

auth/api/http/keys/endpoint.go

@@ -1,4 +1,4 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package keys
@@ -7,8 +7,8 @@ import (
 	"context"
 	"time"
 
+	"github.com/absmach/supermq/auth"
 	"github.com/go-kit/kit/endpoint"
-	"github.com/mainflux/mainflux/auth"
 )
 
 func issueEndpoint(svc auth.Service) endpoint.Endpoint {
@@ -30,19 +30,15 @@ func issueEndpoint(svc auth.Service) endpoint.Endpoint {
 			newKey.ExpiresAt = exp
 		}
 
-		key, secret, err := svc.Issue(ctx, req.token, newKey)
+		tkn, err := svc.Issue(ctx, req.token, newKey)
 		if err != nil {
 			return nil, err
 		}
 
 		res := issueKeyRes{
-			ID:       key.ID,
-			Value:    secret,
-			IssuedAt: key.IssuedAt,
-		}
-		if !key.ExpiresAt.IsZero() {
-			res.ExpiresAt = &key.ExpiresAt
+			Value: tkn.AccessToken,
 		}
+
 		return res, nil
 	}
 }
@@ -56,13 +52,12 @@ func retrieveEndpoint(svc auth.Service) endpoint.Endpoint {
 		}
 
 		key, err := svc.RetrieveKey(ctx, req.token, req.id)
-
 		if err != nil {
 			return nil, err
 		}
 		ret := retrieveKeyRes{
 			ID:       key.ID,
-			IssuerID: key.IssuerID,
+			IssuerID: key.Issuer,
 			Subject:  key.Subject,
 			Type:     key.Type,
 			IssuedAt: key.IssuedAt,

auth/api/http/keys/endpoint_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package keys_test
@@ -14,20 +14,27 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mainflux/mainflux/auth"
-	httpapi "github.com/mainflux/mainflux/auth/api/http"
-	"github.com/mainflux/mainflux/auth/jwt"
-	"github.com/mainflux/mainflux/auth/mocks"
-	"github.com/mainflux/mainflux/pkg/uuid"
-	"github.com/opentracing/opentracing-go/mocktracer"
+	"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"
+	"github.com/absmach/supermq/pkg/apiutil"
+	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"
+	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
 )
 
 type issueRequest struct {
@@ -50,7 +57,7 @@ func (tr testRequest) make() (*http.Response, error) {
 		return nil, err
 	}
 	if tr.token != "" {
-		req.Header.Set("Authorization", tr.token)
+		req.Header.Set("Authorization", apiutil.BearerPrefix+tr.token)
 	}
 	if tr.contentType != "" {
 		req.Header.Set("Content-Type", tr.contentType)
@@ -60,36 +67,41 @@ func (tr testRequest) make() (*http.Response, error) {
 	return tr.client.Do(req)
 }
 
-func newService() auth.Service {
-	repo := mocks.NewKeyRepository()
-	groupRepo := mocks.NewGroupRepository()
+func newService() (auth.Service, *mocks.KeyRepository) {
+	krepo := new(mocks.KeyRepository)
 	idProvider := uuid.NewMock()
-	t := jwt.New(secret)
-	return auth.New(repo, groupRepo, idProvider, t)
+	pService := new(policymocks.Service)
+	pEvaluator := new(policymocks.Evaluator)
+	t := jwt.New([]byte(secret))
+
+	return auth.New(krepo, idProvider, t, pEvaluator, pService, loginDuration, refreshDuration, invalidDuration), krepo
 }
 
 func newServer(svc auth.Service) *httptest.Server {
-	mux := httpapi.MakeHandler(svc, mocktracer.New())
+	mux := httpapi.MakeHandler(svc, smqlog.NewMock(), "")
 	return httptest.NewServer(mux)
 }
 
 func toJSON(data interface{}) string {
-	jsonData, _ := json.Marshal(data)
+	jsonData, err := json.Marshal(data)
+	if err != nil {
+		return ""
+	}
 	return string(jsonData)
 }
 
 func TestIssue(t *testing.T) {
-	svc := newService()
-	_, loginSecret, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.UserKey, IssuedAt: time.Now(), IssuerID: id, Subject: email})
-	assert.Nil(t, err, fmt.Sprintf("Issuing user key expected to succeed: %s", err))
+	svc, krepo := newService()
+	token, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.AccessKey, IssuedAt: time.Now(), Subject: id})
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
 
 	ts := newServer(svc)
 	defer ts.Close()
 	client := ts.Client()
 
-	uk := issueRequest{Type: auth.UserKey}
-	ak := issueRequest{Type: auth.APIKey, Duration: time.Hour}
-	rk := issueRequest{Type: auth.RecoveryKey}
+	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
@@ -99,73 +111,73 @@ func TestIssue(t *testing.T) {
 		status int
 	}{
 		{
-			desc:   "issue user key",
-			req:    toJSON(uk),
+			desc:   "issue login key with empty token",
+			req:    toJSON(lk),
 			ct:     contentType,
 			token:  "",
-			status: http.StatusCreated,
+			status: http.StatusUnauthorized,
 		},
 		{
 			desc:   "issue API key",
 			req:    toJSON(ak),
 			ct:     contentType,
-			token:  loginSecret,
+			token:  token.AccessToken,
 			status: http.StatusCreated,
 		},
 		{
 			desc:   "issue recovery key",
 			req:    toJSON(rk),
 			ct:     contentType,
-			token:  loginSecret,
-			status: http.StatusBadRequest,
+			token:  token.AccessToken,
+			status: http.StatusCreated,
 		},
 		{
-			desc:   "issue user key wrong content type",
-			req:    toJSON(uk),
+			desc:   "issue login key wrong content type",
+			req:    toJSON(lk),
 			ct:     "",
-			token:  loginSecret,
+			token:  token.AccessToken,
 			status: http.StatusUnsupportedMediaType,
 		},
 		{
 			desc:   "issue recovery key wrong content type",
 			req:    toJSON(rk),
 			ct:     "",
-			token:  loginSecret,
+			token:  token.AccessToken,
 			status: http.StatusUnsupportedMediaType,
 		},
 		{
-			desc:   "issue key unauthorized",
+			desc:   "issue key with an invalid token",
 			req:    toJSON(ak),
 			ct:     contentType,
 			token:  "wrong",
-			status: http.StatusForbidden,
+			status: http.StatusUnauthorized,
 		},
 		{
 			desc:   "issue recovery key with empty token",
 			req:    toJSON(rk),
 			ct:     contentType,
 			token:  "",
-			status: http.StatusBadRequest,
+			status: http.StatusUnauthorized,
 		},
 		{
 			desc:   "issue key with invalid request",
 			req:    "{",
 			ct:     contentType,
-			token:  "",
+			token:  token.AccessToken,
 			status: http.StatusBadRequest,
 		},
 		{
 			desc:   "issue key with invalid JSON",
 			req:    "{invalid}",
 			ct:     contentType,
-			token:  "",
+			token:  token.AccessToken,
 			status: http.StatusBadRequest,
 		},
 		{
 			desc:   "issue key with invalid JSON content",
-			req:    `{"Type":{"key":"value"}}`,
+			req:    `{"Type":{"key":"AccessToken"}}`,
 			ct:     contentType,
-			token:  "",
+			token:  token.AccessToken,
 			status: http.StatusBadRequest,
 		},
 	}
@@ -179,20 +191,24 @@ func TestIssue(t *testing.T) {
 			token:       tc.token,
 			body:        strings.NewReader(tc.req),
 		}
+		repocall := krepo.On("Save", 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()
 	}
 }
 
 func TestRetrieve(t *testing.T) {
-	svc := newService()
-	_, loginSecret, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.UserKey, IssuedAt: time.Now(), IssuerID: id, Subject: email})
+	svc, krepo := newService()
+	token, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.AccessKey, 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(), IssuerID: id, Subject: email}
+	key := auth.Key{Type: auth.APIKey, IssuedAt: time.Now(), Subject: id}
 
-	k, _, err := svc.Issue(context.Background(), loginSecret, key)
+	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()
 
 	ts := newServer(svc)
 	defer ts.Close()
@@ -202,25 +218,43 @@ func TestRetrieve(t *testing.T) {
 		desc   string
 		id     string
 		token  string
+		key    auth.Key
 		status int
+		err    error
 	}{
 		{
-			desc:   "retrieve an existing key",
-			id:     k.ID,
-			token:  loginSecret,
+			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:  loginSecret,
-			status: http.StatusNotFound,
+			token:  token.AccessToken,
+			status: http.StatusBadRequest,
+			err:    svcerr.ErrNotFound,
 		},
 		{
-			desc:   "retrieve a key unauthorized",
-			id:     k.ID,
+			desc:   "retrieve a key with an invalid token",
+			id:     k.AccessToken,
 			token:  "wrong",
-			status: http.StatusForbidden,
+			status: http.StatusUnauthorized,
+			err:    svcerr.ErrAuthentication,
+		},
+		{
+			desc:   "retrieve a key with an empty token",
+			token:  "",
+			id:     k.AccessToken,
+			status: http.StatusUnauthorized,
+			err:    svcerr.ErrAuthentication,
 		},
 	}
 
@@ -231,20 +265,24 @@ func TestRetrieve(t *testing.T) {
 			url:    fmt.Sprintf("%s/keys/%s", ts.URL, tc.id),
 			token:  tc.token,
 		}
+		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()
 	}
 }
 
 func TestRevoke(t *testing.T) {
-	svc := newService()
-	_, loginSecret, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.UserKey, IssuedAt: time.Now(), IssuerID: id, Subject: email})
-	assert.Nil(t, err, fmt.Sprintf("Issuing user key expected to succeed: %s", err))
-	key := auth.Key{Type: auth.APIKey, IssuedAt: time.Now(), IssuerID: id, Subject: email}
+	svc, krepo := newService()
+	token, err := svc.Issue(context.Background(), "", auth.Key{Type: auth.AccessKey, 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}
 
-	k, _, err := svc.Issue(context.Background(), loginSecret, key)
-	assert.Nil(t, err, fmt.Sprintf("Issuing user key expected to succeed: %s", err))
+	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()
 
 	ts := newServer(svc)
 	defer ts.Close()
@@ -258,21 +296,28 @@ func TestRevoke(t *testing.T) {
 	}{
 		{
 			desc:   "revoke an existing key",
-			id:     k.ID,
-			token:  loginSecret,
+			id:     k.AccessToken,
+			token:  token.AccessToken,
 			status: http.StatusNoContent,
 		},
 		{
 			desc:   "revoke a non-existing key",
 			id:     "non-existing",
-			token:  loginSecret,
+			token:  token.AccessToken,
 			status: http.StatusNoContent,
 		},
 		{
-			desc:   "revoke a key unauthorized",
-			id:     k.ID,
+			desc:   "revoke key with invalid token",
+			id:     k.AccessToken,
 			token:  "wrong",
-			status: http.StatusForbidden},
+			status: http.StatusUnauthorized,
+		},
+		{
+			desc:   "revoke key with empty token",
+			id:     k.AccessToken,
+			token:  "",
+			status: http.StatusUnauthorized,
+		},
 	}
 
 	for _, tc := range cases {
@@ -282,8 +327,10 @@ func TestRevoke(t *testing.T) {
 			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()
 	}
 }

auth/api/http/keys/requests.go

@@ -1,4 +1,4 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package keys
@@ -6,23 +6,28 @@ package keys
 import (
 	"time"
 
-	"github.com/mainflux/mainflux/auth"
+	"github.com/absmach/supermq/auth"
+	"github.com/absmach/supermq/pkg/apiutil"
 )
 
 type issueKeyReq struct {
 	token    string
-	Type     uint32        `json:"type,omitempty"`
+	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.Type == auth.UserKey {
-		return nil
+	if req.token == "" {
+		return apiutil.ErrBearerToken
 	}
-	if req.token == "" || (req.Type != auth.APIKey) {
-		return auth.ErrMalformedEntity
+
+	if req.Type != auth.AccessKey &&
+		req.Type != auth.RecoveryKey &&
+		req.Type != auth.APIKey {
+		return apiutil.ErrInvalidAPIKey
 	}
+
 	return nil
 }
 
@@ -32,8 +37,12 @@ type keyReq struct {
 }
 
 func (req keyReq) validate() error {
-	if req.token == "" || req.id == "" {
-		return auth.ErrMalformedEntity
+	if req.token == "" {
+		return apiutil.ErrBearerToken
+	}
+
+	if req.id == "" {
+		return apiutil.ErrMissingID
 	}
 	return nil
 }

auth/api/http/keys/requests_test.go

@@ -0,0 +1,88 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
+package keys
+
+import (
+	"testing"
+
+	"github.com/absmach/supermq/auth"
+	"github.com/absmach/supermq/pkg/apiutil"
+	"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)
+	}
+}

auth/api/http/keys/responses.go

@@ -1,4 +1,4 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package keys
@@ -7,12 +7,13 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mainflux/mainflux"
+	"github.com/absmach/supermq"
+	"github.com/absmach/supermq/auth"
 )
 
 var (
-	_ mainflux.Response = (*issueKeyRes)(nil)
-	_ mainflux.Response = (*revokeKeyRes)(nil)
+	_ supermq.Response = (*issueKeyRes)(nil)
+	_ supermq.Response = (*revokeKeyRes)(nil)
 )
 
 type issueKeyRes struct {
@@ -35,12 +36,12 @@ func (res issueKeyRes) Empty() bool {
 }
 
 type retrieveKeyRes struct {
-	ID        string     `json:"id,omitempty"`
-	IssuerID  string     `json:"issuer_id,omitempty"`
-	Subject   string     `json:"subject,omitempty"`
-	Type      uint32     `json:"type,omitempty"`
-	IssuedAt  time.Time  `json:"issued_at,omitempty"`
-	ExpiresAt *time.Time `json:"expires_at,omitempty"`
+	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 {
@@ -55,8 +56,7 @@ func (res retrieveKeyRes) Empty() bool {
 	return false
 }
 
-type revokeKeyRes struct {
-}
+type revokeKeyRes struct{}
 
 func (res revokeKeyRes) Code() int {
 	return http.StatusNoContent
@@ -69,7 +69,3 @@ func (res revokeKeyRes) Headers() map[string]string {
 func (res revokeKeyRes) Empty() bool {
 	return true
 }
-
-type errorRes struct {
-	Err string `json:"error"`
-}

auth/api/http/keys/transport.go

@@ -1,4 +1,4 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package keys
@@ -6,60 +6,58 @@ package keys
 import (
 	"context"
 	"encoding/json"
-	"io"
+	"log/slog"
 	"net/http"
 	"strings"
 
-	kitot "github.com/go-kit/kit/tracing/opentracing"
+	"github.com/absmach/supermq/auth"
+	"github.com/absmach/supermq/internal/api"
+	"github.com/absmach/supermq/pkg/apiutil"
+	"github.com/absmach/supermq/pkg/errors"
+	"github.com/go-chi/chi/v5"
 	kithttp "github.com/go-kit/kit/transport/http"
-	"github.com/go-zoo/bone"
-	"github.com/mainflux/mainflux"
-	"github.com/mainflux/mainflux/auth"
-	"github.com/mainflux/mainflux/pkg/errors"
-	"github.com/opentracing/opentracing-go"
 )
 
 const contentType = "application/json"
 
-var errUnsupportedContentType = errors.New("unsupported content type")
-
-func MakeHandler(svc auth.Service, mux *bone.Mux, tracer opentracing.Tracer) *bone.Mux {
+// 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(encodeError),
+		kithttp.ServerErrorEncoder(apiutil.LoggingErrorEncoder(logger, api.EncodeError)),
 	}
-	mux.Post("/keys", kithttp.NewServer(
-		kitot.TraceServer(tracer, "issue")(issueEndpoint(svc)),
-		decodeIssue,
-		encodeResponse,
-		opts...,
-	))
+	mux.Route("/keys", func(r chi.Router) {
+		r.Post("/", kithttp.NewServer(
+			issueEndpoint(svc),
+			decodeIssue,
+			api.EncodeResponse,
+			opts...,
+		).ServeHTTP)
 
-	mux.Get("/keys/:id", kithttp.NewServer(
-		kitot.TraceServer(tracer, "retrieve")(retrieveEndpoint(svc)),
-		decodeKeyReq,
-		encodeResponse,
-		opts...,
-	))
-
-	mux.Delete("/keys/:id", kithttp.NewServer(
-		kitot.TraceServer(tracer, "revoke")(revokeEndpoint(svc)),
-		decodeKeyReq,
-		encodeResponse,
-		opts...,
-	))
+		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) (interface{}, error) {
 	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, errUnsupportedContentType
-	}
-	req := issueKeyReq{
-		token: r.Header.Get("Authorization"),
+		return nil, apiutil.ErrUnsupportedContentType
 	}
+
+	req := issueKeyReq{token: apiutil.ExtractBearerToken(r)}
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, errors.Wrap(auth.ErrMalformedEntity, err)
+		return nil, errors.Wrap(errors.ErrMalformedEntity, err)
 	}
 
 	return req, nil
@@ -67,54 +65,8 @@ func decodeIssue(_ context.Context, r *http.Request) (interface{}, error) {
 
 func decodeKeyReq(_ context.Context, r *http.Request) (interface{}, error) {
 	req := keyReq{
-		token: r.Header.Get("Authorization"),
-		id:    bone.GetValue(r, "id"),
+		token: apiutil.ExtractBearerToken(r),
+		id:    chi.URLParam(r, "id"),
 	}
 	return req, nil
 }
-
-func encodeResponse(_ context.Context, w http.ResponseWriter, response interface{}) error {
-	w.Header().Set("Content-Type", contentType)
-
-	if ar, ok := response.(mainflux.Response); ok {
-		for k, v := range ar.Headers() {
-			w.Header().Set(k, v)
-		}
-
-		w.WriteHeader(ar.Code())
-
-		if ar.Empty() {
-			return nil
-		}
-	}
-
-	return json.NewEncoder(w).Encode(response)
-}
-
-func encodeError(_ context.Context, err error, w http.ResponseWriter) {
-	switch {
-	case errors.Contains(err, auth.ErrMalformedEntity):
-		w.WriteHeader(http.StatusBadRequest)
-	case errors.Contains(err, auth.ErrUnauthorizedAccess):
-		w.WriteHeader(http.StatusForbidden)
-	case errors.Contains(err, auth.ErrNotFound):
-		w.WriteHeader(http.StatusNotFound)
-	case errors.Contains(err, auth.ErrConflict):
-		w.WriteHeader(http.StatusConflict)
-	case errors.Contains(err, io.EOF):
-		w.WriteHeader(http.StatusBadRequest)
-	case errors.Contains(err, io.ErrUnexpectedEOF):
-		w.WriteHeader(http.StatusBadRequest)
-	case errors.Contains(err, errUnsupportedContentType):
-		w.WriteHeader(http.StatusUnsupportedMediaType)
-	default:
-		w.WriteHeader(http.StatusInternalServerError)
-	}
-	errorVal, ok := err.(errors.Error)
-	if ok {
-		if err := json.NewEncoder(w).Encode(errorRes{Err: errorVal.Msg()}); err != nil {
-			w.Header().Set("Content-Type", contentType)
-			w.WriteHeader(http.StatusInternalServerError)
-		}
-	}
-}

auth/api/http/transport.go

@@ -1,24 +1,26 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 package http
 
 import (
+	"log/slog"
 	"net/http"
 
-	"github.com/go-zoo/bone"
-	"github.com/mainflux/mainflux"
-	"github.com/mainflux/mainflux/auth"
-	"github.com/mainflux/mainflux/auth/api/http/groups"
-	"github.com/mainflux/mainflux/auth/api/http/keys"
-	"github.com/opentracing/opentracing-go"
+	"github.com/absmach/supermq"
+	"github.com/absmach/supermq/auth"
+	"github.com/absmach/supermq/auth/api/http/keys"
+	"github.com/go-chi/chi/v5"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
-func MakeHandler(svc auth.Service, tracer opentracing.Tracer) http.Handler {
-	mux := bone.New()
-	mux = keys.MakeHandler(svc, mux, tracer)
-	mux = groups.MakeHandler(svc, mux, tracer)
-	mux.GetFunc("/version", mainflux.Version("auth"))
+// 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.Get("/health", supermq.Health("auth", instanceID))
 	mux.Handle("/metrics", promhttp.Handler())
+
 	return mux
 }

auth/api/logging.go

@@ -1,56 +1,63 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
-// +build !test
+//go:build !test
 
 package api
 
 import (
 	"context"
-	"fmt"
+	"log/slog"
 	"time"
 
-	"github.com/mainflux/mainflux/auth"
-	log "github.com/mainflux/mainflux/logger"
+	"github.com/absmach/supermq/auth"
+	"github.com/absmach/supermq/pkg/policies"
 )
 
 var _ auth.Service = (*loggingMiddleware)(nil)
 
 type loggingMiddleware struct {
-	logger log.Logger
+	logger *slog.Logger
 	svc    auth.Service
 }
 
 // LoggingMiddleware adds logging facilities to the core service.
-func LoggingMiddleware(svc auth.Service, logger log.Logger) auth.Service {
+func LoggingMiddleware(svc auth.Service, logger *slog.Logger) auth.Service {
 	return &loggingMiddleware{logger, svc}
 }
 
-func (lm *loggingMiddleware) Issue(ctx context.Context, token string, newKey auth.Key) (key auth.Key, secret string, err error) {
+func (lm *loggingMiddleware) Issue(ctx context.Context, token string, key auth.Key) (tkn auth.Token, err error) {
 	defer func(begin time.Time) {
-		d := "infinite duration"
-		if !key.ExpiresAt.IsZero() {
-			d = fmt.Sprintf("the key with expiration date %v", key.ExpiresAt)
+		args := []any{
+			slog.String("duration", time.Since(begin).String()),
+			slog.Group("key",
+				slog.String("subject", key.Subject),
+				slog.Any("type", key.Type),
+			),
 		}
-		message := fmt.Sprintf("Method issue for %s took %s to complete", d, time.Since(begin))
 		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
+			args = append(args, slog.Any("error", err))
+			lm.logger.Warn("Issue key failed", args...)
 			return
 		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
+		lm.logger.Info("Issue key completed successfully", args...)
 	}(time.Now())
 
-	return lm.svc.Issue(ctx, token, newKey)
+	return lm.svc.Issue(ctx, token, key)
 }
 
 func (lm *loggingMiddleware) Revoke(ctx context.Context, token, id string) (err error) {
 	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method revoke for key %s took %s to complete", id, time.Since(begin))
+		args := []any{
+			slog.String("duration", time.Since(begin).String()),
+			slog.String("key_id", id),
+		}
 		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
+			args = append(args, slog.Any("error", err))
+			lm.logger.Warn("Revoke key failed", args...)
 			return
 		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
+		lm.logger.Info("Revoke key completed successfully", args...)
 	}(time.Now())
 
 	return lm.svc.Revoke(ctx, token, id)
@@ -58,182 +65,62 @@ func (lm *loggingMiddleware) Revoke(ctx context.Context, token, id string) (err
 
 func (lm *loggingMiddleware) RetrieveKey(ctx context.Context, token, id string) (key auth.Key, err error) {
 	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method retrieve for key %s took %s to complete", id, time.Since(begin))
+		args := []any{
+			slog.String("duration", time.Since(begin).String()),
+			slog.String("key_id", id),
+		}
 		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
+			args = append(args, slog.Any("error", err))
+			lm.logger.Warn("Retrieve key failed", args...)
 			return
 		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
+		lm.logger.Info("Retrieve key completed successfully", args...)
 	}(time.Now())
 
 	return lm.svc.RetrieveKey(ctx, token, id)
 }
 
-func (lm *loggingMiddleware) Identify(ctx context.Context, key string) (id auth.Identity, err error) {
+func (lm *loggingMiddleware) Identify(ctx context.Context, token string) (id auth.Key, err error) {
 	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method identify took %s to complete", time.Since(begin))
+		args := []any{
+			slog.String("duration", time.Since(begin).String()),
+			slog.Group("key",
+				slog.String("subject", id.Subject),
+				slog.Any("type", id.Type),
+			),
+		}
 		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
+			args = append(args, slog.Any("error", err))
+			lm.logger.Warn("Identify key failed", args...)
 			return
 		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
+		lm.logger.Info("Identify key completed successfully", args...)
 	}(time.Now())
 
-	return lm.svc.Identify(ctx, key)
+	return lm.svc.Identify(ctx, token)
 }
 
-func (lm *loggingMiddleware) Authorize(ctx context.Context, token, sub, obj, act string) (auth bool, err error) {
+func (lm *loggingMiddleware) Authorize(ctx context.Context, pr policies.Policy) (err error) {
 	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method authorize took %s to complete", time.Since(begin))
+		args := []any{
+			slog.String("duration", time.Since(begin).String()),
+			slog.Group("object",
+				slog.String("id", pr.Object),
+				slog.String("type", pr.ObjectType),
+			),
+			slog.Group("subject",
+				slog.String("id", pr.Subject),
+				slog.String("kind", pr.SubjectKind),
+				slog.String("type", pr.SubjectType),
+			),
+			slog.String("permission", pr.Permission),
+		}
 		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
+			args = append(args, slog.Any("error", err))
+			lm.logger.Warn("Authorize failed", args...)
 			return
 		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
+		lm.logger.Info("Authorize completed successfully", args...)
 	}(time.Now())
-
-	return lm.svc.Authorize(ctx, token, sub, obj, act)
-}
-
-func (lm *loggingMiddleware) CreateGroup(ctx context.Context, token string, group auth.Group) (g auth.Group, err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method create_group for token %s and name %s took %s to complete", token, group.Name, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.CreateGroup(ctx, token, group)
-}
-
-func (lm *loggingMiddleware) UpdateGroup(ctx context.Context, token string, group auth.Group) (gr auth.Group, err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method update_group for token %s and name %s took %s to complete", token, group.Name, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.UpdateGroup(ctx, token, group)
-}
-
-func (lm *loggingMiddleware) RemoveGroup(ctx context.Context, token string, id string) (err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method remove_group for token %s and id %s took %s to complete", token, id, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.RemoveGroup(ctx, token, id)
-}
-
-func (lm *loggingMiddleware) ViewGroup(ctx context.Context, token, id string) (group auth.Group, err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method view_group for token %s and id %s took %s to complete", token, id, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.ViewGroup(ctx, token, id)
-}
-
-func (lm *loggingMiddleware) ListGroups(ctx context.Context, token string, pm auth.PageMetadata) (gp auth.GroupPage, err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method list_groups for token %s took %s to complete", token, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.ListGroups(ctx, token, pm)
-}
-
-func (lm *loggingMiddleware) ListChildren(ctx context.Context, token, parentID string, pm auth.PageMetadata) (gp auth.GroupPage, err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method list_children for token %s and parent %s took %s to complete", token, parentID, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.ListChildren(ctx, token, parentID, pm)
-}
-
-func (lm *loggingMiddleware) ListParents(ctx context.Context, token, childID string, pm auth.PageMetadata) (gp auth.GroupPage, err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method list_parents for token %s and child %s took for child %s to complete", token, childID, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.ListParents(ctx, token, childID, pm)
-}
-
-func (lm *loggingMiddleware) ListMembers(ctx context.Context, token, groupID, groupType string, pm auth.PageMetadata) (gp auth.MemberPage, err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method list_members for token %s and group id %s took %s to complete", token, groupID, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.ListMembers(ctx, token, groupID, groupType, pm)
-}
-
-func (lm *loggingMiddleware) ListMemberships(ctx context.Context, token, memberID string, pm auth.PageMetadata) (gp auth.GroupPage, err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method list_memberships for token %s and member id %s took %s to complete", token, memberID, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.ListMemberships(ctx, token, memberID, pm)
-}
-
-func (lm *loggingMiddleware) Assign(ctx context.Context, token, groupID, groupType string, memberIDs ...string) (err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method assign for token %s and member %s group id %s took %s to complete", token, memberIDs, groupID, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.Assign(ctx, token, groupID, groupType, memberIDs...)
-}
-
-func (lm *loggingMiddleware) Unassign(ctx context.Context, token string, groupID string, memberIDs ...string) (err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method unassign for token %s and member %s group id %s took %s to complete", token, memberIDs, groupID, time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
-	}(time.Now())
-
-	return lm.svc.Unassign(ctx, token, groupID, memberIDs...)
+	return lm.svc.Authorize(ctx, pr)
 }

auth/api/metrics.go

@@ -1,14 +1,17 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
+//go:build !test
+
 package api
 
 import (
 	"context"
 	"time"
 
+	"github.com/absmach/supermq/auth"
+	"github.com/absmach/supermq/pkg/policies"
 	"github.com/go-kit/kit/metrics"
-	"github.com/mainflux/mainflux/auth"
 )
 
 var _ auth.Service = (*metricsMiddleware)(nil)
@@ -28,7 +31,7 @@ func MetricsMiddleware(svc auth.Service, counter metrics.Counter, latency metric
 	}
 }
 
-func (ms *metricsMiddleware) Issue(ctx context.Context, token string, key auth.Key) (auth.Key, string, error) {
+func (ms *metricsMiddleware) Issue(ctx context.Context, token string, key auth.Key) (auth.Token, error) {
 	defer func(begin time.Time) {
 		ms.counter.With("method", "issue_key").Add(1)
 		ms.latency.With("method", "issue_key").Observe(time.Since(begin).Seconds())
@@ -55,7 +58,7 @@ func (ms *metricsMiddleware) RetrieveKey(ctx context.Context, token, id string)
 	return ms.svc.RetrieveKey(ctx, token, id)
 }
 
-func (ms *metricsMiddleware) Identify(ctx context.Context, token string) (auth.Identity, error) {
+func (ms *metricsMiddleware) Identify(ctx context.Context, token string) (auth.Key, error) {
 	defer func(begin time.Time) {
 		ms.counter.With("method", "identify").Add(1)
 		ms.latency.With("method", "identify").Observe(time.Since(begin).Seconds())
@@ -64,107 +67,10 @@ func (ms *metricsMiddleware) Identify(ctx context.Context, token string) (auth.I
 	return ms.svc.Identify(ctx, token)
 }
 
-func (ms *metricsMiddleware) Authorize(ctx context.Context, token, sub, obj, act string) (auth bool, err error) {
+func (ms *metricsMiddleware) Authorize(ctx context.Context, pr policies.Policy) error {
 	defer func(begin time.Time) {
 		ms.counter.With("method", "authorize").Add(1)
 		ms.latency.With("method", "authorize").Observe(time.Since(begin).Seconds())
 	}(time.Now())
-
-	return ms.svc.Authorize(ctx, token, sub, obj, act)
-}
-
-func (ms *metricsMiddleware) CreateGroup(ctx context.Context, token string, group auth.Group) (gr auth.Group, err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "create_group").Add(1)
-		ms.latency.With("method", "create_group").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-	return ms.svc.CreateGroup(ctx, token, group)
-}
-
-func (ms *metricsMiddleware) UpdateGroup(ctx context.Context, token string, group auth.Group) (gr auth.Group, err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "update_group").Add(1)
-		ms.latency.With("method", "update_group").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-	return ms.svc.UpdateGroup(ctx, token, group)
-}
-
-func (ms *metricsMiddleware) RemoveGroup(ctx context.Context, token string, id string) (err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "remove_group").Add(1)
-		ms.latency.With("method", "remove_group").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-	return ms.svc.RemoveGroup(ctx, token, id)
-}
-
-func (ms *metricsMiddleware) ViewGroup(ctx context.Context, token, id string) (group auth.Group, err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "view_group").Add(1)
-		ms.latency.With("method", "view_group").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.ViewGroup(ctx, token, id)
-}
-
-func (ms *metricsMiddleware) ListGroups(ctx context.Context, token string, pm auth.PageMetadata) (gp auth.GroupPage, err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "list_groups").Add(1)
-		ms.latency.With("method", "list_groups").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.ListGroups(ctx, token, pm)
-}
-
-func (ms *metricsMiddleware) ListParents(ctx context.Context, token, childID string, pm auth.PageMetadata) (gp auth.GroupPage, err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "parents").Add(1)
-		ms.latency.With("method", "parents").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.ListParents(ctx, token, childID, pm)
-}
-
-func (ms *metricsMiddleware) ListChildren(ctx context.Context, token, parentID string, pm auth.PageMetadata) (gp auth.GroupPage, err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "list_children").Add(1)
-		ms.latency.With("method", "list_children").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.ListChildren(ctx, token, parentID, pm)
-}
-
-func (ms *metricsMiddleware) ListMembers(ctx context.Context, token, groupID, groupType string, pm auth.PageMetadata) (gp auth.MemberPage, err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "list_members").Add(1)
-		ms.latency.With("method", "list_members").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.ListMembers(ctx, token, groupID, groupType, pm)
-}
-
-func (ms *metricsMiddleware) ListMemberships(ctx context.Context, token, memberID string, pm auth.PageMetadata) (gp auth.GroupPage, err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "list_memberships").Add(1)
-		ms.latency.With("method", "list_memberships").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.ListMemberships(ctx, token, memberID, pm)
-}
-
-func (ms *metricsMiddleware) Assign(ctx context.Context, token, groupID, groupType string, memberIDs ...string) (err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "assign").Add(1)
-		ms.latency.With("method", "assign").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.Assign(ctx, token, groupID, groupType, memberIDs...)
-}
-
-func (ms *metricsMiddleware) Unassign(ctx context.Context, token, groupID string, memberIDs ...string) (err error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "unassign").Add(1)
-		ms.latency.With("method", "unassign").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.Unassign(ctx, token, groupID, memberIDs...)
+	return ms.svc.Authorize(ctx, pr)
 }

auth/groups.go

@@ -1,177 +0,0 @@
-package auth
-
-import (
-	"context"
-	"errors"
-	"time"
-)
-
-const MaxLevel = uint64(5)
-const MinLevel = uint64(1)
-
-var (
-	// ErrMaxLevelExceeded malformed entity.
-	ErrMaxLevelExceeded = errors.New("level must be less than or equal 5")
-
-	// ErrBadGroupName malformed entity.
-	ErrBadGroupName = errors.New("incorrect group name")
-
-	// ErrGroupConflict group conflict.
-	ErrGroupConflict = errors.New("group already exists")
-
-	// ErrCreateGroup indicates failure to create group.
-	ErrCreateGroup = errors.New("failed to create group")
-
-	// ErrFetchGroups indicates failure to fetch groups.
-	ErrFetchGroups = errors.New("failed to fetch groups")
-
-	// ErrUpdateGroup indicates failure to update group.
-	ErrUpdateGroup = errors.New("failed to update group")
-
-	// ErrDeleteGroup indicates failure to delete group.
-	ErrDeleteGroup = errors.New("failed to delete group")
-
-	// ErrGroupNotFound indicates failure to find group.
-	ErrGroupNotFound = errors.New("failed to find group")
-
-	// ErrAssignToGroup indicates failure to assign member to a group.
-	ErrAssignToGroup = errors.New("failed to assign member to a group")
-
-	// ErrUnassignFromGroup indicates failure to unassign member from a group.
-	ErrUnassignFromGroup = errors.New("failed to unassign member from a group")
-
-	// ErrUnsupportedContentType indicates unacceptable or lack of Content-Type
-	ErrUnsupportedContentType = errors.New("unsupported content type")
-
-	// ErrFailedDecode indicates failed to decode request body
-	ErrFailedDecode = errors.New("failed to decode request body")
-
-	// ErrMissingParent indicates that parent can't be found
-	ErrMissingParent = errors.New("failed to retrieve parent")
-
-	// ErrGroupNotEmpty indicates group is not empty, can't be deleted.
-	ErrGroupNotEmpty = errors.New("group is not empty")
-
-	// ErrMemberAlreadyAssigned indicates that members is already assigned.
-	ErrMemberAlreadyAssigned = errors.New("member is already assigned")
-
-	// ErrSelectEntity indicates error while reading entity from database
-	ErrSelectEntity = errors.New("select entity from db error")
-)
-
-type GroupMetadata map[string]interface{}
-
-type Member struct {
-	ID   string
-	Type string
-}
-
-type Group struct {
-	ID          string
-	OwnerID     string
-	ParentID    string
-	Name        string
-	Description string
-	Metadata    GroupMetadata
-	// Indicates a level in tree hierarchy.
-	// Root node is level 1.
-	Level int
-	// Path in a tree consisting of group ids
-	// parentID1.parentID2.childID1
-	// e.g. 01EXPM5Z8HRGFAEWTETR1X1441.01EXPKW2TVK74S5NWQ979VJ4PJ.01EXPKW2TVK74S5NWQ979VJ4PJ
-	Path      string
-	Children  []*Group
-	CreatedAt time.Time
-	UpdatedAt time.Time
-}
-
-type PageMetadata struct {
-	Total    uint64
-	Offset   uint64
-	Limit    uint64
-	Size     uint64
-	Level    uint64
-	Name     string
-	Type     string
-	Metadata GroupMetadata
-}
-
-type GroupPage struct {
-	PageMetadata
-	Groups []Group
-}
-
-type MemberPage struct {
-	PageMetadata
-	Members []Member
-}
-
-type GroupService interface {
-	// CreateGroup creates new  group.
-	CreateGroup(ctx context.Context, token string, g Group) (Group, error)
-
-	// UpdateGroup updates the group identified by the provided ID.
-	UpdateGroup(ctx context.Context, token string, g Group) (Group, error)
-
-	// ViewGroup retrieves data about the group identified by ID.
-	ViewGroup(ctx context.Context, token, id string) (Group, error)
-
-	// ListGroups retrieves groups.
-	ListGroups(ctx context.Context, token string, pm PageMetadata) (GroupPage, error)
-
-	// ListChildren retrieves groups that are children to group identified by parentID
-	ListChildren(ctx context.Context, token, parentID string, pm PageMetadata) (GroupPage, error)
-
-	// ListParents retrieves groups that are parent to group identified by childID.
-	ListParents(ctx context.Context, token, childID string, pm PageMetadata) (GroupPage, error)
-
-	// ListMembers retrieves everything that is assigned to a group identified by groupID.
-	ListMembers(ctx context.Context, token, groupID, groupType string, pm PageMetadata) (MemberPage, error)
-
-	// ListMemberships retrieves all groups for member that is identified with memberID belongs to.
-	ListMemberships(ctx context.Context, token, memberID string, pm PageMetadata) (GroupPage, error)
-
-	// RemoveGroup removes the group identified with the provided ID.
-	RemoveGroup(ctx context.Context, token, id string) error
-
-	// Assign adds a member with memberID into the group identified by groupID.
-	Assign(ctx context.Context, token, groupID, groupType string, memberIDs ...string) error
-
-	// Unassign removes member with memberID from group identified by groupID.
-	Unassign(ctx context.Context, token, groupID string, memberIDs ...string) error
-}
-
-type GroupRepository interface {
-	// Save group
-	Save(ctx context.Context, g Group) (Group, error)
-
-	// Update a group
-	Update(ctx context.Context, g Group) (Group, error)
-
-	// Delete a group
-	Delete(ctx context.Context, id string) error
-
-	// RetrieveByID retrieves group by its id
-	RetrieveByID(ctx context.Context, id string) (Group, error)
-
-	// RetrieveAll retrieves all groups.
-	RetrieveAll(ctx context.Context, pm PageMetadata) (GroupPage, error)
-
-	// RetrieveAllParents retrieves all groups that are ancestors to the group with given groupID.
-	RetrieveAllParents(ctx context.Context, groupID string, pm PageMetadata) (GroupPage, error)
-
-	// RetrieveAllChildren retrieves all children from group with given groupID up to the hierarchy level.
-	RetrieveAllChildren(ctx context.Context, groupID string, pm PageMetadata) (GroupPage, error)
-
-	//  Retrieves list of groups that member belongs to
-	Memberships(ctx context.Context, memberID string, pm PageMetadata) (GroupPage, error)
-
-	// Members retrieves everything that is assigned to a group identified by groupID.
-	Members(ctx context.Context, groupID, groupType string, pm PageMetadata) (MemberPage, error)
-
-	// Assign adds a member to group.
-	Assign(ctx context.Context, groupID, groupType string, memberIDs ...string) error
-
-	// Unassign removes a member from a group
-	Unassign(ctx context.Context, groupID string, memberIDs ...string) error
-}

auth/jwt/token_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package jwt_test
@@ -8,29 +8,54 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mainflux/mainflux/auth"
-	"github.com/mainflux/mainflux/auth/jwt"
-	"github.com/mainflux/mainflux/pkg/errors"
+	"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 secret = "test"
+const (
+	tokenType   = "type"
+	userField   = "user"
+	domainField = "domain"
+	issuerName  = "supermq.auth"
+	secret      = "test"
+)
 
-func key() auth.Key {
-	exp := time.Now().UTC().Add(10 * time.Minute).Round(time.Second)
-	return auth.Key{
-		ID:        "id",
-		Type:      auth.UserKey,
-		Subject:   "user@email.com",
-		IssuerID:  "",
-		IssuedAt:  time.Now().UTC().Add(-10 * time.Second).Round(time.Second),
-		ExpiresAt: exp,
+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(userField, key.User)
+	if key.Domain != "" {
+		builder.Claim(domainField, key.Domain)
 	}
+	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 := jwt.New(secret)
+	tokenizer := authjwt.New([]byte(secret))
 
 	cases := []struct {
 		desc string
@@ -42,16 +67,70 @@ func TestIssue(t *testing.T) {
 			key:  key(),
 			err:  nil,
 		},
+		{
+			desc: "issue token with OAuth token",
+			key: auth.Key{
+				ID:        testsutil.GenerateUUID(t),
+				Type:      auth.AccessKey,
+				Subject:   testsutil.GenerateUUID(t),
+				User:      testsutil.GenerateUUID(t),
+				Domain:    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),
+				User:     testsutil.GenerateUUID(t),
+				Domain:   "",
+				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:  "",
+				User:     testsutil.GenerateUUID(t),
+				Domain:   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:   "",
+				User:      testsutil.GenerateUUID(t),
+				Domain:    "",
+				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 {
-		_, 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))
+		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 := jwt.New(secret)
+	tokenizer := authjwt.New([]byte(secret))
 
 	token, err := tokenizer.Issue(key())
 	require.Nil(t, err, fmt.Sprintf("issuing key expected to succeed: %s", err))
@@ -67,6 +146,24 @@ func TestParse(t *testing.T) {
 	expToken, err := tokenizer.Issue(expKey)
 	require.Nil(t, err, fmt.Sprintf("issuing expired key expected to succeed: %s", err))
 
+	emptyDomainKey := key()
+	emptyDomainKey.Domain = ""
+	emptyDomainToken, err := tokenizer.Issue(emptyDomainKey)
+	require.Nil(t, err, fmt.Sprintf("issuing user 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))
+
+	emptyKey := key()
+	emptyKey.Domain = ""
+	emptyKey.Subject = ""
+	emptyToken, err := tokenizer.Issue(emptyKey)
+	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
@@ -80,28 +177,74 @@ func TestParse(t *testing.T) {
 			err:   nil,
 		},
 		{
-			desc:  "parse ivalid key",
+			desc:  "parse invalid key",
 			key:   auth.Key{},
 			token: "invalid",
-			err:   auth.ErrUnauthorizedAccess,
+			err:   svcerr.ErrAuthentication,
 		},
 		{
 			desc:  "parse expired key",
 			key:   auth.Key{},
 			token: expToken,
-			err:   auth.ErrKeyExpired,
+			err:   auth.ErrExpiry,
 		},
 		{
 			desc:  "parse expired API key",
 			key:   apiKey,
 			token: apiToken,
-			err:   auth.ErrAPIKeyExpired,
+			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 domain",
+			key:   emptyDomainKey,
+			token: emptyDomainToken,
+			err:   nil,
+		},
+		{
+			desc:  "parse token with empty subject",
+			key:   emptySubjectKey,
+			token: emptySubjectToken,
+			err:   nil,
+		},
+		{
+			desc:  "parse token with empty domain and subject",
+			key:   emptyKey,
+			token: emptyToken,
+			err:   nil,
 		},
 	}
 
 	for _, tc := range cases {
-		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))
-		assert.Equal(t, tc.key, key, fmt.Sprintf("%s expected %v, got %v", tc.desc, tc.key, key))
+		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",
+		Subject:   "66af4a67-3823-438a-abd7-efdb613eaef6",
+		IssuedAt:  time.Now().UTC().Add(-10 * time.Second).Round(time.Second),
+		ExpiresAt: exp,
 	}
 }

auth/jwt/tokenizer.go

@@ -1,101 +1,145 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package jwt
 
 import (
-	"time"
+	"context"
+	"encoding/json"
+	"fmt"
+	"strconv"
 
-	"github.com/dgrijalva/jwt-go"
-	"github.com/mainflux/mainflux/auth"
-	"github.com/mainflux/mainflux/pkg/errors"
+	"github.com/absmach/supermq/auth"
+	"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"
 )
 
-const issuerName = "mainflux.auth"
+var (
+	errInvalidIssuer = errors.New("invalid token issuer value")
+	// errJWTExpiryKey is used to check if the token is expired.
+	errJWTExpiryKey = errors.New(`"exp" not satisfied`)
+	// ErrSignJWT indicates an error in signing jwt token.
+	ErrSignJWT = errors.New("failed to sign jwt token")
+	// ErrValidateJWTToken indicates a failure to validate JWT token.
+	ErrValidateJWTToken = errors.New("failed to validate jwt token")
+	// ErrJSONHandle indicates an error in handling JSON.
+	ErrJSONHandle = errors.New("failed to perform operation JSON")
+)
 
-type claims struct {
-	jwt.StandardClaims
-	IssuerID string  `json:"issuer_id,omitempty"`
-	Type     *uint32 `json:"type,omitempty"`
-}
-
-func (c claims) Valid() error {
-	if c.Type == nil || *c.Type > auth.APIKey || c.Issuer != issuerName {
-		return auth.ErrMalformedEntity
-	}
-
-	return c.StandardClaims.Valid()
-}
+const (
+	issuerName             = "supermq.auth"
+	tokenType              = "type"
+	userField              = "user"
+	oauthProviderField     = "oauth_provider"
+	oauthAccessTokenField  = "access_token"
+	oauthRefreshTokenField = "refresh_token"
+)
 
 type tokenizer struct {
-	secret string
+	secret []byte
 }
 
-// New returns new JWT Tokenizer.
-func New(secret string) auth.Tokenizer {
-	return tokenizer{secret: secret}
-}
+var _ auth.Tokenizer = (*tokenizer)(nil)
 
-func (svc tokenizer) Issue(key auth.Key) (string, error) {
-	claims := claims{
-		StandardClaims: jwt.StandardClaims{
-			Issuer:   issuerName,
-			Subject:  key.Subject,
-			IssuedAt: key.IssuedAt.UTC().Unix(),
-		},
-		IssuerID: key.IssuerID,
-		Type:     &key.Type,
+// NewRepository instantiates an implementation of Token repository.
+func New(secret []byte) auth.Tokenizer {
+	return &tokenizer{
+		secret: secret,
 	}
+}
 
-	if !key.ExpiresAt.IsZero() {
-		claims.ExpiresAt = key.ExpiresAt.UTC().Unix()
+func (tok *tokenizer) Issue(key auth.Key) (string, error) {
+	builder := jwt.NewBuilder()
+	builder.
+		Issuer(issuerName).
+		IssuedAt(key.IssuedAt).
+		Claim(tokenType, key.Type).
+		Expiration(key.ExpiresAt)
+	builder.Claim(userField, key.User)
+	if key.Subject != "" {
+		builder.Subject(key.Subject)
 	}
 	if key.ID != "" {
-		claims.Id = key.ID
+		builder.JwtID(key.ID)
 	}
-
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-	return token.SignedString([]byte(svc.secret))
-}
-
-func (svc tokenizer) Parse(token string) (auth.Key, error) {
-	c := claims{}
-	_, err := jwt.ParseWithClaims(token, &c, func(token *jwt.Token) (interface{}, error) {
-		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
-			return nil, auth.ErrUnauthorizedAccess
-		}
-		return []byte(svc.secret), nil
-	})
-
+	tkn, err := builder.Build()
 	if err != nil {
-		if e, ok := err.(*jwt.ValidationError); ok && e.Errors == jwt.ValidationErrorExpired {
-			// Expired User key needs to be revoked.
-			if c.Type != nil && *c.Type == auth.APIKey {
-				return c.toKey(), auth.ErrAPIKeyExpired
-			}
-			return auth.Key{}, errors.Wrap(auth.ErrKeyExpired, err)
+		return "", errors.Wrap(svcerr.ErrAuthentication, err)
+	}
+	signedTkn, err := jwt.Sign(tkn, jwt.WithKey(jwa.HS512, tok.secret))
+	if err != nil {
+		return "", errors.Wrap(ErrSignJWT, err)
+	}
+	return string(signedTkn), nil
+}
+
+func (tok *tokenizer) Parse(token string) (auth.Key, error) {
+	tkn, err := tok.validateToken(token)
+	if err != nil {
+		return auth.Key{}, errors.Wrap(svcerr.ErrAuthentication, err)
+	}
+
+	key, err := toKey(tkn)
+	if err != nil {
+		return auth.Key{}, errors.Wrap(svcerr.ErrAuthentication, err)
+	}
+
+	return key, nil
+}
+
+func (tok *tokenizer) validateToken(token string) (jwt.Token, error) {
+	tkn, err := jwt.Parse(
+		[]byte(token),
+		jwt.WithValidate(true),
+		jwt.WithKey(jwa.HS512, tok.secret),
+	)
+	if err != nil {
+		if errors.Contains(err, errJWTExpiryKey) {
+			return nil, auth.ErrExpiry
 		}
-		return auth.Key{}, errors.Wrap(auth.ErrUnauthorizedAccess, err)
+
+		return nil, err
+	}
+	validator := jwt.ValidatorFunc(func(_ context.Context, t jwt.Token) jwt.ValidationError {
+		if t.Issuer() != issuerName {
+			return jwt.NewValidationError(errInvalidIssuer)
+		}
+		return nil
+	})
+	if err := jwt.Validate(tkn, jwt.WithValidator(validator)); err != nil {
+		return nil, errors.Wrap(ErrValidateJWTToken, err)
 	}
 
-	return c.toKey(), nil
+	return tkn, nil
 }
 
-func (c claims) toKey() auth.Key {
-	key := auth.Key{
-		ID:       c.Id,
-		IssuerID: c.IssuerID,
-		Subject:  c.Subject,
-		IssuedAt: time.Unix(c.IssuedAt, 0).UTC(),
+func toKey(tkn jwt.Token) (auth.Key, error) {
+	data, err := json.Marshal(tkn.PrivateClaims())
+	if err != nil {
+		return auth.Key{}, errors.Wrap(ErrJSONHandle, err)
 	}
-	if c.ExpiresAt != 0 {
-		key.ExpiresAt = time.Unix(c.ExpiresAt, 0).UTC()
+	var key auth.Key
+	if err := json.Unmarshal(data, &key); err != nil {
+		return auth.Key{}, errors.Wrap(ErrJSONHandle, err)
 	}
 
-	// Default type is 0.
-	if c.Type != nil {
-		key.Type = *c.Type
+	tType, ok := tkn.Get(tokenType)
+	if !ok {
+		return auth.Key{}, err
+	}
+	ktype, err := strconv.ParseInt(fmt.Sprintf("%v", tType), 10, 64)
+	if err != nil {
+		return auth.Key{}, err
 	}
 
-	return key
+	key.ID = tkn.JwtID()
+	key.Type = auth.KeyType(ktype)
+	key.Issuer = tkn.Issuer()
+	key.Subject = tkn.Subject()
+	key.IssuedAt = tkn.IssuedAt()
+	key.ExpiresAt = tkn.Expiration()
+
+	return key, nil
 }

auth/keys.go

@@ -1,4 +1,4 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package auth
@@ -6,63 +6,93 @@ package auth
 import (
 	"context"
 	"errors"
+	"fmt"
 	"time"
 )
 
-var (
-	// ErrInvalidKeyIssuedAt indicates that the Key is being used before it's issued.
-	ErrInvalidKeyIssuedAt = errors.New("invalid issue time")
+// ErrKeyExpired indicates that the Key is expired.
+var ErrKeyExpired = errors.New("use of expired key")
 
-	// ErrKeyExpired indicates that the Key is expired.
-	ErrKeyExpired = errors.New("use of expired key")
+type Token struct {
+	AccessToken  string // AccessToken contains the security credentials for a login session and identifies the client.
+	RefreshToken string // RefreshToken is a credential artifact that OAuth can use to get a new access token without client interaction.
+	AccessType   string // AccessType is the specific type of access token issued. It can be Bearer, Client or Basic.
+}
 
-	// ErrAPIKeyExpired indicates that the Key is expired
-	// and that the key type is API key.
-	ErrAPIKeyExpired = errors.New("use of expired API key")
-)
+type KeyType uint32
 
 const (
-	// UserKey is temporary User key received on successfull login.
-	UserKey uint32 = iota
+	// AccessKey is temporary User key received on successful login.
+	AccessKey KeyType = iota
+	// RefreshKey is a temporary User key used to generate a new access key.
+	RefreshKey
 	// RecoveryKey represents a key for resseting password.
 	RecoveryKey
 	// APIKey enables the one to act on behalf of the user.
 	APIKey
+	// InvitationKey is a key for inviting new users.
+	InvitationKey
 )
 
+func (kt KeyType) String() string {
+	switch kt {
+	case AccessKey:
+		return "access"
+	case RefreshKey:
+		return "refresh"
+	case RecoveryKey:
+		return "recovery"
+	case APIKey:
+		return "API"
+	default:
+		return "unknown"
+	}
+}
+
 // Key represents API key.
 type Key struct {
-	ID        string
-	Type      uint32
-	IssuerID  string
-	Subject   string
-	IssuedAt  time.Time
-	ExpiresAt time.Time
+	ID        string    `json:"id,omitempty"`
+	Type      KeyType   `json:"type,omitempty"`
+	Issuer    string    `json:"issuer,omitempty"`
+	Subject   string    `json:"subject,omitempty"` // user ID
+	User      string    `json:"user,omitempty"`
+	Domain    string    `json:"domain,omitempty"` // domain user ID
+	IssuedAt  time.Time `json:"issued_at,omitempty"`
+	ExpiresAt time.Time `json:"expires_at,omitempty"`
 }
 
-// Identity contains ID and Email.
-type Identity struct {
-	ID    string
-	Email string
+func (key Key) String() string {
+	return fmt.Sprintf(`{
+	id: %s,
+	type: %s,
+	issuer_id: %s,
+	subject: %s,
+	user: %s,
+	domain: %s,
+	iat: %v,
+	eat: %v
+}`, key.ID, key.Type, key.Issuer, key.Subject, key.User, key.Domain, key.IssuedAt, key.ExpiresAt)
 }
 
 // Expired verifies if the key is expired.
-func (k Key) Expired() bool {
-	if k.Type == APIKey && k.ExpiresAt.IsZero() {
+func (key Key) Expired() bool {
+	if key.Type == APIKey && key.ExpiresAt.IsZero() {
 		return false
 	}
-	return k.ExpiresAt.UTC().Before(time.Now().UTC())
+	return key.ExpiresAt.UTC().Before(time.Now().UTC())
 }
 
 // KeyRepository specifies Key persistence API.
+//
+//go:generate mockery --name KeyRepository --output=./mocks --filename keys.go --quiet --note "Copyright (c) Abstract Machines"
 type KeyRepository interface {
 	// Save persists the Key. A non-nil error is returned to indicate
 	// operation failure
-	Save(context.Context, Key) (string, error)
+	Save(ctx context.Context, key Key) (id string, err error)
 
 	// Retrieve retrieves Key by its unique identifier.
-	Retrieve(context.Context, string, string) (Key, error)
+	Retrieve(ctx context.Context, issuer string, id string) (key Key, err error)
 
 	// Remove removes Key with provided ID.
-	Remove(context.Context, string, string) error
+	Remove(ctx context.Context, issuer string, id string) error
 }

auth/keys_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package auth_test
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mainflux/mainflux/auth"
+	"github.com/absmach/supermq/auth"
 	"github.com/stretchr/testify/assert"
 )
 

auth/mocks/authz.go

@@ -0,0 +1,49 @@
+// Code generated by mockery v2.43.2. DO NOT EDIT.
+
+// Copyright (c) Abstract Machines
+
+package mocks
+
+import (
+	context "context"
+
+	policies "github.com/absmach/supermq/pkg/policies"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// Authz is an autogenerated mock type for the Authz type
+type Authz struct {
+	mock.Mock
+}
+
+// Authorize provides a mock function with given fields: ctx, pr
+func (_m *Authz) Authorize(ctx context.Context, pr policies.Policy) error {
+	ret := _m.Called(ctx, pr)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Authorize")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, policies.Policy) error); ok {
+		r0 = rf(ctx, pr)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// NewAuthz creates a new instance of Authz. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewAuthz(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *Authz {
+	mock := &Authz{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}

auth/mocks/groups.go

@@ -1,318 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-package mocks
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/mainflux/mainflux/auth"
-)
-
-var _ auth.GroupRepository = (*groupRepositoryMock)(nil)
-
-type groupRepositoryMock struct {
-	mu sync.Mutex
-	// Map of groups, group id as a key.
-	// groups      map[GroupID]auth.Group
-	groups map[string]auth.Group
-	// Map of groups with group id as key that are
-	// children (i.e. has same parent id) is element
-	// in children's map where parent id is key.
-	// children    map[ParentID]map[GroupID]auth.Group
-	children map[string]map[string]auth.Group
-	// Map of parents' id with child group id as key.
-	// Each child has one parent.
-	// parents     map[ChildID]ParentID
-	parents map[string]string
-	// Map of groups (with group id as key) which
-	// represent memberships is element in
-	// memberships' map where member id is a key.
-	// memberships map[MemberID]map[GroupID]auth.Group
-	memberships map[string]map[string]auth.Group
-	// Map of group members where member id is a key
-	// is an element in the map members where group id is a key.
-	// members     map[type][GroupID]map[MemberID]MemberID
-	members map[string]map[string]map[string]string
-}
-
-// NewGroupRepository creates in-memory user repository
-func NewGroupRepository() auth.GroupRepository {
-	return &groupRepositoryMock{
-		groups:      make(map[string]auth.Group),
-		children:    make(map[string]map[string]auth.Group),
-		parents:     make(map[string]string),
-		memberships: make(map[string]map[string]auth.Group),
-		members:     make(map[string]map[string]map[string]string),
-	}
-}
-
-func (grm *groupRepositoryMock) Save(ctx context.Context, group auth.Group) (auth.Group, error) {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-	if _, ok := grm.groups[group.ID]; ok {
-		return auth.Group{}, auth.ErrGroupConflict
-	}
-	path := group.ID
-
-	if group.ParentID != "" {
-		parent, ok := grm.groups[group.ParentID]
-		if !ok {
-			return auth.Group{}, auth.ErrCreateGroup
-		}
-		if _, ok := grm.children[group.ParentID]; !ok {
-			grm.children[group.ParentID] = make(map[string]auth.Group)
-		}
-		grm.children[group.ParentID][group.ID] = group
-		grm.parents[group.ID] = group.ParentID
-		path = fmt.Sprintf("%s.%s", parent.Path, path)
-	}
-
-	group.Path = path
-	group.Level = len(strings.Split(path, "."))
-
-	grm.groups[group.ID] = group
-	return group, nil
-}
-
-func (grm *groupRepositoryMock) Update(ctx context.Context, group auth.Group) (auth.Group, error) {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-	up, ok := grm.groups[group.ID]
-	if !ok {
-		return auth.Group{}, auth.ErrNotFound
-	}
-	up.Name = group.Name
-	up.Description = group.Description
-	up.Metadata = group.Metadata
-	up.UpdatedAt = time.Now()
-
-	grm.groups[group.ID] = up
-	return up, nil
-}
-
-func (grm *groupRepositoryMock) Delete(ctx context.Context, id string) error {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-	if _, ok := grm.groups[id]; !ok {
-		return auth.ErrGroupNotFound
-	}
-
-	if len(grm.members[id]) > 0 {
-		return auth.ErrGroupNotEmpty
-	}
-
-	// This is not quite exact, it should go in depth
-	for _, ch := range grm.children[id] {
-		if len(grm.members[ch.ID]) > 0 {
-			return auth.ErrGroupNotEmpty
-		}
-	}
-
-	// This is not quite exact, it should go in depth
-	delete(grm.groups, id)
-	for _, ch := range grm.children[id] {
-		delete(grm.members, ch.ID)
-	}
-
-	delete(grm.children, id)
-
-	return nil
-
-}
-
-func (grm *groupRepositoryMock) RetrieveByID(ctx context.Context, id string) (auth.Group, error) {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-
-	val, ok := grm.groups[id]
-	if !ok {
-		return auth.Group{}, auth.ErrGroupNotFound
-	}
-	return val, nil
-}
-
-func (grm *groupRepositoryMock) RetrieveAll(ctx context.Context, pm auth.PageMetadata) (auth.GroupPage, error) {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-	var items []auth.Group
-	for _, g := range grm.groups {
-		items = append(items, g)
-	}
-	return auth.GroupPage{
-		Groups: items,
-		PageMetadata: auth.PageMetadata{
-			Total: uint64(len(items)),
-		},
-	}, nil
-}
-
-func (grm *groupRepositoryMock) Unassign(ctx context.Context, groupID string, memberIDs ...string) error {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-	if _, ok := grm.groups[groupID]; !ok {
-		return auth.ErrGroupNotFound
-	}
-	for _, memberID := range memberIDs {
-		for typ, m := range grm.members[groupID] {
-			_, ok := m[memberID]
-			if !ok {
-				return auth.ErrGroupNotFound
-			}
-			delete(grm.members[groupID][typ], memberID)
-			delete(grm.memberships[memberID], groupID)
-		}
-
-	}
-	return nil
-}
-
-func (grm *groupRepositoryMock) Assign(ctx context.Context, groupID, groupType string, memberIDs ...string) error {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-	if _, ok := grm.groups[groupID]; !ok {
-		return auth.ErrGroupNotFound
-	}
-
-	if _, ok := grm.members[groupID]; !ok {
-		grm.members[groupID] = make(map[string]map[string]string)
-	}
-
-	for _, memberID := range memberIDs {
-		if _, ok := grm.members[groupID][groupType]; !ok {
-			grm.members[groupID][groupType] = make(map[string]string)
-		}
-		if _, ok := grm.memberships[memberID]; !ok {
-			grm.memberships[memberID] = make(map[string]auth.Group)
-		}
-
-		grm.members[groupID][groupType][memberID] = memberID
-		grm.memberships[memberID][groupID] = grm.groups[groupID]
-	}
-	return nil
-
-}
-
-func (grm *groupRepositoryMock) Memberships(ctx context.Context, memberID string, pm auth.PageMetadata) (auth.GroupPage, error) {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-	var items []auth.Group
-
-	first := uint64(pm.Offset)
-	last := first + uint64(pm.Limit)
-
-	i := uint64(0)
-	for _, g := range grm.memberships[memberID] {
-		if i >= first && i < last {
-			items = append(items, g)
-		}
-		i++
-	}
-
-	return auth.GroupPage{
-		Groups: items,
-		PageMetadata: auth.PageMetadata{
-			Limit:  pm.Limit,
-			Offset: pm.Offset,
-			Total:  uint64(len(items)),
-		},
-	}, nil
-}
-
-func (grm *groupRepositoryMock) Members(ctx context.Context, groupID, groupType string, pm auth.PageMetadata) (auth.MemberPage, error) {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-	var items []auth.Member
-	members, ok := grm.members[groupID][groupType]
-	if !ok {
-		return auth.MemberPage{}, auth.ErrGroupNotFound
-	}
-
-	first := uint64(pm.Offset)
-	last := first + uint64(pm.Limit)
-
-	i := uint64(0)
-	for _, g := range members {
-		if i >= first && i < last {
-			items = append(items, auth.Member{ID: g, Type: groupType})
-		}
-		i++
-	}
-	return auth.MemberPage{
-		Members: items,
-		PageMetadata: auth.PageMetadata{
-			Total: uint64(len(items)),
-		},
-	}, nil
-}
-
-func (grm *groupRepositoryMock) RetrieveAllParents(ctx context.Context, groupID string, pm auth.PageMetadata) (auth.GroupPage, error) {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-	if groupID == "" {
-		return auth.GroupPage{}, nil
-	}
-
-	group, ok := grm.groups[groupID]
-	if !ok {
-		return auth.GroupPage{}, auth.ErrGroupNotFound
-	}
-
-	groups := make([]auth.Group, 0)
-	groups, err := grm.getParents(groups, group)
-	if err != nil {
-		return auth.GroupPage{}, err
-	}
-
-	return auth.GroupPage{
-		Groups: groups,
-		PageMetadata: auth.PageMetadata{
-			Total: uint64(len(groups)),
-		},
-	}, nil
-}
-
-func (grm *groupRepositoryMock) getParents(groups []auth.Group, group auth.Group) ([]auth.Group, error) {
-	groups = append(groups, group)
-	parentID, ok := grm.parents[group.ID]
-	if !ok && parentID == "" {
-		return groups, nil
-	}
-	parent, ok := grm.groups[parentID]
-	if !ok {
-		panic(fmt.Sprintf("parent with id: %s not found", parentID))
-	}
-	return grm.getParents(groups, parent)
-}
-
-func (grm *groupRepositoryMock) RetrieveAllChildren(ctx context.Context, groupID string, pm auth.PageMetadata) (auth.GroupPage, error) {
-	grm.mu.Lock()
-	defer grm.mu.Unlock()
-	group, ok := grm.groups[groupID]
-	if !ok {
-		return auth.GroupPage{}, nil
-	}
-
-	groups := make([]auth.Group, 0)
-	groups = append(groups, group)
-	for ch := range grm.parents {
-		g, ok := grm.groups[ch]
-		if !ok {
-			panic(fmt.Sprintf("child with id %s not found", ch))
-		}
-		groups = append(groups, g)
-	}
-
-	return auth.GroupPage{
-		Groups: groups,
-		PageMetadata: auth.PageMetadata{
-			Total:  uint64(len(groups)),
-			Offset: pm.Offset,
-			Limit:  pm.Limit,
-		},
-	}, nil
-}

auth/mocks/keys.go

@@ -1,55 +1,106 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
+// Code generated by mockery v2.43.2. DO NOT EDIT.
+
+// Copyright (c) Abstract Machines
 
 package mocks
 
 import (
-	"context"
-	"sync"
+	context "context"
 
-	"github.com/mainflux/mainflux/auth"
+	auth "github.com/absmach/supermq/auth"
+
+	mock "github.com/stretchr/testify/mock"
 )
 
-var _ auth.KeyRepository = (*keyRepositoryMock)(nil)
-
-type keyRepositoryMock struct {
-	mu   sync.Mutex
-	keys map[string]auth.Key
+// KeyRepository is an autogenerated mock type for the KeyRepository type
+type KeyRepository struct {
+	mock.Mock
 }
 
-// NewKeyRepository creates in-memory user repository
-func NewKeyRepository() auth.KeyRepository {
-	return &keyRepositoryMock{
-		keys: make(map[string]auth.Key),
-	}
-}
+// Remove provides a mock function with given fields: ctx, issuer, id
+func (_m *KeyRepository) Remove(ctx context.Context, issuer string, id string) error {
+	ret := _m.Called(ctx, issuer, id)
 
-func (krm *keyRepositoryMock) Save(ctx context.Context, key auth.Key) (string, error) {
-	krm.mu.Lock()
-	defer krm.mu.Unlock()
-
-	if _, ok := krm.keys[key.ID]; ok {
-		return "", auth.ErrConflict
+	if len(ret) == 0 {
+		panic("no return value specified for Remove")
 	}
 
-	krm.keys[key.ID] = key
-	return key.ID, nil
-}
-func (krm *keyRepositoryMock) Retrieve(ctx context.Context, issuerID, id string) (auth.Key, error) {
-	krm.mu.Lock()
-	defer krm.mu.Unlock()
-
-	if key, ok := krm.keys[id]; ok && key.IssuerID == issuerID {
-		return key, nil
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok {
+		r0 = rf(ctx, issuer, id)
+	} else {
+		r0 = ret.Error(0)
 	}
 
-	return auth.Key{}, auth.ErrNotFound
+	return r0
 }
-func (krm *keyRepositoryMock) Remove(ctx context.Context, issuerID, id string) error {
-	krm.mu.Lock()
-	defer krm.mu.Unlock()
-	if key, ok := krm.keys[id]; ok && key.IssuerID == issuerID {
-		delete(krm.keys, id)
+
+// Retrieve provides a mock function with given fields: ctx, issuer, id
+func (_m *KeyRepository) Retrieve(ctx context.Context, issuer string, id string) (auth.Key, error) {
+	ret := _m.Called(ctx, issuer, id)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Retrieve")
 	}
-	return nil
+
+	var r0 auth.Key
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) (auth.Key, error)); ok {
+		return rf(ctx, issuer, id)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) auth.Key); ok {
+		r0 = rf(ctx, issuer, id)
+	} else {
+		r0 = ret.Get(0).(auth.Key)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok {
+		r1 = rf(ctx, issuer, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Save provides a mock function with given fields: ctx, key
+func (_m *KeyRepository) Save(ctx context.Context, key auth.Key) (string, error) {
+	ret := _m.Called(ctx, key)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
+	var r0 string
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, auth.Key) (string, error)); ok {
+		return rf(ctx, key)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, auth.Key) string); ok {
+		r0 = rf(ctx, key)
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, auth.Key) error); ok {
+		r1 = rf(ctx, key)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewKeyRepository creates a new instance of KeyRepository. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewKeyRepository(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *KeyRepository {
+	mock := &KeyRepository{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
 }

auth/mocks/service.go

@@ -0,0 +1,154 @@
+// Code generated by mockery v2.43.2. DO NOT EDIT.
+
+// Copyright (c) Abstract Machines
+
+package mocks
+
+import (
+	context "context"
+
+	auth "github.com/absmach/supermq/auth"
+
+	mock "github.com/stretchr/testify/mock"
+
+	policies "github.com/absmach/supermq/pkg/policies"
+)
+
+// Service is an autogenerated mock type for the Service type
+type Service struct {
+	mock.Mock
+}
+
+// Authorize provides a mock function with given fields: ctx, pr
+func (_m *Service) Authorize(ctx context.Context, pr policies.Policy) error {
+	ret := _m.Called(ctx, pr)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Authorize")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, policies.Policy) error); ok {
+		r0 = rf(ctx, pr)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// Identify provides a mock function with given fields: ctx, token
+func (_m *Service) Identify(ctx context.Context, token string) (auth.Key, error) {
+	ret := _m.Called(ctx, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Identify")
+	}
+
+	var r0 auth.Key
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (auth.Key, error)); ok {
+		return rf(ctx, token)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) auth.Key); ok {
+		r0 = rf(ctx, token)
+	} else {
+		r0 = ret.Get(0).(auth.Key)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Issue provides a mock function with given fields: ctx, token, key
+func (_m *Service) Issue(ctx context.Context, token string, key auth.Key) (auth.Token, error) {
+	ret := _m.Called(ctx, token, key)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Issue")
+	}
+
+	var r0 auth.Token
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, auth.Key) (auth.Token, error)); ok {
+		return rf(ctx, token, key)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string, auth.Key) auth.Token); ok {
+		r0 = rf(ctx, token, key)
+	} else {
+		r0 = ret.Get(0).(auth.Token)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string, auth.Key) error); ok {
+		r1 = rf(ctx, token, key)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// RetrieveKey provides a mock function with given fields: ctx, token, id
+func (_m *Service) RetrieveKey(ctx context.Context, token string, id string) (auth.Key, error) {
+	ret := _m.Called(ctx, token, id)
+
+	if len(ret) == 0 {
+		panic("no return value specified for RetrieveKey")
+	}
+
+	var r0 auth.Key
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) (auth.Key, error)); ok {
+		return rf(ctx, token, id)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) auth.Key); ok {
+		r0 = rf(ctx, token, id)
+	} else {
+		r0 = ret.Get(0).(auth.Key)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok {
+		r1 = rf(ctx, token, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Revoke provides a mock function with given fields: ctx, token, id
+func (_m *Service) Revoke(ctx context.Context, token string, id string) error {
+	ret := _m.Called(ctx, token, id)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Revoke")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok {
+		r0 = rf(ctx, token, id)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// NewService creates a new instance of Service. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewService(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *Service {
+	mock := &Service{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}

auth/mocks/token_client.go

@@ -0,0 +1,192 @@
+// Copyright (c) Abstract Machines
+
+// SPDX-License-Identifier: Apache-2.0
+
+// Code generated by mockery v2.43.2. DO NOT EDIT.
+
+package mocks
+
+import (
+	context "context"
+
+	grpc "google.golang.org/grpc"
+
+	mock "github.com/stretchr/testify/mock"
+
+	v1 "github.com/absmach/supermq/internal/grpc/token/v1"
+)
+
+// TokenServiceClient is an autogenerated mock type for the TokenServiceClient type
+type TokenServiceClient struct {
+	mock.Mock
+}
+
+type TokenServiceClient_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *TokenServiceClient) EXPECT() *TokenServiceClient_Expecter {
+	return &TokenServiceClient_Expecter{mock: &_m.Mock}
+}
+
+// Issue provides a mock function with given fields: ctx, in, opts
+func (_m *TokenServiceClient) Issue(ctx context.Context, in *v1.IssueReq, opts ...grpc.CallOption) (*v1.Token, error) {
+	_va := make([]interface{}, len(opts))
+	for _i := range opts {
+		_va[_i] = opts[_i]
+	}
+	var _ca []interface{}
+	_ca = append(_ca, ctx, in)
+	_ca = append(_ca, _va...)
+	ret := _m.Called(_ca...)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Issue")
+	}
+
+	var r0 *v1.Token
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *v1.IssueReq, ...grpc.CallOption) (*v1.Token, error)); ok {
+		return rf(ctx, in, opts...)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *v1.IssueReq, ...grpc.CallOption) *v1.Token); ok {
+		r0 = rf(ctx, in, opts...)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*v1.Token)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *v1.IssueReq, ...grpc.CallOption) error); ok {
+		r1 = rf(ctx, in, opts...)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// TokenServiceClient_Issue_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Issue'
+type TokenServiceClient_Issue_Call struct {
+	*mock.Call
+}
+
+// Issue is a helper method to define mock.On call
+//   - ctx context.Context
+//   - in *v1.IssueReq
+//   - opts ...grpc.CallOption
+func (_e *TokenServiceClient_Expecter) Issue(ctx interface{}, in interface{}, opts ...interface{}) *TokenServiceClient_Issue_Call {
+	return &TokenServiceClient_Issue_Call{Call: _e.mock.On("Issue",
+		append([]interface{}{ctx, in}, opts...)...)}
+}
+
+func (_c *TokenServiceClient_Issue_Call) Run(run func(ctx context.Context, in *v1.IssueReq, opts ...grpc.CallOption)) *TokenServiceClient_Issue_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		variadicArgs := make([]grpc.CallOption, len(args)-2)
+		for i, a := range args[2:] {
+			if a != nil {
+				variadicArgs[i] = a.(grpc.CallOption)
+			}
+		}
+		run(args[0].(context.Context), args[1].(*v1.IssueReq), variadicArgs...)
+	})
+	return _c
+}
+
+func (_c *TokenServiceClient_Issue_Call) Return(_a0 *v1.Token, _a1 error) *TokenServiceClient_Issue_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *TokenServiceClient_Issue_Call) RunAndReturn(run func(context.Context, *v1.IssueReq, ...grpc.CallOption) (*v1.Token, error)) *TokenServiceClient_Issue_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Refresh provides a mock function with given fields: ctx, in, opts
+func (_m *TokenServiceClient) Refresh(ctx context.Context, in *v1.RefreshReq, opts ...grpc.CallOption) (*v1.Token, error) {
+	_va := make([]interface{}, len(opts))
+	for _i := range opts {
+		_va[_i] = opts[_i]
+	}
+	var _ca []interface{}
+	_ca = append(_ca, ctx, in)
+	_ca = append(_ca, _va...)
+	ret := _m.Called(_ca...)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Refresh")
+	}
+
+	var r0 *v1.Token
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *v1.RefreshReq, ...grpc.CallOption) (*v1.Token, error)); ok {
+		return rf(ctx, in, opts...)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *v1.RefreshReq, ...grpc.CallOption) *v1.Token); ok {
+		r0 = rf(ctx, in, opts...)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*v1.Token)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *v1.RefreshReq, ...grpc.CallOption) error); ok {
+		r1 = rf(ctx, in, opts...)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// TokenServiceClient_Refresh_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Refresh'
+type TokenServiceClient_Refresh_Call struct {
+	*mock.Call
+}
+
+// Refresh is a helper method to define mock.On call
+//   - ctx context.Context
+//   - in *v1.RefreshReq
+//   - opts ...grpc.CallOption
+func (_e *TokenServiceClient_Expecter) Refresh(ctx interface{}, in interface{}, opts ...interface{}) *TokenServiceClient_Refresh_Call {
+	return &TokenServiceClient_Refresh_Call{Call: _e.mock.On("Refresh",
+		append([]interface{}{ctx, in}, opts...)...)}
+}
+
+func (_c *TokenServiceClient_Refresh_Call) Run(run func(ctx context.Context, in *v1.RefreshReq, opts ...grpc.CallOption)) *TokenServiceClient_Refresh_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		variadicArgs := make([]grpc.CallOption, len(args)-2)
+		for i, a := range args[2:] {
+			if a != nil {
+				variadicArgs[i] = a.(grpc.CallOption)
+			}
+		}
+		run(args[0].(context.Context), args[1].(*v1.RefreshReq), variadicArgs...)
+	})
+	return _c
+}
+
+func (_c *TokenServiceClient_Refresh_Call) Return(_a0 *v1.Token, _a1 error) *TokenServiceClient_Refresh_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *TokenServiceClient_Refresh_Call) RunAndReturn(run func(context.Context, *v1.RefreshReq, ...grpc.CallOption) (*v1.Token, error)) *TokenServiceClient_Refresh_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// NewTokenServiceClient creates a new instance of TokenServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewTokenServiceClient(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *TokenServiceClient {
+	mock := &TokenServiceClient{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}

auth/openapi.yml

@@ -1,594 +0,0 @@
-openapi: 3.0.1
-info:
-  title: Mainflux authentication service
-  description: HTTP API for managing platform API keys.
-  version: "1.0.0"
-paths:
-  /keys:
-    post:
-      summary: Issue API key
-      description: |
-        Generates a new API key. Thew new API key will
-        be uniquely identified by its ID.
-      tags:
-        - auth
-      requestBody:
-        $ref: "#/components/requestBodies/KeyRequest"
-      responses:
-        '201':
-          description: Issued new key.
-        '400':
-          description: Failed due to malformed JSON.
-        '409':
-          description: Failed due to using already existing ID.
-        '415':
-          description: Missing or invalid content type.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-  /keys/{id}:
-    get:
-      summary: Gets API key details.
-      description: |
-        Gets API key details for the given key.
-      tags:
-        - auth
-      parameters:
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/parameters/ApiKeyId"
-      responses:
-        '200':
-          $ref: "#/components/responses/KeyRes"
-        '400':
-          description: Failed due to malformed query parameters.
-        '403':
-          description: Missing or invalid access token provided.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-    delete:
-      summary: Revoke API key
-      description: |
-        Revoke API key identified by the given ID.
-      tags:
-        - auth
-      parameters:
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/parameters/ApiKeyId"
-      responses:
-        '204':
-          description: Key revoked.
-        '403':
-          description: Missing or invalid access token provided.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-  /groups:
-    post:
-      summary: Creates new group
-      description: |
-        Creates new group that can be used for grouping entities - things, users.
-      tags:
-        - auth
-      parameters:
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/requestBodies/GroupCreateReq"
-      responses:
-        '201':
-          $ref: "#/components/responses/GroupCreateRes"
-        '400':
-          description: Failed due to malformed JSON.
-        '409':
-          description: Failed due to using an existing email address.
-        '415':
-          description: Missing or invalid content type.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-    get:
-      summary: Gets all groups.
-      description: |
-        Gets all groups up to a max level of hierarchy that can be fetched in one
-        request ( max level = 5). Result can be filtered by metadata. Groups will 
-        be returned as JSON array or JSON tree.
-      tags:
-        - auth
-      parameters:    
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/parameters/Level"
-        - $ref: "#/components/parameters/Metadata"
-        - $ref: "#/components/parameters/Tree"
-      responses:
-        '200':
-          $ref: "#/components/responses/GroupsPageRes"
-        '400':
-          description: Failed due to malformed query parameters.
-        '403':
-          description: Missing or invalid access token provided.
-        '404':
-          description: Group does not exist.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-  /groups/{groupId}:
-    get:
-      summary: Gets group info.
-      description: |
-        Gets info on a group specified by id.
-      tags:
-        - auth
-      parameters:
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/parameters/GroupId"
-      responses:
-        '200':
-          $ref: "#/components/responses/GroupRes"
-        '400':
-          description: Failed due to malformed query parameters.
-        '403':
-          description: Missing or invalid access token provided.
-        '404':
-          description: Group does not exist.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-    put:
-      summary: Updates group data.
-      description: |
-        Updates Name, Description or Metadata of a group.
-      tags:
-        - auth
-      parameters:
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/parameters/GroupId"
-      requestBody:
-        $ref: "#/components/requestBodies/GroupUpdateReq"
-      responses:
-        '200':
-          description: Group updated.
-        '400':
-          description: Failed due to malformed query parameters.
-        '403':
-          description: Missing or invalid access token provided.
-        '404':
-          description: Group does not exist.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-    delete:
-      summary: Deletes group.
-      description: |
-        Deletes group. If group is parent and descendant groups do not have any members
-        child groups will be deleted. Group cannot be deleted if has members or if 
-        any descendant group has members.
-      tags:
-        - auth
-      parameters:
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/parameters/GroupId"
-        - $ref: "#/components/parameters/Level"
-        - $ref: "#/components/parameters/Metadata"
-        - $ref: "#/components/parameters/Tree"
-      responses:
-        '204':
-          description: Group removed.
-        '400':
-          description: Failed due to malformed query parameters.
-        '403':
-          description: Missing or invalid access token provided.
-        '404':
-          description: Group does not exist.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-  /groups/{groupId}/children:
-    get:
-      summary: Gets group children.
-      description: |
-        Gets the whole tree of descendants of group for given id including itself.
-        For performance reason request is limited up to a given level of hierarchy
-        (max. 5).
-      tags:
-        - auth
-      parameters:
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/parameters/GroupId"
-        - $ref: "#/components/parameters/Level"
-        - $ref: "#/components/parameters/Metadata"
-        - $ref: "#/components/parameters/Tree"
-      responses:
-        '200':
-          $ref: "#/components/responses/GroupsPageRes"
-        '400':
-          description: Failed due to malformed query parameters.
-        '403':
-          description: Missing or invalid access token provided.
-        '404':
-          description: Group does not exist.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-  /groups/{groupId}/parents:
-    get:
-      summary: Gets group info.
-      description: |
-        Gets a direct line of ancestors for a group specified by id.
-        Result is up to a specified hierarchy level or up to a root group.
-        Result can be a JSON array or a JSON tree.
-      tags:
-        - auth
-      parameters:
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/parameters/GroupId"
-        - $ref: "#/components/parameters/Level"
-        - $ref: "#/components/parameters/Metadata"
-        - $ref: "#/components/parameters/Tree"
-      responses:
-        '200':
-          $ref: "#/components/responses/GroupsPageRes"
-        '400':
-          description: Failed due to malformed query parameters.
-        '403':
-          description: Missing or invalid access token provided.
-        '404':
-          description: Group does not exist.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-  /groups/{groupId}/members:
-    post:
-      summary: Assigns members to a group.
-      description: |
-        Assigns thing or user id to a group.
-      tags:
-        - auth
-      parameters:
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/parameters/GroupId"
-      requestBody:
-        $ref: "#/components/requestBodies/MembersReq"
-      responses:
-        '201':
-          $ref: "#/components/responses/GroupCreateRes"
-        '400':
-          description: Failed due to malformed JSON.
-        '403':
-          description: Missing or invalid access token provided.
-        '409':
-          description: Failed due to using an existing email address.
-        '415':
-          description: Missing or invalid content type.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-    get:
-      summary: Gets members of a group.
-      description: |
-        Array of member ids that are in the group specified with groupID.
-      parameters:
-        - $ref: "#/components/parameters/Authorization"
-        - $ref: "#/components/parameters/MemberType"
-        - $ref: "#/components/parameters/GroupId"
-        - $ref: "#/components/parameters/Offset"
-        - $ref: "#/components/parameters/Limit"
-      responses:
-        '200':
-          $ref: "#/components/responses/MembersRes"
-        '403':
-          description: Missing or invalid access token provided.
-        '500':
-          $ref: "#/components/responses/ServiceError"
-components:
-  schemas:
-    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.
-    GroupReqSchema:
-      type: object
-      properties:
-        name:
-          type: string
-          description: |
-            Free-form group name. Group name is unique on the given hierarchy level.
-        description:
-          type: string
-          description: Group description, free form text. 
-        parent_id:
-          type: string
-          format: ulid
-          description: Id of parent group, it must be existing group.
-        metadata:
-          type: object
-          description: Arbitrary, object-encoded group's data.
-    GroupUpdateSchema:
-      type: object
-      properties:
-        name:
-          type: string
-          description: |
-            Free-form group name. Group name is unique on the given hierarchy level.
-        description:
-          type: string
-          description: Group description, free form text. 
-        metadata:
-          type: object
-          description: Arbitrary, object-encoded group's data.
-    GroupResSchema:
-      type: object
-      properties:
-        id:
-          type: string
-          format: ulid
-          description: Unique group identifier generated by the service.
-        name:
-          type: string
-          description: Free-form group name.
-        parent_id:
-          type: string
-          description: Group ID of parent group.
-        owner_id:
-          type: string
-          format: uuid
-          description: UUID of user that created the group.
-        metadata:
-          type: object
-          description: Arbitrary, object-encoded group's data.
-        level:
-          type: integer
-          description: Level in hierarchy, distance from the root group.
-        path:
-          type: string
-          description: Hierarchy path, concatenated ids of group ancestors.
-        children:
-          type: object
-          # schema: GroupResSchema
-        created_at:
-          type: string
-          description: Datetime of group creation.
-        updated_at:
-          type: string
-          description: Datetime of last group updated.
-      required:
-        - id
-        - name
-        - owner_id
-        - description
-        - level
-        - path
-        - created_at
-        - updated_at
-    MembersReqSchema:
-      type: object
-      properties:
-        members:
-          type: array
-          minItems: 0
-          uniqueItems: true
-          items:
-            type: string
-            format: uuid | ulid
-        type:
-          type: string
-          description: Type of entity
-    GroupsPage:
-      type: object
-      properties:
-        groups:
-          type: array
-          minItems: 0
-          uniqueItems: true
-          items:
-            $ref: "#/components/schemas/GroupResSchema"
-        total:
-          type: integer
-          description: Total number of items.
-        level:
-          type: integer
-          description: Level of hierarchy up to which groups are fetched.
-      required:
-        - groups
-        - total
-        - level
-    MembershipPage:
-      type: object
-      properties:
-        groups:
-          type: array
-          minItems: 0
-          uniqueItems: true
-          items:
-            $ref: "#/components/schemas/GroupResSchema"
-        offset:
-          type: integer
-          description: Number of items to skip during retrieval.
-        limit:
-          type: integer
-          description: Maximum number of items to return in one page.
-        total:
-          type: integer
-          description: Total number of items.
-      required:
-        - groups
-  parameters:
-    Authorization:
-      name: Authorization
-      description: User's access token.
-      in: header
-      schema:
-        type: string
-        format: jwt
-      required: true
-    ApiKeyId:
-      name: id
-      description: API Key ID.
-      in: path
-      schema:
-        type: string
-        format: uuid
-      required: true
-    GroupId:
-      name: groupId
-      description: Group ID.
-      in: path
-      schema:
-        type: string
-        format: uuid
-      required: true
-    MemberType:
-      name: type
-      description: Member type association.
-      in: path
-      schema:
-        type: string
-        enum: [users, things]
-      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
-    Level:
-      name: level
-      description: Level of hierarchy up to which to retrieve groups from given group id.
-      in: query
-      schema:
-        type: integer
-        minimum: 1
-        maximum: 5
-      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: {}
-    Tree:
-      name: tree
-      description: Specify type of response, JSON array or tree.
-      in: query
-      required: false
-      schema:
-        type: boolean
-        default: false
-  requestBodies:
-    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.
-              token:
-                type: string
-                format: jwt
-                example: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiZXhhbXBsZSIsImlhdCI6MTUxNjIzOTAyMn0.9UYAFWmPIn4ojss36LpIGSqABZHfADQmVuKQ4PJBMdI"
-                description: JWT for the entity that's sending Key request.
-              duration:
-                type: number
-                format: integer
-                example: 23456
-                description: Number of seconds issued token is valid for.
-    GroupCreateReq:  
-      description: JSON-formatted document describing group create request.
-      required: true
-      content:
-        application/json:
-          schema:
-           $ref: "#/components/schemas/GroupReqSchema"
-    GroupUpdateReq:
-      description: JSON-formatted document describing group create request.
-      required: true
-      content:
-        application/json:
-          schema:
-           $ref: "#/components/schemas/GroupUpdateSchema"
-    MembersReq:
-      description: JSON array of member IDs.
-      required: true
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/MembersReqSchema"
-  responses:
-    ServiceError:
-      description: Unexpected server-side error occurred.
-    KeyRes:
-      description: Data retrieved.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/Key"
-    GroupCreateRes:
-      description: Group created.
-      headers:
-        Location:
-          content:
-            text/plain:
-              schema:
-                type: string
-                description: Created group's relative URL.
-                example: /groups/{groupId}
-    GroupRes:
-      description: Data retrieved.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/GroupResSchema"
-    GroupsPageRes:
-      description: Group data retrieved.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/GroupsPage"
-    MembersRes:
-      description: Groups data retrieved. Groups assigned to a member.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/MembershipPage"
-    MembershipPageRes:
-      description: Groups data retrieved. Groups assigned to a member.
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/MembershipPage"

auth/postgres/doc.go

@@ -1,4 +1,4 @@
-// Copyright (c) Mainflux
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 // Package postgres contains Key repository implementations using

auth/postgres/groups.go

@@ -1,743 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-package postgres
-
-import (
-	"context"
-	"database/sql"
-	"database/sql/driver"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/gofrs/uuid"
-	"github.com/jmoiron/sqlx"
-
-	"github.com/lib/pq"
-	"github.com/mainflux/mainflux/auth"
-	"github.com/mainflux/mainflux/pkg/errors"
-	"github.com/mainflux/mainflux/users"
-)
-
-var (
-	errStringToUUID        = errors.New("error converting string")
-	errGetTotal            = errors.New("failed to get total number of groups")
-	errCreateMetadataQuery = errors.New("failed to create query for metadata")
-
-	errTruncation = "string_data_right_truncation"
-	errFK         = "foreign_key_violation"
-	groupIDFkeyy  = "group_relations_group_id_fkey"
-)
-
-var _ auth.GroupRepository = (*groupRepository)(nil)
-
-type groupRepository struct {
-	db Database
-}
-
-// NewGroupRepo instantiates a PostgreSQL implementation of group
-// repository.
-func NewGroupRepo(db Database) auth.GroupRepository {
-	return &groupRepository{
-		db: db,
-	}
-}
-
-func (gr groupRepository) Save(ctx context.Context, g auth.Group) (auth.Group, error) {
-	// For root group path is initialized with id
-	q := `INSERT INTO groups (name, description, id, path, owner_id, metadata, created_at, updated_at) 
-		  VALUES (:name, :description, :id, :id, :owner_id, :metadata, :created_at, :updated_at) 
-		  RETURNING id, name, owner_id, parent_id, description, metadata, path, nlevel(path) as level, created_at, updated_at`
-	if g.ParentID != "" {
-		// Path is constructed in insert_group_tr - init.go
-		q = `INSERT INTO groups (name, description, id, owner_id, parent_id, metadata, created_at, updated_at) 
-			 VALUES ( :name, :description, :id, :owner_id, :parent_id, :metadata, :created_at, :updated_at) 
-			 RETURNING id, name, owner_id, parent_id, description, metadata, path, nlevel(path) as level, created_at, updated_at`
-	}
-
-	dbg, err := toDBGroup(g)
-	if err != nil {
-		return auth.Group{}, err
-	}
-
-	row, err := gr.db.NamedQueryContext(ctx, q, dbg)
-	if err != nil {
-		pqErr, ok := err.(*pq.Error)
-		if ok {
-			switch pqErr.Code.Name() {
-			case errInvalid, errTruncation:
-				return auth.Group{}, errors.Wrap(auth.ErrMalformedEntity, err)
-			case errFK:
-				return auth.Group{}, errors.Wrap(auth.ErrCreateGroup, err)
-			case errDuplicate:
-				return auth.Group{}, errors.Wrap(auth.ErrGroupConflict, err)
-			}
-		}
-
-		return auth.Group{}, errors.Wrap(auth.ErrCreateGroup, errors.New(pqErr.Message))
-	}
-
-	defer row.Close()
-	row.Next()
-	dbg = dbGroup{}
-	if err := row.StructScan(&dbg); err != nil {
-		return auth.Group{}, err
-	}
-
-	return toGroup(dbg)
-}
-
-func (gr groupRepository) Update(ctx context.Context, g auth.Group) (auth.Group, error) {
-	q := `UPDATE groups SET name = :name, description = :description, metadata = :metadata, updated_at = :updated_at WHERE id = :id 
-		  RETURNING id, name, owner_id, parent_id, description, metadata, path, nlevel(path) as level, created_at, updated_at`
-
-	dbu, err := toDBGroup(g)
-	if err != nil {
-		return auth.Group{}, errors.Wrap(auth.ErrUpdateGroup, err)
-	}
-
-	row, err := gr.db.NamedQueryContext(ctx, q, dbu)
-	if err != nil {
-		pqErr, ok := err.(*pq.Error)
-		if ok {
-			switch pqErr.Code.Name() {
-			case errInvalid, errTruncation:
-				return auth.Group{}, errors.Wrap(auth.ErrMalformedEntity, err)
-			case errDuplicate:
-				return auth.Group{}, errors.Wrap(auth.ErrGroupConflict, err)
-			}
-		}
-		return auth.Group{}, errors.Wrap(auth.ErrUpdateGroup, errors.New(pqErr.Message))
-	}
-
-	defer row.Close()
-	row.Next()
-	dbu = dbGroup{}
-	if err := row.StructScan(&dbu); err != nil {
-		return g, errors.Wrap(auth.ErrUpdateGroup, err)
-	}
-
-	return toGroup(dbu)
-}
-
-func (gr groupRepository) Delete(ctx context.Context, groupID string) error {
-	qd := `DELETE FROM groups WHERE id = :id`
-	group := auth.Group{
-		ID: groupID,
-	}
-	dbg, err := toDBGroup(group)
-	if err != nil {
-		return errors.Wrap(auth.ErrUpdateGroup, err)
-	}
-
-	res, err := gr.db.NamedExecContext(ctx, qd, dbg)
-	if err != nil {
-		pqErr, ok := err.(*pq.Error)
-		if ok {
-			switch pqErr.Code.Name() {
-			case errInvalid, errTruncation:
-				return errors.Wrap(auth.ErrMalformedEntity, err)
-			case errFK:
-				switch pqErr.Constraint {
-				case groupIDFkeyy:
-					return errors.Wrap(auth.ErrGroupNotEmpty, err)
-				}
-				return errors.Wrap(auth.ErrGroupConflict, err)
-			}
-		}
-		return errors.Wrap(auth.ErrUpdateGroup, errors.New(pqErr.Message))
-	}
-
-	cnt, err := res.RowsAffected()
-	if err != nil {
-		return errors.Wrap(auth.ErrDeleteGroup, err)
-	}
-
-	if cnt != 1 {
-		return errors.Wrap(auth.ErrDeleteGroup, err)
-	}
-	return nil
-}
-
-func (gr groupRepository) RetrieveByID(ctx context.Context, id string) (auth.Group, error) {
-	dbu := dbGroup{
-		ID: id,
-	}
-	q := `SELECT id, name, owner_id, parent_id, description, metadata, path, nlevel(path) as level, created_at, updated_at FROM groups WHERE id = $1`
-	if err := gr.db.QueryRowxContext(ctx, q, id).StructScan(&dbu); err != nil {
-		if err == sql.ErrNoRows {
-			return auth.Group{}, errors.Wrap(auth.ErrGroupNotFound, err)
-
-		}
-		return auth.Group{}, errors.Wrap(auth.ErrSelectEntity, err)
-	}
-	return toGroup(dbu)
-}
-
-func (gr groupRepository) RetrieveAll(ctx context.Context, pm auth.PageMetadata) (auth.GroupPage, error) {
-	_, metaQuery, err := getGroupsMetadataQuery("groups", pm.Metadata)
-	if err != nil {
-		return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveAll, err)
-	}
-
-	var mq string
-	if metaQuery != "" {
-		mq = fmt.Sprintf(" AND %s", metaQuery)
-	}
-
-	q := fmt.Sprintf(`SELECT id, owner_id, parent_id, name, description, metadata, path, nlevel(path) as level, created_at, updated_at FROM groups 
-					  WHERE nlevel(path) <= :level %s ORDER BY path`, mq)
-
-	dbPage, err := toDBGroupPage("", "", pm)
-	if err != nil {
-		return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveAll, err)
-	}
-
-	rows, err := gr.db.NamedQueryContext(ctx, q, dbPage)
-	if err != nil {
-		return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveAll, err)
-	}
-	defer rows.Close()
-
-	items, err := gr.processRows(rows)
-	if err != nil {
-		return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveAll, err)
-	}
-
-	cq := "SELECT COUNT(*) FROM groups"
-	if metaQuery != "" {
-		cq = fmt.Sprintf(" %s WHERE %s", cq, metaQuery)
-	}
-
-	total, err := total(ctx, gr.db, cq, dbPage)
-	if err != nil {
-		return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveAll, err)
-	}
-
-	page := auth.GroupPage{
-		Groups: items,
-		PageMetadata: auth.PageMetadata{
-			Total: total,
-			Size:  uint64(len(items)),
-		},
-	}
-
-	return page, nil
-}
-
-func (gr groupRepository) RetrieveAllParents(ctx context.Context, groupID string, pm auth.PageMetadata) (auth.GroupPage, error) {
-	q := `SELECT g.id, g.name, g.owner_id, g.parent_id, g.description, g.metadata, g.path, nlevel(g.path) as level, g.created_at, g.updated_at
-		  FROM groups parent, groups g
-	      WHERE parent.id = :id AND g.path @> parent.path AND nlevel(parent.path) - nlevel(g.path) <= :level`
-	cq := `SELECT COUNT(*) FROM groups parent, groups g WHERE parent.id = :id AND g.path @> parent.path`
-
-	gp, err := gr.retrieve(ctx, groupID, q, cq, pm)
-	if err != nil {
-		return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveParents, err)
-	}
-	return gp, nil
-}
-
-func (gr groupRepository) RetrieveAllChildren(ctx context.Context, groupID string, pm auth.PageMetadata) (auth.GroupPage, error) {
-	q := `SELECT g.id, g.name, g.owner_id, g.parent_id, g.description, g.metadata, g.path,  nlevel(g.path) as level, g.created_at, g.updated_at 
-	FROM groups parent, groups g
-	WHERE parent.id = :id AND g.path <@ parent.path AND nlevel(g.path) - nlevel(parent.path) < :level`
-
-	cq := `SELECT COUNT(*) FROM groups parent, groups g WHERE parent.id = :id AND g.path <@ parent.path `
-	gp, err := gr.retrieve(ctx, groupID, q, cq, pm)
-	if err != nil {
-		return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveChildren, err)
-	}
-	return gp, nil
-}
-
-func (gr groupRepository) retrieve(ctx context.Context, groupID, retQuery, cntQuery string, pm auth.PageMetadata) (auth.GroupPage, error) {
-	if groupID == "" {
-		return auth.GroupPage{}, nil
-	}
-	_, mq, err := getGroupsMetadataQuery("g", pm.Metadata)
-	if err != nil {
-		return auth.GroupPage{}, err
-	}
-	if mq != "" {
-		mq = fmt.Sprintf("AND %s", mq)
-	}
-
-	retQuery = fmt.Sprintf(`%s %s`, retQuery, mq)
-	cntQuery = fmt.Sprintf(`%s %s`, cntQuery, mq)
-
-	dbPage, err := toDBGroupPage(groupID, "", pm)
-	if err != nil {
-		return auth.GroupPage{}, err
-	}
-
-	rows, err := gr.db.NamedQueryContext(ctx, retQuery, dbPage)
-	if err != nil {
-		return auth.GroupPage{}, err
-	}
-	defer rows.Close()
-
-	items, err := gr.processRows(rows)
-	if err != nil {
-		return auth.GroupPage{}, err
-	}
-
-	total, err := total(ctx, gr.db, cntQuery, dbPage)
-	if err != nil {
-		return auth.GroupPage{}, err
-	}
-
-	page := auth.GroupPage{
-		Groups: items,
-		PageMetadata: auth.PageMetadata{
-			Level: pm.Level,
-			Total: total,
-			Size:  uint64(len(items)),
-		},
-	}
-
-	return page, nil
-
-}
-
-func (gr groupRepository) Members(ctx context.Context, groupID, groupType string, pm auth.PageMetadata) (auth.MemberPage, error) {
-	_, mq, err := getGroupsMetadataQuery("groups", pm.Metadata)
-	if err != nil {
-		return auth.MemberPage{}, errors.Wrap(auth.ErrFailedToRetrieveMembers, err)
-	}
-
-	q := fmt.Sprintf(`SELECT gr.member_id, gr.group_id, gr.type, gr.created_at, gr.updated_at FROM group_relations gr
-					  WHERE gr.group_id = :group_id AND gr.type = :type %s`, mq)
-
-	if groupType == "" {
-		q = fmt.Sprintf(`SELECT gr.member_id, gr.group_id, gr.type, gr.created_at, gr.updated_at FROM group_relations gr
-		                 WHERE gr.group_id = :group_id %s`, mq)
-	}
-
-	params, err := toDBMemberPage("", groupID, groupType, pm)
-	if err != nil {
-		return auth.MemberPage{}, err
-	}
-
-	rows, err := gr.db.NamedQueryContext(ctx, q, params)
-	if err != nil {
-		return auth.MemberPage{}, errors.Wrap(auth.ErrFailedToRetrieveMembers, err)
-	}
-	defer rows.Close()
-
-	var items []auth.Member
-	for rows.Next() {
-		member := dbMember{}
-		if err := rows.StructScan(&member); err != nil {
-			return auth.MemberPage{}, errors.Wrap(auth.ErrFailedToRetrieveMembers, err)
-		}
-
-		if err != nil {
-			return auth.MemberPage{}, err
-		}
-
-		items = append(items, auth.Member{ID: member.MemberID, Type: member.Type})
-	}
-
-	cq := fmt.Sprintf(`SELECT COUNT(*) FROM groups g, group_relations gr
-					   WHERE gr.group_id = :group_id AND gr.group_id = g.id AND gr.type = :type %s;`, mq)
-
-	total, err := total(ctx, gr.db, cq, params)
-	if err != nil {
-		return auth.MemberPage{}, errors.Wrap(auth.ErrFailedToRetrieveMembers, err)
-	}
-
-	page := auth.MemberPage{
-		Members: items,
-		PageMetadata: auth.PageMetadata{
-			Total:  total,
-			Offset: pm.Offset,
-			Limit:  pm.Limit,
-			Size:   uint64(len(items)),
-		},
-	}
-
-	return page, nil
-}
-
-func (gr groupRepository) Memberships(ctx context.Context, memberID string, pm auth.PageMetadata) (auth.GroupPage, error) {
-	_, mq, err := getGroupsMetadataQuery("groups", pm.Metadata)
-	if err != nil {
-		return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveMembership, err)
-	}
-
-	if mq != "" {
-		mq = fmt.Sprintf("AND %s", mq)
-	}
-	q := fmt.Sprintf(`SELECT g.id, g.owner_id, g.parent_id, g.name, g.description, g.metadata 
-					  FROM group_relations gr, groups g
-					  WHERE gr.group_id = g.id and gr.member_id = :member_id
-		  			  %s ORDER BY id LIMIT :limit OFFSET :offset;`, mq)
-
-	params, err := toDBMemberPage(memberID, "", "", pm)
-	if err != nil {
-		return auth.GroupPage{}, err
-	}
-
-	rows, err := gr.db.NamedQueryContext(ctx, q, params)
-	if err != nil {
-		return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveMembership, err)
-	}
-	defer rows.Close()
-
-	var items []auth.Group
-	for rows.Next() {
-		dbg := dbGroup{}
-		if err := rows.StructScan(&dbg); err != nil {
-			return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveMembership, err)
-		}
-		gr, err := toGroup(dbg)
-		if err != nil {
-			return auth.GroupPage{}, err
-		}
-		items = append(items, gr)
-	}
-
-	cq := fmt.Sprintf(`SELECT COUNT(*) FROM group_relations gr, groups g
-					   WHERE gr.group_id = g.id and gr.member_id = :member_id %s `, mq)
-
-	total, err := total(ctx, gr.db, cq, params)
-	if err != nil {
-		return auth.GroupPage{}, errors.Wrap(auth.ErrFailedToRetrieveMembership, err)
-	}
-
-	page := auth.GroupPage{
-		Groups: items,
-		PageMetadata: auth.PageMetadata{
-			Total:  total,
-			Offset: pm.Offset,
-			Limit:  pm.Limit,
-			Size:   uint64(len(items)),
-		},
-	}
-
-	return page, nil
-}
-
-func (gr groupRepository) Assign(ctx context.Context, groupID, groupType string, ids ...string) error {
-	tx, err := gr.db.BeginTxx(ctx, nil)
-	if err != nil {
-		return errors.Wrap(auth.ErrAssignToGroup, err)
-	}
-
-	qIns := `INSERT INTO group_relations (group_id, member_id, type, created_at, updated_at) 
-			 VALUES(:group_id, :member_id, :type, :created_at, :updated_at)`
-
-	for _, id := range ids {
-		dbg, err := toDBGroupRelation(id, groupID, groupType)
-		if err != nil {
-			return errors.Wrap(auth.ErrAssignToGroup, err)
-		}
-		created := time.Now()
-		dbg.CreatedAt = created
-		dbg.UpdatedAt = created
-
-		if _, err := tx.NamedExecContext(ctx, qIns, dbg); err != nil {
-			tx.Rollback()
-			pqErr, ok := err.(*pq.Error)
-			if ok {
-				switch pqErr.Code.Name() {
-				case errInvalid, errTruncation:
-					return errors.Wrap(auth.ErrMalformedEntity, err)
-				case errFK:
-					return errors.Wrap(auth.ErrConflict, errors.New(pqErr.Detail))
-				case errDuplicate:
-					return errors.Wrap(auth.ErrMemberAlreadyAssigned, errors.New(pqErr.Detail))
-				}
-			}
-
-			return errors.Wrap(auth.ErrAssignToGroup, err)
-		}
-	}
-
-	if err = tx.Commit(); err != nil {
-		return errors.Wrap(auth.ErrAssignToGroup, err)
-	}
-
-	return nil
-}
-
-func (gr groupRepository) Unassign(ctx context.Context, groupID string, ids ...string) error {
-	tx, err := gr.db.BeginTxx(ctx, nil)
-	if err != nil {
-		return errors.Wrap(auth.ErrAssignToGroup, err)
-	}
-
-	qDel := `DELETE from group_relations WHERE group_id = :group_id AND member_id = :member_id`
-
-	for _, id := range ids {
-		dbg, err := toDBGroupRelation(id, groupID, "")
-		if err != nil {
-			return errors.Wrap(auth.ErrAssignToGroup, err)
-		}
-
-		if _, err := tx.NamedExecContext(ctx, qDel, dbg); err != nil {
-			tx.Rollback()
-			pqErr, ok := err.(*pq.Error)
-			if ok {
-				switch pqErr.Code.Name() {
-				case errInvalid, errTruncation:
-					return errors.Wrap(auth.ErrMalformedEntity, err)
-				case errDuplicate:
-					return errors.Wrap(auth.ErrConflict, err)
-				}
-			}
-
-			return errors.Wrap(auth.ErrAssignToGroup, err)
-		}
-	}
-
-	if err = tx.Commit(); err != nil {
-		return errors.Wrap(auth.ErrAssignToGroup, err)
-	}
-
-	return nil
-}
-
-type dbMember struct {
-	MemberID  string    `db:"member_id"`
-	GroupID   string    `db:"group_id"`
-	Type      string    `db:"type"`
-	CreatedAt time.Time `db:"created_at"`
-	UpdatedAt time.Time `db:"updated_at"`
-}
-
-type dbGroup struct {
-	ID          string         `db:"id"`
-	ParentID    sql.NullString `db:"parent_id"`
-	OwnerID     uuid.NullUUID  `db:"owner_id"`
-	Name        string         `db:"name"`
-	Description string         `db:"description"`
-	Metadata    dbMetadata     `db:"metadata"`
-	Level       int            `db:"level"`
-	Path        string         `db:"path"`
-	CreatedAt   time.Time      `db:"created_at"`
-	UpdatedAt   time.Time      `db:"updated_at"`
-}
-
-type dbGroupPage struct {
-	ID       string        `db:"id"`
-	ParentID string        `db:"parent_id"`
-	OwnerID  uuid.NullUUID `db:"owner_id"`
-	Metadata dbMetadata    `db:"metadata"`
-	Path     string        `db:"path"`
-	Level    uint64        `db:"level"`
-	Total    uint64        `db:"total"`
-	Limit    uint64        `db:"limit"`
-	Offset   uint64        `db:"offset"`
-}
-
-type dbMemberPage struct {
-	GroupID  string     `db:"group_id"`
-	MemberID string     `db:"member_id"`
-	Type     string     `db:"type"`
-	Metadata dbMetadata `db:"metadata"`
-	Limit    uint64     `db:"limit"`
-	Offset   uint64     `db:"offset"`
-	Size     uint64
-}
-
-func toUUID(id string) (uuid.NullUUID, error) {
-	var uid uuid.NullUUID
-	if id == "" {
-		return uuid.NullUUID{UUID: uuid.Nil, Valid: false}, nil
-	}
-	err := uid.Scan(id)
-	return uid, err
-}
-
-func toString(id uuid.NullUUID) (string, error) {
-	if id.Valid {
-		return id.UUID.String(), nil
-	}
-	if id.UUID == uuid.Nil {
-		return "", nil
-	}
-	return "", errStringToUUID
-}
-
-func toDBGroup(g auth.Group) (dbGroup, error) {
-	ownerID, err := toUUID(g.OwnerID)
-	if err != nil {
-		return dbGroup{}, err
-	}
-
-	var parentID sql.NullString
-	if g.ParentID != "" {
-		parentID = sql.NullString{String: g.ParentID, Valid: true}
-	}
-
-	meta := dbMetadata(g.Metadata)
-
-	return dbGroup{
-		ID:          g.ID,
-		Name:        g.Name,
-		ParentID:    parentID,
-		OwnerID:     ownerID,
-		Description: g.Description,
-		Metadata:    meta,
-		Path:        g.Path,
-		CreatedAt:   g.CreatedAt,
-		UpdatedAt:   g.UpdatedAt,
-	}, nil
-}
-
-func toDBGroupPage(id, path string, pm auth.PageMetadata) (dbGroupPage, error) {
-	level := auth.MaxLevel
-	if pm.Level < auth.MaxLevel {
-		level = pm.Level
-	}
-	return dbGroupPage{
-		Metadata: dbMetadata(pm.Metadata),
-		ID:       id,
-		Path:     path,
-		Level:    level,
-		Total:    pm.Total,
-		Offset:   pm.Offset,
-		Limit:    pm.Limit,
-	}, nil
-}
-
-func toDBMemberPage(memberID, groupID, groupType string, pm auth.PageMetadata) (dbMemberPage, error) {
-	return dbMemberPage{
-		GroupID:  groupID,
-		MemberID: memberID,
-		Type:     groupType,
-		Metadata: dbMetadata(pm.Metadata),
-		Offset:   pm.Offset,
-		Limit:    pm.Limit,
-	}, nil
-}
-
-func toGroup(dbu dbGroup) (auth.Group, error) {
-	ownerID, err := toString(dbu.OwnerID)
-	if err != nil {
-		return auth.Group{}, err
-	}
-
-	return auth.Group{
-		ID:          dbu.ID,
-		Name:        dbu.Name,
-		ParentID:    dbu.ParentID.String,
-		OwnerID:     ownerID,
-		Description: dbu.Description,
-		Metadata:    auth.GroupMetadata(dbu.Metadata),
-		Level:       dbu.Level,
-		Path:        dbu.Path,
-		UpdatedAt:   dbu.UpdatedAt,
-		CreatedAt:   dbu.CreatedAt,
-	}, nil
-}
-
-type dbGroupRelation struct {
-	GroupID   sql.NullString `db:"group_id"`
-	MemberID  sql.NullString `db:"member_id"`
-	CreatedAt time.Time      `db:"created_at"`
-	UpdatedAt time.Time      `db:"updated_at"`
-	Type      string         `db:"type"`
-}
-
-func toDBGroupRelation(memberID, groupID, groupType string) (dbGroupRelation, error) {
-	var grID sql.NullString
-	if groupID != "" {
-		grID = sql.NullString{String: groupID, Valid: true}
-	}
-
-	var mID sql.NullString
-	if memberID != "" {
-		mID = sql.NullString{String: memberID, Valid: true}
-	}
-
-	return dbGroupRelation{
-		GroupID:  grID,
-		MemberID: mID,
-		Type:     groupType,
-	}, nil
-}
-
-func getGroupsMetadataQuery(db string, m auth.GroupMetadata) (mb []byte, mq string, err error) {
-	if len(m) > 0 {
-		mq = `metadata @> :metadata`
-		if db != "" {
-			mq = db + "." + mq
-		}
-
-		b, err := json.Marshal(m)
-		if err != nil {
-			return nil, "", errors.Wrap(err, errCreateMetadataQuery)
-		}
-		mb = b
-	}
-	return mb, mq, nil
-}
-
-func (gr groupRepository) processRows(rows *sqlx.Rows) ([]auth.Group, error) {
-	var items []auth.Group
-	for rows.Next() {
-		dbg := dbGroup{}
-		if err := rows.StructScan(&dbg); err != nil {
-			return items, err
-		}
-		group, err := toGroup(dbg)
-		if err != nil {
-			return items, err
-		}
-		items = append(items, group)
-	}
-	return items, nil
-}
-
-func total(ctx context.Context, db Database, query string, params interface{}) (uint64, error) {
-	rows, err := db.NamedQueryContext(ctx, query, params)
-	if err != nil {
-		return 0, errors.Wrap(errGetTotal, err)
-	}
-	defer rows.Close()
-	total := uint64(0)
-	if rows.Next() {
-		if err := rows.Scan(&total); err != nil {
-			return 0, errors.Wrap(errGetTotal, err)
-		}
-	}
-	return total, nil
-}
-
-// dbMetadata type for handling metadata properly in database/sql
-type dbMetadata map[string]interface{}
-
-// Scan - Implement the database/sql scanner interface
-func (m *dbMetadata) Scan(value interface{}) error {
-	if value == nil {
-		return nil
-	}
-
-	b, ok := value.([]byte)
-	if !ok {
-		return users.ErrScanMetadata
-	}
-
-	if err := json.Unmarshal(b, m); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Value Implements valuer
-func (m dbMetadata) Value() (driver.Value, error) {
-	if len(m) == 0 {
-		return nil, nil
-	}
-
-	b, err := json.Marshal(m)
-	if err != nil {
-		return nil, err
-	}
-	return b, err
-}

auth/postgres/groups_test.go

@@ -1,777 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-package postgres_test
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/mainflux/mainflux/auth"
-	"github.com/mainflux/mainflux/auth/postgres"
-	"github.com/mainflux/mainflux/pkg/errors"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-const (
-	maxNameSize = 254
-	maxDescSize = 1024
-	groupName   = "Mainflux"
-	description = "description"
-)
-
-var (
-	invalidName = strings.Repeat("m", maxNameSize+1)
-	invalidDesc = strings.Repeat("m", maxDescSize+1)
-	metadata    = auth.GroupMetadata{
-		"admin": "true",
-	}
-)
-
-func generateGroupID(t *testing.T) string {
-	grpID, err := ulidProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-	return grpID
-}
-
-func TestGroupSave(t *testing.T) {
-	t.Cleanup(func() { cleanUp(t) })
-	dbMiddleware := postgres.NewDatabase(db)
-	groupRepo := postgres.NewGroupRepo(dbMiddleware)
-
-	usrID, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	wrongID, err := ulidProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	grpID := generateGroupID(t)
-
-	cases := []struct {
-		desc  string
-		group auth.Group
-		err   error
-	}{
-		{
-			desc: "create new group",
-			group: auth.Group{
-				ID:      grpID,
-				OwnerID: usrID,
-				Name:    groupName,
-			},
-			err: nil,
-		},
-		{
-			desc: "create new group with existing name",
-			group: auth.Group{
-				ID:      grpID,
-				OwnerID: usrID,
-				Name:    groupName,
-			},
-			err: auth.ErrGroupConflict,
-		},
-		{
-			desc: "create group with invalid name",
-			group: auth.Group{
-				ID:      generateGroupID(t),
-				OwnerID: usrID,
-				Name:    invalidName,
-			},
-			err: auth.ErrMalformedEntity,
-		},
-		{
-			desc: "create group with invalid description",
-			group: auth.Group{
-				ID:          generateGroupID(t),
-				OwnerID:     usrID,
-				Name:        groupName,
-				Description: invalidDesc,
-			},
-			err: auth.ErrMalformedEntity,
-		},
-		{
-			desc: "create group with parent",
-			group: auth.Group{
-				ID:       generateGroupID(t),
-				ParentID: grpID,
-				OwnerID:  usrID,
-				Name:     "withParent",
-			},
-			err: nil,
-		},
-		{
-			desc: "create group with parent and existing name",
-			group: auth.Group{
-				ID:       generateGroupID(t),
-				ParentID: grpID,
-				OwnerID:  usrID,
-				Name:     groupName,
-			},
-			err: nil,
-		},
-		{
-			desc: "create group with wrong parent",
-			group: auth.Group{
-				ID:       generateGroupID(t),
-				ParentID: wrongID,
-				OwnerID:  usrID,
-				Name:     "wrongParent",
-			},
-			err: auth.ErrCreateGroup,
-		},
-	}
-
-	for _, tc := range cases {
-		_, err := groupRepo.Save(context.Background(), tc.group)
-		assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
-	}
-
-}
-
-func TestGroupRetrieveByID(t *testing.T) {
-	t.Cleanup(func() { cleanUp(t) })
-	dbMiddleware := postgres.NewDatabase(db)
-	groupRepo := postgres.NewGroupRepo(dbMiddleware)
-
-	uid, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	require.Nil(t, err, fmt.Sprintf("group id unexpected error: %s", err))
-	group1 := auth.Group{
-		ID:      generateGroupID(t),
-		Name:    groupName + "TestGroupRetrieveByID1",
-		OwnerID: uid,
-	}
-
-	_, err = groupRepo.Save(context.Background(), group1)
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	retrieved, err := groupRepo.RetrieveByID(context.Background(), group1.ID)
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-	assert.True(t, retrieved.ID == group1.ID, fmt.Sprintf("Save group, ID: expected %s got %s\n", group1.ID, retrieved.ID))
-
-	// Round to milliseconds as otherwise saving and retriving from DB
-	// adds rounding error.
-	creationTime := time.Now().UTC().Round(time.Millisecond)
-	group2 := auth.Group{
-		ID:          generateGroupID(t),
-		Name:        groupName + "TestGroupRetrieveByID",
-		OwnerID:     uid,
-		ParentID:    group1.ID,
-		CreatedAt:   creationTime,
-		UpdatedAt:   creationTime,
-		Description: description,
-		Metadata:    metadata,
-	}
-
-	_, err = groupRepo.Save(context.Background(), group2)
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	retrieved, err = groupRepo.RetrieveByID(context.Background(), group2.ID)
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-	assert.True(t, retrieved.ID == group2.ID, fmt.Sprintf("Save group, ID: expected %s got %s\n", group2.ID, retrieved.ID))
-	assert.True(t, retrieved.CreatedAt.Equal(creationTime), fmt.Sprintf("Save group, CreatedAt: expected %s got %s\n", creationTime, retrieved.CreatedAt))
-	assert.True(t, retrieved.UpdatedAt.Equal(creationTime), fmt.Sprintf("Save group, UpdatedAt: expected %s got %s\n", creationTime, retrieved.UpdatedAt))
-	assert.True(t, retrieved.Level == 2, fmt.Sprintf("Save group, Level: expected %d got %d\n", retrieved.Level, 2))
-	assert.True(t, retrieved.ParentID == group1.ID, fmt.Sprintf("Save group, Level: expected %s got %s\n", group1.ID, retrieved.ParentID))
-	assert.True(t, retrieved.Description == description, fmt.Sprintf("Save group, Description: expected %v got %v\n", retrieved.Description, description))
-	assert.True(t, retrieved.Path == fmt.Sprintf("%s.%s", group1.ID, group2.ID), fmt.Sprintf("Save group, Path: expected %s got %s\n", fmt.Sprintf("%s.%s", group1.ID, group2.ID), retrieved.Path))
-
-	retrieved, err = groupRepo.RetrieveByID(context.Background(), generateGroupID(t))
-	assert.True(t, errors.Contains(err, auth.ErrGroupNotFound), fmt.Sprintf("Retrieve group: expected %s got %s\n", auth.ErrGroupNotFound, err))
-}
-
-func TestGroupUpdate(t *testing.T) {
-	t.Cleanup(func() { cleanUp(t) })
-	dbMiddleware := postgres.NewDatabase(db)
-	groupRepo := postgres.NewGroupRepo(dbMiddleware)
-
-	uid, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	creationTime := time.Now().UTC()
-	updateTime := time.Now().UTC()
-	groupID := generateGroupID(t)
-
-	group := auth.Group{
-		ID:          groupID,
-		Name:        groupName + "TestGroupUpdate",
-		OwnerID:     uid,
-		CreatedAt:   creationTime,
-		UpdatedAt:   creationTime,
-		Description: description,
-		Metadata:    metadata,
-	}
-
-	_, err = groupRepo.Save(context.Background(), group)
-	require.Nil(t, err, fmt.Sprintf("group save got unexpected error: %s", err))
-
-	retrieved, err := groupRepo.RetrieveByID(context.Background(), group.ID)
-	require.Nil(t, err, fmt.Sprintf("group save got unexpected error: %s", err))
-
-	cases := []struct {
-		desc          string
-		groupUpdate   auth.Group
-		groupExpected auth.Group
-		err           error
-	}{
-		{
-			desc: "update group for existing id",
-			groupUpdate: auth.Group{
-				ID:        groupID,
-				Name:      groupName + "Updated",
-				UpdatedAt: updateTime,
-				Metadata:  auth.GroupMetadata{"admin": "false"},
-			},
-			groupExpected: auth.Group{
-				Name:      groupName + "Updated",
-				UpdatedAt: updateTime,
-				Metadata:  auth.GroupMetadata{"admin": "false"},
-				CreatedAt: retrieved.CreatedAt,
-				Path:      retrieved.Path,
-				ParentID:  retrieved.ParentID,
-				ID:        retrieved.ID,
-				Level:     retrieved.Level,
-			},
-			err: nil,
-		},
-		{
-			desc: "update group for non-existing id",
-			groupUpdate: auth.Group{
-				ID:   "wrong",
-				Name: groupName + "-2",
-			},
-			err: auth.ErrUpdateGroup,
-		},
-		{
-			desc: "update group for invalid name",
-			groupUpdate: auth.Group{
-				ID:   groupID,
-				Name: invalidName,
-			},
-			err: auth.ErrMalformedEntity,
-		},
-		{
-			desc: "update group for invalid description",
-			groupUpdate: auth.Group{
-				ID:          groupID,
-				Description: invalidDesc,
-			},
-			err: auth.ErrMalformedEntity,
-		},
-	}
-
-	for _, tc := range cases {
-		updated, err := groupRepo.Update(context.Background(), tc.groupUpdate)
-		assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
-		if tc.desc == "update group for existing id" {
-			assert.True(t, updated.Level == tc.groupExpected.Level, fmt.Sprintf("%s:Level: expected %d got %d\n", tc.desc, tc.groupExpected.Level, updated.Level))
-			assert.True(t, updated.Name == tc.groupExpected.Name, fmt.Sprintf("%s:Name: expected %s got %s\n", tc.desc, tc.groupExpected.Name, updated.Name))
-			assert.True(t, updated.Metadata["admin"] == tc.groupExpected.Metadata["admin"], fmt.Sprintf("%s:Level: expected %d got %d\n", tc.desc, tc.groupExpected.Metadata["admin"], updated.Metadata["admin"]))
-		}
-	}
-}
-
-func TestGroupDelete(t *testing.T) {
-	t.Cleanup(func() { cleanUp(t) })
-	dbMiddleware := postgres.NewDatabase(db)
-	groupRepo := postgres.NewGroupRepo(dbMiddleware)
-
-	uid, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	creationTime := time.Now().UTC()
-	groupParent := auth.Group{
-		ID:        generateGroupID(t),
-		Name:      groupName + "Updated",
-		OwnerID:   uid,
-		CreatedAt: creationTime,
-		UpdatedAt: creationTime,
-	}
-
-	groupParent, err = groupRepo.Save(context.Background(), groupParent)
-	require.Nil(t, err, fmt.Sprintf("group save got unexpected error: %s", err))
-
-	creationTime = time.Now().UTC()
-	groupChild1 := auth.Group{
-		ID:        generateGroupID(t),
-		ParentID:  groupParent.ID,
-		Name:      groupName + "child1",
-		OwnerID:   uid,
-		CreatedAt: creationTime,
-		UpdatedAt: creationTime,
-	}
-
-	creationTime = time.Now().UTC()
-	groupChild2 := auth.Group{
-		ID:        generateGroupID(t),
-		ParentID:  groupParent.ID,
-		Name:      groupName + "child2",
-		OwnerID:   uid,
-		CreatedAt: creationTime,
-		UpdatedAt: creationTime,
-	}
-
-	meta := auth.PageMetadata{
-		Level: auth.MaxLevel,
-	}
-
-	groupChild1, err = groupRepo.Save(context.Background(), groupChild1)
-	require.Nil(t, err, fmt.Sprintf("group save got unexpected error: %s", err))
-
-	groupChild2, err = groupRepo.Save(context.Background(), groupChild2)
-	require.Nil(t, err, fmt.Sprintf("group save got unexpected error: %s", err))
-
-	gp, err := groupRepo.RetrieveAllChildren(context.Background(), groupParent.ID, meta)
-	assert.True(t, errors.Contains(err, nil), fmt.Sprintf("Retrieve children for parent: expected %v got %v\n", nil, err))
-	assert.True(t, gp.Total == 3, fmt.Sprintf("Number of children + parent: expected %d got %d\n", 3, gp.Total))
-
-	thingID, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("thing id create unexpected error: %s", err))
-
-	err = groupRepo.Assign(context.Background(), groupChild1.ID, "things", thingID)
-	require.Nil(t, err, fmt.Sprintf("thing assign got unexpected error: %s", err))
-
-	err = groupRepo.Delete(context.Background(), groupChild1.ID)
-	assert.True(t, errors.Contains(err, auth.ErrGroupNotEmpty), fmt.Sprintf("delete non empty group: expected %v got %v\n", auth.ErrGroupNotEmpty, err))
-
-	err = groupRepo.Delete(context.Background(), groupChild2.ID)
-	assert.True(t, errors.Contains(err, nil), fmt.Sprintf("delete empty group: expected %v got %v\n", nil, err))
-
-	err = groupRepo.Delete(context.Background(), groupParent.ID)
-	assert.True(t, errors.Contains(err, auth.ErrGroupNotEmpty), fmt.Sprintf("delete parent with children with members: expected %v got %v\n", auth.ErrGroupNotEmpty, err))
-
-	gp, err = groupRepo.RetrieveAllChildren(context.Background(), groupParent.ID, meta)
-	assert.True(t, errors.Contains(err, nil), fmt.Sprintf("retrieve children after one child removed: expected %v got %v\n", nil, err))
-	assert.True(t, gp.Total == 2, fmt.Sprintf("number of children + parent: expected %d got %d\n", 2, gp.Total))
-
-	err = groupRepo.Unassign(context.Background(), groupChild1.ID, thingID)
-	require.Nil(t, err, fmt.Sprintf("failed to remove thing from a group error: %s", err))
-
-	err = groupRepo.Delete(context.Background(), groupParent.ID)
-	assert.True(t, errors.Contains(err, nil), fmt.Sprintf("delete parent with children with no members: expected %v got %v\n", nil, err))
-
-	_, err = groupRepo.RetrieveByID(context.Background(), groupChild1.ID)
-	assert.True(t, errors.Contains(err, auth.ErrGroupNotFound), fmt.Sprintf("retrieve child after parent removed: expected %v got %v\n", nil, err))
-}
-
-func TestRetrieveAll(t *testing.T) {
-	t.Cleanup(func() { cleanUp(t) })
-	dbMiddleware := postgres.NewDatabase(db)
-	groupRepo := postgres.NewGroupRepo(dbMiddleware)
-	uid, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	metadata := auth.PageMetadata{
-		Metadata: auth.GroupMetadata{
-			"field": "value",
-		},
-		Level: auth.MaxLevel,
-	}
-	wrongMeta := auth.PageMetadata{
-		Metadata: auth.GroupMetadata{
-			"wrong": "wrong",
-		},
-		Level: auth.MaxLevel,
-	}
-
-	metaNum := uint64(3)
-
-	n := uint64(auth.MaxLevel)
-	parentID := ""
-	for i := uint64(0); i < n; i++ {
-		creationTime := time.Now().UTC()
-		group := auth.Group{
-			ID:        generateGroupID(t),
-			Name:      fmt.Sprintf("%s-%d", groupName, i),
-			OwnerID:   uid,
-			ParentID:  parentID,
-			CreatedAt: creationTime,
-			UpdatedAt: creationTime,
-		}
-		// Create Groups with metadata.
-		if i < metaNum {
-			group.Metadata = metadata.Metadata
-		}
-
-		_, err = groupRepo.Save(context.Background(), group)
-		require.Nil(t, err, fmt.Sprintf("unexpected error: %s\n", err))
-		parentID = group.ID
-	}
-
-	cases := map[string]struct {
-		Size     uint64
-		Metadata auth.PageMetadata
-	}{
-		"retrieve all groups": {
-			Metadata: auth.PageMetadata{
-				Total: n,
-				Limit: n,
-				Level: auth.MaxLevel,
-			},
-			Size: n,
-		},
-		"retrieve groups with existing metadata": {
-			Metadata: auth.PageMetadata{
-				Total:    metaNum,
-				Limit:    n,
-				Level:    auth.MaxLevel,
-				Metadata: metadata.Metadata,
-			},
-			Size: metaNum,
-		},
-		"retrieve groups with non-existing metadata": {
-			Metadata: auth.PageMetadata{
-				Total:    uint64(0),
-				Limit:    n,
-				Level:    auth.MaxLevel,
-				Metadata: wrongMeta.Metadata,
-			},
-			Size: uint64(0),
-		},
-		"retrieve groups with hierarchy level depth": {
-			Metadata: auth.PageMetadata{
-				Total:    uint64(metaNum),
-				Limit:    n,
-				Level:    auth.MaxLevel,
-				Metadata: metadata.Metadata,
-			},
-			Size: uint64(metaNum),
-		},
-		"retrieve groups with hierarchy level depth and existing metadata": {
-			Metadata: auth.PageMetadata{
-				Total:    uint64(metaNum),
-				Limit:    n,
-				Level:    auth.MaxLevel,
-				Metadata: metadata.Metadata,
-			},
-			Size: uint64(metaNum),
-		},
-	}
-
-	for desc, tc := range cases {
-		page, err := groupRepo.RetrieveAll(context.Background(), tc.Metadata)
-		size := len(page.Groups)
-		assert.Equal(t, tc.Size, uint64(size), fmt.Sprintf("%s: expected size %d got %d\n", desc, tc.Size, size))
-		assert.Equal(t, tc.Metadata.Total, page.Total, fmt.Sprintf("%s: expected total %d got %d\n", desc, tc.Metadata.Total, page.Total))
-		assert.Nil(t, err, fmt.Sprintf("%s: expected no error got %d\n", desc, err))
-	}
-}
-
-func TestRetrieveAllParents(t *testing.T) {
-	t.Cleanup(func() { cleanUp(t) })
-	dbMiddleware := postgres.NewDatabase(db)
-	groupRepo := postgres.NewGroupRepo(dbMiddleware)
-
-	uid, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	metadata := auth.GroupMetadata{
-		"field": "value",
-	}
-	wrongMeta := auth.GroupMetadata{
-		"wrong": "wrong",
-	}
-
-	p, err := groupRepo.RetrieveAll(context.Background(), auth.PageMetadata{Level: auth.MaxLevel})
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-	assert.Equal(t, uint64(0), p.Total, fmt.Sprintf("expected total %d got %d\n", 0, p.Total))
-
-	metaNum := uint64(3)
-
-	n := uint64(10)
-	parentID := ""
-	parentMiddle := ""
-	for i := uint64(0); i < n; i++ {
-		creationTime := time.Now().UTC()
-		group := auth.Group{
-			ID:        generateGroupID(t),
-			Name:      fmt.Sprintf("%s-%d", groupName, i),
-			OwnerID:   uid,
-			ParentID:  parentID,
-			CreatedAt: creationTime,
-			UpdatedAt: creationTime,
-		}
-		// Create Groups with metadata.
-		if n-i <= metaNum {
-			group.Metadata = metadata
-		}
-		if i == n/2 {
-			parentMiddle = group.ID
-		}
-		_, err = groupRepo.Save(context.Background(), group)
-		require.Nil(t, err, fmt.Sprintf("unexpected error: %s\n", err))
-		parentID = group.ID
-	}
-
-	cases := map[string]struct {
-		level    uint64
-		parentID string
-		Size     uint64
-		Total    uint64
-		Metadata auth.GroupMetadata
-	}{
-		"retrieve all parents": {
-			Total:    n,
-			Size:     auth.MaxLevel + 1,
-			level:    auth.MaxLevel,
-			parentID: parentID,
-		},
-		"retrieve groups with existing metadata": {
-			Total:    metaNum,
-			Size:     metaNum,
-			Metadata: metadata,
-			parentID: parentID,
-			level:    auth.MaxLevel,
-		},
-		"retrieve groups with non-existing metadata": {
-			Total:    uint64(0),
-			Metadata: wrongMeta,
-			Size:     uint64(0),
-			level:    auth.MaxLevel,
-			parentID: parentID,
-		},
-		"retrieve groups with hierarchy level depth": {
-			Total:    n,
-			Size:     2 + 1,
-			level:    uint64(2),
-			parentID: parentID,
-		},
-		"retrieve groups with hierarchy level depth and existing metadata": {
-			Total:    metaNum,
-			Size:     metaNum,
-			level:    3,
-			Metadata: metadata,
-			parentID: parentID,
-		},
-		"retrieve parent groups from children in the middle": {
-			Total:    n/2 + 1,
-			Size:     n/2 + 1,
-			level:    auth.MaxLevel,
-			parentID: parentMiddle,
-		},
-	}
-
-	for desc, tc := range cases {
-		page, err := groupRepo.RetrieveAllParents(context.Background(), tc.parentID, auth.PageMetadata{Level: tc.level, Metadata: tc.Metadata})
-		size := len(page.Groups)
-		assert.Equal(t, tc.Size, uint64(size), fmt.Sprintf("%s: expected size %d got %d\n", desc, tc.Size, size))
-		assert.Equal(t, tc.Total, page.Total, fmt.Sprintf("%s: expected total %d got %d\n", desc, tc.Total, page.Total))
-		assert.Nil(t, err, fmt.Sprintf("%s: expected no error got %d\n", desc, err))
-	}
-}
-
-func TestRetrieveAllChildren(t *testing.T) {
-	t.Cleanup(func() { cleanUp(t) })
-	dbMiddleware := postgres.NewDatabase(db)
-	groupRepo := postgres.NewGroupRepo(dbMiddleware)
-
-	uid, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	metadata := auth.GroupMetadata{
-		"field": "value",
-	}
-	wrongMeta := auth.GroupMetadata{
-		"wrong": "wrong",
-	}
-
-	metaNum := uint64(3)
-
-	n := uint64(10)
-	groupID := generateGroupID(t)
-	firstParentID := groupID
-	parentID := ""
-	parentMiddle := ""
-	for i := uint64(0); i < n; i++ {
-		creationTime := time.Now().UTC()
-		group := auth.Group{
-			ID:        groupID,
-			Name:      fmt.Sprintf("%s-%d", groupName, i),
-			OwnerID:   uid,
-			ParentID:  parentID,
-			CreatedAt: creationTime,
-			UpdatedAt: creationTime,
-		}
-		// Create Groups with metadata.
-		if i < metaNum {
-			group.Metadata = metadata
-		}
-		if i == n/2 {
-			parentMiddle = group.ID
-		}
-		_, err = groupRepo.Save(context.Background(), group)
-		require.Nil(t, err, fmt.Sprintf("unexpected error: %s\n", err))
-		parentID = group.ID
-		groupID = generateGroupID(t)
-	}
-
-	p, err := groupRepo.RetrieveAll(context.Background(), auth.PageMetadata{Level: auth.MaxLevel})
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-	assert.Equal(t, n, p.Total, fmt.Sprintf("expected total %d got %d\n", n, p.Total))
-
-	cases := map[string]struct {
-		parentID string
-		size     uint64
-		total    uint64
-		metadata auth.PageMetadata
-	}{
-		"retrieve all children": {
-			size:  auth.MaxLevel,
-			total: n,
-			metadata: auth.PageMetadata{
-				Level: auth.MaxLevel,
-			},
-			parentID: firstParentID,
-		},
-		"retrieve groups with existing metadata": {
-			size:  metaNum,
-			total: metaNum,
-			metadata: auth.PageMetadata{
-				Level:    auth.MaxLevel,
-				Metadata: metadata,
-			},
-			parentID: firstParentID,
-		},
-		"retrieve groups with non-existing metadata": {
-			total: 0,
-			size:  0,
-			metadata: auth.PageMetadata{
-				Level:    auth.MaxLevel,
-				Metadata: wrongMeta,
-			},
-			parentID: firstParentID,
-		},
-		"retrieve groups with hierarchy level depth": {
-			total: n,
-			size:  2,
-			metadata: auth.PageMetadata{
-				Level: 2,
-			},
-			parentID: firstParentID,
-		},
-		"retrieve groups with hierarchy level depth and existing metadata": {
-			total: metaNum,
-			size:  metaNum,
-			metadata: auth.PageMetadata{
-				Level:    3,
-				Metadata: metadata,
-			},
-			parentID: firstParentID,
-		},
-		"retrieve parent groups from children in the middle": {
-			total: n / 2,
-			size:  n / 2,
-			metadata: auth.PageMetadata{
-				Level: auth.MaxLevel,
-			},
-			parentID: parentMiddle,
-		},
-	}
-
-	for desc, tc := range cases {
-		page, err := groupRepo.RetrieveAllChildren(context.Background(), tc.parentID, tc.metadata)
-		size := len(page.Groups)
-		assert.Equal(t, tc.size, uint64(size), fmt.Sprintf("%s: expected size %d got %d\n", desc, tc.size, size))
-		assert.Equal(t, tc.total, page.Total, fmt.Sprintf("%s: expected total %d got %d\n", desc, tc.total, page.Total))
-		assert.Nil(t, err, fmt.Sprintf("%s: expected no error got %d\n", desc, err))
-	}
-}
-
-func TestAssign(t *testing.T) {
-	t.Cleanup(func() { cleanUp(t) })
-	dbMiddleware := postgres.NewDatabase(db)
-	groupRepo := postgres.NewGroupRepo(dbMiddleware)
-
-	uid, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	creationTime := time.Now().UTC()
-	group := auth.Group{
-		ID:        generateGroupID(t),
-		Name:      groupName + "Updated",
-		OwnerID:   uid,
-		CreatedAt: creationTime,
-		UpdatedAt: creationTime,
-	}
-
-	pm := auth.PageMetadata{
-		Offset: 0,
-		Limit:  10,
-	}
-
-	group, err = groupRepo.Save(context.Background(), group)
-	require.Nil(t, err, fmt.Sprintf("group save got unexpected error: %s", err))
-
-	mid, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	err = groupRepo.Assign(context.Background(), group.ID, "things", mid)
-	require.Nil(t, err, fmt.Sprintf("member assign save unexpected error: %s", err))
-
-	mp, err := groupRepo.Members(context.Background(), group.ID, "things", pm)
-	require.Nil(t, err, fmt.Sprintf("member assign save unexpected error: %s", err))
-	assert.True(t, mp.Total == 1, fmt.Sprintf("retrieve members of a group: expected %d got %d\n", 1, mp.Total))
-
-	err = groupRepo.Assign(context.Background(), group.ID, "things", mid)
-	assert.True(t, errors.Contains(err, auth.ErrMemberAlreadyAssigned), fmt.Sprintf("assign member again: expected %v got %v\n", auth.ErrMemberAlreadyAssigned, err))
-}
-
-func TestUnassign(t *testing.T) {
-	t.Cleanup(func() { cleanUp(t) })
-	dbMiddleware := postgres.NewDatabase(db)
-	groupRepo := postgres.NewGroupRepo(dbMiddleware)
-
-	uid, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	creationTime := time.Now().UTC()
-	group := auth.Group{
-		ID:        generateGroupID(t),
-		Name:      groupName + "Updated",
-		OwnerID:   uid,
-		CreatedAt: creationTime,
-		UpdatedAt: creationTime,
-	}
-
-	pm := auth.PageMetadata{
-		Offset: 0,
-		Limit:  10,
-	}
-
-	group, err = groupRepo.Save(context.Background(), group)
-	require.Nil(t, err, fmt.Sprintf("group save got unexpected error: %s", err))
-
-	mid, err := idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-	err = groupRepo.Assign(context.Background(), group.ID, "things", mid)
-	require.Nil(t, err, fmt.Sprintf("member assign unexpected error: %s", err))
-
-	mid, err = idProvider.ID()
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-	err = groupRepo.Assign(context.Background(), group.ID, "things", mid)
-	require.Nil(t, err, fmt.Sprintf("member assign unexpected error: %s", err))
-
-	mp, err := groupRepo.Members(context.Background(), group.ID, "things", pm)
-	require.Nil(t, err, fmt.Sprintf("member assign save unexpected error: %s", err))
-	assert.True(t, mp.Total == 2, fmt.Sprintf("retrieve members of a group: expected %d got %d\n", 2, mp.Total))
-
-	err = groupRepo.Unassign(context.Background(), group.ID, mid)
-	require.Nil(t, err, fmt.Sprintf("member unassign save unexpected error: %s", err))
-
-	mp, err = groupRepo.Members(context.Background(), group.ID, "things", pm)
-	require.Nil(t, err, fmt.Sprintf("members retrieve unexpected error: %s", err))
-	assert.True(t, mp.Total == 1, fmt.Sprintf("retrieve members of a group: expected %d got %d\n", 1, mp.Total))
-}
-
-func cleanUp(t *testing.T) {
-	_, err := db.Exec("delete from group_relations")
-	require.Nil(t, err, fmt.Sprintf("clean relations unexpected error: %s", err))
-	_, err = db.Exec("delete from groups")
-	require.Nil(t, err, fmt.Sprintf("clean groups unexpected error: %s", err))
-}