Added changelog for 0.10.0 release (#984 )

Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com>
Fix MQTT protobuf file name (#981 )
2026-08-07 23:32:14 +00:00 · 2019-12-17 17:32:27 +01:00 · 2019-12-16 18:05:59 +01:00 · 2019-12-16 16:22:09 +01:00 · 2019-12-16 16:06:37 +01:00 · 2019-12-10 18:53:14 +01:00
2025 changed files with 290488 additions and 212254 deletions
@@ -1,7 +1,6 @@
 .git
 .github
 build
-ui
 docker
 docs
 k8s
@@ -1,14 +1,15 @@
 # Docker: Environment variables in Compose

-## NGINX
+## NginX
 MF_NGINX_HTTP_PORT=80
 MF_NGINX_SSL_PORT=443
-MF_NGINX_MQTT_PORT=8883
+MF_NGINX_MQTT_PORT=1883
+MF_NGINX_MQTTS_PORT=8883

 ## NATS
 MF_NATS_URL=nats://nats:4222

-## REDIS
+## Redis
 MF_REDIS_TCP_PORT=6379

 ## UI
@@ -25,15 +26,37 @@ MF_JAEGER_CONFIGS=5778
 MF_JAEGER_URL=jaeger:6831

 ## Core Services
+
+### AuthN
+MF_AUTHN_LOG_LEVEL=debug
+MF_AUTHN_HTTP_PORT=8189
+MF_AUTHN_GRPC_PORT=8181
+MF_AUTHN_DB_PORT=5432
+MF_AUTHN_DB_USER=mainflux
+MF_AUTHN_DB_PASS=mainflux
+MF_AUTHN_DB=authn
+MF_AUTHN_SECRET=secret
+
 ### Users
 MF_USERS_LOG_LEVEL=debug
 MF_USERS_HTTP_PORT=8180
-MF_USERS_GRPC_PORT=8181
 MF_USERS_DB_PORT=5432
 MF_USERS_DB_USER=mainflux
 MF_USERS_DB_PASS=mainflux
 MF_USERS_DB=users
-MF_USERS_SECRET=secret
+
+### Email utility
+MF_EMAIL_DRIVER=smtp
+MF_EMAIL_HOST=smtp.mailtrap.io
+MF_EMAIL_PORT=2525
+MF_EMAIL_USERNAME=18bf7f70705139
+MF_EMAIL_PASSWORD=2b0d302e775b1e
+MF_EMAIL_FROM_ADDRESS=from@example.com
+MF_EMAIL_FROM_NAME=Example
+MF_EMAIL_TEMPLATE=email.tmpl
+
+### Token utility
+MF_TOKEN_RESET_ENDPOINT=/reset-request

 ### Things
 MF_THINGS_LOG_LEVEL=debug
@@ -45,10 +68,9 @@ MF_THINGS_DB_USER=mainflux
 MF_THINGS_DB_PASS=mainflux
 MF_THINGS_DB=things
 MF_THINGS_SECRET=secret
-
-### Normalizer
-MF_NORMALIZER_LOG_LEVEL=debug
-MF_NORMALIZER_PORT=8184
+MF_THINGS_ES_URL=localhost:6379
+MF_THINGS_ES_PASS=
+MF_THINGS_ES_DB=0

 ### WS
 MF_WS_ADAPTER_LOG_LEVEL=debug
@@ -60,16 +82,16 @@ MF_HTTP_ADAPTER_PORT=8185
 ### MQTT
 MF_MQTT_ADAPTER_LOG_LEVEL=debug
 MF_MQTT_ADAPTER_PORT=1883
-MF_MQTT_ADAPTER_WS_PORT=8880
+MF_MQTT_ADAPTER_WS_PORT=8080

-### COAP
+### CoAP
 MF_COAP_ADAPTER_LOG_LEVEL=debug
 MF_COAP_ADAPTER_PORT=5683

 ## Addons Services
 ### Bootstrap
 MF_BOOTSTRAP_LOG_LEVEL=debug
-MF_BOOTSTRAP_PORT=8200
+MF_BOOTSTRAP_PORT=8202
 MF_BOOTSTRAP_DB_PORT=5432
 MF_BOOTSTRAP_DB_USER=mainflux
 MF_BOOTSTRAP_DB_PASS=mainflux
@@ -80,6 +102,24 @@ MF_BOOTSTRAP_DB_SSL_MODE=disable
 MF_LORA_ADAPTER_LOG_LEVEL=debug
 MF_LORA_ADAPTER_MESSAGES_URL=tcp://lora.mqtt.mainflux.io:1883
 MF_LORA_ADAPTER_HTTP_PORT=8187
+MF_LORA_ADAPTER_ROUTE_MAP_URL=localhost:6379
+MF_LORA_ADAPTER_ROUTE_MAP_PASS=
+MF_LORA_ADAPTER_ROUTE_MAP_DB=0
+
+### OPC-UA
+MF_OPCUA_ADAPTER_HTTP_PORT=8188
+MF_OPCUA_ADAPTER_LOG_LEVEL=debug
+MF_OPCUA_ADAPTER_SERVER_URI=opc.tcp://opcua.rocks:4840
+MF_OPCUA_ADAPTER_NODE_NAMESPACE=0
+MF_OPCUA_ADAPTER_NODE_IDENTIFIER=2256
+MF_OPCUA_ADAPTER_POLICY=
+MF_OPCUA_ADAPTER_MODE=
+MF_OPCUA_ADAPTER_CERT_FILE=
+MF_OPCUA_ADAPTER_KEY_FILE=
+MF_OPCUA_ADAPTER_ROUTE_MAP_URL=localhost:6379
+MF_OPCUA_ADAPTER_ROUTE_MAP_PASS=
+MF_OPCUA_ADAPTER_ROUTE_MAP_DB=0
+MF_OPCUA_ADAPTER_EVENT_CONSUMER=opcua

 ### Cassandra Writer
 MF_CASSANDRA_WRITER_LOG_LEVEL=debug
@@ -1,3 +1,8 @@
+# Copyright (c) Mainflux
+# SPDX-License-Identifier: Apache-2.0
+
+# Set your private global .gitignore:
+# https://digitalfortress.tech/tricks/creating-a-global-gitignore/
+
 build

-site/
@@ -11,6 +11,112 @@ Otherwise, whole log in a similar format can be observed via:
 git log --pretty=oneline --abbrev-commit
 ```

+
+## 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)
@@ -1,850 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  digest = "1:6da51e5ec493ad2b44cb04129e2d0a068c8fb9bd6cb5739d199573558696bb94"
-  name = "github.com/Azure/go-ansiterm"
-  packages = [
-    ".",
-    "winterm",
-  ]
-  pruneopts = "UT"
-  revision = "d6e3b3328b783f23731bc4d058875b0371ff8109"
-
-[[projects]]
-  digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761"
-  name = "github.com/BurntSushi/toml"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
-  version = "v0.3.1"
-
-[[projects]]
-  digest = "1:bf42be3cb1519bf8018dfd99720b1005ee028d947124cab3ccf965da59381df6"
-  name = "github.com/Microsoft/go-winio"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "7da180ee92d8bd8bb8c37fc560e673e6557c392f"
-  version = "v0.4.7"
-
-[[projects]]
-  branch = "master"
-  digest = "1:3721a10686511b80c052323423f0de17a8c06d417dbdd3b392b1578432a33aae"
-  name = "github.com/Nvveen/Gotty"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "cd527374f1e5bff4938207604a14f2e38a9cf512"
-
-[[projects]]
-  branch = "master"
-  digest = "1:d6afaeed1502aa28e80a4ed0981d570ad91b2579193404256ce672ed0a609e0d"
-  name = "github.com/beorn7/perks"
-  packages = ["quantile"]
-  pruneopts = "UT"
-  revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
-
-[[projects]]
-  digest = "1:2209584c0f7c9b68c23374e659357ab546e1b70eec2761f03280f69a8fd23d77"
-  name = "github.com/cenkalti/backoff"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "2ea60e5f094469f9e65adb9cd103795b73ae743e"
-  version = "v2.0.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:bb300c7f4b52deb1fcc65f6be624ae3dc289453824c2f1f184963dc41d941a68"
-  name = "github.com/cisco/senml"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "910a55054e168c1122b905e3f8acdc5ff97cbec1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:fc8dbcc2a5de7c093e167828ebbdf551641761d2ad75431d3a167d467a264115"
-  name = "github.com/containerd/continuity"
-  packages = ["pathdriver"]
-  pruneopts = "UT"
-  revision = "c6cef34830231743494fe2969284df7b82cc0ad0"
-
-[[projects]]
-  digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39"
-  name = "github.com/davecgh/go-spew"
-  packages = ["spew"]
-  pruneopts = "UT"
-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:76dc72490af7174349349838f2fe118996381b31ea83243812a97e5a0fd5ed55"
-  name = "github.com/dgrijalva/jwt-go"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
-  version = "v3.2.0"
-
-[[projects]]
-  digest = "1:a5036bc703c3994f70ced9b34e9941381aa6bd03e69a0ce538f43bf14dc8dc98"
-  name = "github.com/docker/docker"
-  packages = [
-    "pkg/namesgenerator",
-    "pkg/random",
-  ]
-  pruneopts = "UT"
-  revision = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363"
-  version = "v1.13.1"
-
-[[projects]]
-  digest = "1:87dcb59127512b84097086504c16595cf8fef35b9e0bfca565dfc06e198158d7"
-  name = "github.com/docker/go-connections"
-  packages = ["nat"]
-  pruneopts = "UT"
-  revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"
-  version = "v0.3.0"
-
-[[projects]]
-  digest = "1:6f82cacd0af5921e99bf3f46748705239b36489464f4529a1589bc895764fb18"
-  name = "github.com/docker/go-units"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "47565b4f722fb6ceae66b95f853feed578a4a51c"
-  version = "v0.3.3"
-
-[[projects]]
-  branch = "master"
-  digest = "1:f77ee3cd73cbf60434b4f72ec46a66773c555d46764399735b5f9a28505f3ece"
-  name = "github.com/dustin/go-coap"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "ddcc80675fa42611359d91a6dfa5aa57fb90e72b"
-
-[[projects]]
-  digest = "1:184008c955d6a3226b700c13ed0e875a7a051a759618f9bccba9b5c99f17faa5"
-  name = "github.com/eclipse/paho.mqtt.golang"
-  packages = [
-    ".",
-    "packets",
-  ]
-  pruneopts = "UT"
-  revision = "36d01c2b4cbeb3d2a12063e4880ce30800af9560"
-  version = "v1.1.1"
-
-[[projects]]
-  digest = "1:865079840386857c809b72ce300be7580cb50d3d3129ce11bf9aa6ca2bc1934a"
-  name = "github.com/fatih/color"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
-  version = "v1.7.0"
-
-[[projects]]
-  digest = "1:80abda6d164916248f3297f714a17b1a33e54bb5694ff283409b4d0320357b3a"
-  name = "github.com/go-kit/kit"
-  packages = [
-    "endpoint",
-    "log",
-    "metrics",
-    "metrics/internal/lv",
-    "metrics/prometheus",
-    "tracing/opentracing",
-    "transport/grpc",
-    "transport/http",
-  ]
-  pruneopts = "UT"
-  revision = "ca4112baa34cb55091301bdc13b1420a122b1b9e"
-  version = "v0.7.0"
-
-[[projects]]
-  digest = "1:31a18dae27a29aa074515e43a443abfd2ba6deb6d69309d8d7ce789c45f34659"
-  name = "github.com/go-logfmt/logfmt"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
-  version = "v0.3.0"
-
-[[projects]]
-  digest = "1:424f6593024cdf0f6f90cba81bc69ca98df3758525e6fb248198ef15ead603a9"
-  name = "github.com/go-redis/redis"
-  packages = [
-    ".",
-    "internal",
-    "internal/consistenthash",
-    "internal/hashtag",
-    "internal/pool",
-    "internal/proto",
-    "internal/singleflight",
-    "internal/util",
-  ]
-  pruneopts = "UT"
-  revision = "7f89fbac80bcc62ce920b6dbc6ca60238d7725d1"
-  version = "v6.15.0"
-
-[[projects]]
-  digest = "1:c4a2528ccbcabf90f9f3c464a5fc9e302d592861bbfd0b7135a7de8a943d0406"
-  name = "github.com/go-stack/stack"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"
-  version = "v1.7.0"
-
-[[projects]]
-  digest = "1:8dfa0b1b7c4b7398d46340aef0f2a58aad5a75959eeeb79e023ab826f0c7f7f0"
-  name = "github.com/go-zoo/bone"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "fd0aebc74e908868b09ac140fb5a53cb363884c1"
-  version = "1.2"
-
-[[projects]]
-  branch = "master"
-  digest = "1:348bbd07b4a983b2f811f81948c78142de09bb9fcf25284bee5e2ab3bdd0f6f9"
-  name = "github.com/gocql/gocql"
-  packages = [
-    ".",
-    "internal/lru",
-    "internal/murmur",
-    "internal/streams",
-  ]
-  pruneopts = "UT"
-  revision = "68ae1e384be4d7cd7df0f5b77f331759d806308e"
-
-[[projects]]
-  digest = "1:bed9d72d596f94e65fff37f4d6c01398074a6bb1c3f3ceff963516bd01db6ff5"
-  name = "github.com/gofrs/uuid"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "6b08a5c5172ba18946672b49749cde22873dd7c2"
-  version = "v3.2.0"
-
-[[projects]]
-  digest = "1:bbadccf3d3317ea03c0dac0b45b673b4b397c8f91a1d2eff550a3c51c4ad770e"
-  name = "github.com/gogo/protobuf"
-  packages = ["proto"]
-  pruneopts = "UT"
-  revision = "636bf0302bc95575d69441b25a2603156ffdddf1"
-  version = "v1.1.1"
-
-[[projects]]
-  digest = "1:5ac24c0ad5dc117fb2b6d90d205c876ec599c09cccb702a36586680e09cb20b5"
-  name = "github.com/golang/protobuf"
-  packages = [
-    "proto",
-    "ptypes",
-    "ptypes/any",
-    "ptypes/duration",
-    "ptypes/empty",
-    "ptypes/timestamp",
-  ]
-  pruneopts = "UT"
-  revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5"
-  version = "v1.2.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:4a0c6bb4805508a6287675fac876be2ac1182539ca8a32468d8128882e9d5009"
-  name = "github.com/golang/snappy"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"
-
-[[projects]]
-  digest = "1:7b5c6e2eeaa9ae5907c391a91c132abfd5c9e8a784a341b5625e750c67e6825d"
-  name = "github.com/gorilla/websocket"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"
-  version = "v1.4.0"
-
-[[projects]]
-  digest = "1:364b908b9b27b97ab838f2f6f1b1f46281fa29b978a037d72a9b1d4f6d940190"
-  name = "github.com/hailocab/go-hostpool"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"
-
-[[projects]]
-  branch = "master"
-  digest = "1:6727359c2ab1efe714cc87acb36be6cf15a3aae078d8ae736a17fec787dab307"
-  name = "github.com/hokaccha/go-prettyjson"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "f579f869bbfea48a61fbea09207cadd1aaeceb83"
-
-[[projects]]
-  digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
-  name = "github.com/inconshreveable/mousetrap"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-  version = "v1.0"
-
-[[projects]]
-  digest = "1:65b0a07f85f7b5cc019c26775efc278a155a5dea0a8aa617c980e8308d16bc55"
-  name = "github.com/influxdata/influxdb"
-  packages = [
-    "client/v2",
-    "models",
-    "pkg/escape",
-  ]
-  pruneopts = "UT"
-  revision = "a2ba6e7654fb078f8a3f5add1f8d935df38161bd"
-  version = "v1.6.4"
-
-[[projects]]
-  branch = "master"
-  digest = "1:965881afde38cce93606988d7ef9cd187b394a8a73b11a7dde379206f5e2fba3"
-  name = "github.com/jmoiron/sqlx"
-  packages = [
-    ".",
-    "reflectx",
-  ]
-  pruneopts = "UT"
-  revision = "cdf62fdf55f66fb2484fe214f89c059f0bd3f567"
-
-[[projects]]
-  branch = "master"
-  digest = "1:a64e323dc06b73892e5bb5d040ced475c4645d456038333883f58934abbf6f72"
-  name = "github.com/kr/logfmt"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:1e537dfb7b4d543e25efa2c812084dd65736f8010979c1b7e167a5b876563199"
-  name = "github.com/lib/pq"
-  packages = [
-    ".",
-    "oid",
-  ]
-  pruneopts = "UT"
-  revision = "d34b9ff171c21ad295489235aec8b6626023cd04"
-
-[[projects]]
-  digest = "1:c658e84ad3916da105a761660dcaeb01e63416c8ec7bc62256a9b411a05fcd67"
-  name = "github.com/mattn/go-colorable"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"
-  version = "v0.0.9"
-
-[[projects]]
-  digest = "1:d4d17353dbd05cb52a2a52b7fe1771883b682806f68db442b436294926bbfafb"
-  name = "github.com/mattn/go-isatty"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-  version = "v0.0.3"
-
-[[projects]]
-  digest = "1:5985ef4caf91ece5d54817c11ea25f182697534f8ae6521eadcd628c142ac4b6"
-  name = "github.com/matttproud/golang_protobuf_extensions"
-  packages = ["pbutil"]
-  pruneopts = "UT"
-  revision = "3247c84500bff8d9fb6d579d800f20b3e091582c"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:4ce94f3d2074662c04677db471456feb56078244ebcfe3789e6e95901c085bc5"
-  name = "github.com/nats-io/go-nats"
-  packages = [
-    ".",
-    "encoders/builtin",
-    "util",
-  ]
-  pruneopts = "UT"
-  revision = "fb0396ee0bdb8018b0fef30d6d1de798ce99cd05"
-  version = "v1.6.0"
-
-[[projects]]
-  digest = "1:c3cd663f2f30b92536b9f290ac85c6310dae36a14cb8961553ae9ccf0d85ae41"
-  name = "github.com/nats-io/nuid"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "289cccf02c178dc782430d534e3c1f5b72af807f"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:ee4d4af67d93cc7644157882329023ce9a7bcfce956a079069a9405521c7cc8d"
-  name = "github.com/opencontainers/go-digest"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf"
-  version = "v1.0.0-rc1"
-
-[[projects]]
-  digest = "1:11db38d694c130c800d0aefb502fb02519e514dc53d9804ce51d1ad25ec27db6"
-  name = "github.com/opencontainers/image-spec"
-  packages = [
-    "specs-go",
-    "specs-go/v1",
-  ]
-  pruneopts = "UT"
-  revision = "d60099175f88c47cd379c4738d158884749ed235"
-  version = "v1.0.1"
-
-[[projects]]
-  digest = "1:1869683e323ebff2bdf8adcb560f82bf6f8d94019d35099e3403f7df12e9c07e"
-  name = "github.com/opencontainers/runc"
-  packages = [
-    "libcontainer/system",
-    "libcontainer/user",
-  ]
-  pruneopts = "UT"
-  revision = "baf6536d6259209c3edfa2b22237af82942d3dfa"
-  version = "v0.1.1"
-
-[[projects]]
-  digest = "1:c2024d8533dc702a6ef5c92d5cf1494858eff4484d8abbf794f21acd29e7ef70"
-  name = "github.com/opentracing/opentracing-go"
-  packages = [
-    ".",
-    "ext",
-    "log",
-    "mocktracer",
-  ]
-  pruneopts = "UT"
-  revision = "659c90643e714681897ec2521c60567dd21da733"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:3b830e06971be8448e7c9e57c9cc15ce53ab7e8846e7b7c39110a177c7fae466"
-  name = "github.com/ory/dockertest"
-  packages = [
-    "docker",
-    "docker/opts",
-    "docker/pkg/archive",
-    "docker/pkg/fileutils",
-    "docker/pkg/homedir",
-    "docker/pkg/idtools",
-    "docker/pkg/ioutils",
-    "docker/pkg/jsonmessage",
-    "docker/pkg/longpath",
-    "docker/pkg/mount",
-    "docker/pkg/pools",
-    "docker/pkg/stdcopy",
-    "docker/pkg/system",
-    "docker/pkg/term",
-    "docker/pkg/term/windows",
-    "docker/types",
-    "docker/types/blkiodev",
-    "docker/types/container",
-    "docker/types/filters",
-    "docker/types/mount",
-    "docker/types/network",
-    "docker/types/registry",
-    "docker/types/strslice",
-    "docker/types/versions",
-  ]
-  pruneopts = "UT"
-  revision = "2e92e7784b6fb199fd168aa46269a2f1b34f299e"
-  version = "v3.3.0"
-
-[[projects]]
-  digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747"
-  name = "github.com/pkg/errors"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
-  version = "v0.8.0"
-
-[[projects]]
-  digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe"
-  name = "github.com/pmezard/go-difflib"
-  packages = ["difflib"]
-  pruneopts = "UT"
-  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:26663fafdea73a38075b07e8e9d82fc0056379d2be8bb4e13899e8fda7c7dd23"
-  name = "github.com/prometheus/client_golang"
-  packages = [
-    "prometheus",
-    "prometheus/internal",
-    "prometheus/promhttp",
-  ]
-  pruneopts = "UT"
-  revision = "abad2d1bd44235a26707c172eab6bca5bf2dbad3"
-  version = "v0.9.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:32d10bdfa8f09ecf13598324dba86ab891f11db3c538b6a34d1c3b5b99d7c36b"
-  name = "github.com/prometheus/client_model"
-  packages = ["go"]
-  pruneopts = "UT"
-  revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
-
-[[projects]]
-  branch = "master"
-  digest = "1:e469cd65badf7694aeb44874518606d93c1d59e7735d3754ad442782437d3cc3"
-  name = "github.com/prometheus/common"
-  packages = [
-    "expfmt",
-    "internal/bitbucket.org/ww/goautoneg",
-    "model",
-  ]
-  pruneopts = "UT"
-  revision = "d811d2e9bf898806ecfb6ef6296774b13ffc314c"
-
-[[projects]]
-  branch = "master"
-  digest = "1:570784e0ddbf67f14087c6d8cfb7b999b9c55e75518a755e88cb202566ea8a17"
-  name = "github.com/prometheus/procfs"
-  packages = [
-    ".",
-    "internal/util",
-    "nfs",
-    "xfs",
-  ]
-  pruneopts = "UT"
-  revision = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"
-
-[[projects]]
-  branch = "master"
-  digest = "1:89cf776c0a621a34017c819b66b9e0f0bb076d3c5b9ca74763fb89570e140038"
-  name = "github.com/rubenv/sql-migrate"
-  packages = [
-    ".",
-    "sqlparse",
-  ]
-  pruneopts = "UT"
-  revision = "ba2c6a7295c59448dbc195cef2f41df5163b3892"
-
-[[projects]]
-  digest = "1:9e9193aa51197513b3abcb108970d831fbcf40ef96aa845c4f03276e1fa316d2"
-  name = "github.com/sirupsen/logrus"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
-  version = "v1.0.5"
-
-[[projects]]
-  digest = "1:d3ffbc45dfe6929a4ba313464c2d761d96325d306eda29512da56c034db2a4dd"
-  name = "github.com/sony/gobreaker"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "b2a34562d02c4d5fd6645399c69e00141fb24e5a"
-  version = "0.4.0"
-
-[[projects]]
-  digest = "1:645cabccbb4fa8aab25a956cbcbdf6a6845ca736b2c64e197ca7cbb9d210b939"
-  name = "github.com/spf13/cobra"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"
-  version = "v0.0.3"
-
-[[projects]]
-  digest = "1:9424f440bba8f7508b69414634aef3b2b3a877e522d8a4624692412805407bb7"
-  name = "github.com/spf13/pflag"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
-  version = "v1.0.1"
-
-[[projects]]
-  digest = "1:c40d65817cdd41fac9aa7af8bed56927bb2d6d47e4fea566a74880f5c2b1c41e"
-  name = "github.com/stretchr/testify"
-  packages = [
-    "assert",
-    "require",
-  ]
-  pruneopts = "UT"
-  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
-  version = "v1.2.2"
-
-[[projects]]
-  digest = "1:3b0ac1ac6f703e6d43f4e29c97da2c9e34465c66e2e19f9828e9841d1c9279a4"
-  name = "github.com/uber/jaeger-client-go"
-  packages = [
-    ".",
-    "config",
-    "internal/baggage",
-    "internal/baggage/remote",
-    "internal/spanlog",
-    "internal/throttler",
-    "internal/throttler/remote",
-    "log",
-    "rpcmetrics",
-    "thrift",
-    "thrift-gen/agent",
-    "thrift-gen/baggage",
-    "thrift-gen/jaeger",
-    "thrift-gen/sampling",
-    "thrift-gen/zipkincore",
-    "transport",
-    "utils",
-  ]
-  pruneopts = "UT"
-  revision = "2f47546e3facd43297739439600bcf43f44cce5d"
-  version = "v2.16.0"
-
-[[projects]]
-  digest = "1:c9d69a04f7fa171f50360bbcc32196b4de8ab8837ef772f6302d0140a1e3e7f6"
-  name = "github.com/uber/jaeger-lib"
-  packages = ["metrics"]
-  pruneopts = "UT"
-  revision = "0e30338a695636fe5bcf7301e8030ce8dd2a8530"
-  version = "v2.0.0"
-
-[[projects]]
-  digest = "1:03aa6e485e528acb119fb32901cf99582c380225fc7d5a02758e08b180cb56c3"
-  name = "github.com/ugorji/go"
-  packages = ["codec"]
-  pruneopts = "UT"
-  revision = "b4c50a2b199d93b13dc15e78929cfb23bfdf21ab"
-  version = "v1.1.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:40fdfd6ab85ca32b6935853bbba35935dcb1d796c8135efd85947566c76e662e"
-  name = "github.com/xdg/scram"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "7eeb5667e42c09cb51bf7b7c28aea8c56767da90"
-
-[[projects]]
-  branch = "master"
-  digest = "1:f5c1d04bc09c644c592b45b9f0bad4030521b1a7d11c7dadbb272d9439fa6e8e"
-  name = "github.com/xdg/stringprep"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "73f8eece6fdcd902c185bf651de50f3828bed5ed"
-
-[[projects]]
-  digest = "1:21f9cb6f1337c4776ed1d2d7b7ed6ffba3269ca12274c065364a5c0edee1f28b"
-  name = "go.mongodb.org/mongo-driver"
-  packages = [
-    "bson",
-    "bson/bsoncodec",
-    "bson/bsonrw",
-    "bson/bsontype",
-    "bson/primitive",
-    "event",
-    "internal",
-    "mongo",
-    "mongo/options",
-    "mongo/readconcern",
-    "mongo/readpref",
-    "mongo/writeconcern",
-    "tag",
-    "version",
-    "x/bsonx",
-    "x/bsonx/bsoncore",
-    "x/mongo/driver",
-    "x/mongo/driver/auth",
-    "x/mongo/driver/auth/internal/gssapi",
-    "x/mongo/driver/session",
-    "x/mongo/driver/topology",
-    "x/mongo/driver/uuid",
-    "x/network/address",
-    "x/network/command",
-    "x/network/compressor",
-    "x/network/connection",
-    "x/network/connstring",
-    "x/network/description",
-    "x/network/result",
-    "x/network/wiremessage",
-  ]
-  pruneopts = "UT"
-  revision = "1c3b9b9a41eecdf056560e07b68e6407b8d598c3"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:7310f5459b88177d24e26c5ec7deb100b78ec03c0437d7a7aaec3c7eac333a55"
-  name = "golang.org/x/crypto"
-  packages = [
-    "bcrypt",
-    "blowfish",
-    "pbkdf2",
-    "ssh/terminal",
-  ]
-  pruneopts = "UT"
-  revision = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06"
-
-[[projects]]
-  branch = "master"
-  digest = "1:70e155783b8dfd4f7697243384e2f361930ff0751459580769ce44d511f38b05"
-  name = "golang.org/x/net"
-  packages = [
-    "context",
-    "http/httpguts",
-    "http2",
-    "http2/hpack",
-    "idna",
-    "internal/socks",
-    "internal/timeseries",
-    "proxy",
-    "trace",
-    "websocket",
-  ]
-  pruneopts = "UT"
-  revision = "f73e4c9ed3b7ebdd5f699a16a880c2b1994e50dd"
-
-[[projects]]
-  branch = "master"
-  digest = "1:e0140c0c868c6e0f01c0380865194592c011fe521d6e12d78bfd33e756fe018a"
-  name = "golang.org/x/sync"
-  packages = ["semaphore"]
-  pruneopts = "UT"
-  revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"
-
-[[projects]]
-  branch = "master"
-  digest = "1:66e34aa65b83061616603ba83517a4523c7261e18afd01c769dd215614bf7d70"
-  name = "golang.org/x/sys"
-  packages = [
-    "unix",
-    "windows",
-  ]
-  pruneopts = "UT"
-  revision = "7dfd1290c7917b7ba22824b9d24954ab3002fe24"
-
-[[projects]]
-  digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18"
-  name = "golang.org/x/text"
-  packages = [
-    "collate",
-    "collate/build",
-    "internal/colltab",
-    "internal/gen",
-    "internal/tag",
-    "internal/triegen",
-    "internal/ucd",
-    "language",
-    "secure/bidirule",
-    "transform",
-    "unicode/bidi",
-    "unicode/cldr",
-    "unicode/norm",
-    "unicode/rangetable",
-  ]
-  pruneopts = "UT"
-  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
-  version = "v0.3.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:cd018653a358d4b743a9d3bee89e825521f2ab2f2ec0770164bf7632d8d73ab7"
-  name = "google.golang.org/genproto"
-  packages = ["googleapis/rpc/status"]
-  pruneopts = "UT"
-  revision = "86e600f69ee4704c6efbf6a2a40a5c10700e76c2"
-
-[[projects]]
-  digest = "1:c3ad9841823db6da420a5625b367913b4ff54bbe60e8e3c98bd20e243e62e2d2"
-  name = "google.golang.org/grpc"
-  packages = [
-    ".",
-    "balancer",
-    "balancer/base",
-    "balancer/roundrobin",
-    "codes",
-    "connectivity",
-    "credentials",
-    "encoding",
-    "encoding/proto",
-    "grpclog",
-    "internal",
-    "internal/backoff",
-    "internal/channelz",
-    "internal/envconfig",
-    "internal/grpcrand",
-    "internal/transport",
-    "keepalive",
-    "metadata",
-    "naming",
-    "peer",
-    "resolver",
-    "resolver/dns",
-    "resolver/passthrough",
-    "stats",
-    "status",
-    "tap",
-  ]
-  pruneopts = "UT"
-  revision = "2e463a05d100327ca47ac218281906921038fd95"
-  version = "v1.16.0"
-
-[[projects]]
-  digest = "1:fa9a7c0ef59217bd22f32eb7cc027894d73f340a5633258cc079dec025db6a7f"
-  name = "gopkg.in/gorp.v1"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "c87af80f3cc5036b55b83d77171e156791085e2e"
-  version = "v1.7.1"
-
-[[projects]]
-  digest = "1:2d1fbdc6777e5408cabeb02bf336305e724b925ff4546ded0fa8715a7267922a"
-  name = "gopkg.in/inf.v0"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"
-  version = "v0.9.1"
-
-[[projects]]
-  digest = "1:de4bc452b049bde272d99e944aabcf218dc22df0a478a42a7107932f82430ae2"
-  name = "gopkg.in/ory-am/dockertest.v3"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "9f1141b78507d23603f6be530587664ebb63a8d2"
-  version = "v3.3.2"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = [
-    "github.com/BurntSushi/toml",
-    "github.com/cisco/senml",
-    "github.com/dgrijalva/jwt-go",
-    "github.com/docker/docker/pkg/namesgenerator",
-    "github.com/dustin/go-coap",
-    "github.com/eclipse/paho.mqtt.golang",
-    "github.com/fatih/color",
-    "github.com/go-kit/kit/endpoint",
-    "github.com/go-kit/kit/log",
-    "github.com/go-kit/kit/metrics",
-    "github.com/go-kit/kit/metrics/prometheus",
-    "github.com/go-kit/kit/tracing/opentracing",
-    "github.com/go-kit/kit/transport/grpc",
-    "github.com/go-kit/kit/transport/http",
-    "github.com/go-redis/redis",
-    "github.com/go-zoo/bone",
-    "github.com/gocql/gocql",
-    "github.com/gofrs/uuid",
-    "github.com/gogo/protobuf/proto",
-    "github.com/golang/protobuf/proto",
-    "github.com/golang/protobuf/ptypes/empty",
-    "github.com/gorilla/websocket",
-    "github.com/hokaccha/go-prettyjson",
-    "github.com/influxdata/influxdb/client/v2",
-    "github.com/jmoiron/sqlx",
-    "github.com/lib/pq",
-    "github.com/nats-io/go-nats",
-    "github.com/opentracing/opentracing-go",
-    "github.com/opentracing/opentracing-go/mocktracer",
-    "github.com/prometheus/client_golang/prometheus",
-    "github.com/prometheus/client_golang/prometheus/promhttp",
-    "github.com/rubenv/sql-migrate",
-    "github.com/sony/gobreaker",
-    "github.com/spf13/cobra",
-    "github.com/stretchr/testify/assert",
-    "github.com/stretchr/testify/require",
-    "github.com/uber/jaeger-client-go/config",
-    "go.mongodb.org/mongo-driver/bson",
-    "go.mongodb.org/mongo-driver/mongo",
-    "go.mongodb.org/mongo-driver/mongo/options",
-    "golang.org/x/crypto/bcrypt",
-    "golang.org/x/net/context",
-    "google.golang.org/grpc",
-    "google.golang.org/grpc/codes",
-    "google.golang.org/grpc/credentials",
-    "google.golang.org/grpc/status",
-    "gopkg.in/ory-am/dockertest.v3",
-  ]
-  solver-name = "gps-cdcl"
-  solver-version = 1
@@ -1,120 +0,0 @@
-[[constraint]]
-  name = "github.com/cisco/senml"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/dgrijalva/jwt-go"
-  version = "3.2.0"
-
-[[constraint]]
-  name = "github.com/eclipse/paho.mqtt.golang"
-  version = "1.1.1"
-
-[[constraint]]
-  name = "github.com/fatih/color"
-  version = "1.7.0"
-
-[[constraint]]
-  name = "github.com/go-kit/kit"
-  version = "0.7.0"
-
-[[constraint]]
-  name = "github.com/go-zoo/bone"
-  version = "1.2.0"
-
-[[constraint]]
-  name = "github.com/golang/protobuf"
-  version = "1.2.0"
-
-[[constraint]]
-  name = "github.com/hokaccha/go-prettyjson"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/lib/pq"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/nats-io/go-nats"
-  version = "1.6.0"
-
-[[constraint]]
-  name = "github.com/prometheus/client_golang"
-  version = "0.9.1"
-
-[[constraint]]
-  name = "github.com/sony/gobreaker"
-  version = "0.4.0"
-
-[[constraint]]
-  name = "github.com/spf13/cobra"
-  version = "0.0.3"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.2.2"
-
-[[constraint]]
-  name = "golang.org/x/crypto"
-  branch = "master"
-
-[[constraint]]
-  name = "gopkg.in/ory-am/dockertest.v3"
-  version = "3.3.2"
-
-[[constraint]]
-  name = "github.com/gorilla/websocket"
-  version = "1.4.0"
-
-[[constraint]]
-  name = "github.com/rubenv/sql-migrate"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/jmoiron/sqlx"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/influxdata/influxdb"
-  version = "1.6.4"
-
-
-[[constraint]]
-  name = "github.com/gocql/gocql"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/dustin/go-coap"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/gogo/protobuf"
-  version = "1.1.1"
-
-[[constraint]]
-  name = "google.golang.org/grpc"
-  version = "1.16.0"
-
-[[constraint]]
-  name = "github.com/go-redis/redis"
-  version = "v6.15.0"
-
-[[constraint]]
-  name = "go.mongodb.org/mongo-driver"
-  version = "~1.0.0"
-
-[[constraint]]
-  name = "github.com/BurntSushi/toml"
-  version = "~v0.3.1"
-
-[[constraint]]
-  name = "github.com/gofrs/uuid"
-  version = "~v3.2.0"
-
-[[constraint]]
-  name = "github.com/opentracing/opentracing-go"
-  version = "~v1.1.0"
-
-[prune]
-  go-tests = true
-  unused-packages = true
@@ -1,44 +1,48 @@
-## Copyright (c) 2015-2019
-## Mainflux
-##
-## SPDX-License-Identifier: Apache-2.0
+# Copyright (c) Mainflux
+# SPDX-License-Identifier: Apache-2.0

 BUILD_DIR = build
-SERVICES = users things http normalizer ws coap lora influxdb-writer influxdb-reader mongodb-writer mongodb-reader cassandra-writer cassandra-reader postgres-writer postgres-reader cli bootstrap
+SERVICES = users things http ws coap lora influxdb-writer influxdb-reader mongodb-writer \
+	mongodb-reader cassandra-writer cassandra-reader postgres-writer postgres-reader cli \
+	bootstrap opcua authn
 DOCKERS = $(addprefix docker_,$(SERVICES))
 DOCKERS_DEV = $(addprefix docker_dev_,$(SERVICES))
 CGO_ENABLED ?= 0
 GOARCH ?= amd64

 define compile_service
-	CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build -ldflags "-s -w" -o ${BUILD_DIR}/mainflux-$(1) cmd/$(1)/main.go
+	CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build -mod=vendor -ldflags "-s -w" -o ${BUILD_DIR}/mainflux-$(1) cmd/$(1)/main.go
 endef

 define make_docker
+	$(eval svc=$(subst docker_,,$(1)))
+
 	docker build \
 		--no-cache \
-		--build-arg SVC=$(subst docker_,,$(1)) \
+		--build-arg SVC=$(svc) \
 		--build-arg GOARCH=$(GOARCH) \
 		--build-arg GOARM=$(GOARM) \
-		--tag=mainflux/$(subst docker_,,$(1))-$(2) \
+		--tag=mainflux/$(svc) \
 		-f docker/Dockerfile .
 endef

 define make_docker_dev
+	$(eval svc=$(subst docker_dev_,,$(1)))
+
 	docker build \
 		--no-cache \
-		--build-arg SVC=$(subst docker_dev_,,$(1)) \
-		--tag=mainflux/$(subst docker_dev_,,$(1)) \
+		--build-arg SVC=$(svc) \
+		--tag=mainflux/$(svc) \
 		-f docker/Dockerfile.dev ./build
 endef

 all: $(SERVICES) mqtt

-.PHONY: all $(SERVICES) dockers dockers_dev latest release mqtt ui latest_manifest
+.PHONY: all $(SERVICES) dockers dockers_dev latest release mqtt

 clean:
 	rm -rf ${BUILD_DIR}
-	rm -rf mqtt/node_modules
+	rm -rf mqtt/aedes/node_modules

 cleandocker:
 	# Stop all containers (if running)
@@ -59,11 +63,12 @@ ifdef pv
 	# Remove unused volumes
 	docker volume ls -f name=mainflux -f dangling=true -q | xargs -r docker volume rm
 endif
+
 install:
 	cp ${BUILD_DIR}/* $(GOBIN)

 test:
-	go test -v -race -count 1 -tags test $(shell go list ./... | grep -v 'vendor\|cmd')
+	go test -mod=vendor -v -race -count 1 -tags test $(shell go list ./... | grep -v 'vendor\|cmd')

 proto:
 	protoc --gofast_out=plugins=grpc:. *.proto
@@ -77,80 +82,61 @@ $(DOCKERS):
 $(DOCKERS_DEV):
 	$(call make_docker_dev,$(@))

-docker_ui:
-	$(MAKE) -C ui docker
-
 docker_mqtt:
 	# MQTT Docker build must be done from root dir because it copies .proto files
 ifeq ($(GOARCH), arm)
-	docker build --tag=mainflux/mqtt-arm -f mqtt/Dockerfile.arm .
+	docker build --tag=mainflux/mqtt -f mqtt/aedes/Dockerfile.arm .
 else
-	docker build --tag=mainflux/mqtt-amd64 -f mqtt/Dockerfile .
+	docker build --tag=mainflux/mqtt -f mqtt/aedes/Dockerfile .
 endif

-dockers: $(DOCKERS) docker_ui docker_mqtt
+docker_mqtt_verne:
+	docker build --tag=mainflux/mqtt-verne -f mqtt/verne/Dockerfile .
+
+dockers: $(DOCKERS) docker_mqtt

 dockers_dev: $(DOCKERS_DEV)

-ui:
-	$(MAKE) -C ui
-
 mqtt:
-	cd mqtt && npm install
+	cd mqtt/aedes && npm install

 define docker_push
 	for svc in $(SERVICES); do \
-		docker push mainflux/$$svc-$(1):$(2); \
+		docker push mainflux/$$svc:$(1); \
 	done
-	docker push mainflux/ui-$(1):$(2)
-	docker push mainflux/mqtt-$(1):$(2)
+	docker push mainflux/mqtt:$(1)
 endef

 changelog:
 	git log $(shell git describe --tags --abbrev=0)..HEAD --pretty=format:"- %s"

-define docker_manifest
-	for svc in $(SERVICES); do \
-		docker manifest create mainflux/$$svc:$(1) mainflux/$$svc-amd64:$(1) mainflux/$$svc-arm:$(1); \
-		docker manifest annotate mainflux/$$svc:$(1) mainflux/$$svc-arm:$(1) --arch arm --variant v7; \
-		docker manifest push mainflux/$$svc:$(1); \
-	done
-	docker manifest create mainflux/ui:$(1) mainflux/ui-amd64:$(1) mainflux/ui-arm:$(1)
-	docker manifest annotate mainflux/ui:$(1) mainflux/ui-arm:$(1) --arch arm --variant v7
-	docker manifest push mainflux/ui:$(1)
-	docker manifest create mainflux/mqtt:$(1) mainflux/mqtt-amd64:$(1) mainflux/mqtt-arm:$(1)
-	docker manifest annotate mainflux/mqtt:$(1) mainflux/mqtt-arm:$(1) --arch arm --variant v7
-	docker manifest push mainflux/mqtt:$(1)
-endef
-
 latest: dockers
-	$(call docker_push,$(GOARCH),latest)
-
-latest_manifest:
-	$(call docker_manifest,latest)
+	$(call docker_push,latest)

 release:
 	$(eval version = $(shell git describe --abbrev=0 --tags))
 	git checkout $(version)
-	GOARCH=$(GOARCH) GOARM=$(GOARM) $(MAKE) dockers
+	$(MAKE) dockers
 	for svc in $(SERVICES); do \
-		docker tag mainflux/$$svc-$(GOARCH) mainflux/$$svc-$(GOARCH):$(version); \
+		docker tag mainflux/$$svc mainflux/$$svc:$(version); \
 	done
-	docker tag mainflux/ui mainflux/ui-$(GOARCH):$(version)
-	docker tag mainflux/mqtt mainflux/mqtt-$(GOARCH):$(version)
-	$(call docker_push,$(GOARCH),$(version))
-	$(call docker_manifest,$(version))
+	docker tag mainflux/ui mainflux/ui:$(version)
+	docker tag mainflux/mqtt mainflux/mqtt:$(version)
+	$(call docker_push,$(version))

 rundev:
 	cd scripts && ./run.sh

 run:
-	docker-compose -f docker/docker-compose.yml up
-
-runui:
-	$(MAKE) -C ui run
+	docker-compose -f docker/docker-compose.yml -f docker/aedes.yml up

 runlora:
-	docker-compose -f docker/docker-compose.yml up -d
-	docker-compose -f docker/addons/influxdb-writer/docker-compose.yml up -d
-	docker-compose -f docker/addons/lora-adapter/docker-compose.yml up
+	docker-compose \
+		-f docker/docker-compose.yml \
+		-f docker/aedes.yml up \
+		-f docker/addons/influxdb-writer/docker-compose.yml \
+		-f docker/addons/lora-adapter/docker-compose.yml up \
+
+# Run all Mainflux core services except distributed tracing system - Jaeger. Recommended on gateways:
+rungw:
+	MF_JAEGER_URL= docker-compose -f docker/docker-compose.yml -f docker/aedes.yml up --scale jaeger=0
@@ -8,7 +8,7 @@

 ![banner][banner]

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

 It accepts user and thing connections over various network protocols (i.e. HTTP,
 MQTT, WebSocket, CoAP), thus making a seamless bridge between them. It is used as the IoT middleware
@@ -17,15 +17,17 @@ for building complex IoT 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 company][company],
+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.

 ## Features
- Multi-protocol connectivity and protocol bridging (HTTP, MQTT, WebSocket and CoAP)
- Device management and provisioning
+
+- Multi-protocol connectivity and bridging (HTTP, MQTT, WebSocket and CoAP)
+- Device management and provisioning (Zero Touch provisioning)
+- Mutual TLS Authentication (mTLS) using X.509 Certificates
 - Fine-grained access control
- Storage support (Cassandra, InfluxDB and MongoDB)
- Platform logging and instrumentation support
+- Message persistence (Cassandra, InfluxDB, MongoDB and PostgresSQL)
+- Platform logging and instrumentation support (Grafana, Prometheus and OpenTracing)
 - Event sourcing
 - Container-based deployment using [Docker][docker] and [Kubernetes][kubernetes]
 - [LoRaWAN][lora] network integration
@@ -34,78 +36,101 @@ which maintains the project and offers professional services around it.
 - Small memory footprint and fast execution
 - Domain-driven design architecture, high-quality code and test coverage

+## Prerequisites
+
+The following are needed to run Mainflux:
+
+- [Docker](https://docs.docker.com/install/) (version 18.09)
+- [Docker compose](https://docs.docker.com/compose/install/) (version 1.24.1)
+
+Developing Mainflux will also require:
+
+- [Go](https://golang.org/doc/install) (version 1.13.3)
+- [Protobuf](https://github.com/protocolbuffers/protobuf#protocol-compiler-installation) (version 3.6.1)
+
 ## Install
-Before proceeding, install the following prerequisites:

- [Docker](https://docs.docker.com/install/)
- [Docker compose](https://docs.docker.com/compose/install/)
-
-Once everything is installed, execute the following commands from project root:
+Once the prerequisites are installed, execute the following commands from the project's root:

 ```bash
-docker-compose -f docker/docker-compose.yml up -d
+docker-compose -f docker/docker-compose.yml -f docker/aedes.yml up
 ```

-This will bring up all Mainflux dockers and inter-connect them in the composition.
+This will bring up the Mainflux docker services and interconnect them. This command can also be executed using the project's included Makefile:
+
+```bash
+make run
+```

 ## Usage
-Best way to quickstart using Mainflux is via CLI:
-```
+
+The quickest way to start using Mainflux is via the CLI. The latest version can be downloaded from the [official releases page][rel]. 
+
+It can also be built and used from the project's root directory:
+
+```bash
 make cli
 ./build/mainflux-cli version
 ```

-> Mainflux CLI can also be downloaded as a tarball from [offical release page][rel]
-
-If this works, head to [official documentation][docs] to understand Mainflux provisioning and messaging.
+Additional details on using the CLI can be found in the [CLI documentation](https://mainflux.readthedocs.io/en/latest/cli/).

 ## Documentation
-Official documentation is hosted at [Mainflux Read The Docs page][docs].

-Documentation is auto-generated from Markdown files in `./docs` directory.
-If you spot an error or need for corrections, please let us know - or even better: send us a PR.
+Official documentation is hosted at [Mainflux Read The Docs page][docs]. Documentation is auto-generated from Markdown files in `./docs` directory. These can be viewed locally by [installing mkdocs](https://www.mkdocs.org/#installation) and running the command:
+
+```bash
+mkdocs serve
+```
+
+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].

 Additionally, [@nmarcetic][nikola] and [@janko-isidorovic][janko] assured
 overall architecture and design, while [@manuio][manu] and [@darkodraskovic][darko]
-helped with crafting initial implementation and continiusly work on the project evolutions.
+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] and a large set of contributors.
+[@gsaleh][george], [@blokovi][iva], [@chombium][kole], [@mteodor][mirko] and a large set of contributors.

 Maintainers are listed in [MAINTAINERS](MAINTAINERS) file.

-Mainflux team would like to give special thanks to [@mijicd][dejan] for his monumental work
-on designing and implementing highly improved and optimized version of the platform,
-and [@malidukica][dusanm] for his effort on implementing initial user interface.
+The Mainflux team would like to give special thanks to [@mijicd][dejan] for his monumental work
+on designing and implementing a highly improved and optimized version of the platform,
+and [@malidukica][dusanm] for his effort on implementing the initial user interface.

 ## Contributing
-Thank you for your interest in Mainflux and wish to contribute!

-1. Take a look at our [open issues](https://github.com/mainflux/mainflux/issues).
+Thank you for your interest in Mainflux and the desire to contribute!
+
+1. Take a look at our [open issues](https://github.com/mainflux/mainflux/issues). The [good-first-issue](https://github.com/mainflux/mainflux/labels/good-first-issue) label is specifically for issues that are great for getting started.
 2. Checkout the [contribution guide](CONTRIBUTING.md) to learn more about our style and conventions.
 3. Make your changes compatible to our workflow.

 ### 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>.

-Note that the best way to grab our attention is by sending PRs :sunglasses:.
+>The best way to grab our attention is by sending PRs :sunglasses:.

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

 ## License
+
 [Apache-2.0](LICENSE)

-[banner]: https://github.com/mainflux/mainflux/blob/master/docs/img/gopherBanner.jpg
+[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
@@ -140,3 +165,4 @@ Note that the best way to grab our attention is by sending PRs :sunglasses:.
 [iva]: https://github.com/blokovi
 [kole]: https://github.com/chombium
 [dusanm]: https://github.com/malidukica
+[mirko]: https://github.com/mteodor
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package mainflux

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 syntax = "proto3";

@@ -12,17 +8,18 @@ package mainflux;
 import "google/protobuf/empty.proto";

 service ThingsService {
-    rpc CanAccess(AccessReq) returns (ThingID) {}
+    rpc CanAccessByKey(AccessByKeyReq) returns (ThingID) {}
    rpc CanAccessByID(AccessByIDReq) returns (google.protobuf.Empty) {}
    rpc Identify(Token) returns (ThingID) {}
 }

-service UsersService {
+service AuthNService {
+    rpc Issue(IssueReq) returns (Token) {}
    rpc Identify(Token) returns (UserID) {}
 }

-message AccessReq {
-    string token = 1;
+message AccessByKeyReq {
+    string token  = 1;
    string chanID = 2;
 }

@@ -32,9 +29,12 @@ message ThingID {

 message AccessByIDReq {
    string thingID = 1;
-    string chanID = 2;
+    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;
 }
@@ -42,3 +42,8 @@ message Token {
 message UserID {
    string value = 1;
 }
+
+message IssueReq {
+    string issuer = 1;
+    uint32 type   = 2;
+}
@@ -0,0 +1,106 @@
+# Authentication service
+
+Authentication service provides an API for managing authentication keys.
+
+There are *three types of authentication keys*:
+
+- user key - keys issued to the user upon login request
+- API key - keys issued upon the user request
+- recovery key - password recovery key
+
+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_. 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].
+
+The following actions are supported:
+
+- create (all key types)
+- verify (all key types)
+- obtain (API keys only; secret is never obtained)
+- revoke (API keys only)
+
+## Configuration
+
+The service is configured using the environment variables presented in the
+following table. Note that any unset variables will be replaced with their
+default values.
+
+| Variable                  | Description                                                              | Default       |
+|---------------------------|--------------------------------------------------------------------------|---------------|
+| MF_AUTHN_LOG_LEVEL        | Service level (debug, info, warn, error)                                | error          |
+| MF_AUTHN_DB_HOST          | Database host address                                                   | localhost      |
+| MF_AUTHN_DB_PORT          | Database host port                                                      | 5432           |
+| MF_AUTHN_DB_USER          | Database user                                                           | mainflux       |
+| MF_AUTHN_DB_PASSWORD      | Database password                                                       | mainflux       |
+| MF_AUTHN_DB               | Name of the database used by the service                                | auth           |
+| MF_AUTHN_DB_SSL_MODE      | Database connection SSL mode (disable, require, verify-ca, verify-full) | disable        |
+| MF_AUTHN_DB_SSL_CERT      | Path to the PEM encoded certificate file                                |                |
+| MF_AUTHN_DB_SSL_KEY       | Path to the PEM encoded key file                                        |                |
+| MF_AUTHN_DB_SSL_ROOT_CERT | Path to the PEM encoded root certificate file                           |                |
+| MF_AUTHN_HTTP_PORT        | Authn service HTTP port                                                 | 8180           |
+| MF_AUTHN_GRPC_PORT        | Authn service gRPC port                                                 | 8181           |
+| MF_AUTHN_SERVER_CERT      | Path to server certificate in pem format                                |                |
+| MF_AUTHN_SERVER_KEY       | Path to server key in pem format                                        |                |
+| MF_AUTHN_SECRET           | String used for signing tokens                                          | auth           |
+| MF_JAEGER_URL             | Jaeger server URL                                                       | localhost:6831 |
+
+## Deployment
+
+The service itself is distributed as Docker container. The following snippet
+provides a compose file template that can be used to deploy the service container
+locally:
+
+```yaml
+version: "2"
+services:
+  authn:
+    image: mainflux/authn:[version]
+    container_name: [instance name]
+    ports:
+      - [host machine port]:[configured HTTP port]
+    environment:
+      MF_AUTHN_LOG_LEVEL: [Service log level]
+      MF_AUTHN_DB_HOST: [Database host address]
+      MF_AUTHN_DB_PORT: [Database host port]
+      MF_AUTHN_DB_USER: [Database user]
+      MF_AUTHN_DB_PASS: [Database password]
+      MF_AUTHN_DB: [Name of the database used by the service]
+      MF_AUTHN_DB_SSL_MODE: [SSL mode to connect to the database with]
+      MF_AUTHN_DB_SSL_CERT: [Path to the PEM encoded certificate file]
+      MF_AUTHN_DB_SSL_KEY: [Path to the PEM encoded key file]
+      MF_AUTHN_DB_SSL_ROOT_CERT: [Path to the PEM encoded root certificate file]
+      MF_AUTHN_HTTP_PORT: [Service HTTP port]
+      MF_AUTHN_GRPC_PORT: [Service gRPC port]
+      MF_AUTHN_SECRET: [String used for signing tokens]
+      MF_AUTHN_SERVER_CERT: [String path to server certificate in pem format]
+      MF_AUTHN_SERVER_KEY: [String path to server key in pem format]
+      MF_JAEGER_URL: [Jaeger server URL]
+```
+
+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
+
+cd $GOPATH/src/github.com/mainflux/mainflux
+
+# compile the service
+make authn
+
+# copy binary to bin
+make install
+
+# set the environment variables and run the service
+MF_AUTHN_LOG_LEVEL=[Service log level] MF_AUTHN_DB_HOST=[Database host address] MF_AUTHN_DB_PORT=[Database host port] MF_AUTHN_DB_USER=[Database user] MF_AUTHN_DB_PASS=[Database password] MF_AUTHN_DB=[Name of the database used by the service] MF_AUTHN_DB_SSL_MODE=[SSL mode to connect to the database with] MF_AUTHN_DB_SSL_CERT=[Path to the PEM encoded certificate file] MF_AUTHN_DB_SSL_KEY=[Path to the PEM encoded key file] MF_AUTHN_DB_SSL_ROOT_CERT=[Path to the PEM encoded root certificate file] MF_AUTHN_HTTP_PORT=[Service HTTP port] MF_AUTHN_GRPC_PORT=[Service gRPC port] MF_AUTHN_SECRET=[String used for signing tokens] MF_AUTHN_SERVER_CERT=[Path to server certificate] MF_AUTHN_SERVER_KEY=[Path to server key] MF_JAEGER_URL=[Jaeger server URL] $GOBIN/mainflux-authn
+```
+
+If `MF_EMAIL_TEMPLATE` doesn't point to any file service will function but password reset functionality will not work.
+
+## Usage
+
+For more information about service capabilities and its usage, please check out
+the [API documentation](swagger.yaml).
+
+[doc]: http://mainflux.readthedocs.io
@@ -0,0 +1,5 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+// Package api contains implementation of AuthN service HTTP API.
+package api
@@ -0,0 +1,94 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package grpc
+
+import (
+	"time"
+
+	"github.com/go-kit/kit/endpoint"
+	kitot "github.com/go-kit/kit/tracing/opentracing"
+	kitgrpc "github.com/go-kit/kit/transport/grpc"
+	opentracing "github.com/opentracing/opentracing-go"
+
+	"github.com/mainflux/mainflux"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+)
+
+var _ mainflux.AuthNServiceClient = (*grpcClient)(nil)
+
+type grpcClient struct {
+	issue    endpoint.Endpoint
+	identify endpoint.Endpoint
+	timeout  time.Duration
+}
+
+// NewClient returns new gRPC client instance.
+func NewClient(tracer opentracing.Tracer, conn *grpc.ClientConn, timeout time.Duration) mainflux.AuthNServiceClient {
+	return &grpcClient{
+		issue: kitot.TraceClient(tracer, "issue")(kitgrpc.NewClient(
+			conn,
+			"mainflux.AuthNService",
+			"Issue",
+			encodeIssueRequest,
+			decodeIssueResponse,
+			mainflux.UserID{},
+		).Endpoint()),
+		identify: kitot.TraceClient(tracer, "identify")(kitgrpc.NewClient(
+			conn,
+			"mainflux.AuthNService",
+			"Identify",
+			encodeIdentifyRequest,
+			decodeIdentifyResponse,
+			mainflux.UserID{},
+		).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{issuer: req.GetIssuer(), keyType: req.Type})
+	if err != nil {
+		return nil, err
+	}
+
+	ir := res.(identityRes)
+	return &mainflux.Token{Value: ir.id}, ir.err
+}
+
+func encodeIssueRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
+	req := grpcReq.(issueReq)
+	return &mainflux.IssueReq{Issuer: req.issuer, Type: req.keyType}, nil
+}
+
+func decodeIssueResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
+	res := grpcRes.(*mainflux.UserID)
+	return identityRes{res.GetValue(), nil}, nil
+}
+
+func (client grpcClient) Identify(ctx context.Context, token *mainflux.Token, _ ...grpc.CallOption) (*mainflux.UserID, 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.UserID{Value: ir.id}, ir.err
+}
+
+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.UserID)
+	return identityRes{res.GetValue(), nil}, nil
+}
@@ -0,0 +1,5 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+// Package grpc contains implementation of AuthN service gRPC API.
+package grpc
@@ -0,0 +1,50 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package grpc
+
+import (
+	"time"
+
+	"github.com/go-kit/kit/endpoint"
+	"github.com/mainflux/mainflux/authn"
+	context "golang.org/x/net/context"
+)
+
+func issueEndpoint(svc authn.Service) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (interface{}, error) {
+		req := request.(issueReq)
+		if err := req.validate(); err != nil {
+			return nil, err
+		}
+
+		now := time.Now().UTC()
+		key := authn.Key{
+			Type:     req.keyType,
+			IssuedAt: now,
+		}
+
+		k, err := svc.Issue(ctx, req.issuer, key)
+		if err != nil {
+			return identityRes{}, err
+		}
+
+		return identityRes{k.Secret, nil}, nil
+	}
+}
+
+func identifyEndpoint(svc authn.Service) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (interface{}, error) {
+		req := request.(identityReq)
+		if err := req.validate(); err != nil {
+			return nil, err
+		}
+
+		id, err := svc.Identify(ctx, req.token)
+		if err != nil {
+			return identityRes{}, err
+		}
+
+		return identityRes{id, nil}, nil
+	}
+}
@@ -0,0 +1,123 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package grpc_test
+
+import (
+	"fmt"
+	"net"
+	"testing"
+	"time"
+
+	"github.com/mainflux/mainflux"
+	"github.com/mainflux/mainflux/authn"
+	grpcapi "github.com/mainflux/mainflux/authn/api/grpc"
+	"github.com/mainflux/mainflux/authn/jwt"
+	"github.com/mainflux/mainflux/authn/mocks"
+	"github.com/opentracing/opentracing-go/mocktracer"
+	"github.com/stretchr/testify/assert"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+const (
+	port   = 8081
+	secret = "secret"
+	email  = "test@example.com"
+)
+
+var svc authn.Service
+
+func newService() authn.Service {
+	repo := mocks.NewKeyRepository()
+	idp := mocks.NewIdentityProvider()
+	t := jwt.New(secret)
+
+	return authn.New(repo, idp, t)
+}
+
+func startGRPCServer(svc authn.Service, port int) {
+	listener, _ := net.Listen("tcp", fmt.Sprintf(":%d", port))
+	server := grpc.NewServer()
+	mainflux.RegisterAuthNServiceServer(server, grpcapi.NewServer(mocktracer.New(), svc))
+	go server.Serve(listener)
+}
+
+func TestIssue(t *testing.T) {
+	loginKey, err := svc.Issue(context.Background(), email, authn.Key{Type: authn.UserKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing login 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 := map[string]struct {
+		token string
+		id    string
+		kind  uint32
+		err   error
+	}{
+		"issue for user with valid token":   {"", email, authn.UserKey, nil},
+		"issue for user that doesn't exist": {"", loginKey.Secret, 32, status.Error(codes.InvalidArgument, "received invalid token request")},
+	}
+
+	for desc, tc := range cases {
+		_, err := client.Issue(context.Background(), &mainflux.IssueReq{Issuer: tc.id, Type: tc.kind})
+		assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s", desc, tc.err, err))
+	}
+}
+
+func TestIdentify(t *testing.T) {
+	loginKey, err := svc.Issue(context.Background(), email, authn.Key{Type: authn.UserKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
+
+	resetKey, err := svc.Issue(context.Background(), loginKey.Secret, authn.Key{Type: authn.RecoveryKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing reset key expected to succeed: %s", err))
+
+	userKey, err := svc.Issue(context.Background(), loginKey.Secret, authn.Key{Type: authn.APIKey, IssuedAt: time.Now(), ExpiresAt: time.Now().Add(time.Minute)})
+	assert.Nil(t, err, fmt.Sprintf("Issuing user 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
+		id    string
+		err   error
+	}{
+		{
+			desc:  "identify user with reset token",
+			token: resetKey.Secret,
+			id:    email,
+			err:   nil,
+		},
+		{
+			desc:  "identify user with user token",
+			token: userKey.Secret,
+			id:    email,
+			err:   nil,
+		},
+		{
+			desc:  "identify user with invalid login token",
+			token: "invalid",
+			id:    "",
+			err:   status.Error(codes.Unauthenticated, "unauthorized access"),
+		},
+		{
+			desc:  "identify user that doesn't exist",
+			token: "",
+			id:    "",
+			err:   status.Error(codes.InvalidArgument, "received invalid token request"),
+		},
+	}
+
+	for _, tc := range cases {
+		id, err := client.Identify(context.Background(), &mainflux.Token{Value: tc.token})
+		assert.Equal(t, tc.id, id.GetValue(), fmt.Sprintf("%s: expected %s got %s", tc.desc, tc.id, id.GetValue()))
+		assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s", tc.desc, tc.err, err))
+	}
+}
@@ -0,0 +1,42 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package grpc
+
+import "github.com/mainflux/mainflux/authn"
+
+type identityReq struct {
+	token string
+	kind  uint32
+}
+
+func (req identityReq) validate() error {
+	if req.token == "" {
+		return authn.ErrMalformedEntity
+	}
+	if req.kind != authn.UserKey &&
+		req.kind != authn.APIKey &&
+		req.kind != authn.RecoveryKey {
+		return authn.ErrMalformedEntity
+	}
+
+	return nil
+}
+
+type issueReq struct {
+	issuer  string
+	keyType uint32
+}
+
+func (req issueReq) validate() error {
+	if req.issuer == "" {
+		return authn.ErrUnauthorizedAccess
+	}
+	if req.keyType != authn.UserKey &&
+		req.keyType != authn.APIKey &&
+		req.keyType != authn.RecoveryKey {
+		return authn.ErrMalformedEntity
+	}
+
+	return nil
+}
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package grpc

@@ -0,0 +1,87 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package grpc
+
+import (
+	kitot "github.com/go-kit/kit/tracing/opentracing"
+	kitgrpc "github.com/go-kit/kit/transport/grpc"
+	mainflux "github.com/mainflux/mainflux"
+	"github.com/mainflux/mainflux/authn"
+	opentracing "github.com/opentracing/opentracing-go"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+var _ mainflux.AuthNServiceServer = (*grpcServer)(nil)
+
+type grpcServer struct {
+	issue    kitgrpc.Handler
+	identify kitgrpc.Handler
+}
+
+// NewServer returns new AuthnServiceServer instance.
+func NewServer(tracer opentracing.Tracer, svc authn.Service) mainflux.AuthNServiceServer {
+	return &grpcServer{
+		issue: kitgrpc.NewServer(
+			kitot.TraceServer(tracer, "issue")(issueEndpoint(svc)),
+			decodeIssueRequest,
+			encodeIssueResponse,
+		),
+		identify: kitgrpc.NewServer(
+			kitot.TraceServer(tracer, "identify")(identifyEndpoint(svc)),
+			decodeIdentifyRequest,
+			encodeIdentifyResponse,
+		),
+	}
+}
+
+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.UserID, error) {
+	_, res, err := s.identify.ServeGRPC(ctx, token)
+	if err != nil {
+		return nil, encodeError(err)
+	}
+	return res.(*mainflux.UserID), nil
+}
+
+func decodeIssueRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
+	req := grpcReq.(*mainflux.IssueReq)
+	return issueReq{issuer: req.GetIssuer(), keyType: req.GetType()}, nil
+}
+
+func encodeIssueResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
+	res := grpcRes.(identityRes)
+	return &mainflux.Token{Value: res.id}, encodeError(res.err)
+}
+
+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.UserID{Value: res.id}, encodeError(res.err)
+}
+
+func encodeError(err error) error {
+	switch err {
+	case nil:
+		return nil
+	case authn.ErrMalformedEntity:
+		return status.Error(codes.InvalidArgument, "received invalid token request")
+	case authn.ErrUnauthorizedAccess, authn.ErrKeyExpired:
+		return status.Error(codes.Unauthenticated, err.Error())
+	default:
+		return status.Error(codes.Internal, "internal server error")
+	}
+}
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package grpc_test

@@ -0,0 +1,83 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package http
+
+import (
+	"context"
+	"time"
+
+	"github.com/go-kit/kit/endpoint"
+	"github.com/mainflux/mainflux/authn"
+)
+
+func issueEndpoint(svc authn.Service) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (interface{}, error) {
+		req := request.(issueKeyReq)
+		if err := req.validate(); err != nil {
+			return nil, err
+		}
+
+		now := time.Now().UTC()
+		newKey := authn.Key{
+			Issuer:   req.issuer,
+			IssuedAt: now,
+			Type:     req.Type,
+		}
+
+		duration := time.Duration(req.Duration * time.Second)
+		if duration != 0 {
+			exp := now.Add(duration)
+			newKey.ExpiresAt = exp
+		}
+
+		key, err := svc.Issue(ctx, req.issuer, newKey)
+		if err != nil {
+			return nil, err
+		}
+
+		res := issueKeyRes{
+			ID:       key.ID,
+			Value:    key.Secret,
+			IssuedAt: key.IssuedAt,
+		}
+		if !key.ExpiresAt.IsZero() {
+			res.ExpiresAt = &key.ExpiresAt
+		}
+		return res, nil
+	}
+}
+
+func revokeEndpoint(svc authn.Service) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (interface{}, error) {
+		req := request.(keyReq)
+
+		if err := req.validate(); err != nil {
+			return nil, err
+		}
+
+		if err := svc.Revoke(ctx, req.issuer, req.id); err != nil {
+			return nil, err
+		}
+
+		return revokeKeyRes{}, nil
+	}
+}
+
+func retrieveEndpoint(svc authn.Service) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (interface{}, error) {
+		req := request.(keyReq)
+
+		if err := req.validate(); err != nil {
+			return nil, err
+		}
+
+		key, err := svc.Retrieve(ctx, req.issuer, req.id)
+
+		if err != nil {
+			return nil, err
+		}
+
+		return key, nil
+	}
+}
@@ -0,0 +1,288 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package http_test
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	authn "github.com/mainflux/mainflux/authn"
+	httpapi "github.com/mainflux/mainflux/authn/api/http"
+	"github.com/mainflux/mainflux/authn/jwt"
+	"github.com/mainflux/mainflux/authn/mocks"
+	"github.com/opentracing/opentracing-go/mocktracer"
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	secret       = "secret"
+	contentType  = "application/json"
+	invalidEmail = "userexample.com"
+	wrongID      = "123e4567-e89b-12d3-a456-000000000042"
+	id           = "123e4567-e89b-12d3-a456-000000000001"
+	email        = "user@example.com"
+)
+
+type issueRequest struct {
+	Duration time.Duration `json:"duration,omitempty"`
+	Type     uint32        `json:"type,omitempty"`
+}
+
+type testRequest struct {
+	client      *http.Client
+	method      string
+	url         string
+	contentType string
+	token       string
+	body        io.Reader
+}
+
+func (tr testRequest) make() (*http.Response, error) {
+	req, err := http.NewRequest(tr.method, tr.url, tr.body)
+	if err != nil {
+		return nil, err
+	}
+	if tr.token != "" {
+		req.Header.Set("Authorization", tr.token)
+	}
+	if tr.contentType != "" {
+		req.Header.Set("Content-Type", tr.contentType)
+	}
+
+	req.Header.Set("Referer", "http://localhost")
+	return tr.client.Do(req)
+}
+
+func newService() authn.Service {
+	repo := mocks.NewKeyRepository()
+	idp := mocks.NewIdentityProvider()
+	t := jwt.New(secret)
+	return authn.New(repo, idp, t)
+}
+
+func newServer(svc authn.Service) *httptest.Server {
+	mux := httpapi.MakeHandler(svc, mocktracer.New())
+	return httptest.NewServer(mux)
+}
+
+func toJSON(data interface{}) string {
+	jsonData, _ := json.Marshal(data)
+	return string(jsonData)
+}
+
+func TestIssue(t *testing.T) {
+	svc := newService()
+	loginKey, err := svc.Issue(context.Background(), email, authn.Key{Type: authn.UserKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
+
+	ts := newServer(svc)
+	defer ts.Close()
+	client := ts.Client()
+
+	lk := issueRequest{Type: authn.UserKey}
+	rk := issueRequest{Type: authn.RecoveryKey}
+	uk := issueRequest{Type: authn.APIKey, Duration: time.Hour}
+
+	cases := []struct {
+		desc   string
+		req    string
+		ct     string
+		token  string
+		status int
+	}{
+		{
+			desc:   "issue login key",
+			req:    toJSON(lk),
+			ct:     contentType,
+			token:  "",
+			status: http.StatusCreated,
+		},
+		{
+			desc:   "issue user key",
+			req:    toJSON(uk),
+			ct:     contentType,
+			token:  loginKey.Secret,
+			status: http.StatusCreated,
+		},
+		{
+			desc:   "issue reset key",
+			req:    toJSON(rk),
+			ct:     contentType,
+			token:  loginKey.Secret,
+			status: http.StatusBadRequest,
+		},
+		{
+			desc: "issue login key wrong content type",
+			req:  toJSON(lk),
+			ct:   "", token: loginKey.Secret,
+			status: http.StatusUnsupportedMediaType,
+		},
+		{
+			desc:   "issue key wrong content type",
+			req:    toJSON(rk),
+			ct:     "",
+			token:  loginKey.Secret,
+			status: http.StatusUnsupportedMediaType,
+		},
+		{
+			desc:   "issue key unauthorized",
+			req:    toJSON(uk),
+			ct:     contentType,
+			token:  "wrong",
+			status: http.StatusForbidden,
+		},
+		{
+			desc:   "issue reset key with empty token",
+			req:    toJSON(rk),
+			ct:     contentType,
+			token:  "",
+			status: http.StatusBadRequest,
+		},
+		{
+			desc:   "issue key with invalid request",
+			req:    "{",
+			ct:     contentType,
+			token:  "",
+			status: http.StatusBadRequest,
+		},
+		{
+			desc:   "issue key with invalid JSON",
+			req:    "{invalid}",
+			ct:     contentType,
+			token:  "",
+			status: http.StatusBadRequest,
+		},
+		{
+			desc:   "issue key with invalid JSON content",
+			req:    `{"Type":{"key":"value"}}`,
+			ct:     contentType,
+			token:  "",
+			status: http.StatusBadRequest,
+		},
+	}
+
+	for _, tc := range cases {
+		req := testRequest{
+			client:      client,
+			method:      http.MethodPost,
+			url:         fmt.Sprintf("%s/keys", ts.URL),
+			contentType: tc.ct,
+			token:       tc.token,
+			body:        strings.NewReader(tc.req),
+		}
+		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))
+	}
+}
+
+func TestRetrieve(t *testing.T) {
+	svc := newService()
+	loginKey, err := svc.Issue(context.Background(), email, authn.Key{Type: authn.UserKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
+	key := authn.Key{Type: authn.APIKey, IssuedAt: time.Now()}
+
+	k, err := svc.Issue(context.Background(), loginKey.Secret, key)
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
+
+	ts := newServer(svc)
+	defer ts.Close()
+	client := ts.Client()
+
+	cases := []struct {
+		desc   string
+		id     string
+		token  string
+		status int
+	}{
+		{
+			desc:   "retrieve an existing key",
+			id:     k.ID,
+			token:  loginKey.Secret,
+			status: http.StatusOK,
+		},
+		{
+			desc:   "retrieve a non-existing key",
+			id:     "non-existing",
+			token:  loginKey.Secret,
+			status: http.StatusNotFound,
+		},
+		{
+			desc:   "retrieve a key unauthorized",
+			id:     k.ID,
+			token:  "wrong",
+			status: http.StatusForbidden,
+		},
+	}
+
+	for _, tc := range cases {
+		req := testRequest{
+			client: client,
+			method: http.MethodGet,
+			url:    fmt.Sprintf("%s/keys/%s", ts.URL, tc.id),
+			token:  tc.token,
+		}
+		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))
+	}
+}
+
+func TestRevoke(t *testing.T) {
+	svc := newService()
+	loginKey, err := svc.Issue(context.Background(), email, authn.Key{Type: authn.UserKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
+	key := authn.Key{Type: authn.APIKey, IssuedAt: time.Now()}
+
+	k, err := svc.Issue(context.Background(), loginKey.Secret, key)
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
+
+	ts := newServer(svc)
+	defer ts.Close()
+	client := ts.Client()
+
+	cases := []struct {
+		desc   string
+		id     string
+		token  string
+		status int
+	}{
+		{
+			desc:   "revoke an existing key",
+			id:     k.ID,
+			token:  loginKey.Secret,
+			status: http.StatusNoContent,
+		},
+		{
+			desc:   "revoke a non-existing key",
+			id:     "non-existing",
+			token:  loginKey.Secret,
+			status: http.StatusNoContent,
+		},
+		{
+			desc:   "revoke a key unauthorized",
+			id:     k.ID,
+			token:  "wrong",
+			status: http.StatusForbidden},
+	}
+
+	for _, tc := range cases {
+		req := testRequest{
+			client: client,
+			method: http.MethodDelete,
+			url:    fmt.Sprintf("%s/keys/%s", ts.URL, tc.id),
+			token:  tc.token,
+		}
+		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))
+	}
+}
@@ -0,0 +1,39 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package http
+
+import (
+	"time"
+
+	"github.com/mainflux/mainflux/authn"
+)
+
+type issueKeyReq struct {
+	issuer   string
+	Type     uint32        `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 == authn.UserKey {
+		return nil
+	}
+	if req.issuer == "" || (req.Type != authn.APIKey) {
+		return authn.ErrMalformedEntity
+	}
+	return nil
+}
+
+type keyReq struct {
+	issuer string
+	id     string
+}
+
+func (req keyReq) validate() error {
+	if req.issuer == "" || req.id == "" {
+		return authn.ErrMalformedEntity
+	}
+	return nil
+}
@@ -0,0 +1,50 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package http
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/mainflux/mainflux"
+)
+
+var (
+	_ mainflux.Response = (*issueKeyRes)(nil)
+	_ mainflux.Response = (*revokeKeyRes)(nil)
+)
+
+type issueKeyRes struct {
+	ID        string     `json:"id,omitempty"`
+	Value     string     `json:"value,omitempty"`
+	IssuedAt  time.Time  `json:"issued_at,omitempty"`
+	ExpiresAt *time.Time `json:"expires_at,omitempty"`
+}
+
+func (res issueKeyRes) Code() int {
+	return http.StatusCreated
+}
+
+func (res issueKeyRes) Headers() map[string]string {
+	return map[string]string{}
+}
+
+func (res issueKeyRes) Empty() bool {
+	return res.Value == ""
+}
+
+type revokeKeyRes struct {
+}
+
+func (res revokeKeyRes) Code() int {
+	return http.StatusNoContent
+}
+
+func (res revokeKeyRes) Headers() map[string]string {
+	return map[string]string{}
+}
+
+func (res revokeKeyRes) Empty() bool {
+	return true
+}
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package http

@@ -11,7 +7,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"net/http"
 	"strings"
@@ -20,62 +15,70 @@ import (
 	kithttp "github.com/go-kit/kit/transport/http"
 	"github.com/go-zoo/bone"
 	"github.com/mainflux/mainflux"
-	log "github.com/mainflux/mainflux/logger"
-	"github.com/mainflux/mainflux/users"
-	opentracing "github.com/opentracing/opentracing-go"
+	"github.com/mainflux/mainflux/authn"
+	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )

 const contentType = "application/json"

-var (
-	errUnsupportedContentType = errors.New("unsupported content type")
-	logger                    log.Logger
-)
+var errUnsupportedContentType = errors.New("unsupported content type")

 // MakeHandler returns a HTTP handler for API endpoints.
-func MakeHandler(svc users.Service, tracer opentracing.Tracer, l log.Logger) http.Handler {
-	logger = l
-
+func MakeHandler(svc authn.Service, tracer opentracing.Tracer) http.Handler {
 	opts := []kithttp.ServerOption{
 		kithttp.ServerErrorEncoder(encodeError),
 	}

 	mux := bone.New()

-	mux.Post("/users", kithttp.NewServer(
-		kitot.TraceServer(tracer, "register")(registrationEndpoint(svc)),
-		decodeCredentials,
+	mux.Post("/keys", kithttp.NewServer(
+		kitot.TraceServer(tracer, "issue")(issueEndpoint(svc)),
+		decodeIssue,
 		encodeResponse,
 		opts...,
 	))

-	mux.Post("/tokens", kithttp.NewServer(
-		kitot.TraceServer(tracer, "login")(loginEndpoint(svc)),
-		decodeCredentials,
+	mux.Get("/keys/:id", kithttp.NewServer(
+		kitot.TraceServer(tracer, "retrieve")(retrieveEndpoint(svc)),
+		decodeKeyReq,
 		encodeResponse,
 		opts...,
 	))

-	mux.GetFunc("/version", mainflux.Version("users"))
+	mux.Delete("/keys/:id", kithttp.NewServer(
+		kitot.TraceServer(tracer, "revoke")(revokeEndpoint(svc)),
+		decodeKeyReq,
+		encodeResponse,
+		opts...,
+	))
+
+	mux.GetFunc("/version", mainflux.Version("auth"))
 	mux.Handle("/metrics", promhttp.Handler())

 	return mux
 }

-func decodeCredentials(_ context.Context, r *http.Request) (interface{}, error) {
+func decodeIssue(_ context.Context, r *http.Request) (interface{}, error) {
 	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		logger.Warn("Invalid or missing content type.")
 		return nil, errUnsupportedContentType
 	}
-
-	var user users.User
-	if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
-		logger.Warn(fmt.Sprintf("Failed to decode user credentials: %s", err))
+	req := issueKeyReq{
+		issuer: r.Header.Get("Authorization"),
+	}
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		return nil, err
 	}

-	return userReq{user}, nil
+	return req, nil
+}
+
+func decodeKeyReq(_ context.Context, r *http.Request) (interface{}, error) {
+	req := keyReq{
+		issuer: r.Header.Get("Authorization"),
+		id:     bone.GetValue(r, "id"),
+	}
+	return req, nil
 }

 func encodeResponse(_ context.Context, w http.ResponseWriter, response interface{}) error {
@@ -100,18 +103,18 @@ func encodeError(_ context.Context, err error, w http.ResponseWriter) {
 	w.Header().Set("Content-Type", contentType)

 	switch err {
-	case users.ErrMalformedEntity:
+	case authn.ErrMalformedEntity:
 		w.WriteHeader(http.StatusBadRequest)
-	case users.ErrUnauthorizedAccess:
+	case authn.ErrUnauthorizedAccess:
 		w.WriteHeader(http.StatusForbidden)
-	case users.ErrConflict:
+	case authn.ErrNotFound:
+		w.WriteHeader(http.StatusNotFound)
+	case authn.ErrConflict:
 		w.WriteHeader(http.StatusConflict)
+	case io.EOF, io.ErrUnexpectedEOF:
+		w.WriteHeader(http.StatusBadRequest)
 	case errUnsupportedContentType:
 		w.WriteHeader(http.StatusUnsupportedMediaType)
-	case io.ErrUnexpectedEOF:
-		w.WriteHeader(http.StatusBadRequest)
-	case io.EOF:
-		w.WriteHeader(http.StatusBadRequest)
 	default:
 		switch err.(type) {
 		case *json.SyntaxError:
@@ -0,0 +1,83 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+// +build !test
+
+package api
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/mainflux/mainflux/authn"
+	log "github.com/mainflux/mainflux/logger"
+)
+
+var _ authn.Service = (*loggingMiddleware)(nil)
+
+type loggingMiddleware struct {
+	logger log.Logger
+	svc    authn.Service
+}
+
+// LoggingMiddleware adds logging facilities to the core service.
+func LoggingMiddleware(svc authn.Service, logger log.Logger) authn.Service {
+	return &loggingMiddleware{logger, svc}
+}
+
+func (lm *loggingMiddleware) Issue(ctx context.Context, issuer string, newKey authn.Key) (key authn.Key, 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)
+		}
+		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))
+			return
+		}
+		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
+	}(time.Now())
+
+	return lm.svc.Issue(ctx, issuer, newKey)
+}
+
+func (lm *loggingMiddleware) Revoke(ctx context.Context, owner, 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))
+		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.Revoke(ctx, owner, id)
+}
+
+func (lm *loggingMiddleware) Retrieve(ctx context.Context, owner, id string) (key authn.Key, err error) {
+	defer func(begin time.Time) {
+		message := fmt.Sprintf("Method retrieve for key %s took %s to complete", 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.Retrieve(ctx, owner, id)
+}
+
+func (lm *loggingMiddleware) Identify(ctx context.Context, key string) (id string, err error) {
+	defer func(begin time.Time) {
+		message := fmt.Sprintf("Method identify took %s to complete", 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.Identify(ctx, key)
+}
@@ -0,0 +1,66 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package api
+
+import (
+	"context"
+	"time"
+
+	"github.com/go-kit/kit/metrics"
+	"github.com/mainflux/mainflux/authn"
+)
+
+var _ authn.Service = (*metricsMiddleware)(nil)
+
+type metricsMiddleware struct {
+	counter metrics.Counter
+	latency metrics.Histogram
+	svc     authn.Service
+}
+
+// MetricsMiddleware instruments core service by tracking request count and
+// latency.
+func MetricsMiddleware(svc authn.Service, counter metrics.Counter, latency metrics.Histogram) authn.Service {
+	return &metricsMiddleware{
+		counter: counter,
+		latency: latency,
+		svc:     svc,
+	}
+}
+
+func (ms *metricsMiddleware) Issue(ctx context.Context, issuer string, key authn.Key) (authn.Key, error) {
+	defer func(begin time.Time) {
+		ms.counter.With("method", "issue").Add(1)
+		ms.latency.With("method", "issue").Observe(time.Since(begin).Seconds())
+	}(time.Now())
+
+	return ms.svc.Issue(ctx, issuer, key)
+}
+
+func (ms *metricsMiddleware) Revoke(ctx context.Context, issuer, id string) error {
+	defer func(begin time.Time) {
+		ms.counter.With("method", "revoke").Add(1)
+		ms.latency.With("method", "revoke").Observe(time.Since(begin).Seconds())
+	}(time.Now())
+
+	return ms.svc.Revoke(ctx, issuer, id)
+}
+
+func (ms *metricsMiddleware) Retrieve(ctx context.Context, issuer, id string) (authn.Key, error) {
+	defer func(begin time.Time) {
+		ms.counter.With("method", "retrieve").Add(1)
+		ms.latency.With("method", "retrieve").Observe(time.Since(begin).Seconds())
+	}(time.Now())
+
+	return ms.svc.Retrieve(ctx, issuer, id)
+}
+
+func (ms *metricsMiddleware) Identify(ctx context.Context, key string) (string, error) {
+	defer func(begin time.Time) {
+		ms.counter.With("method", "identify").Add(1)
+		ms.latency.With("method", "identify").Observe(time.Since(begin).Seconds())
+	}(time.Now())
+
+	return ms.svc.Identify(ctx, key)
+}
@@ -0,0 +1,10 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package authn
+
+// IdentityProvider specifies an API for generating unique identifiers.
+type IdentityProvider interface {
+	// ID generates the unique identifier.
+	ID() (string, error)
+}
@@ -0,0 +1,110 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package jwt_test
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/mainflux/mainflux/authn"
+	"github.com/mainflux/mainflux/authn/jwt"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const secret = "test"
+
+func key() authn.Key {
+	exp := time.Now().UTC().Add(10 * time.Minute).Round(time.Second)
+	return authn.Key{
+		ID:        "id",
+		Type:      authn.UserKey,
+		Issuer:    "user@email.com",
+		Secret:    "",
+		IssuedAt:  time.Now().UTC().Add(-10 * time.Second).Round(time.Second),
+		ExpiresAt: exp,
+	}
+}
+
+func TestIssue(t *testing.T) {
+	tokenizer := jwt.New(secret)
+
+	emptyIssuer := key()
+	emptyIssuer.Issuer = ""
+
+	cases := []struct {
+		desc string
+		key  authn.Key
+		err  error
+	}{
+		{
+			desc: "issue new token",
+			key:  key(),
+			err:  nil,
+		},
+	}
+
+	for _, tc := range cases {
+		_, err := tokenizer.Issue(tc.key)
+		assert.Equal(t, tc.err, err, fmt.Sprintf("%s expected %s, got %s", tc.desc, tc.err, err))
+	}
+}
+
+func TestParse(t *testing.T) {
+	tokenizer := jwt.New(secret)
+
+	token, err := tokenizer.Issue(key())
+	require.Nil(t, err, fmt.Sprintf("issuing key expected to succeed: %s", err))
+
+	userKey := key()
+	userKey.Type = authn.APIKey
+	userKey.ExpiresAt = time.Now().UTC().Add(-1 * time.Minute).Round(time.Second)
+	userToken, err := tokenizer.Issue(userKey)
+	require.Nil(t, err, fmt.Sprintf("issuing user key expected to succeed: %s", err))
+
+	expKey := key()
+	expKey.ExpiresAt = time.Now().UTC().Add(-1 * time.Minute).Round(time.Second)
+	expToken, err := tokenizer.Issue(expKey)
+	require.Nil(t, err, fmt.Sprintf("issuing expired key expected to succeed: %s", err))
+
+	cases := []struct {
+		desc  string
+		key   authn.Key
+		token string
+		err   error
+	}{
+		{
+			desc:  "parse valid key",
+			key:   key(),
+			token: token,
+			err:   nil,
+		},
+		{
+			desc:  "parse ivalid key",
+			key:   authn.Key{},
+			token: "invalid",
+			err:   authn.ErrUnauthorizedAccess,
+		},
+
+		{
+			desc:  "parse expired key",
+			key:   authn.Key{},
+			token: expToken,
+			err:   authn.ErrKeyExpired,
+		},
+		{
+			desc:  "parse expired user key",
+			key:   userKey,
+			token: userToken,
+			err:   nil,
+		},
+	}
+
+	for _, tc := range cases {
+		key, err := tokenizer.Parse(tc.token)
+		assert.Equal(t, tc.err, 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))
+	}
+}
@@ -0,0 +1,96 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package jwt
+
+import (
+	"time"
+
+	"github.com/dgrijalva/jwt-go"
+	"github.com/mainflux/mainflux/authn"
+)
+
+type claims struct {
+	jwt.StandardClaims
+	Type *uint32 `json:"type,omitempty"`
+}
+
+func (c claims) Valid() error {
+	if c.Type == nil || *c.Type > authn.APIKey {
+		return authn.ErrMalformedEntity
+	}
+
+	return c.StandardClaims.Valid()
+}
+
+type tokenizer struct {
+	secret string
+}
+
+// New returns new JWT Tokenizer.
+func New(secret string) authn.Tokenizer {
+	return tokenizer{secret: secret}
+}
+
+func (svc tokenizer) Issue(key authn.Key) (string, error) {
+	claims := claims{
+		StandardClaims: jwt.StandardClaims{
+			Issuer:   key.Issuer,
+			Subject:  key.Secret,
+			IssuedAt: key.IssuedAt.UTC().Unix(),
+		},
+		Type: &key.Type,
+	}
+
+	if !key.ExpiresAt.IsZero() {
+		claims.ExpiresAt = key.ExpiresAt.UTC().Unix()
+	}
+	if key.ID != "" {
+		claims.Id = key.ID
+	}
+
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	return token.SignedString([]byte(svc.secret))
+}
+
+func (svc tokenizer) Parse(token string) (authn.Key, error) {
+	c := claims{}
+	_, err := jwt.ParseWithClaims(token, &c, func(token *jwt.Token) (interface{}, error) {
+		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
+			return nil, authn.ErrUnauthorizedAccess
+		}
+		return []byte(svc.secret), nil
+	})
+
+	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 == authn.APIKey {
+				return c.toKey(), nil
+			}
+			return authn.Key{}, authn.ErrKeyExpired
+		}
+		return authn.Key{}, authn.ErrUnauthorizedAccess
+	}
+
+	return c.toKey(), nil
+}
+
+func (c claims) toKey() authn.Key {
+	key := authn.Key{
+		ID:       c.Id,
+		Issuer:   c.Issuer,
+		Secret:   c.Subject,
+		IssuedAt: time.Unix(c.IssuedAt, 0).UTC(),
+	}
+	if c.ExpiresAt != 0 {
+		key.ExpiresAt = time.Unix(c.ExpiresAt, 0).UTC()
+	}
+
+	// Default type is 0.
+	if c.Type != nil {
+		key.Type = *c.Type
+	}
+
+	return key
+}
@@ -0,0 +1,55 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package authn
+
+import (
+	"context"
+	"errors"
+	"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.
+	ErrKeyExpired = errors.New("use of expired key")
+)
+
+const (
+	// UserKey is temporary User key received on successfull login.
+	UserKey uint32 = iota
+	// RecoveryKey represents a key for resseting password.
+	RecoveryKey
+	// APIKey enables the one to act on behalf of the user.
+	APIKey
+)
+
+// Key represents API key.
+type Key struct {
+	ID        string
+	Type      uint32
+	Issuer    string
+	Secret    string
+	IssuedAt  time.Time
+	ExpiresAt time.Time
+}
+
+// Expired verifies if the key is expired.
+func (k Key) Expired() bool {
+	return k.ExpiresAt.UTC().Before(time.Now().UTC())
+}
+
+// KeyRepository specifies Key persistence API.
+type KeyRepository interface {
+	// Save persists the Key. A non-nil error is returned to indicate
+	// operation failure
+	Save(context.Context, Key) (string, error)
+
+	// Retrieve retrieves Key by its unique identifier.
+	Retrieve(context.Context, string, string) (Key, error)
+
+	// Remove removes Key with provided ID.
+	Remove(context.Context, string, string) error
+}
@@ -0,0 +1,52 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package authn_test
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/mainflux/mainflux/authn"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestExpired(t *testing.T) {
+	exp := time.Now().Add(5 * time.Minute)
+	exp1 := time.Now()
+	cases := []struct {
+		desc    string
+		key     authn.Key
+		expired bool
+	}{
+		{
+			desc: "not expired key",
+			key: authn.Key{
+				IssuedAt:  time.Now(),
+				ExpiresAt: exp,
+			},
+			expired: false,
+		},
+		{
+			desc: "expired key",
+			key: authn.Key{
+				IssuedAt:  time.Now().UTC().Add(2 * time.Minute),
+				ExpiresAt: exp1,
+			},
+			expired: true,
+		},
+		{
+			desc: "key with no expiration date",
+			key: authn.Key{
+				IssuedAt: time.Now(),
+			},
+			expired: true,
+		},
+	}
+
+	for _, tc := range cases {
+		res := tc.key.Expired()
+		assert.Equal(t, tc.expired, res, fmt.Sprintf("%s: expected %t got %t\n", tc.desc, tc.expired, res))
+	}
+}
@@ -0,0 +1,32 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package mocks
+
+import (
+	"fmt"
+	"sync"
+
+	"github.com/mainflux/mainflux/authn"
+)
+
+var _ authn.IdentityProvider = (*identityProviderMock)(nil)
+
+type identityProviderMock struct {
+	mu      sync.Mutex
+	counter int
+}
+
+func (idp *identityProviderMock) ID() (string, error) {
+	idp.mu.Lock()
+	defer idp.mu.Unlock()
+
+	idp.counter++
+	return fmt.Sprintf("%s%012d", "123e4567-e89b-12d3-a456-", idp.counter), nil
+}
+
+// NewIdentityProvider creates "mirror" identity provider, i.e. generated
+// token will hold value provided by the caller.
+func NewIdentityProvider() authn.IdentityProvider {
+	return &identityProviderMock{}
+}
@@ -0,0 +1,55 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package mocks
+
+import (
+	"context"
+	"sync"
+
+	"github.com/mainflux/mainflux/authn"
+)
+
+var _ authn.KeyRepository = (*keyRepositoryMock)(nil)
+
+type keyRepositoryMock struct {
+	mu   sync.Mutex
+	keys map[string]authn.Key
+}
+
+// NewKeyRepository creates in-memory user repository
+func NewKeyRepository() authn.KeyRepository {
+	return &keyRepositoryMock{
+		keys: make(map[string]authn.Key),
+	}
+}
+
+func (krm *keyRepositoryMock) Save(ctx context.Context, key authn.Key) (string, error) {
+	krm.mu.Lock()
+	defer krm.mu.Unlock()
+
+	if _, ok := krm.keys[key.ID]; ok {
+		return "", authn.ErrConflict
+	}
+
+	krm.keys[key.ID] = key
+	return key.ID, nil
+}
+func (krm *keyRepositoryMock) Retrieve(ctx context.Context, issuer, id string) (authn.Key, error) {
+	krm.mu.Lock()
+	defer krm.mu.Unlock()
+
+	if key, ok := krm.keys[id]; ok && key.Issuer == issuer {
+		return key, nil
+	}
+
+	return authn.Key{}, authn.ErrNotFound
+}
+func (krm *keyRepositoryMock) Remove(ctx context.Context, issuer, id string) error {
+	krm.mu.Lock()
+	defer krm.mu.Unlock()
+	if key, ok := krm.keys[id]; ok && key.Issuer == issuer {
+		delete(krm.keys, id)
+	}
+	return nil
+}
@@ -0,0 +1,6 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+// Package postgres contains Key repository implementations using
+// PostgreSQL as the underlying database.
+package postgres
@@ -0,0 +1,65 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package postgres
+
+import (
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	migrate "github.com/rubenv/sql-migrate"
+)
+
+// Config defines the options that are used when connecting to a PostgreSQL instance
+type Config struct {
+	Host        string
+	Port        string
+	User        string
+	Pass        string
+	Name        string
+	SSLMode     string
+	SSLCert     string
+	SSLKey      string
+	SSLRootCert string
+}
+
+// Connect creates a connection to the PostgreSQL instance and applies any
+// unapplied database migrations. A non-nil error is returned to indicate
+// failure.
+func Connect(cfg Config) (*sqlx.DB, error) {
+	url := fmt.Sprintf("host=%s port=%s user=%s dbname=%s password=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s", cfg.Host, cfg.Port, cfg.User, cfg.Name, cfg.Pass, cfg.SSLMode, cfg.SSLCert, cfg.SSLKey, cfg.SSLRootCert)
+
+	db, err := sqlx.Open("postgres", url)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := migrateDB(db); err != nil {
+		return nil, err
+	}
+	return db, nil
+}
+
+func migrateDB(db *sqlx.DB) error {
+	migrations := &migrate.MemoryMigrationSource{
+		Migrations: []*migrate.Migration{
+			{
+				Id: "authn",
+				Up: []string{
+					`CREATE TABLE IF NOT EXISTS keys (
+						id          UUID NOT NULL,
+						type        SMALLINT,
+						issuer      VARCHAR(254) NOT NULL,
+						issued_at   TIMESTAMP NOT NULL,
+						expires_at  TIMESTAMP,
+						PRIMARY KEY (id, issuer)
+					)`,
+				},
+				Down: []string{"DROP TABLE IF EXISTS keys"},
+			},
+		},
+	}
+
+	_, err := migrate.Exec(db.DB, "postgres", migrations, migrate.Up)
+	return err
+}
@@ -0,0 +1,113 @@
+package postgres
+
+import (
+	"context"
+	"database/sql"
+	"time"
+
+	"github.com/lib/pq"
+	"github.com/mainflux/mainflux/authn"
+)
+
+var _ authn.KeyRepository = (*repo)(nil)
+
+const (
+	errDuplicate = "unique_violation"
+	errInvalid   = "invalid_text_representation"
+)
+
+type repo struct {
+	db Database
+}
+
+// New instantiates a PostgreSQL implementation of key repository.
+func New(db Database) authn.KeyRepository {
+	return &repo{
+		db: db,
+	}
+}
+
+func (kr repo) Save(ctx context.Context, key authn.Key) (string, error) {
+	q := `INSERT INTO keys (id, type, issuer, issued_at, expires_at)
+	      VALUES (:id, :type, :issuer, :issued_at, :expires_at)`
+
+	dbKey := toDBKey(key)
+	if _, err := kr.db.NamedExecContext(ctx, q, dbKey); err != nil {
+
+		pqErr, ok := err.(*pq.Error)
+		if ok {
+			if pqErr.Code.Name() == errDuplicate {
+				return "", authn.ErrConflict
+			}
+		}
+
+		return "", err
+	}
+
+	return dbKey.ID, nil
+}
+
+func (kr repo) Retrieve(ctx context.Context, issuer, id string) (authn.Key, error) {
+	q := `SELECT id, type, issuer, issued_at, expires_at FROM keys WHERE issuer = $1 AND id = $2`
+	key := dbKey{}
+	if err := kr.db.QueryRowxContext(ctx, q, issuer, id).StructScan(&key); err != nil {
+		pqErr, ok := err.(*pq.Error)
+		if err == sql.ErrNoRows || ok && errInvalid == pqErr.Code.Name() {
+			return authn.Key{}, authn.ErrNotFound
+		}
+
+		return authn.Key{}, err
+	}
+
+	return toKey(key), nil
+}
+
+func (kr repo) Remove(ctx context.Context, issuer, id string) error {
+	q := `DELETE FROM keys WHERE issuer = :issuer AND id = :id`
+	key := dbKey{
+		ID:     id,
+		Issuer: issuer,
+	}
+	if _, err := kr.db.NamedExecContext(ctx, q, key); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type dbKey struct {
+	ID        string       `db:"id"`
+	Type      uint32       `db:"type"`
+	Issuer    string       `db:"issuer"`
+	Revoked   bool         `db:"revoked"`
+	IssuedAt  time.Time    `db:"issued_at"`
+	ExpiresAt sql.NullTime `db:"expires_at"`
+}
+
+func toDBKey(key authn.Key) dbKey {
+	ret := dbKey{
+		ID:       key.ID,
+		Type:     key.Type,
+		Issuer:   key.Issuer,
+		IssuedAt: key.IssuedAt,
+	}
+	if !key.ExpiresAt.IsZero() {
+		ret.ExpiresAt = sql.NullTime{Time: key.ExpiresAt, Valid: true}
+	}
+
+	return ret
+}
+
+func toKey(key dbKey) authn.Key {
+	ret := authn.Key{
+		ID:       key.ID,
+		Type:     key.Type,
+		Issuer:   key.Issuer,
+		IssuedAt: key.IssuedAt,
+	}
+	if key.ExpiresAt.Valid {
+		ret.ExpiresAt = key.ExpiresAt.Time
+	}
+
+	return ret
+}
@@ -0,0 +1,148 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package postgres_test
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/mainflux/mainflux/authn"
+	"github.com/mainflux/mainflux/authn/postgres"
+	"github.com/mainflux/mainflux/authn/uuid"
+	"github.com/opentracing/opentracing-go"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestKeySave(t *testing.T) {
+	dbMiddleware := postgres.NewDatabase(db)
+	repo := postgres.New(dbMiddleware)
+
+	email := "user-save@example.com"
+	expTime := time.Now().Add(5 * time.Minute)
+	idp := uuid.New()
+	id, _ := idp.ID()
+	cases := []struct {
+		desc string
+		key  authn.Key
+		err  error
+	}{
+		{
+			desc: "save a new key",
+			key: authn.Key{
+				Issuer:    email,
+				IssuedAt:  time.Now(),
+				ExpiresAt: expTime,
+				ID:        id,
+			},
+			err: nil,
+		},
+		{
+			desc: "save with duplicate id",
+			key: authn.Key{
+				Issuer:    email,
+				IssuedAt:  time.Now(),
+				ExpiresAt: expTime,
+				ID:        id,
+			},
+			err: authn.ErrConflict,
+		},
+	}
+
+	for _, tc := range cases {
+		_, err := repo.Save(context.Background(), tc.key)
+		assert.Equal(t, err, tc.err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
+	}
+}
+
+func TestKeyRetrieve(t *testing.T) {
+	dbMiddleware := postgres.NewDatabase(db)
+	repo := postgres.New(dbMiddleware)
+
+	email := "user-save@example.com"
+	expTime := time.Now().Add(5 * time.Minute)
+	idp := uuid.New()
+	id, _ := idp.ID()
+	key := authn.Key{
+		Issuer:    email,
+		IssuedAt:  time.Now(),
+		ExpiresAt: expTime,
+		ID:        id,
+	}
+	_, err := repo.Save(context.Background(), key)
+	assert.Nil(t, err, fmt.Sprintf("Storing Key expected to succeed: %s", err))
+	cases := []struct {
+		desc   string
+		id     string
+		issuer string
+		err    error
+	}{
+		{
+			desc:   "retrieve an existing key",
+			id:     key.ID,
+			issuer: key.Issuer,
+			err:    nil,
+		},
+		{
+			desc:   "retrieve unauthorized",
+			id:     key.ID,
+			issuer: "",
+			err:    authn.ErrNotFound,
+		},
+		{
+			desc:   "retrieve unknown key",
+			id:     "",
+			issuer: key.Issuer,
+			err:    authn.ErrNotFound,
+		},
+	}
+
+	for _, tc := range cases {
+		_, err := repo.Retrieve(context.Background(), tc.issuer, tc.id)
+		assert.Equal(t, err, tc.err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
+	}
+}
+
+func TestKeyRemove(t *testing.T) {
+	dbMiddleware := postgres.NewDatabase(db)
+	repo := postgres.New(dbMiddleware)
+
+	email := "user-save@example.com"
+	expTime := time.Now().Add(5 * time.Minute)
+	idp := uuid.New()
+	id, _ := idp.ID()
+	key := authn.Key{
+		Issuer:    email,
+		IssuedAt:  time.Now(),
+		ExpiresAt: expTime,
+		ID:        id,
+	}
+	_, err := repo.Save(opentracing.ContextWithSpan(context.Background(), opentracing.StartSpan("")), key)
+	assert.Nil(t, err, fmt.Sprintf("Storing Key expected to succeed: %s", err))
+	cases := []struct {
+		desc   string
+		id     string
+		issuer string
+		err    error
+	}{
+		{
+			desc:   "remove an existing key",
+			id:     key.ID,
+			issuer: key.Issuer,
+			err:    nil,
+		},
+		{
+			desc:   "remove key that does not exist",
+			id:     key.ID,
+			issuer: key.Issuer,
+			err:    nil,
+		},
+	}
+
+	for _, tc := range cases {
+		err := repo.Remove(context.Background(), tc.issuer, tc.id)
+		assert.Equal(t, err, tc.err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
+	}
+}
@@ -0,0 +1,77 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+// Package postgres_test contains tests for PostgreSQL repository
+// implementations.
+package postgres_test
+
+import (
+	"database/sql"
+	"fmt"
+	"log"
+	"os"
+	"testing"
+
+	"github.com/jmoiron/sqlx"
+	"github.com/mainflux/mainflux/authn/postgres"
+	dockertest "gopkg.in/ory-am/dockertest.v3"
+)
+
+const wrong string = "wrong-value"
+
+var db *sqlx.DB
+
+func TestMain(m *testing.M) {
+	pool, err := dockertest.NewPool("")
+	if err != nil {
+		log.Fatalf("Could not connect to docker: %s", err)
+	}
+
+	cfg := []string{
+		"POSTGRES_USER=test",
+		"POSTGRES_PASSWORD=test",
+		"POSTGRES_DB=test",
+	}
+	container, err := pool.Run("postgres", "10.2-alpine", cfg)
+	if err != nil {
+		log.Fatalf("Could not start container: %s", err)
+	}
+
+	port := container.GetPort("5432/tcp")
+
+	if err := pool.Retry(func() error {
+		url := fmt.Sprintf("host=localhost port=%s user=test dbname=test password=test sslmode=disable", port)
+		db, err := sql.Open("postgres", url)
+		if err != nil {
+			return err
+		}
+		return db.Ping()
+	}); err != nil {
+		log.Fatalf("Could not connect to docker: %s", err)
+	}
+
+	dbConfig := postgres.Config{
+		Host:        "localhost",
+		Port:        port,
+		User:        "test",
+		Pass:        "test",
+		Name:        "test",
+		SSLMode:     "disable",
+		SSLCert:     "",
+		SSLKey:      "",
+		SSLRootCert: "",
+	}
+
+	if db, err = postgres.Connect(dbConfig); err != nil {
+		log.Fatalf("Could not setup test DB connection: %s", err)
+	}
+	defer db.Close()
+
+	code := m.Run()
+
+	if err := pool.Purge(container); err != nil {
+		log.Fatalf("Could not purge container: %s", err)
+	}
+
+	os.Exit(code)
+}
@@ -0,0 +1,51 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package postgres
+
+import (
+	"context"
+	"database/sql"
+
+	"github.com/jmoiron/sqlx"
+	"github.com/opentracing/opentracing-go"
+)
+
+var _ Database = (*database)(nil)
+
+type database struct {
+	db *sqlx.DB
+}
+
+// Database provides a database interface
+type Database interface {
+	NamedExecContext(context.Context, string, interface{}) (sql.Result, error)
+	QueryRowxContext(context.Context, string, ...interface{}) *sqlx.Row
+}
+
+// NewDatabase creates a ThingDatabase instance
+func NewDatabase(db *sqlx.DB) Database {
+	return &database{
+		db: db,
+	}
+}
+
+func (d database) NamedExecContext(ctx context.Context, query string, args interface{}) (sql.Result, error) {
+	addSpanTags(ctx, query)
+	return d.db.NamedExecContext(ctx, query, args)
+}
+
+func (d database) QueryRowxContext(ctx context.Context, query string, args ...interface{}) *sqlx.Row {
+	addSpanTags(ctx, query)
+	return d.db.QueryRowxContext(ctx, query, args...)
+}
+
+func addSpanTags(ctx context.Context, query string) {
+	span := opentracing.SpanFromContext(ctx)
+	if span != nil {
+		span.SetTag("sql.statement", query)
+		span.SetTag("span.kind", "client")
+		span.SetTag("peer.service", "postgres")
+		span.SetTag("db.type", "sql")
+	}
+}
@@ -0,0 +1,197 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package authn
+
+import (
+	"context"
+	"errors"
+	"time"
+)
+
+const (
+	loginDuration = 10 * time.Hour
+	resetDuration = 5 * time.Minute
+	issuerName    = "mainflux.authn"
+)
+
+var (
+	// ErrUnauthorizedAccess represents unauthorized access.
+	ErrUnauthorizedAccess = errors.New("unauthorized access")
+
+	// ErrMalformedEntity indicates malformed entity specification (e.g.
+	// invalid owner or ID).
+	ErrMalformedEntity = errors.New("malformed entity specification")
+
+	// ErrNotFound indicates a non-existing entity request.
+	ErrNotFound = errors.New("entity not found")
+
+	// ErrConflict indicates that entity already exists.
+	ErrConflict = errors.New("entity already exists")
+)
+
+// Service specifies an API that must be fullfiled by the domain service
+// implementation, and all of its decorators (e.g. logging & metrics).
+type Service interface {
+	// Issue issues a new Key.
+	Issue(context.Context, string, Key) (Key, error)
+
+	// Revoke removes the Key with the provided id that is
+	// issued by the user identified by the provided key.
+	Revoke(context.Context, string, string) error
+
+	// Retrieve retrieves data for the Key identified by the provided
+	// ID, that is issued by the user identified by the provided key.
+	Retrieve(context.Context, string, string) (Key, error)
+
+	// Identify validates token token. If token is valid, content
+	// is returned. If token is invalid, or invocation failed for some
+	// other reason, non-nil error value is returned in response.
+	Identify(context.Context, string) (string, error)
+}
+
+var _ Service = (*service)(nil)
+
+type service struct {
+	keys      KeyRepository
+	idp       IdentityProvider
+	tokenizer Tokenizer
+}
+
+// New instantiates the auth service implementation.
+func New(keys KeyRepository, idp IdentityProvider, tokenizer Tokenizer) Service {
+	return &service{
+		tokenizer: tokenizer,
+		keys:      keys,
+		idp:       idp,
+	}
+}
+
+func (svc service) Issue(ctx context.Context, issuer string, key Key) (Key, error) {
+	if key.IssuedAt.IsZero() {
+		return Key{}, ErrInvalidKeyIssuedAt
+	}
+	switch key.Type {
+	case APIKey:
+		return svc.userKey(ctx, issuer, key)
+	case RecoveryKey:
+		return svc.resetKey(ctx, issuer, key)
+	default:
+		return svc.loginKey(issuer, key)
+	}
+}
+
+func (svc service) Revoke(ctx context.Context, issuer, id string) error {
+	email, err := svc.login(issuer)
+	if err != nil {
+		return err
+	}
+
+	return svc.keys.Remove(ctx, email, id)
+}
+
+func (svc service) Retrieve(ctx context.Context, issuer, id string) (Key, error) {
+	email, err := svc.login(issuer)
+	if err != nil {
+		return Key{}, err
+	}
+
+	return svc.keys.Retrieve(ctx, email, id)
+}
+
+func (svc service) Identify(ctx context.Context, token string) (string, error) {
+	c, err := svc.tokenizer.Parse(token)
+	if err != nil {
+		return "", err
+	}
+
+	switch c.Type {
+	case APIKey:
+		k, err := svc.keys.Retrieve(ctx, c.Issuer, c.ID)
+		if err != nil {
+			return "", err
+		}
+		// Auto revoke expired key.
+		if k.Expired() {
+			svc.keys.Remove(ctx, c.Issuer, c.ID)
+			return "", ErrKeyExpired
+		}
+		return c.Issuer, nil
+	case RecoveryKey, UserKey:
+		if c.Issuer != issuerName {
+			return "", ErrUnauthorizedAccess
+		}
+		return c.Secret, nil
+	default:
+		return "", ErrUnauthorizedAccess
+	}
+}
+
+func (svc service) loginKey(issuer string, key Key) (Key, error) {
+	key.Secret = issuer
+	return svc.tempKey(loginDuration, key)
+}
+
+func (svc service) resetKey(ctx context.Context, issuer string, key Key) (Key, error) {
+	issuer, err := svc.login(issuer)
+	if err != nil {
+		return Key{}, err
+	}
+	key.Secret = issuer
+
+	return svc.tempKey(resetDuration, key)
+}
+
+func (svc service) tempKey(duration time.Duration, key Key) (Key, error) {
+	key.Issuer = issuerName
+	key.ExpiresAt = key.IssuedAt.Add(duration)
+	val, err := svc.tokenizer.Issue(key)
+	if err != nil {
+		return Key{}, err
+	}
+
+	key.Secret = val
+	return key, nil
+}
+
+func (svc service) userKey(ctx context.Context, issuer string, key Key) (Key, error) {
+	email, err := svc.login(issuer)
+	if err != nil {
+		return Key{}, err
+	}
+	key.Issuer = email
+
+	id, err := svc.idp.ID()
+	if err != nil {
+		return Key{}, err
+	}
+	key.ID = id
+
+	value, err := svc.tokenizer.Issue(key)
+	if err != nil {
+		return Key{}, err
+	}
+	key.Secret = value
+
+	if _, err := svc.keys.Save(ctx, key); err != nil {
+		return Key{}, err
+	}
+
+	return key, nil
+}
+
+func (svc service) login(token string) (string, error) {
+	c, err := svc.tokenizer.Parse(token)
+	if err != nil {
+		return "", err
+	}
+	// Only user key token is valid for login.
+	if c.Type != UserKey {
+		return "", ErrUnauthorizedAccess
+	}
+
+	if c.Secret == "" {
+		return "", ErrUnauthorizedAccess
+	}
+	return c.Secret, nil
+}
@@ -0,0 +1,278 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package authn_test
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/mainflux/mainflux/authn"
+	"github.com/mainflux/mainflux/authn/jwt"
+	"github.com/mainflux/mainflux/authn/mocks"
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	secret = "secret"
+	email  = "test@example.com"
+)
+
+func newService() authn.Service {
+	repo := mocks.NewKeyRepository()
+	idp := mocks.NewIdentityProvider()
+	t := jwt.New(secret)
+	return authn.New(repo, idp, t)
+}
+
+func TestIssue(t *testing.T) {
+	svc := newService()
+	loginKey, err := svc.Issue(context.Background(), email, authn.Key{Type: authn.UserKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
+
+	cases := []struct {
+		desc   string
+		key    authn.Key
+		issuer string
+		err    error
+	}{
+		{
+			desc: "issue login key",
+			key: authn.Key{
+				Type:     authn.UserKey,
+				IssuedAt: time.Now(),
+			},
+			issuer: email,
+			err:    nil,
+		},
+		{
+			desc: "issue login key no issue time",
+			key: authn.Key{
+				Type: authn.UserKey,
+			},
+			issuer: email,
+			err:    authn.ErrInvalidKeyIssuedAt,
+		},
+		{
+			desc: "issue user key",
+			key: authn.Key{
+				Type:     authn.APIKey,
+				IssuedAt: time.Now(),
+			},
+			issuer: loginKey.Secret,
+			err:    nil,
+		},
+		{
+			desc: "issue user key unauthorized",
+			key: authn.Key{
+				Type:     authn.APIKey,
+				IssuedAt: time.Now(),
+			},
+			issuer: "",
+			err:    authn.ErrUnauthorizedAccess,
+		},
+		{
+			desc: "issue user key no issue time",
+			key: authn.Key{
+				Type: authn.APIKey,
+			},
+			issuer: loginKey.Secret,
+			err:    authn.ErrInvalidKeyIssuedAt,
+		},
+		{
+			desc: "issue reset key",
+			key: authn.Key{
+				Type:     authn.RecoveryKey,
+				IssuedAt: time.Now(),
+			},
+			issuer: loginKey.Secret,
+			err:    nil,
+		},
+		{
+			desc: "issue reset key no issue time",
+			key: authn.Key{
+				Type: authn.RecoveryKey,
+			},
+			issuer: loginKey.Secret,
+			err:    authn.ErrInvalidKeyIssuedAt,
+		},
+	}
+
+	for _, tc := range cases {
+		_, err := svc.Issue(context.Background(), tc.issuer, tc.key)
+		assert.Equal(t, err, tc.err, fmt.Sprintf("%s expected %s got %s\n", tc.desc, tc.err, err))
+	}
+}
+func TestRevoke(t *testing.T) {
+	svc := newService()
+	loginKey, err := svc.Issue(context.Background(), email, authn.Key{Type: authn.UserKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
+	key := authn.Key{
+		Type:     authn.APIKey,
+		IssuedAt: time.Now(),
+	}
+	newKey, err := svc.Issue(context.Background(), loginKey.Secret, key)
+	assert.Nil(t, err, fmt.Sprintf("Issuing user's key expected to succeed: %s", err))
+
+	cases := []struct {
+		desc   string
+		id     string
+		issuer string
+		err    error
+	}{
+		{
+			desc:   "revoke user key",
+			id:     newKey.ID,
+			issuer: loginKey.Secret,
+			err:    nil,
+		},
+		{
+			desc:   "revoke non-existing user key",
+			id:     newKey.ID,
+			issuer: loginKey.Secret,
+			err:    nil,
+		},
+		{
+			desc:   "revoke unauthorized",
+			id:     newKey.ID,
+			issuer: "",
+			err:    authn.ErrUnauthorizedAccess,
+		},
+	}
+
+	for _, tc := range cases {
+		err := svc.Revoke(context.Background(), tc.issuer, tc.id)
+		assert.Equal(t, err, tc.err, fmt.Sprintf("%s expected %s got %s\n", tc.desc, tc.err, err))
+	}
+}
+func TestRetrieve(t *testing.T) {
+	svc := newService()
+	loginKey, err := svc.Issue(context.Background(), email, authn.Key{Type: authn.UserKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
+	key := authn.Key{
+		ID:       "id",
+		Type:     authn.APIKey,
+		IssuedAt: time.Now(),
+	}
+	newKey, err := svc.Issue(context.Background(), loginKey.Secret, key)
+	assert.Nil(t, err, fmt.Sprintf("Issuing user's key expected to succeed: %s", err))
+
+	resetKey, err := svc.Issue(context.Background(), loginKey.Secret, authn.Key{Type: authn.RecoveryKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing reset key expected to succeed: %s", err))
+
+	userKey, err := svc.Issue(context.Background(), loginKey.Secret, authn.Key{Type: authn.APIKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing user key expected to succeed: %s", err))
+
+	cases := []struct {
+		desc   string
+		id     string
+		issuer string
+		err    error
+	}{
+		{
+			desc:   "retrieve user key",
+			id:     newKey.ID,
+			issuer: loginKey.Secret,
+			err:    nil,
+		},
+		{
+			desc:   "retrieve non-existing user key",
+			id:     "invalid",
+			issuer: loginKey.Secret,
+			err:    authn.ErrNotFound,
+		},
+		{
+			desc:   "retrieve unauthorized",
+			id:     newKey.ID,
+			issuer: "wrong",
+			err:    authn.ErrUnauthorizedAccess,
+		},
+		{
+			desc:   "retrieve with user key",
+			id:     newKey.ID,
+			issuer: userKey.Secret,
+			err:    authn.ErrUnauthorizedAccess,
+		},
+		{
+			desc:   "retrieve with reset key",
+			id:     newKey.ID,
+			issuer: resetKey.Secret,
+			err:    authn.ErrUnauthorizedAccess,
+		},
+	}
+
+	for _, tc := range cases {
+		_, err := svc.Retrieve(context.Background(), tc.issuer, tc.id)
+		assert.Equal(t, err, tc.err, fmt.Sprintf("%s expected %s got %s\n", tc.desc, tc.err, err))
+	}
+}
+func TestIdentify(t *testing.T) {
+	svc := newService()
+	loginKey, err := svc.Issue(context.Background(), email, authn.Key{Type: authn.UserKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing login key expected to succeed: %s", err))
+
+	resetKey, err := svc.Issue(context.Background(), loginKey.Secret, authn.Key{Type: authn.RecoveryKey, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing reset key expected to succeed: %s", err))
+
+	userKey, err := svc.Issue(context.Background(), loginKey.Secret, authn.Key{Type: authn.APIKey, IssuedAt: time.Now(), ExpiresAt: time.Now().Add(time.Minute)})
+	assert.Nil(t, err, fmt.Sprintf("Issuing user key expected to succeed: %s", err))
+
+	exp1 := time.Now().Add(-2 * time.Second)
+	expKey, err := svc.Issue(context.Background(), loginKey.Secret, authn.Key{Type: authn.APIKey, IssuedAt: time.Now(), ExpiresAt: exp1})
+	assert.Nil(t, err, fmt.Sprintf("Issuing expired user key expected to succeed: %s", err))
+
+	invalidKey, err := svc.Issue(context.Background(), loginKey.Secret, authn.Key{Type: 22, IssuedAt: time.Now()})
+	assert.Nil(t, err, fmt.Sprintf("Issuing user key expected to succeed: %s", err))
+
+	cases := []struct {
+		desc string
+		key  string
+		id   string
+		err  error
+	}{
+		{
+			desc: "identify login key",
+			key:  loginKey.Secret,
+			id:   email,
+			err:  nil,
+		},
+		{
+			desc: "identify reset key",
+			key:  resetKey.Secret,
+			id:   email,
+			err:  nil,
+		},
+		{
+			desc: "identify user key",
+			key:  userKey.Secret,
+			id:   email,
+			err:  nil,
+		},
+		{
+			desc: "identify expired user key",
+			key:  expKey.Secret,
+			id:   "",
+			err:  authn.ErrKeyExpired,
+		},
+		{
+			desc: "identify expired key",
+			key:  invalidKey.Secret,
+			id:   "",
+			err:  authn.ErrUnauthorizedAccess,
+		},
+		{
+			desc: "identify invalid key",
+			key:  "invalid",
+			id:   "",
+			err:  authn.ErrUnauthorizedAccess,
+		},
+	}
+
+	for _, tc := range cases {
+		id, err := svc.Identify(context.Background(), tc.key)
+		assert.Equal(t, tc.err, err, fmt.Sprintf("%s expected %s got %s\n", tc.desc, tc.err, err))
+		assert.Equal(t, tc.id, id, fmt.Sprintf("%s expected %s got %s\n", tc.desc, tc.id, id))
+	}
+}
@@ -0,0 +1,127 @@
+swagger: "2.0"
+info:
+  title: Mainflux authentication service
+  description: HTTP API for managing platform API keys.
+  version: "1.0.0"
+consumes:
+  - "application/json"
+produces:
+  - "application/json"
+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:
+        - authn
+      parameters:
+        - name: key
+          description: JSON-formatted document describing the new key.
+          in: body
+          schema:
+            $ref: "#/definitions/Key"
+          required: true
+      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: "#/responses/ServiceError"
+    get:
+      summary: Gets API key details.
+      description: |
+        Gets API key details for the given key.
+      tags:
+        - authn
+      parameters:
+        - $ref: "#/parameters/Authorization"
+        - name: id
+          description: API Key id.
+          in: path
+          type: string
+          required: true
+      responses:
+        200:
+          description: Data retrieved.
+          schema:
+            $ref: "#/definitions/Key"
+        400:
+          description: Failed due to malformed query parameters.
+        403:
+          description: Missing or invalid access token provided.
+        500:
+          $ref: "#/responses/ServiceError"
+    delete:
+      summary: Revoke API key
+      description: |
+        Revoke API key identified by the given ID.
+      tags:
+        - authn
+      parameters:
+        - $ref: "#/parameters/Authorization"
+        - name: id
+          description: API Key id.
+          in: path
+          type: string
+          required: true
+      responses:
+        204:
+          description: Key revoked.
+        403:
+          description: Missing or invalid access token provided.
+        500:
+          $ref: "#/responses/ServiceError"
+
+definitions:
+  Key:
+    type: object
+    properties:
+      id:
+        type: string
+        format: uuid
+        example: "c5747f2f-2a7c-4fe1-b41a-51a5ae290945"
+        description: API key unique identifier
+      type:
+        type: integer
+        example: 0
+        description: API key type. Keys of different type are processed differently
+      issuer:
+        type: string
+        format: string
+        example: "test@example.com"
+        description: User's email or service identifier of API key issuer
+      secret:
+        type: string
+        example: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiZXhhbXBsZSIsImlhdCI6MTUxNjIzOTAyMn0.9UYAFWmPIn4ojss36LpIGSqABZHfADQmVuKQ4PJBMdI
+        description: API Key value.
+      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
+    required:
+      - type
+
+parameters:
+  Authorization:
+    name: Authorization
+    description: Login key secret (User's access token).
+    in: header
+    type: string
+    required: true
+
+responses:
+  ServiceError:
+    description: Unexpected server-side error occurred.
@@ -0,0 +1,13 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package authn
+
+// Tokenizer specifies API for encoding and decoding between string and Key.
+type Tokenizer interface {
+	// Issue converts API Key to its string representation.
+	Issue(Key) (string, error)
+
+	// Parse extracts API Key data from string token.
+	Parse(string) (Key, error)
+}
@@ -0,0 +1,72 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+// Package tracing contains middlewares that will add spans
+// to existing traces.
+package tracing
+
+import (
+	"context"
+
+	"github.com/mainflux/mainflux/authn"
+	opentracing "github.com/opentracing/opentracing-go"
+)
+
+const (
+	saveOp     = "save"
+	retrieveOp = "retrieve_by_id"
+	revokeOp   = "remove"
+)
+
+var _ authn.KeyRepository = (*keyRepositoryMiddleware)(nil)
+
+// keyRepositoryMiddleware tracks request and their latency, and adds spans
+// to context.
+type keyRepositoryMiddleware struct {
+	tracer opentracing.Tracer
+	repo   authn.KeyRepository
+}
+
+// New tracks request and their latency, and adds spans
+// to context.
+func New(repo authn.KeyRepository, tracer opentracing.Tracer) authn.KeyRepository {
+	return keyRepositoryMiddleware{
+		tracer: tracer,
+		repo:   repo,
+	}
+}
+
+func (krm keyRepositoryMiddleware) Save(ctx context.Context, key authn.Key) (string, error) {
+	span := createSpan(ctx, krm.tracer, saveOp)
+	defer span.Finish()
+	ctx = opentracing.ContextWithSpan(ctx, span)
+
+	return krm.repo.Save(ctx, key)
+}
+
+func (krm keyRepositoryMiddleware) Retrieve(ctx context.Context, owner, id string) (authn.Key, error) {
+	span := createSpan(ctx, krm.tracer, retrieveOp)
+	defer span.Finish()
+	ctx = opentracing.ContextWithSpan(ctx, span)
+
+	return krm.repo.Retrieve(ctx, owner, id)
+}
+
+func (krm keyRepositoryMiddleware) Remove(ctx context.Context, owner, id string) error {
+	span := createSpan(ctx, krm.tracer, revokeOp)
+	defer span.Finish()
+	ctx = opentracing.ContextWithSpan(ctx, span)
+
+	return krm.repo.Remove(ctx, owner, id)
+}
+
+func createSpan(ctx context.Context, tracer opentracing.Tracer, opName string) opentracing.Span {
+	if parentSpan := opentracing.SpanFromContext(ctx); parentSpan != nil {
+		return tracer.StartSpan(
+			opName,
+			opentracing.ChildOf(parentSpan.Context()),
+		)
+	}
+
+	return tracer.StartSpan(opName)
+}
@@ -0,0 +1,28 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+// Package uuid provides a UUID identity provider.
+package uuid
+
+import (
+	"github.com/gofrs/uuid"
+	"github.com/mainflux/mainflux/authn"
+)
+
+var _ authn.IdentityProvider = (*uuidIdentityProvider)(nil)
+
+type uuidIdentityProvider struct{}
+
+// New instantiates a UUID identity provider.
+func New() authn.IdentityProvider {
+	return &uuidIdentityProvider{}
+}
+
+func (idp *uuidIdentityProvider) ID() (string, error) {
+	id, err := uuid.NewV4()
+	if err != nil {
+		return "", err
+	}
+
+	return id.String(), nil
+}
@@ -35,35 +35,36 @@ Thing configuration also contains the so-called `external ID` and `external key`

 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_BOOTSTRAP_LOG_LEVEL        | Log level for Bootstrap (debug, info, warn, error)                      | error                 |
-| MF_BOOTSTRAP_DB_HOST          | Database host address                                                   | localhost             |
-| MF_BOOTSTRAP_DB_PORT          | Database host port                                                      | 5432                  |
-| MF_BOOTSTRAP_DB_USER          | Database user                                                           | mainflux              |
-| MF_BOOTSTRAP_DB_PASS          | Database password                                                       | mainflux              |
-| MF_BOOTSTRAP_DB               | Name of the database used by the service                                | bootstrap             |
-| MF_BOOTSTRAP_DB_SSL_MODE      | Database connection SSL mode (disable, require, verify-ca, verify-full) | disable               |
-| MF_BOOTSTRAP_DB_SSL_CERT      | Path to the PEM encoded certificate file                                |                       |
-| MF_BOOTSTRAP_DB_SSL_KEY       | Path to the PEM encoded key file                                        |                       |
-| MF_BOOTSTRAP_DB_SSL_ROOT_CERT | Path to the PEM encoded root certificate file                           |                       |
-| MF_BOOTSTRAP_CLIENT_TLS       | Flag that indicates if TLS should be turned on                          | false                 |
-| MF_BOOTSTRAP_CA_CERTS         | Path to trusted CAs in PEM format                                       |                       |
-| MF_BOOTSTRAP_PORT             | Bootstrap service HTTP port                                             | 8180                  |
-| MF_BOOTSTRAP_SERVER_CERT      | Path to server certificate in pem format                                |                       |
-| MF_BOOTSTRAP_SERVER_KEY       | Path to server key in pem format                                        |                       |
-| MF_SDK_BASE_URL               | Base url for Mainflux SDK                                               | http://localhost      |
-| MF_SDK_THINGS_PREFIX          | SDK prefix for Things service                                           |                       |
-| MF_USERS_URL                  | Users service URL                                                       | localhost:8181        |
-| MF_THINGS_ES_URL              | Things service event source URL                                         | localhost:6379        |
-| MF_THINGS_ES_PASS             | Things service event source password                                    |                       |
-| MF_THINGS_ES_DB               | Things service event source database                                    | 0                     |
-| MF_BOOTSTRAP_ES_URL           | Bootstrap service event source URL                                      | localhost:6379        |
-| MF_BOOTSTRAP_ES_PASS          | Bootstrap service event source password                                 |                       |
-| MF_BOOTSTRAP_ES_DB            | Bootstrap service event source database                                 | 0                     |
-| MF_BOOTSTRAP_INSTANCE_NAME    | Bootstrap service instance name                                         | bootstrap             |
-| MF_JAEGER_URL                 | Jaeger server URL                                                       | localhost:6831        |
-| MF_BOOTSTRAP_THINGS_TIMEOUT   | Things gRPC request timeout in seconds                                  | 1                     |
+| Variable                      | Description                                                             | Default                          |
+|-------------------------------|-------------------------------------------------------------------------|-----------------------           |
+| MF_BOOTSTRAP_LOG_LEVEL        | Log level for Bootstrap (debug, info, warn, error)                      | error                            |
+| MF_BOOTSTRAP_DB_HOST          | Database host address                                                   | localhost                        |
+| MF_BOOTSTRAP_DB_PORT          | Database host port                                                      | 5432                             |
+| MF_BOOTSTRAP_DB_USER          | Database user                                                           | mainflux                         |
+| MF_BOOTSTRAP_DB_PASS          | Database password                                                       | mainflux                         |
+| MF_BOOTSTRAP_DB               | Name of the database used by the service                                | bootstrap                        |
+| MF_BOOTSTRAP_DB_SSL_MODE      | Database connection SSL mode (disable, require, verify-ca, verify-full) | disable                          |
+| MF_BOOTSTRAP_DB_SSL_CERT      | Path to the PEM encoded certificate file                                |                                  |
+| MF_BOOTSTRAP_DB_SSL_KEY       | Path to the PEM encoded key file                                        |                                  |
+| MF_BOOTSTRAP_DB_SSL_ROOT_CERT | Path to the PEM encoded root certificate file                           |                                  |
+| MF_BOOTSTRAP_ENCRYPT_KEY      | Secret key for secure bootstrapping encryption                          | 12345678910111213141516171819202 |
+| MF_BOOTSTRAP_CLIENT_TLS       | Flag that indicates if TLS should be turned on                          | false                            |
+| MF_BOOTSTRAP_CA_CERTS         | Path to trusted CAs in PEM format                                       |                                  |
+| MF_BOOTSTRAP_PORT             | Bootstrap service HTTP port                                             | 8180                             |
+| MF_BOOTSTRAP_SERVER_CERT      | Path to server certificate in pem format                                |                                  |
+| MF_BOOTSTRAP_SERVER_KEY       | Path to server key in pem format                                        |                                  |
+| MF_SDK_BASE_URL               | Base url for Mainflux SDK                                               | http://localhost                 |
+| MF_SDK_THINGS_PREFIX          | SDK prefix for Things service                                           |                                  |
+| MF_USERS_URL                  | Users service URL                                                       | localhost:8181                   |
+| MF_THINGS_ES_URL              | Things service event source URL                                         | localhost:6379                   |
+| MF_THINGS_ES_PASS             | Things service event source password                                    |                                  |
+| MF_THINGS_ES_DB               | Things service event source database                                    | 0                                |
+| MF_BOOTSTRAP_ES_URL           | Bootstrap service event source URL                                      | localhost:6379                   |
+| MF_BOOTSTRAP_ES_PASS          | Bootstrap service event source password                                 |                                  |
+| MF_BOOTSTRAP_ES_DB            | Bootstrap service event source database                                 | 0                                |
+| MF_BOOTSTRAP_EVENT_CONSUMER   | Bootstrap service event source consumer name                            | bootstrap                        |
+| MF_JAEGER_URL                 | Jaeger server URL                                                       | localhost:6831                   |
+| MF_BOOTSTRAP_THINGS_TIMEOUT   | Things gRPC request timeout in seconds                                  | 1                                |

 ## Deployment

@@ -92,6 +93,7 @@ version: "2"
      MF_BOOTSTRAP_DB_SSL_CERT: [Path to the PEM encoded certificate file]
      MF_BOOTSTRAP_DB_SSL_KEY: [Path to the PEM encoded key file]
      MF_BOOTSTRAP_DB_SSL_ROOT_CERT: [Path to the PEM encoded root certificate file]
+      MF_BOOTSTRAP_ENCRYPT_KEY: [Hex-encoded encryption key used for secure bootstrap]
      MF_BOOTSTRAP_CLIENT_TLS: [Boolean value to enable/disable client TLS]
      MF_BOOTSTRAP_CA_CERTS: [Path to trusted CAs in PEM format]
      MF_BOOTSTRAP_PORT: 8200
@@ -106,7 +108,7 @@ version: "2"
      MF_BOOTSTRAP_ES_URL: [Bootstrap service event source URL]
      MF_BOOTSTRAP_ES_PASS: [Bootstrap service event source password]
      MF_BOOTSTRAP_ES_DB: [Bootstrap service event source database]
-      MF_BOOTSTRAP_INSTANCE_NAME: [Bootstrap service instance name]
+      MF_BOOTSTRAP_EVENT_CONSUMER: [Bootstrap service event source consumer name]
      MF_JAEGER_URL: [Jaeger server URL]
      MF_BOOTSTRAP_THINGS_TIMEOUT: [Things gRPC request timeout in seconds]
 ```
@@ -115,9 +117,9 @@ To start the service outside of the container, execute the following shell scrip

 ```bash
 # download the latest version of the service
-go get github.com/mainflux/mainflux
+git clone https://github.com/mainflux/mainflux

-cd $GOPATH/src/github.com/mainflux/mainflux
+cd mainflux

 # compile the service
 make bootstrap
@@ -126,7 +128,7 @@ make bootstrap
 make install

 # set the environment variables and run the service
-MF_BOOTSTRAP_LOG_LEVEL=[Bootstrap log level] MF_BOOTSTRAP_DB_HOST=[Database host address] MF_BOOTSTRAP_DB_PORT=[Database host port] MF_BOOTSTRAP_DB_USER=[Database user] MF_BOOTSTRAP_DB_PASS=[Database password] MF_BOOTSTRAP_DB=[Name of the database used by the service] MF_BOOTSTRAP_DB_SSL_MODE=[SSL mode to connect to the database with] MF_BOOTSTRAP_DB_SSL_CERT=[Path to the PEM encoded certificate file] MF_BOOTSTRAP_DB_SSL_KEY=[Path to the PEM encoded key file] MF_BOOTSTRAP_DB_SSL_ROOT_CERT=[Path to the PEM encoded root certificate file] MF_BOOTSTRAP_CLIENT_TLS=[Boolean value to enable/disable client TLS] MF_BOOTSTRAP_CA_CERTS=[Path to trusted CAs in PEM format] MF_BOOTSTRAP_PORT=[Service HTTP port] MF_BOOTSTRAP_SERVER_CERT=[Path to server certificate] MF_BOOTSTRAP_SERVER_KEY=[Path to server key] MF_SDK_BASE_URL=[Base SDK URL for the Mainflux services] MF_SDK_THINGS_PREFIX=[SDK prefix for Things service] MF_USERS_URL=[Users service URL] MF_JAEGER_URL=[Jaeger server URL] MF_BOOTSTRAP_THINGS_TIMEOUT=[Things gRPC request timeout in seconds] $GOBIN/mainflux-bootstrap
+MF_BOOTSTRAP_LOG_LEVEL=[Bootstrap log level] MF_BOOTSTRAP_DB_HOST=[Database host address] MF_BOOTSTRAP_DB_PORT=[Database host port] MF_BOOTSTRAP_DB_USER=[Database user] MF_BOOTSTRAP_DB_PASS=[Database password] MF_BOOTSTRAP_DB=[Name of the database used by the service] MF_BOOTSTRAP_DB_SSL_MODE=[SSL mode to connect to the database with] MF_BOOTSTRAP_DB_SSL_CERT=[Path to the PEM encoded certificate file] MF_BOOTSTRAP_DB_SSL_KEY=[Path to the PEM encoded key file] MF_BOOTSTRAP_DB_SSL_ROOT_CERT=[Path to the PEM encoded root certificate file] MF_BOOTSTRAP_ENCRYPT_KEY=[Hex-encoded encryption key used for secure bootstrap] MF_BOOTSTRAP_CLIENT_TLS=[Boolean value to enable/disable client TLS] MF_BOOTSTRAP_CA_CERTS=[Path to trusted CAs in PEM format] MF_BOOTSTRAP_PORT=[Service HTTP port] MF_BOOTSTRAP_SERVER_CERT=[Path to server certificate] MF_BOOTSTRAP_SERVER_KEY=[Path to server key] MF_SDK_BASE_URL=[Base SDK URL for the Mainflux services] MF_SDK_THINGS_PREFIX=[SDK prefix for Things service] MF_USERS_URL=[Users service URL] MF_JAEGER_URL=[Jaeger server URL] MF_BOOTSTRAP_THINGS_TIMEOUT=[Things gRPC request timeout in seconds] $GOBIN/mainflux-bootstrap
 ```

 Setting `MF_BOOTSTRAP_CA_CERTS` expects a file in PEM format of trusted CAs. This will enable TLS against the Users gRPC endpoint trusting only those CAs that are provided.
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 // Package api contains implementation of bootstrap service HTTP API.
 package api
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package api

@@ -59,7 +55,7 @@ func updateCertEndpoint(svc bootstrap.Service) endpoint.Endpoint {
 			return nil, err
 		}

-		if err := svc.UpdateCert(req.key, req.thingKey, req.ClientCert, req.ClientKey, req.CACert); err != nil {
+		if err := svc.UpdateCert(req.key, req.thingID, req.ClientCert, req.ClientKey, req.CACert); err != nil {
 			return nil, err
 		}

@@ -228,19 +224,19 @@ func removeEndpoint(svc bootstrap.Service) endpoint.Endpoint {
 	}
 }

-func bootstrapEndpoint(svc bootstrap.Service, reader bootstrap.ConfigReader) endpoint.Endpoint {
+func bootstrapEndpoint(svc bootstrap.Service, reader bootstrap.ConfigReader, secure bool) endpoint.Endpoint {
 	return func(_ context.Context, request interface{}) (interface{}, error) {
 		req := request.(bootstrapReq)
 		if err := req.validate(); err != nil {
 			return nil, err
 		}

-		cfg, err := svc.Bootstrap(req.key, req.id)
+		cfg, err := svc.Bootstrap(req.key, req.id, secure)
 		if err != nil {
 			return nil, err
 		}

-		return reader.ReadConfig(cfg)
+		return reader.ReadConfig(cfg, secure)
 	}
 }

@@ -1,13 +1,13 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package api_test

 import (
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/rand"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -45,6 +45,7 @@ const (
 )

 var (
+	encKey      = []byte("1234567891011121")
 	addChannels = []string{"1"}
 	metadata    = map[string]interface{}{"meta": "data"}
 	addReq      = struct {
@@ -95,6 +96,9 @@ func newConfig(channels []bootstrap.Channel) bootstrap.Config {
 		MFChannels:  channels,
 		Name:        addName,
 		Content:     addContent,
+		ClientCert:  "newcert",
+		ClientKey:   "newkey",
+		CACert:      "newca",
 	}
 }

@@ -116,14 +120,44 @@ func (tr testRequest) make() (*http.Response, error) {
 	return tr.client.Do(req)
 }

-func newService(users mainflux.UsersServiceClient, unknown map[string]string, url string) bootstrap.Service {
+func enc(in []byte) ([]byte, error) {
+	block, err := aes.NewCipher(encKey)
+	if err != nil {
+		return nil, err
+	}
+	ciphertext := make([]byte, aes.BlockSize+len(in))
+	iv := ciphertext[:aes.BlockSize]
+	if _, err := io.ReadFull(rand.Reader, iv); err != nil {
+		return nil, err
+	}
+	stream := cipher.NewCFBEncrypter(block, iv)
+	stream.XORKeyStream(ciphertext[aes.BlockSize:], in)
+	return ciphertext, nil
+}
+
+func dec(in []byte) ([]byte, error) {
+	block, err := aes.NewCipher(encKey)
+	if err != nil {
+		return nil, err
+	}
+	if len(in) < aes.BlockSize {
+		return nil, bootstrap.ErrMalformedEntity
+	}
+	iv := in[:aes.BlockSize]
+	in = in[aes.BlockSize:]
+	stream := cipher.NewCFBDecrypter(block, iv)
+	stream.XORKeyStream(in, in)
+	return in, nil
+}
+
+func newService(authn mainflux.AuthNServiceClient, unknown map[string]string, url string) bootstrap.Service {
 	things := mocks.NewConfigsRepository(unknown)
 	config := mfsdk.Config{
 		BaseURL: url,
 	}

 	sdk := mfsdk.NewSDK(config)
-	return bootstrap.New(users, things, sdk)
+	return bootstrap.New(authn, things, sdk, encKey)
 }

 func generateChannels() map[string]things.Channel {
@@ -139,8 +173,8 @@ func generateChannels() map[string]things.Channel {
 	return channels
 }

-func newThingsService(users mainflux.UsersServiceClient) things.Service {
-	return mocks.NewThingsService(map[string]things.Thing{}, generateChannels(), users)
+func newThingsService(authn mainflux.AuthNServiceClient) things.Service {
+	return mocks.NewThingsService(map[string]things.Thing{}, generateChannels(), authn)
 }

 func newThingsServer(svc things.Service) *httptest.Server {
@@ -149,7 +183,7 @@ func newThingsServer(svc things.Service) *httptest.Server {
 }

 func newBootstrapServer(svc bootstrap.Service) *httptest.Server {
-	mux := bsapi.MakeHandler(svc, bootstrap.NewConfigReader())
+	mux := bsapi.MakeHandler(svc, bootstrap.NewConfigReader(encKey))
 	return httptest.NewServer(mux)
 }

@@ -368,7 +402,7 @@ func TestView(t *testing.T) {
 		assert.Equal(t, tc.status, res.StatusCode, fmt.Sprintf("%s: expected status code %d got %d", tc.desc, tc.status, res.StatusCode))
 		var view config
 		if err := json.NewDecoder(res.Body).Decode(&view); err != io.EOF {
-			assert.Nil(t, err, fmt.Sprintf("Decoding expeceted to succeed %s: %s", tc.desc, err))
+			assert.Nil(t, err, fmt.Sprintf("Decoding expected to succeed %s: %s", tc.desc, err))
 		}

 		assert.ElementsMatch(t, tc.res.Channels, view.Channels, fmt.Sprintf("%s: expected response '%s' got '%s'", tc.desc, tc.res.Channels, view.Channels))
@@ -490,7 +524,7 @@ func TestUpdateCert(t *testing.T) {
 	cases := []struct {
 		desc        string
 		req         string
-		key         string
+		id          string
 		auth        string
 		contentType string
 		status      int
@@ -498,7 +532,7 @@ func TestUpdateCert(t *testing.T) {
 		{
 			desc:        "update unauthorized",
 			req:         data,
-			key:         saved.MFKey,
+			id:          saved.MFThing,
 			auth:        invalidToken,
 			contentType: contentType,
 			status:      http.StatusForbidden,
@@ -506,7 +540,7 @@ func TestUpdateCert(t *testing.T) {
 		{
 			desc:        "update with an empty token",
 			req:         data,
-			key:         saved.MFKey,
+			id:          saved.MFThing,
 			auth:        "",
 			contentType: contentType,
 			status:      http.StatusForbidden,
@@ -514,7 +548,7 @@ func TestUpdateCert(t *testing.T) {
 		{
 			desc:        "update a valid config",
 			req:         data,
-			key:         saved.MFKey,
+			id:          saved.MFThing,
 			auth:        validToken,
 			contentType: contentType,
 			status:      http.StatusOK,
@@ -522,7 +556,7 @@ func TestUpdateCert(t *testing.T) {
 		{
 			desc:        "update a config with wrong content type",
 			req:         data,
-			key:         saved.MFKey,
+			id:          saved.MFThing,
 			auth:        validToken,
 			contentType: "",
 			status:      http.StatusUnsupportedMediaType,
@@ -530,7 +564,7 @@ func TestUpdateCert(t *testing.T) {
 		{
 			desc:        "update a non-existing config",
 			req:         data,
-			key:         wrongID,
+			id:          wrongID,
 			auth:        validToken,
 			contentType: contentType,
 			status:      http.StatusNotFound,
@@ -538,14 +572,14 @@ func TestUpdateCert(t *testing.T) {
 		{
 			desc:        "update a config with invalid request format",
 			req:         "}",
-			key:         saved.MFKey,
+			id:          saved.MFKey,
 			auth:        validToken,
 			contentType: contentType,
 			status:      http.StatusBadRequest,
 		},
 		{
 			desc:        "update a config with an empty request",
-			key:         saved.MFKey,
+			id:          saved.MFThing,
 			req:         "",
 			auth:        validToken,
 			contentType: contentType,
@@ -556,8 +590,8 @@ func TestUpdateCert(t *testing.T) {
 	for _, tc := range cases {
 		req := testRequest{
 			client:      bs.Client(),
-			method:      http.MethodPut,
-			url:         fmt.Sprintf("%s/things/configs/certs/%s", bs.URL, tc.key),
+			method:      http.MethodPatch,
+			url:         fmt.Sprintf("%s/things/configs/certs/%s", bs.URL, tc.id),
 			contentType: tc.contentType,
 			token:       tc.auth,
 			body:        strings.NewReader(tc.req),
@@ -1100,6 +1134,9 @@ func TestBootstrap(t *testing.T) {
 	saved, err := svc.Add(validToken, c)
 	require.Nil(t, err, fmt.Sprintf("Saving config expected to succeed: %s.\n", err))

+	encExternKey, err := enc([]byte(c.ExternalKey))
+	require.Nil(t, err, fmt.Sprintf("Encrypting config expected to succeed: %s.\n", err))
+
 	var channels []channel
 	for _, ch := range saved.MFChannels {
 		channels = append(channels, channel{ID: ch.ID, Name: ch.Name, Metadata: ch.Metadata})
@@ -1110,11 +1147,17 @@ func TestBootstrap(t *testing.T) {
 		MFKey      string    `json:"mainflux_key"`
 		MFChannels []channel `json:"mainflux_channels"`
 		Content    string    `json:"content"`
+		ClientCert string    `json:"client_cert"`
+		ClientKey  string    `json:"client_key"`
+		CACert     string    `json:"ca_cert"`
 	}{
 		MFThing:    saved.MFThing,
 		MFKey:      saved.MFKey,
 		MFChannels: channels,
 		Content:    saved.Content,
+		ClientCert: saved.ClientCert,
+		ClientKey:  saved.ClientKey,
+		CACert:     saved.CACert,
 	}

 	data := toJSON(s)
@@ -1125,6 +1168,7 @@ func TestBootstrap(t *testing.T) {
 		external_key string
 		status       int
 		res          string
+		secure       bool
 	}{
 		{
 			desc:         "bootstrap a Thing with unknown ID",
@@ -1132,6 +1176,7 @@ func TestBootstrap(t *testing.T) {
 			external_key: c.ExternalKey,
 			status:       http.StatusNotFound,
 			res:          "",
+			secure:       false,
 		},
 		{
 			desc:         "bootstrap a Thing with an empty ID",
@@ -1139,6 +1184,7 @@ func TestBootstrap(t *testing.T) {
 			external_key: c.ExternalKey,
 			status:       http.StatusBadRequest,
 			res:          "",
+			secure:       false,
 		},
 		{
 			desc:         "bootstrap a Thing with unknown key",
@@ -1146,6 +1192,7 @@ func TestBootstrap(t *testing.T) {
 			external_key: unknown,
 			status:       http.StatusNotFound,
 			res:          "",
+			secure:       false,
 		},
 		{
 			desc:         "bootstrap a Thing with an empty key",
@@ -1153,6 +1200,7 @@ func TestBootstrap(t *testing.T) {
 			external_key: "",
 			status:       http.StatusForbidden,
 			res:          "",
+			secure:       false,
 		},
 		{
 			desc:         "bootstrap known Thing",
@@ -1160,6 +1208,23 @@ func TestBootstrap(t *testing.T) {
 			external_key: c.ExternalKey,
 			status:       http.StatusOK,
 			res:          data,
+			secure:       false,
+		},
+		{
+			desc:         "bootstrap secure",
+			external_id:  fmt.Sprintf("secure/%s", c.ExternalID),
+			external_key: hex.EncodeToString(encExternKey),
+			status:       http.StatusOK,
+			res:          data,
+			secure:       true,
+		},
+		{
+			desc:         "bootstrap secure with unencrypted key",
+			external_id:  fmt.Sprintf("secure/%s", c.ExternalID),
+			external_key: c.ExternalKey,
+			status:       http.StatusNotFound,
+			res:          "",
+			secure:       true,
 		},
 	}

@@ -1176,6 +1241,9 @@ func TestBootstrap(t *testing.T) {
 		assert.Equal(t, tc.status, res.StatusCode, fmt.Sprintf("%s: expected status code %d got %d", tc.desc, tc.status, res.StatusCode))
 		body, err := ioutil.ReadAll(res.Body)
 		assert.Nil(t, err, fmt.Sprintf("%s: unexpected error %s", tc.desc, err))
+		if tc.secure {
+			body, err = dec(body)
+		}

 		data := strings.Trim(string(body), "\n")
 		assert.Equal(t, tc.res, data, fmt.Sprintf("%s: expected response '%s' got '%s'", tc.desc, tc.res, data))
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 // +build !test

@@ -68,9 +64,9 @@ func (lm *loggingMiddleware) Update(key string, cfg bootstrap.Config) (err error
 	return lm.svc.Update(key, cfg)
 }

-func (lm *loggingMiddleware) UpdateCert(key, thingKey, clientCert, clientKey, caCert string) (err error) {
+func (lm *loggingMiddleware) UpdateCert(key, thingID, clientCert, clientKey, caCert string) (err error) {
 	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method update_cert for thing with key %s took %s to complete", thingKey, time.Since(begin))
+		message := fmt.Sprintf("Method update_cert for thing with id %s took %s to complete", thingID, time.Since(begin))
 		if err != nil {
 			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
 			return
@@ -78,7 +74,7 @@ func (lm *loggingMiddleware) UpdateCert(key, thingKey, clientCert, clientKey, ca
 		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
 	}(time.Now())

-	return lm.svc.UpdateCert(key, thingKey, clientCert, clientKey, caCert)
+	return lm.svc.UpdateCert(key, thingID, clientCert, clientKey, caCert)
 }

 func (lm *loggingMiddleware) UpdateConnections(key, id string, connections []string) (err error) {
@@ -120,7 +116,7 @@ func (lm *loggingMiddleware) Remove(key, id string) (err error) {
 	return lm.svc.Remove(key, id)
 }

-func (lm *loggingMiddleware) Bootstrap(externalKey, externalID string) (cfg bootstrap.Config, err error) {
+func (lm *loggingMiddleware) Bootstrap(externalKey, externalID string, secure bool) (cfg bootstrap.Config, err error) {
 	defer func(begin time.Time) {
 		message := fmt.Sprintf("Method bootstrap for thing with external id %s took %s to complete", externalID, time.Since(begin))
 		if err != nil {
@@ -130,7 +126,7 @@ func (lm *loggingMiddleware) Bootstrap(externalKey, externalID string) (cfg boot
 		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
 	}(time.Now())

-	return lm.svc.Bootstrap(externalKey, externalID)
+	return lm.svc.Bootstrap(externalKey, externalID, secure)
 }

 func (lm *loggingMiddleware) ChangeState(key, id string, state bootstrap.State) (err error) {
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 // +build !test

@@ -97,13 +93,13 @@ func (mm *metricsMiddleware) Remove(id, key string) (err error) {
 	return mm.svc.Remove(id, key)
 }

-func (mm *metricsMiddleware) Bootstrap(externalKey, externalID string) (cfg bootstrap.Config, err error) {
+func (mm *metricsMiddleware) Bootstrap(externalKey, externalID string, secure bool) (cfg bootstrap.Config, err error) {
 	defer func(begin time.Time) {
 		mm.counter.With("method", "bootstrap").Add(1)
 		mm.latency.With("method", "bootstrap").Observe(time.Since(begin).Seconds())
 	}(time.Now())

-	return mm.svc.Bootstrap(externalKey, externalID)
+	return mm.svc.Bootstrap(externalKey, externalID, secure)
 }

 func (mm *metricsMiddleware) ChangeState(id, key string, state bootstrap.State) (err error) {
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package api

@@ -76,7 +72,7 @@ func (req updateReq) validate() error {

 type updateCertReq struct {
 	key        string
-	thingKey   string
+	thingID    string
 	ClientCert string `json:"client_cert"`
 	ClientKey  string `json:"client_key"`
 	CACert     string `json:"ca_cert"`
@@ -87,7 +83,7 @@ func (req updateCertReq) validate() error {
 		return bootstrap.ErrUnauthorizedAccess
 	}

-	if req.thingKey == "" {
+	if req.thingID == "" {
 		return bootstrap.ErrNotFound
 	}

@@ -116,29 +116,29 @@ func TestUpdateReqValidation(t *testing.T) {

 func TestUpdateCertReqValidation(t *testing.T) {
 	cases := []struct {
-		desc     string
-		key      string
-		thingKey string
-		err      error
+		desc    string
+		key     string
+		thingID string
+		err     error
 	}{
 		{
-			desc:     "empty key",
-			key:      "",
-			thingKey: "thingKey",
-			err:      bootstrap.ErrUnauthorizedAccess,
+			desc:    "empty key",
+			key:     "",
+			thingID: "thingID",
+			err:     bootstrap.ErrUnauthorizedAccess,
 		},
 		{
-			desc:     "empty thing key",
-			key:      "key",
-			thingKey: "",
-			err:      bootstrap.ErrNotFound,
+			desc:    "empty thing key",
+			key:     "key",
+			thingID: "",
+			err:     bootstrap.ErrNotFound,
 		},
 	}

 	for _, tc := range cases {
 		req := updateCertReq{
-			key:      tc.key,
-			thingKey: tc.thingKey,
+			key:     tc.key,
+			thingID: tc.thingID,
 		}

 		err := req.validate()
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package api

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package api

@@ -62,7 +58,7 @@ func MakeHandler(svc bootstrap.Service, reader bootstrap.ConfigReader) http.Hand
 		encodeResponse,
 		opts...))

-	r.Put("/things/configs/certs/:key", kithttp.NewServer(
+	r.Patch("/things/configs/certs/:id", kithttp.NewServer(
 		updateCertEndpoint(svc),
 		decodeUpdateCertRequest,
 		encodeResponse,
@@ -87,11 +83,17 @@ func MakeHandler(svc bootstrap.Service, reader bootstrap.ConfigReader) http.Hand
 		opts...))

 	r.Get("/things/bootstrap/:external_id", kithttp.NewServer(
-		bootstrapEndpoint(svc, reader),
+		bootstrapEndpoint(svc, reader, false),
 		decodeBootstrapRequest,
 		encodeResponse,
 		opts...))

+	r.Get("/things/bootstrap/secure/:external_id", kithttp.NewServer(
+		bootstrapEndpoint(svc, reader, true),
+		decodeBootstrapRequest,
+		encodeSecureRes,
+		opts...))
+
 	r.Put("/things/state/:id", kithttp.NewServer(
 		stateEndpoint(svc),
 		decodeStateRequest,
@@ -142,8 +144,11 @@ func decodeUpdateCertRequest(_ context.Context, r *http.Request) (interface{}, e
 		return nil, errUnsupportedContentType
 	}

-	req := updateCertReq{key: r.Header.Get("Authorization")}
-	req.thingKey = bone.GetValue(r, "key")
+	req := updateCertReq{
+		key:     r.Header.Get("Authorization"),
+		thingID: bone.GetValue(r, "id"),
+	}
+
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		return nil, err
 	}
@@ -258,6 +263,17 @@ func encodeResponse(_ context.Context, w http.ResponseWriter, response interface
 	return json.NewEncoder(w).Encode(response)
 }

+func encodeSecureRes(_ context.Context, w http.ResponseWriter, response interface{}) error {
+	w.Header().Set("Content-Type", contentType)
+	w.WriteHeader(http.StatusOK)
+	if b, ok := response.([]byte); ok {
+		if _, err := w.Write(b); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func encodeError(_ context.Context, err error, w http.ResponseWriter) {
 	w.Header().Set("Content-Type", contentType)

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package bootstrap

@@ -65,7 +61,7 @@ type ConfigRepository interface {
 	RetrieveAll(string, Filter, uint64, uint64) ConfigsPage

 	// RetrieveByExternalID returns Config for given external ID.
-	RetrieveByExternalID(string, string) (Config, error)
+	RetrieveByExternalID(string) (Config, error)

 	// Update updates an existing Config. A non-nil error is returned
 	// to indicate operation failure.
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 // Package bootstrap contains the domain concept definitions needed to support
 // Mainflux bootstrap service functionality.
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package mocks

@@ -134,12 +130,12 @@ func (crm *configRepositoryMock) RetrieveAll(key string, filter bootstrap.Filter
 	}
 }

-func (crm *configRepositoryMock) RetrieveByExternalID(externalKey, externalID string) (bootstrap.Config, error) {
+func (crm *configRepositoryMock) RetrieveByExternalID(externalID string) (bootstrap.Config, error) {
 	crm.mu.Lock()
 	defer crm.mu.Unlock()

 	for _, cfg := range crm.configs {
-		if cfg.ExternalID == externalID && cfg.ExternalKey == externalKey {
+		if cfg.ExternalID == externalID {
 			return cfg, nil
 		}
 	}
@@ -163,12 +159,12 @@ func (crm *configRepositoryMock) Update(config bootstrap.Config) error {
 	return nil
 }

-func (crm *configRepositoryMock) UpdateCert(owner, thingKey, clientCert, clientKey, caCert string) error {
+func (crm *configRepositoryMock) UpdateCert(owner, thingID, clientCert, clientKey, caCert string) error {
 	crm.mu.Lock()
 	defer crm.mu.Unlock()
 	var forUpdate bootstrap.Config
 	for _, v := range crm.configs {
-		if v.MFKey == thingKey && v.Owner == owner {
+		if v.MFThing == thingID && v.Owner == owner {
 			forUpdate = v
 			break
 		}
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package mocks

@@ -23,43 +19,45 @@ type mainfluxThings struct {
 	counter     uint64
 	things      map[string]things.Thing
 	channels    map[string]things.Channel
-	users       mainflux.UsersServiceClient
+	auth        mainflux.AuthNServiceClient
 	connections map[string][]string
 }

 // NewThingsService returns Mainflux Things service mock.
 // Only methods used by SDK are mocked.
-func NewThingsService(things map[string]things.Thing, channels map[string]things.Channel, users mainflux.UsersServiceClient) things.Service {
+func NewThingsService(things map[string]things.Thing, channels map[string]things.Channel, authn mainflux.AuthNServiceClient) things.Service {
 	return &mainfluxThings{
 		things:      things,
 		channels:    channels,
-		users:       users,
+		auth:        authn,
 		connections: make(map[string][]string),
 	}
 }

-func (svc *mainfluxThings) AddThing(_ context.Context, owner string, thing things.Thing) (things.Thing, error) {
+func (svc *mainfluxThings) CreateThings(_ context.Context, owner string, ths ...things.Thing) ([]things.Thing, error) {
 	svc.mu.Lock()
 	defer svc.mu.Unlock()

-	userID, err := svc.users.Identify(context.Background(), &mainflux.Token{Value: owner})
+	userID, err := svc.auth.Identify(context.Background(), &mainflux.Token{Value: owner})
 	if err != nil {
-		return things.Thing{}, things.ErrUnauthorizedAccess
+		return []things.Thing{}, things.ErrUnauthorizedAccess
+	}
+	for i := range ths {
+		svc.counter++
+		ths[i].Owner = userID.Value
+		ths[i].ID = strconv.FormatUint(svc.counter, 10)
+		ths[i].Key = ths[i].ID
+		svc.things[ths[i].ID] = ths[i]
 	}

-	svc.counter++
-	thing.Owner = userID.Value
-	thing.ID = strconv.FormatUint(svc.counter, 10)
-	thing.Key = thing.ID
-	svc.things[thing.ID] = thing
-	return thing, nil
+	return ths, nil
 }

 func (svc *mainfluxThings) ViewThing(_ context.Context, owner, id string) (things.Thing, error) {
 	svc.mu.Lock()
 	defer svc.mu.Unlock()

-	userID, err := svc.users.Identify(context.Background(), &mainflux.Token{Value: owner})
+	userID, err := svc.auth.Identify(context.Background(), &mainflux.Token{Value: owner})
 	if err != nil {
 		return things.Thing{}, things.ErrUnauthorizedAccess
 	}
@@ -72,20 +70,23 @@ func (svc *mainfluxThings) ViewThing(_ context.Context, owner, id string) (thing
 	return things.Thing{}, things.ErrNotFound
 }

-func (svc *mainfluxThings) Connect(_ context.Context, owner, chanID, thingID string) error {
+func (svc *mainfluxThings) Connect(_ context.Context, owner string, chIDs, thIDs []string) error {
 	svc.mu.Lock()
 	defer svc.mu.Unlock()

-	userID, err := svc.users.Identify(context.Background(), &mainflux.Token{Value: owner})
+	userID, err := svc.auth.Identify(context.Background(), &mainflux.Token{Value: owner})
 	if err != nil {
 		return things.ErrUnauthorizedAccess
 	}
-
-	if svc.channels[chanID].Owner != userID.Value {
-		return things.ErrNotFound
+	for _, chID := range chIDs {
+		if svc.channels[chID].Owner != userID.Value {
+			return things.ErrUnauthorizedAccess
+		}
+		for _, thID := range thIDs {
+			svc.connections[chID] = append(svc.connections[chID], thID)
+		}
 	}

-	svc.connections[chanID] = append(svc.connections[chanID], thingID)
 	return nil
 }

@@ -93,7 +94,7 @@ func (svc *mainfluxThings) Disconnect(_ context.Context, owner, chanID, thingID
 	svc.mu.Lock()
 	defer svc.mu.Unlock()

-	userID, err := svc.users.Identify(context.Background(), &mainflux.Token{Value: owner})
+	userID, err := svc.auth.Identify(context.Background(), &mainflux.Token{Value: owner})
 	if err != nil || svc.channels[chanID].Owner != userID.Value {
 		return things.ErrUnauthorizedAccess
 	}
@@ -125,7 +126,7 @@ func (svc *mainfluxThings) RemoveThing(_ context.Context, owner, id string) erro
 	svc.mu.Lock()
 	defer svc.mu.Unlock()

-	userID, err := svc.users.Identify(context.Background(), &mainflux.Token{Value: owner})
+	userID, err := svc.auth.Identify(context.Background(), &mainflux.Token{Value: owner})
 	if err != nil {
 		return things.ErrUnauthorizedAccess
 	}
@@ -137,13 +138,13 @@ func (svc *mainfluxThings) RemoveThing(_ context.Context, owner, id string) erro
 	delete(svc.things, id)
 	conns := make(map[string][]string)
 	for k, v := range svc.connections {
-		idx := findIndex(v, id)
-		if idx != -1 {
+		i := findIndex(v, id)
+		if i != -1 {
 			var tmp []string
-			if idx != len(v)-2 {
-				tmp = v[idx+1:]
+			if i != len(v)-2 {
+				tmp = v[i+1:]
 			}
-			conns[k] = append(v[:idx], tmp...)
+			conns[k] = append(v[:i], tmp...)
 		}
 	}

@@ -166,7 +167,7 @@ func (svc *mainfluxThings) UpdateKey(context.Context, string, string, string) er
 	panic("not implemented")
 }

-func (svc *mainfluxThings) ListThings(context.Context, string, uint64, uint64, string) (things.ThingsPage, error) {
+func (svc *mainfluxThings) ListThings(context.Context, string, uint64, uint64, string, things.Metadata) (things.ThingsPage, error) {
 	panic("not implemented")
 }

@@ -178,15 +179,29 @@ func (svc *mainfluxThings) ListThingsByChannel(context.Context, string, string,
 	panic("not implemented")
 }

-func (svc *mainfluxThings) CreateChannel(context.Context, string, things.Channel) (things.Channel, error) {
-	panic("not implemented")
+func (svc *mainfluxThings) CreateChannels(_ context.Context, owner string, chs ...things.Channel) ([]things.Channel, error) {
+	svc.mu.Lock()
+	defer svc.mu.Unlock()
+
+	userID, err := svc.auth.Identify(context.Background(), &mainflux.Token{Value: owner})
+	if err != nil {
+		return []things.Channel{}, things.ErrUnauthorizedAccess
+	}
+	for i := range chs {
+		svc.counter++
+		chs[i].Owner = userID.Value
+		chs[i].ID = strconv.FormatUint(svc.counter, 10)
+		svc.channels[chs[i].ID] = chs[i]
+	}
+
+	return chs, nil
 }

 func (svc *mainfluxThings) UpdateChannel(context.Context, string, things.Channel) error {
 	panic("not implemented")
 }

-func (svc *mainfluxThings) ListChannels(context.Context, string, uint64, uint64, string) (things.ChannelsPage, error) {
+func (svc *mainfluxThings) ListChannels(context.Context, string, uint64, uint64, string, things.Metadata) (things.ChannelsPage, error) {
 	panic("not implemented")
 }

@@ -194,7 +209,7 @@ func (svc *mainfluxThings) RemoveChannel(context.Context, string, string) error
 	panic("not implemented")
 }

-func (svc *mainfluxThings) CanAccess(context.Context, string, string) (string, error) {
+func (svc *mainfluxThings) CanAccessByKey(context.Context, string, string) (string, error) {
 	panic("not implemented")
 }

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package mocks

@@ -15,20 +11,30 @@ import (
 	"google.golang.org/grpc"
 )

-var _ mainflux.UsersServiceClient = (*usersServiceMock)(nil)
+var _ mainflux.AuthNServiceClient = (*serviceMock)(nil)

-type usersServiceMock struct {
+type serviceMock struct {
 	users map[string]string
 }

 // NewUsersService creates mock of users service.
-func NewUsersService(users map[string]string) mainflux.UsersServiceClient {
-	return &usersServiceMock{users}
+func NewUsersService(users map[string]string) mainflux.AuthNServiceClient {
+	return &serviceMock{users}
 }

-func (svc usersServiceMock) Identify(ctx context.Context, in *mainflux.Token, opts ...grpc.CallOption) (*mainflux.UserID, error) {
+func (svc serviceMock) Identify(ctx context.Context, in *mainflux.Token, opts ...grpc.CallOption) (*mainflux.UserID, error) {
 	if id, ok := svc.users[in.Value]; ok {
 		return &mainflux.UserID{Value: id}, nil
 	}
 	return nil, users.ErrUnauthorizedAccess
 }
+
+func (svc serviceMock) Issue(ctx context.Context, in *mainflux.IssueReq, opts ...grpc.CallOption) (*mainflux.Token, error) {
+	if id, ok := svc.users[in.GetIssuer()]; ok {
+		switch in.Type {
+		default:
+			return &mainflux.Token{Value: id}, nil
+		}
+	}
+	return nil, users.ErrUnauthorizedAccess
+}
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package postgres

@@ -192,16 +188,15 @@ func (cr configRepository) RetrieveAll(key string, filter bootstrap.Filter, offs
 	}
 }

-func (cr configRepository) RetrieveByExternalID(externalKey, externalID string) (bootstrap.Config, error) {
-	q := `SELECT mainflux_thing, mainflux_key, owner, name, client_cert, client_key, ca_cert, content, state 
+func (cr configRepository) RetrieveByExternalID(externalID string) (bootstrap.Config, error) {
+	q := `SELECT mainflux_thing, mainflux_key, external_key, owner, name, client_cert, client_key, ca_cert, content, state 
 		  FROM configs 
-		  WHERE external_key = $1 AND external_id = $2`
+		  WHERE external_id = $1`
 	dbcfg := dbConfig{
-		ExternalID:  externalID,
-		ExternalKey: externalKey,
+		ExternalID: externalID,
 	}

-	if err := cr.db.QueryRowx(q, externalKey, externalID).StructScan(&dbcfg); err != nil {
+	if err := cr.db.QueryRowx(q, externalID).StructScan(&dbcfg); err != nil {
 		empty := bootstrap.Config{}
 		if err == sql.ErrNoRows {
 			return empty, bootstrap.ErrNotFound
@@ -267,10 +262,10 @@ func (cr configRepository) Update(cfg bootstrap.Config) error {
 	return nil
 }

-func (cr configRepository) UpdateCert(key, thingKey, clientCert, clientKey, caCert string) error {
-	q := `UPDATE configs SET client_cert = $1, client_key = $2, ca_cert = $3 WHERE mainflux_key = $4 AND owner = $5`
+func (cr configRepository) UpdateCert(owner, thingID, clientCert, clientKey, caCert string) error {
+	q := `UPDATE configs SET client_cert = $1, client_key = $2, ca_cert = $3 WHERE mainflux_thing = $4 AND owner = $5`

-	res, err := cr.db.Exec(q, clientCert, clientKey, caCert, thingKey, key)
+	res, err := cr.db.Exec(q, clientCert, clientKey, caCert, thingID, owner)
 	if err != nil {
 		return err
 	}
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package postgres_test

@@ -252,32 +248,23 @@ func TestRetrieveByExternalID(t *testing.T) {
 	require.Nil(t, err, fmt.Sprintf("Saving config expected to succeed: %s.\n", err))

 	cases := []struct {
-		desc        string
-		externalID  string
-		externalKey string
-		err         error
+		desc       string
+		externalID string
+		err        error
 	}{
 		{
-			desc:        "retrieve with invalid external ID",
-			externalID:  strconv.Itoa(numConfigs + 1),
-			externalKey: config.ExternalKey,
-			err:         bootstrap.ErrNotFound,
+			desc:       "retrieve with invalid external ID",
+			externalID: strconv.Itoa(numConfigs + 1),
+			err:        bootstrap.ErrNotFound,
 		},
 		{
-			desc:        "retrieve with invalid external key",
-			externalID:  c.ExternalID,
-			externalKey: "invalid",
-			err:         bootstrap.ErrNotFound,
-		},
-		{
-			desc:        "retrieve with external key",
-			externalID:  c.ExternalID,
-			externalKey: c.ExternalKey,
-			err:         nil,
+			desc:       "retrieve with external key",
+			externalID: c.ExternalID,
+			err:        nil,
 		},
 	}
 	for _, tc := range cases {
-		_, err := repo.RetrieveByExternalID(tc.externalKey, tc.externalID)
+		_, err := repo.RetrieveByExternalID(tc.externalID)
 		assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
 	}
 }
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 // Package postgres contains repository implementations using PostgreSQL as
 // the underlying database.
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package postgres

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package postgres_test

@@ -1,16 +1,15 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package bootstrap

 import (
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/rand"
+	"encoding/json"
+	"io"
 	"net/http"
-
-	"github.com/mainflux/mainflux"
 )

 // bootstrapRes represent Mainflux Response to the Bootatrap request.
@@ -20,10 +19,10 @@ type bootstrapRes struct {
 	MFThing    string       `json:"mainflux_id"`
 	MFKey      string       `json:"mainflux_key"`
 	MFChannels []channelRes `json:"mainflux_channels"`
+	Content    string       `json:"content,omitempty"`
 	ClientCert string       `json:"client_cert,omitempty"`
 	ClientKey  string       `json:"client_key,omitempty"`
-	CaCert     string       `json:"ca_cert,omitempty"`
-	Content    string       `json:"content,omitempty"`
+	CACert     string       `json:"ca_cert,omitempty"`
 }

 type channelRes struct {
@@ -44,15 +43,17 @@ func (res bootstrapRes) Empty() bool {
 	return false
 }

-type reader struct{}
+type reader struct {
+	encKey []byte
+}

 // NewConfigReader return new reader which is used to generate response
 // from the config.
-func NewConfigReader() ConfigReader {
-	return reader{}
+func NewConfigReader(encKey []byte) ConfigReader {
+	return reader{encKey: encKey}
 }

-func (r reader) ReadConfig(cfg Config) (mainflux.Response, error) {
+func (r reader) ReadConfig(cfg Config, secure bool) (interface{}, error) {
 	var channels []channelRes
 	for _, ch := range cfg.MFChannels {
 		channels = append(channels, channelRes{ID: ch.ID, Name: ch.Name, Metadata: ch.Metadata})
@@ -62,11 +63,33 @@ func (r reader) ReadConfig(cfg Config) (mainflux.Response, error) {
 		MFKey:      cfg.MFKey,
 		MFThing:    cfg.MFThing,
 		MFChannels: channels,
+		Content:    cfg.Content,
 		ClientCert: cfg.ClientCert,
 		ClientKey:  cfg.ClientKey,
-		CaCert:     cfg.CACert,
-		Content:    cfg.Content,
+		CACert:     cfg.CACert,
+	}
+	if secure {
+		b, err := json.Marshal(res)
+		if err != nil {
+			return nil, err
+		}
+		return r.encrypt(b)
 	}

 	return res, nil
 }
+
+func (r reader) encrypt(in []byte) ([]byte, error) {
+	block, err := aes.NewCipher(r.encKey)
+	if err != nil {
+		return nil, err
+	}
+	ciphertext := make([]byte, aes.BlockSize+len(in))
+	iv := ciphertext[:aes.BlockSize]
+	if _, err := io.ReadFull(rand.Reader, iv); err != nil {
+		return nil, err
+	}
+	stream := cipher.NewCFBEncrypter(block, iv)
+	stream.XORKeyStream(ciphertext[aes.BlockSize:], in)
+	return ciphertext, nil
+}
@@ -0,0 +1,126 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
+package bootstrap_test
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/mainflux/mainflux"
+	"github.com/mainflux/mainflux/bootstrap"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+type readChan struct {
+	ID       string      `json:"id"`
+	Name     string      `json:"name,omitempty"`
+	Metadata interface{} `json:"metadata,omitempty"`
+}
+
+type readResp struct {
+	MFThing    string     `json:"mainflux_id"`
+	MFKey      string     `json:"mainflux_key"`
+	MFChannels []readChan `json:"mainflux_channels"`
+	Content    string     `json:"content,omitempty"`
+	ClientCert string     `json:"client_cert,omitempty"`
+	ClientKey  string     `json:"client_key,omitempty"`
+	CACert     string     `json:"ca_cert,omitempty"`
+}
+
+func dec(in []byte) ([]byte, error) {
+	block, err := aes.NewCipher(encKey)
+	if err != nil {
+		return nil, err
+	}
+	if len(in) < aes.BlockSize {
+		return nil, bootstrap.ErrMalformedEntity
+	}
+	iv := in[:aes.BlockSize]
+	in = in[aes.BlockSize:]
+	stream := cipher.NewCFBDecrypter(block, iv)
+	stream.XORKeyStream(in, in)
+	return in, nil
+}
+
+func TestReadConfig(t *testing.T) {
+	cfg := bootstrap.Config{
+		MFThing:    "mf_id",
+		ClientCert: "client_cert",
+		ClientKey:  "client_key",
+		CACert:     "ca_cert",
+		MFKey:      "mf_key",
+		MFChannels: []bootstrap.Channel{
+			bootstrap.Channel{
+				ID:       "mf_id",
+				Name:     "mf_name",
+				Metadata: map[string]interface{}{"key": "value}"},
+			},
+		},
+		Content: "content",
+	}
+	ret := readResp{
+		MFThing: "mf_id",
+		MFKey:   "mf_key",
+		MFChannels: []readChan{
+			{
+				ID:       "mf_id",
+				Name:     "mf_name",
+				Metadata: map[string]interface{}{"key": "value}"},
+			},
+		},
+		Content:    "content",
+		ClientCert: "client_cert",
+		ClientKey:  "client_key",
+		CACert:     "ca_cert",
+	}
+
+	bin, err := json.Marshal(ret)
+	require.Nil(t, err, fmt.Sprintf("Marshalling expected to succeed: %s.\n", err))
+
+	reader := bootstrap.NewConfigReader(encKey)
+	cases := []struct {
+		desc   string
+		config bootstrap.Config
+		enc    []byte
+		secret bool
+		err    error
+	}{
+		{
+			desc:   "read a config",
+			config: cfg,
+			enc:    bin,
+			secret: false,
+		},
+		{
+			desc:   "read encrypted config",
+			config: cfg,
+			enc:    bin,
+			secret: true,
+		},
+	}
+
+	for _, tc := range cases {
+		res, err := reader.ReadConfig(tc.config, tc.secret)
+		require.Nil(t, err, fmt.Sprintf("Reading config to succeed: %s.\n", err))
+
+		if tc.secret {
+			d, err := dec(res.([]byte))
+			require.Nil(t, err, fmt.Sprintf("Decrypting expected to succeed: %s.\n", err))
+			assert.Equal(t, tc.enc, d, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.enc, d))
+			continue
+		}
+		b, err := json.Marshal(res)
+		require.Nil(t, err, fmt.Sprintf("Marshalling expected to succeed: %s.\n", err))
+		assert.Equal(t, tc.enc, b, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.enc, b))
+		resp, ok := res.(mainflux.Response)
+		require.True(t, ok, fmt.Sprintf("If not encrypted, reader should return response."))
+		assert.False(t, resp.Empty(), fmt.Sprintf("Response should not be empty %s.", err))
+		assert.Equal(t, http.StatusOK, resp.Code(), fmt.Sprintf("Default config response code should be 200."))
+	}
+}
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2019
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 // Package consumer contains events consumer for events
 // published by Things service.
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2019
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package consumer

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2019
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package consumer

@@ -31,8 +27,8 @@ const (
 	exists = "BUSYGROUP Consumer Group name already exists"
 )

-// EventStore represents event source for things and channels provisioning.
-type EventStore interface {
+// Subscriber represents event source for things and channels provisioning.
+type Subscriber interface {
 	// Subscribes to given subject and receives events.
 	Subscribe(string) error
 }
@@ -45,7 +41,7 @@ type eventStore struct {
 }

 // NewEventStore returns new event store instance.
-func NewEventStore(svc bootstrap.Service, client *redis.Client, consumer string, log logger.Logger) EventStore {
+func NewEventStore(svc bootstrap.Service, client *redis.Client, consumer string, log logger.Logger) Subscriber {
 	return eventStore{
 		svc:      svc,
 		client:   client,
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 // Package producer contains the domain events needed to support
 // event sourcing of Bootstrap service actions.
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2019
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package producer

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2019
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package producer_test

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2019
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package producer

@@ -121,8 +117,8 @@ func (es eventStore) Remove(key, id string) error {
 	return nil
 }

-func (es eventStore) Bootstrap(externalKey, externalID string) (bootstrap.Config, error) {
-	cfg, err := es.svc.Bootstrap(externalKey, externalID)
+func (es eventStore) Bootstrap(externalKey, externalID string, secure bool) (bootstrap.Config, error) {
+	cfg, err := es.svc.Bootstrap(externalKey, externalID, secure)

 	ev := bootstrapEvent{
 		externalID: externalID,
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2019
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package producer_test

@@ -50,6 +46,8 @@ const (
 )

 var (
+	encKey = []byte("1234567891011121")
+
 	channel = bootstrap.Channel{
 		ID:       "1",
 		Name:     "name",
@@ -64,17 +62,17 @@ var (
 	}
 )

-func newService(users mainflux.UsersServiceClient, url string) bootstrap.Service {
+func newService(auth mainflux.AuthNServiceClient, url string) bootstrap.Service {
 	configs := mocks.NewConfigsRepository(map[string]string{unknownID: unknownKey})
 	config := mfsdk.Config{
 		BaseURL: url,
 	}

 	sdk := mfsdk.NewSDK(config)
-	return bootstrap.New(users, configs, sdk)
+	return bootstrap.New(auth, configs, sdk, encKey)
 }

-func newThingsService(users mainflux.UsersServiceClient) things.Service {
+func newThingsService(auth mainflux.AuthNServiceClient) things.Service {
 	channels := make(map[string]things.Channel, channelsNum)
 	for i := 0; i < channelsNum; i++ {
 		id := strconv.Itoa(i + 1)
@@ -85,7 +83,7 @@ func newThingsService(users mainflux.UsersServiceClient) things.Service {
 		}
 	}

-	return mocks.NewThingsService(map[string]things.Thing{}, channels, users)
+	return mocks.NewThingsService(map[string]things.Thing{}, channels, auth)
 }

 func newThingsServer(svc things.Service) *httptest.Server {
@@ -449,7 +447,7 @@ func TestBootstrap(t *testing.T) {

 	lastID := "0"
 	for _, tc := range cases {
-		_, err := svc.Bootstrap(tc.externalKey, tc.externalID)
+		_, err := svc.Bootstrap(tc.externalKey, tc.externalID, false)
 		assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))

 		streams := redisClient.XRead(&redis.XReadArgs{
@@ -1,14 +1,13 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package bootstrap

 import (
 	"context"
+	"crypto/aes"
+	"crypto/cipher"
+	"encoding/hex"
 	"errors"
 	"time"

@@ -64,7 +63,7 @@ type Service interface {
 	Remove(string, string) error

 	// Bootstrap returns Config to the Thing with provided external ID using external key.
-	Bootstrap(string, string) (Config, error)
+	Bootstrap(string, string, bool) (Config, error)

 	// ChangeState changes state of the Thing with given ID and owner.
 	ChangeState(string, string, State) error
@@ -90,21 +89,24 @@ type Service interface {
 // is to provide convenient way to generate custom configuration response
 // based on the specific Config which will be consumed by the client.
 type ConfigReader interface {
-	ReadConfig(Config) (mainflux.Response, error)
+	ReadConfig(Config, bool) (interface{}, error)
 }

 type bootstrapService struct {
-	users   mainflux.UsersServiceClient
+	auth    mainflux.AuthNServiceClient
 	configs ConfigRepository
 	sdk     mfsdk.SDK
+	encKey  []byte
+	reader  ConfigReader
 }

 // New returns new Bootstrap service.
-func New(users mainflux.UsersServiceClient, configs ConfigRepository, sdk mfsdk.SDK) Service {
+func New(auth mainflux.AuthNServiceClient, configs ConfigRepository, sdk mfsdk.SDK, encKey []byte) Service {
 	return &bootstrapService{
 		configs: configs,
 		sdk:     sdk,
-		users:   users,
+		auth:    auth,
+		encKey:  encKey,
 	}
 }

@@ -174,12 +176,12 @@ func (bs bootstrapService) Update(key string, cfg Config) error {
 	return bs.configs.Update(cfg)
 }

-func (bs bootstrapService) UpdateCert(key, thingKey, clientCert, clientKey, caCert string) error {
+func (bs bootstrapService) UpdateCert(key, thingID, clientCert, clientKey, caCert string) error {
 	owner, err := bs.identify(key)
 	if err != nil {
 		return err
 	}
-	return bs.configs.UpdateCert(owner, thingKey, clientCert, clientKey, caCert)
+	return bs.configs.UpdateCert(owner, thingID, clientCert, clientKey, caCert)
 }

 func (bs bootstrapService) UpdateConnections(key, id string, connections []string) error {
@@ -257,12 +259,25 @@ func (bs bootstrapService) Remove(key, id string) error {
 	return bs.configs.Remove(owner, id)
 }

-func (bs bootstrapService) Bootstrap(externalKey, externalID string) (Config, error) {
-	cfg, err := bs.configs.RetrieveByExternalID(externalKey, externalID)
+func (bs bootstrapService) Bootstrap(externalKey, externalID string, secure bool) (Config, error) {
+	cfg, err := bs.configs.RetrieveByExternalID(externalID)
 	if err != nil {
 		if err == ErrNotFound {
 			bs.configs.SaveUnknown(externalKey, externalID)
+			return Config{}, ErrNotFound
 		}
+		return cfg, err
+	}
+
+	if secure {
+		dec, err := bs.dec(externalKey)
+		if err != nil {
+			return Config{}, err
+		}
+		externalKey = dec
+	}
+
+	if cfg.ExternalKey != externalKey {
 		return Config{}, ErrNotFound
 	}

@@ -325,7 +340,7 @@ func (bs bootstrapService) identify(token string) (string, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()

-	res, err := bs.users.Identify(ctx, &mainflux.Token{Value: token})
+	res, err := bs.auth.Identify(ctx, &mainflux.Token{Value: token})
 	if err != nil {
 		return "", ErrUnauthorizedAccess
 	}
@@ -426,3 +441,22 @@ func (bs bootstrapService) toIDList(channels []Channel) []string {

 	return ret
 }
+
+func (bs bootstrapService) dec(in string) (string, error) {
+	ciphertext, err := hex.DecodeString(in)
+	if err != nil {
+		return "", ErrNotFound
+	}
+	block, err := aes.NewCipher(bs.encKey)
+	if err != nil {
+		return "", err
+	}
+	if len(ciphertext) < aes.BlockSize {
+		return "", ErrMalformedEntity
+	}
+	iv := ciphertext[:aes.BlockSize]
+	ciphertext = ciphertext[aes.BlockSize:]
+	stream := cipher.NewCFBDecrypter(block, iv)
+	stream.XORKeyStream(ciphertext, ciphertext)
+	return string(ciphertext), nil
+}
@@ -1,14 +1,15 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package bootstrap_test

 import (
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/rand"
+	"encoding/hex"
 	"fmt"
+	"io"
 	"net/http/httptest"
 	"strconv"
 	"testing"
@@ -37,6 +38,8 @@ const (
 )

 var (
+	encKey = []byte("1234567891011121")
+
 	channel = bootstrap.Channel{
 		ID:       "1",
 		Name:     "name",
@@ -51,17 +54,17 @@ var (
 	}
 )

-func newService(users mainflux.UsersServiceClient, url string) bootstrap.Service {
+func newService(auth mainflux.AuthNServiceClient, url string) bootstrap.Service {
 	things := mocks.NewConfigsRepository(map[string]string{unknownID: unknownKey})
 	config := mfsdk.Config{
 		BaseURL: url,
 	}

 	sdk := mfsdk.NewSDK(config)
-	return bootstrap.New(users, things, sdk)
+	return bootstrap.New(auth, things, sdk, encKey)
 }

-func newThingsService(users mainflux.UsersServiceClient) things.Service {
+func newThingsService(auth mainflux.AuthNServiceClient) things.Service {
 	channels := make(map[string]things.Channel, channelsNum)
 	for i := 0; i < channelsNum; i++ {
 		id := strconv.Itoa(i + 1)
@@ -72,7 +75,7 @@ func newThingsService(users mainflux.UsersServiceClient) things.Service {
 		}
 	}

-	return mocks.NewThingsService(map[string]things.Thing{}, channels, users)
+	return mocks.NewThingsService(map[string]things.Thing{}, channels, auth)
 }

 func newThingsServer(svc things.Service) *httptest.Server {
@@ -80,6 +83,21 @@ func newThingsServer(svc things.Service) *httptest.Server {
 	return httptest.NewServer(mux)
 }

+func enc(in []byte) ([]byte, error) {
+	block, err := aes.NewCipher(encKey)
+	if err != nil {
+		return nil, err
+	}
+	ciphertext := make([]byte, aes.BlockSize+len(in))
+	iv := ciphertext[:aes.BlockSize]
+	if _, err := io.ReadFull(rand.Reader, iv); err != nil {
+		return nil, err
+	}
+	stream := cipher.NewCFBEncrypter(block, iv)
+	stream.XORKeyStream(ciphertext[aes.BlockSize:], in)
+	return ciphertext, nil
+}
+
 func TestAdd(t *testing.T) {
 	users := mocks.NewUsersService(map[string]string{validToken: email})

@@ -540,12 +558,16 @@ func TestBootstrap(t *testing.T) {
 	saved, err := svc.Add(validToken, config)
 	require.Nil(t, err, fmt.Sprintf("Saving config expected to succeed: %s.\n", err))

+	e, err := enc([]byte(saved.ExternalKey))
+	require.Nil(t, err, fmt.Sprintf("Encrypting external key expected to succeed: %s.\n", err))
+
 	cases := []struct {
 		desc        string
 		config      bootstrap.Config
 		externalKey string
 		externalID  string
 		err         error
+		encrypted   bool
 	}{
 		{
 			desc:        "bootstrap using invalid external id",
@@ -553,6 +575,7 @@ func TestBootstrap(t *testing.T) {
 			externalID:  "invalid",
 			externalKey: saved.ExternalKey,
 			err:         bootstrap.ErrNotFound,
+			encrypted:   false,
 		},
 		{
 			desc:        "bootstrap using invalid external key",
@@ -560,6 +583,7 @@ func TestBootstrap(t *testing.T) {
 			externalID:  saved.ExternalID,
 			externalKey: "invalid",
 			err:         bootstrap.ErrNotFound,
+			encrypted:   false,
 		},
 		{
 			desc:        "bootstrap an existing config",
@@ -567,11 +591,20 @@ func TestBootstrap(t *testing.T) {
 			externalID:  saved.ExternalID,
 			externalKey: saved.ExternalKey,
 			err:         nil,
+			encrypted:   false,
+		},
+		{
+			desc:        "bootstrap encrypted",
+			config:      saved,
+			externalID:  saved.ExternalID,
+			externalKey: hex.EncodeToString(e),
+			err:         nil,
+			encrypted:   true,
 		},
 	}

 	for _, tc := range cases {
-		config, err := svc.Bootstrap(tc.externalKey, tc.externalID)
+		config, err := svc.Bootstrap(tc.externalKey, tc.externalID, tc.encrypted)
 		assert.Equal(t, tc.config, config, fmt.Sprintf("%s: expected %v got %v\n", tc.desc, tc.config, config))
 		assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
 	}
@@ -720,7 +753,7 @@ func TestRemoveCoinfigHandler(t *testing.T) {
 		err  error
 	}{
 		{
-			desc: "remove an existing conifg",
+			desc: "remove an existing config",
 			id:   saved.MFThing,
 			err:  nil,
 		},
@@ -759,7 +792,7 @@ func TestDisconnectThingsHandler(t *testing.T) {
 			err:       nil,
 		},
 		{
-			desc:      "disconnect dicsonnected",
+			desc:      "disconnect disconnected",
 			channelID: channel.ID,
 			thingID:   saved.MFThing,
 			err:       nil,
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package bootstrap

@@ -18,9 +14,9 @@ const (

 // State represents corresponding Mainflux Thing state. The possible Config States
 // as well as description of what that State represents are given in the table:
-// | State    | What it means 		                                                           |
+// | State    | What it means                                                                  |
 // |----------+--------------------------------------------------------------------------------|
-// | Inactive | Thing is created, but isn't able to communicate over Mainflux 				   |
+// | Inactive | Thing is created, but isn't able to communicate over Mainflux                  |
 // | Active   | Thing is able to communicate using Mainflux                                    |
 type State int

@@ -30,7 +30,7 @@ paths:
          headers:
            Location:
              type: string
-              description: Created config's relative URL (i.e. /things/configs/{configId}).
+              description: Created configuration's relative URL (i.e. /things/configs/{configId}).
        400:
          description: Failed due to malformed JSON.
        403:
@@ -74,7 +74,7 @@ paths:
      tags:
        - configs
      parameters:
-        - $ref: "#/parameters/ConfigAuthorization"
+        - $ref: "#/parameters/ConfigAuth"
        - $ref: "#/parameters/ExternalId"
      responses:
        200:
@@ -88,6 +88,30 @@ paths:
            added to the service later.
        500:
          $ref: "#/responses/ServiceError"
+  /things/bootstrap/secure/{externalId}:
+    get:
+      summary: Retrieves configuration
+      description: |
+        Retrieves a configuration with given external ID and encrypted external key.
+      tags:
+        - configs
+      parameters:
+        - $ref: "#/parameters/EncConfigAuth"
+        - $ref: "#/parameters/ExternalId"
+      responses:
+        200:
+          description: |
+            Data retrieved. In this case, Bootstrap response is encrypted using
+            the secret key, so an actual response is in the binary format.
+          schema:
+            $ref: "#/definitions/BootstrapRes"
+        404:
+          description: |
+            Failed to retrieve corresponding config. Thing which attempted
+            to bootstrap is saved as an unknown Thing and can be listed and
+            added to the service later.
+        500:
+          $ref: "#/responses/ServiceError"
  /things/configs/{configId}:
    get:
      summary: Retrieves config info (with channels)
@@ -140,10 +164,10 @@ paths:
    delete:
      summary: Removes a Config
      description: |
-        Removes a Config. In case of successfull removal the service will ensure
-        that the removed config is disconnected from all of the Maifnlux channels.
+        Removes a Config. In case of successful removal the service will ensure
+        that the removed config is disconnected from all of the Mainflux channels.
      tags:
-        - confgis
+        - configs
      parameters:
        - $ref: "#/parameters/Authorization"
        - $ref: "#/parameters/ConfigId"
@@ -151,13 +175,13 @@ paths:
        204:
          description: Config removed.
        400:
-          description: Failed due to malformed config's ID.
+          description: Failed due to malformed config ID.
        403:
          description: Missing or invalid access token provided.
        500:
          $ref: "#/responses/ServiceError"
-  /things/configs/certs/{thingKey}:
-    put:
+  /things/configs/certs/{configId}:
+    patch:
      summary: Updates certs
      description: |
        Update is performed by replacing the current certificate data with values
@@ -166,7 +190,7 @@ paths:
        - configs
      parameters:
        - $ref: "#/parameters/Authorization"
-        - $ref: "#/parameters/ThingKey"
+        - $ref: "#/parameters/ConfigId"
        - name: config
          description: JSON-formatted document describing the updated thing.
          in: body
@@ -249,7 +273,7 @@ paths:
          $ref: "#/responses/ServiceError"
  /things/unknown/configs:
    get:
-      summary: Get a list of unsucessfully bootstrapped Things
+      summary: Get a list of unsuccessfully bootstrapped Things
      description: |
        Retrieves a list of unknown configs. Due to performance concerns, data
        is retrieved in subsets. The API configs must ensure that the entire
@@ -280,24 +304,27 @@ parameters:
    in: header
    type: string
    required: true
-  ConfigAuthorization:
+  ConfigAuth:
    name: configAuthorization
    description: Configuration external key.
    in: header
    type: string
    required: true
+  EncConfigAuth:
+    name: configAuthorization
+    description: |
+      Hex-encoded configuration external key encrypted using 
+      the AES algorithm and SHA256 sum of the external key 
+      itself as an encryption key.
+    in: header
+    type: string
+    required: true
  ConfigId:
    name: configId
    description: Unique Config identifier. It's the ID of the corresponding Thing.
    in: path
    type: string
    required: true
-  ThingKey:
-    name: thingKey
-    description: Unique Thing key.
-    in: path
-    type: string
-    required: true
  ExternalId:
    name: externalId
    description: Unique Config identifier provided by external entity.
@@ -339,7 +366,7 @@ parameters:

 responses:
  ServiceError:
-    description: Unexpected server-side error occured.
+    description: Unexpected server-side error occurred.

 definitions:
  ConfigList:
@@ -366,7 +393,7 @@ definitions:
        items:
          $ref: "#/definitions/ConfigRes"
    required:
-      - confgis
+      - configs
  State:
    type: integer
    enum:
@@ -398,7 +425,7 @@ definitions:
              description: Custom metadata related to the Channel.
      external_id:
        type: string
-        description: External ID (MAC address or some uinque identifier).
+        description: External ID (MAC address or some unique identifier).
      external_key:
        type: string
        description: External key.
@@ -411,33 +438,43 @@ definitions:
      - external_id
      - external_key
  BootstrapRes:
-      type: object
-      properties:
-        mainflux_id:
+    type: object
+    properties:
+      mainflux_id:
+        type: string
+        description: Corresponding Mainflux Thing ID.
+      mainflux_key:
+        type: string
+        description: Corresponding Mainflux Thing key.
+      mainflux_channels:
+        type: array
+        minItems: 0
+        items:
          type: string
-          description: Corresponding Mainflux Thing ID.
-        mainflux_key:
-          type: string
-          description: Corresponding Mainflux Thing key.
-        mainflux_channels:
-          type: array
-          minItems: 0
-          items:
-            type: string
-        content:
-          type: string
-          description: Free-form custom configuration.
-      required:
-        - mainflux_id
-        - mainflux_key
-        - mainflux_channels
-        - content
+      content:
+        type: string
+        description: Free-form custom configuration.
+      client_cert:
+        type: string
+        description: Client certrificate.
+      client_key:
+        type: string
+        description: Key for the client_cert.
+      ca_cert:
+        type: string
+        description: Issuing CA certificate.
+    required:
+      - mainflux_id
+      - mainflux_key
+      - mainflux_channels
+      - content
+
  ConfigReq:
    type: object
    properties:
      external_id:
        type: string
-        description: External ID (MAC address or some uinque identifier).
+        description: External ID (MAC address or some unique identifier).
      external_key:
        type: string
        description: External key.
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package cli

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package cli

@@ -1,19 +1,16 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package cli

 import (
-	"bufio"
 	"encoding/csv"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"

 	"github.com/docker/docker/pkg/namesgenerator"
 	mfxsdk "github.com/mainflux/mainflux/sdk/go"
@@ -22,82 +19,35 @@ import (

 var errMalformedCSV = errors.New("malformed CSV")

-func createThing(name, token string) (mfxsdk.Thing, error) {
-	id, err := sdk.CreateThing(mfxsdk.Thing{Name: name}, token)
-	if err != nil {
-		return mfxsdk.Thing{}, err
-	}
-
-	t, err := sdk.Thing(id, token)
-	if err != nil {
-		return mfxsdk.Thing{}, err
-	}
-
-	m := mfxsdk.Thing{
-		ID:   id,
-		Name: name,
-		Key:  t.Key,
-	}
-
-	return m, nil
-}
-
-func createChannel(name, token string) (mfxsdk.Channel, error) {
-	id, err := sdk.CreateChannel(mfxsdk.Channel{Name: name}, token)
-	if err != nil {
-		return mfxsdk.Channel{}, nil
-	}
-
-	c := mfxsdk.Channel{
-		ID:   id,
-		Name: name,
-	}
-
-	return c, nil
-}
+const jsonExt = ".json"
+const csvExt = ".csv"

 var cmdProvision = []cobra.Command{
 	cobra.Command{
 		Use:   "things",
-		Short: "things <things_csv> <user_token>",
-		Long:  `Provisions things`,
+		Short: "things <things_file> <user_token>",
+		Long:  `Bulk create things`,
 		Run: func(cmd *cobra.Command, args []string) {
-			things := []mfxsdk.Thing{}
-
 			if len(args) != 2 {
 				logUsage(cmd.Short)
 				return
 			}

-			c, err := os.Open(args[0])
+			if _, err := os.Stat(args[0]); os.IsNotExist(err) {
+				logError(err)
+				return
+			}
+
+			things, err := thingsFromFile(args[0])
 			if err != nil {
 				logError(err)
 				return
 			}
-			reader := csv.NewReader(bufio.NewReader(c))

-			for {
-				l, err := reader.Read()
-				if err == io.EOF {
-					break
-				}
-				if err != nil {
-					logError(err)
-					return
-				}
-
-				if len(l) < 1 {
-					logError(errMalformedCSV)
-					return
-				}
-
-				m, err := createThing(l[0], args[1])
-				if err != nil {
-					logError(err)
-					return
-				}
-
-				things = append(things, m)
+			things, err = sdk.CreateThings(things, args[1])
+			if err != nil {
+				logError(err)
+				return
 			}

 			logJSON(things)
@@ -105,50 +55,52 @@ var cmdProvision = []cobra.Command{
 	},
 	cobra.Command{
 		Use:   "channels",
-		Short: "channels <channels_csv> <user_token>",
-		Long:  `Provisions channels`,
+		Short: "channels <channels_file> <user_token>",
+		Long:  `Bulk create channels`,
 		Run: func(cmd *cobra.Command, args []string) {
-			channels := []mfxsdk.Channel{}
-
 			if len(args) != 2 {
 				logUsage(cmd.Short)
 				return
 			}

-			c, err := os.Open(args[0])
+			channels, err := channelsFromFile(args[0])
 			if err != nil {
 				logError(err)
 				return
 			}
-			reader := csv.NewReader(bufio.NewReader(c))

-			for {
-				l, err := reader.Read()
-				if err == io.EOF {
-					break
-				}
-				if err != nil {
-					logError(err)
-					return
-				}
-
-				if len(l) < 1 {
-					logError(errMalformedCSV)
-					return
-				}
-
-				c, err := createChannel(l[0], args[1])
-				if err != nil {
-					logError(err)
-					return
-				}
-
-				channels = append(channels, c)
+			channels, err = sdk.CreateChannels(channels, args[1])
+			if err != nil {
+				logError(err)
+				return
 			}

 			logJSON(channels)
 		},
 	},
+	cobra.Command{
+		Use:   "connect",
+		Short: "connect <connections_file> <user_token>",
+		Long:  `Bulk connect things to channels`,
+		Run: func(cmd *cobra.Command, args []string) {
+			if len(args) != 2 {
+				logUsage(cmd.Short)
+				return
+			}
+
+			connIDs, err := connectionsFromFile(args[0])
+			if err != nil {
+				logError(err)
+				return
+			}
+
+			err = sdk.Connect(connIDs, args[1])
+			if err != nil {
+				logError(err)
+				return
+			}
+		},
+	},
 	cobra.Command{
 		Use:   "test",
 		Short: "test",
@@ -187,25 +139,33 @@ var cmdProvision = []cobra.Command{
 			for i := 0; i < numThings; i++ {
 				n := fmt.Sprintf("d%d", i)

-				m, err := createThing(n, ut)
-				if err != nil {
-					logError(err)
-					return
+				t := mfxsdk.Thing{
+					Name: n,
 				}

-				things = append(things, m)
+				things = append(things, t)
 			}
+			things, err = sdk.CreateThings(things, ut)
+			if err != nil {
+				logError(err)
+				return
+			}
+
 			// Create channels
 			for i := 0; i < numChan; i++ {
 				n := fmt.Sprintf("c%d", i)
-				c, err := createChannel(n, ut)
-				if err != nil {
-					logError(err)
-					return
+
+				c := mfxsdk.Channel{
+					Name: n,
 				}

 				channels = append(channels, c)
 			}
+			channels, err = sdk.CreateChannels(channels, ut)
+			if err != nil {
+				logError(err)
+				return
+			}

 			// Connect things to channels - first thing to both channels, second only to first
 			for i := 0; i < numThings; i++ {
@@ -234,8 +194,8 @@ var cmdProvision = []cobra.Command{
 func NewProvisionCmd() *cobra.Command {
 	cmd := cobra.Command{
 		Use:   "provision",
-		Short: "Provision things and channels from config file",
-		Long:  `Provision things and channels: use csv config file to provision things and channels`,
+		Short: "Provision things and channels from a config file",
+		Long:  `Provision things and channels: use json or csv file to bulk provision things and channels`,
 	}

 	for i := range cmdProvision {
@@ -244,3 +204,141 @@ func NewProvisionCmd() *cobra.Command {

 	return &cmd
 }
+
+func thingsFromFile(path string) ([]mfxsdk.Thing, error) {
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return []mfxsdk.Thing{}, err
+	}
+
+	file, err := os.OpenFile(path, os.O_RDONLY, os.ModePerm)
+	if err != nil {
+		return []mfxsdk.Thing{}, err
+	}
+	defer file.Close()
+
+	things := []mfxsdk.Thing{}
+	switch filepath.Ext(path) {
+	case csvExt:
+		reader := csv.NewReader(file)
+
+		for {
+			l, err := reader.Read()
+			if err == io.EOF {
+				break
+			}
+			if err != nil {
+				return []mfxsdk.Thing{}, err
+			}
+
+			if len(l) < 1 {
+				return []mfxsdk.Thing{}, errors.New("empty line found in file")
+			}
+
+			thing := mfxsdk.Thing{
+				Name: l[0],
+			}
+
+			things = append(things, thing)
+		}
+	case jsonExt:
+		err := json.NewDecoder(file).Decode(&things)
+		if err != nil {
+			return []mfxsdk.Thing{}, err
+		}
+	default:
+		return []mfxsdk.Thing{}, err
+	}
+
+	return things, nil
+}
+
+func channelsFromFile(path string) ([]mfxsdk.Channel, error) {
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return []mfxsdk.Channel{}, err
+	}
+
+	file, err := os.OpenFile(path, os.O_RDONLY, os.ModePerm)
+	if err != nil {
+		return []mfxsdk.Channel{}, err
+	}
+	defer file.Close()
+
+	channels := []mfxsdk.Channel{}
+	switch filepath.Ext(path) {
+	case csvExt:
+		reader := csv.NewReader(file)
+
+		for {
+			l, err := reader.Read()
+			if err == io.EOF {
+				break
+			}
+			if err != nil {
+				return []mfxsdk.Channel{}, err
+			}
+
+			if len(l) < 1 {
+				return []mfxsdk.Channel{}, errors.New("empty line found in file")
+			}
+
+			channel := mfxsdk.Channel{
+				Name: l[0],
+			}
+
+			channels = append(channels, channel)
+		}
+	case jsonExt:
+		err := json.NewDecoder(file).Decode(&channels)
+		if err != nil {
+			return []mfxsdk.Channel{}, err
+		}
+	default:
+		return []mfxsdk.Channel{}, err
+	}
+
+	return channels, nil
+}
+
+func connectionsFromFile(path string) (mfxsdk.ConnectionIDs, error) {
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return mfxsdk.ConnectionIDs{}, err
+	}
+
+	file, err := os.OpenFile(path, os.O_RDONLY, os.ModePerm)
+	if err != nil {
+		return mfxsdk.ConnectionIDs{}, err
+	}
+	defer file.Close()
+
+	connections := mfxsdk.ConnectionIDs{}
+	switch filepath.Ext(path) {
+	case csvExt:
+		reader := csv.NewReader(file)
+
+		for {
+			l, err := reader.Read()
+			if err == io.EOF {
+				break
+			}
+			if err != nil {
+				return mfxsdk.ConnectionIDs{}, err
+			}
+
+			if len(l) < 1 {
+				return mfxsdk.ConnectionIDs{}, errors.New("empty line found in file")
+			}
+
+			connections.ThingIDs = append(connections.ThingIDs, l[0])
+			connections.ChannelIDs = append(connections.ChannelIDs, l[1])
+		}
+	case jsonExt:
+		err := json.NewDecoder(file).Decode(&connections)
+		if err != nil {
+			return mfxsdk.ConnectionIDs{}, err
+		}
+	default:
+		return mfxsdk.ConnectionIDs{}, err
+	}
+
+	return connections, nil
+}
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package cli

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package cli

@@ -123,7 +119,12 @@ var cmdThings = []cobra.Command{
 				return
 			}

-			if err := sdk.ConnectThing(args[0], args[1], args[2]); err != nil {
+			connIDs := mfxsdk.ConnectionIDs{
+				[]string{args[0]},
+				[]string{args[1]},
+			}
+
+			if err := sdk.Connect(connIDs, args[2]); err != nil {
 				logError(err)
 				return
 			}
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package cli

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package cli

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package cli

@@ -0,0 +1,241 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"net"
+	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
+
+	kitprometheus "github.com/go-kit/kit/metrics/prometheus"
+	"github.com/jmoiron/sqlx"
+	"github.com/mainflux/mainflux"
+	"github.com/mainflux/mainflux/authn"
+	api "github.com/mainflux/mainflux/authn/api"
+	grpcapi "github.com/mainflux/mainflux/authn/api/grpc"
+	httpapi "github.com/mainflux/mainflux/authn/api/http"
+	"github.com/mainflux/mainflux/authn/jwt"
+	"github.com/mainflux/mainflux/authn/postgres"
+	"github.com/mainflux/mainflux/authn/tracing"
+	mfidp "github.com/mainflux/mainflux/authn/uuid"
+	"github.com/mainflux/mainflux/logger"
+	"github.com/opentracing/opentracing-go"
+	stdprometheus "github.com/prometheus/client_golang/prometheus"
+	jconfig "github.com/uber/jaeger-client-go/config"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+)
+
+const (
+	defLogLevel      = "error"
+	defDBHost        = "localhost"
+	defDBPort        = "5432"
+	defDBUser        = "mainflux"
+	defDBPass        = "mainflux"
+	defDBName        = "authn"
+	defDBSSLMode     = "disable"
+	defDBSSLCert     = ""
+	defDBSSLKey      = ""
+	defDBSSLRootCert = ""
+	defHTTPPort      = "8180"
+	defGRPCPort      = "8181"
+	defSecret        = "authn"
+	defServerCert    = ""
+	defServerKey     = ""
+	defJaegerURL     = ""
+
+	envLogLevel      = "MF_AUTHN_LOG_LEVEL"
+	envDBHost        = "MF_AUTHN_DB_HOST"
+	envDBPort        = "MF_AUTHN_DB_PORT"
+	envDBUser        = "MF_AUTHN_DB_USER"
+	envDBPass        = "MF_AUTHN_DB_PASS"
+	envDBName        = "MF_AUTHN_DB"
+	envDBSSLMode     = "MF_AUTHN_DB_SSL_MODE"
+	envDBSSLCert     = "MF_AUTHN_DB_SSL_CERT"
+	envDBSSLKey      = "MF_AUTHN_DB_SSL_KEY"
+	envDBSSLRootCert = "MF_AUTHN_DB_SSL_ROOT_CERT"
+	envHTTPPort      = "MF_AUTHN_HTTP_PORT"
+	envGRPCPort      = "MF_AUTHN_GRPC_PORT"
+	envSecret        = "MF_AUTHN_SECRET"
+	envServerCert    = "MF_AUTHN_SERVER_CERT"
+	envServerKey     = "MF_AUTHN_SERVER_KEY"
+	envJaegerURL     = "MF_JAEGER_URL"
+)
+
+type config struct {
+	logLevel   string
+	dbConfig   postgres.Config
+	httpPort   string
+	grpcPort   string
+	secret     string
+	serverCert string
+	serverKey  string
+	jaegerURL  string
+	resetURL   string
+}
+
+type tokenConfig struct {
+	hmacSampleSecret []byte // secret for signing token
+	tokenDuration    string // token in duration in min
+}
+
+func main() {
+	cfg := loadConfig()
+
+	logger, err := logger.New(os.Stdout, cfg.logLevel)
+	if err != nil {
+		log.Fatalf(err.Error())
+	}
+
+	db := connectToDB(cfg.dbConfig, logger)
+	defer db.Close()
+
+	tracer, closer := initJaeger("authn", cfg.jaegerURL, logger)
+	defer closer.Close()
+
+	dbTracer, dbCloser := initJaeger("authn_db", cfg.jaegerURL, logger)
+	defer dbCloser.Close()
+
+	svc := newService(db, dbTracer, cfg.secret, logger)
+	errs := make(chan error, 2)
+
+	go startHTTPServer(tracer, svc, cfg.httpPort, cfg.serverCert, cfg.serverKey, logger, errs)
+	go startGRPCServer(tracer, svc, cfg.grpcPort, cfg.serverCert, cfg.serverKey, logger, errs)
+
+	go func() {
+		c := make(chan os.Signal)
+		signal.Notify(c, syscall.SIGINT)
+		errs <- fmt.Errorf("%s", <-c)
+	}()
+
+	err = <-errs
+	logger.Error(fmt.Sprintf("Authentication service terminated: %s", err))
+}
+
+func loadConfig() config {
+	dbConfig := postgres.Config{
+		Host:        mainflux.Env(envDBHost, defDBHost),
+		Port:        mainflux.Env(envDBPort, defDBPort),
+		User:        mainflux.Env(envDBUser, defDBUser),
+		Pass:        mainflux.Env(envDBPass, defDBPass),
+		Name:        mainflux.Env(envDBName, defDBName),
+		SSLMode:     mainflux.Env(envDBSSLMode, defDBSSLMode),
+		SSLCert:     mainflux.Env(envDBSSLCert, defDBSSLCert),
+		SSLKey:      mainflux.Env(envDBSSLKey, defDBSSLKey),
+		SSLRootCert: mainflux.Env(envDBSSLRootCert, defDBSSLRootCert),
+	}
+
+	return config{
+		logLevel:   mainflux.Env(envLogLevel, defLogLevel),
+		dbConfig:   dbConfig,
+		httpPort:   mainflux.Env(envHTTPPort, defHTTPPort),
+		grpcPort:   mainflux.Env(envGRPCPort, defGRPCPort),
+		secret:     mainflux.Env(envSecret, defSecret),
+		serverCert: mainflux.Env(envServerCert, defServerCert),
+		serverKey:  mainflux.Env(envServerKey, defServerKey),
+		jaegerURL:  mainflux.Env(envJaegerURL, defJaegerURL),
+	}
+
+}
+
+func initJaeger(svcName, url string, logger logger.Logger) (opentracing.Tracer, io.Closer) {
+	if url == "" {
+		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+	}
+
+	tracer, closer, err := jconfig.Configuration{
+		ServiceName: svcName,
+		Sampler: &jconfig.SamplerConfig{
+			Type:  "const",
+			Param: 1,
+		},
+		Reporter: &jconfig.ReporterConfig{
+			LocalAgentHostPort: url,
+			LogSpans:           true,
+		},
+	}.NewTracer()
+	if err != nil {
+		logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err))
+		os.Exit(1)
+	}
+
+	return tracer, closer
+}
+
+func connectToDB(dbConfig postgres.Config, logger logger.Logger) *sqlx.DB {
+	db, err := postgres.Connect(dbConfig)
+	if err != nil {
+		logger.Error(fmt.Sprintf("Failed to connect to postgres: %s", err))
+		os.Exit(1)
+	}
+	return db
+}
+
+func newService(db *sqlx.DB, tracer opentracing.Tracer, secret string, logger logger.Logger) authn.Service {
+	database := postgres.NewDatabase(db)
+	repo := tracing.New(postgres.New(database), tracer)
+
+	idp := mfidp.New()
+	t := jwt.New(secret)
+	svc := authn.New(repo, idp, t)
+	svc = api.LoggingMiddleware(svc, logger)
+	svc = api.MetricsMiddleware(
+		svc,
+		kitprometheus.NewCounterFrom(stdprometheus.CounterOpts{
+			Namespace: "authn",
+			Subsystem: "api",
+			Name:      "request_count",
+			Help:      "Number of requests received.",
+		}, []string{"method"}),
+		kitprometheus.NewSummaryFrom(stdprometheus.SummaryOpts{
+			Namespace: "authn",
+			Subsystem: "api",
+			Name:      "request_latency_microseconds",
+			Help:      "Total duration of requests in microseconds.",
+		}, []string{"method"}),
+	)
+
+	return svc
+}
+
+func startHTTPServer(tracer opentracing.Tracer, svc authn.Service, port string, certFile string, keyFile string, logger logger.Logger, errs chan error) {
+	p := fmt.Sprintf(":%s", port)
+	if certFile != "" || keyFile != "" {
+		logger.Info(fmt.Sprintf("Authentication service started using https, cert %s key %s, exposed port %s", certFile, keyFile, port))
+		errs <- http.ListenAndServeTLS(p, certFile, keyFile, httpapi.MakeHandler(svc, tracer))
+		return
+	}
+	logger.Info(fmt.Sprintf("Authentication service started using http, exposed port %s", port))
+	errs <- http.ListenAndServe(p, httpapi.MakeHandler(svc, tracer))
+
+}
+
+func startGRPCServer(tracer opentracing.Tracer, svc authn.Service, port string, certFile string, keyFile string, logger logger.Logger, errs chan error) {
+	p := fmt.Sprintf(":%s", port)
+	listener, err := net.Listen("tcp", p)
+	if err != nil {
+		logger.Error(fmt.Sprintf("Failed to listen on port %s: %s", port, err))
+	}
+
+	var server *grpc.Server
+	if certFile != "" || keyFile != "" {
+		creds, err := credentials.NewServerTLSFromFile(certFile, keyFile)
+		if err != nil {
+			logger.Error(fmt.Sprintf("Failed to load authn certificates: %s", err))
+			os.Exit(1)
+		}
+		logger.Info(fmt.Sprintf("Authentication gRPC service started using https on port %s with cert %s key %s", port, certFile, keyFile))
+		server = grpc.NewServer(grpc.Creds(creds))
+	} else {
+		logger.Info(fmt.Sprintf("Authentication gRPC service started using http on port %s", port))
+		server = grpc.NewServer()
+	}
+
+	mainflux.RegisterAuthNServiceServer(server, grpcapi.NewServer(tracer, svc))
+	logger.Info(fmt.Sprintf("Authentication gRPC service started, exposed port %s", port))
+	errs <- server.Serve(listener)
+}
@@ -1,14 +1,13 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//
 package main

 import (
+	"crypto/aes"
+	"encoding/hex"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -17,6 +16,7 @@ import (
 	"syscall"
 	"time"

+	authapi "github.com/mainflux/mainflux/authn/api/grpc"
 	rediscons "github.com/mainflux/mainflux/bootstrap/redis/consumer"
 	redisprod "github.com/mainflux/mainflux/bootstrap/redis/producer"
 	"github.com/mainflux/mainflux/logger"
@@ -31,7 +31,6 @@ import (
 	"github.com/mainflux/mainflux/bootstrap/postgres"
 	mflog "github.com/mainflux/mainflux/logger"
 	mfsdk "github.com/mainflux/mainflux/sdk/go"
-	usersapi "github.com/mainflux/mainflux/users/api/grpc"
 	stdprometheus "github.com/prometheus/client_golang/prometheus"
 	jconfig "github.com/uber/jaeger-client-go/config"
 	"google.golang.org/grpc"
@@ -39,83 +38,86 @@ import (
 )

 const (
-	defLogLevel      = "error"
-	defDBHost        = "localhost"
-	defDBPort        = "5432"
-	defDBUser        = "mainflux"
-	defDBPass        = "mainflux"
-	defDBName        = "bootstrap"
-	defDBSSLMode     = "disable"
-	defDBSSLCert     = ""
-	defDBSSLKey      = ""
-	defDBSSLRootCert = ""
-	defClientTLS     = "false"
-	defCACerts       = ""
-	defPort          = "8180"
-	defServerCert    = ""
-	defServerKey     = ""
-	defBaseURL       = "http://localhost"
-	defThingsPrefix  = ""
-	defUsersURL      = "localhost:8181"
-	defThingsESURL   = "localhost:6379"
-	defThingsESPass  = ""
-	defThingsESDB    = "0"
-	defESURL         = "localhost:6379"
-	defESPass        = ""
-	defESDB          = "0"
-	defInstanceName  = "bootstrap"
-	defJaegerURL     = "localhost:6831"
-	defUsersTimeout  = "1" // in seconds
+	defLogLevel       = "error"
+	defDBHost         = "localhost"
+	defDBPort         = "5432"
+	defDBUser         = "mainflux"
+	defDBPass         = "mainflux"
+	defDBName         = "bootstrap"
+	defDBSSLMode      = "disable"
+	defDBSSLCert      = ""
+	defDBSSLKey       = ""
+	defDBSSLRootCert  = ""
+	defEncryptKey     = "12345678910111213141516171819202"
+	defClientTLS      = "false"
+	defCACerts        = ""
+	defPort           = "8180"
+	defServerCert     = ""
+	defServerKey      = ""
+	defBaseURL        = "http://localhost"
+	defThingsPrefix   = ""
+	defThingsESURL    = "localhost:6379"
+	defThingsESPass   = ""
+	defThingsESDB     = "0"
+	defESURL          = "localhost:6379"
+	defESPass         = ""
+	defESDB           = "0"
+	defESConsumerName = "bootstrap"
+	defJaegerURL      = ""
+	defAuthURL        = "localhost:8181"
+	defAuthTimeout    = "1" // in seconds

-	envLogLevel      = "MF_BOOTSTRAP_LOG_LEVEL"
-	envDBHost        = "MF_BOOTSTRAP_DB_HOST"
-	envDBPort        = "MF_BOOTSTRAP_DB_PORT"
-	envDBUser        = "MF_BOOTSTRAP_DB_USER"
-	envDBPass        = "MF_BOOTSTRAP_DB_PASS"
-	envDBName        = "MF_BOOTSTRAP_DB"
-	envDBSSLMode     = "MF_BOOTSTRAP_DB_SSL_MODE"
-	envDBSSLCert     = "MF_BOOTSTRAP_DB_SSL_CERT"
-	envDBSSLKey      = "MF_BOOTSTRAP_DB_SSL_KEY"
-	envDBSSLRootCert = "MF_BOOTSTRAP_DB_SSL_ROOT_CERT"
-	envClientTLS     = "MF_BOOTSTRAP_CLIENT_TLS"
-	envCACerts       = "MF_BOOTSTRAP_CA_CERTS"
-	envPort          = "MF_BOOTSTRAP_PORT"
-	envServerCert    = "MF_BOOTSTRAP_SERVER_CERT"
-	envServerKey     = "MF_BOOTSTRAP_SERVER_KEY"
-	envBaseURL       = "MF_SDK_BASE_URL"
-	envThingsPrefix  = "MF_SDK_THINGS_PREFIX"
-	envUsersURL      = "MF_USERS_URL"
-	envThingsESURL   = "MF_THINGS_ES_URL"
-	envThingsESPass  = "MF_THINGS_ES_PASS"
-	envThingsESDB    = "MF_THINGS_ES_DB"
-	envESURL         = "MF_BOOTSTRAP_ES_URL"
-	envESPass        = "MF_BOOTSTRAP_ES_PASS"
-	envESDB          = "MF_BOOTSTRAP_ES_DB"
-	envInstanceName  = "MF_BOOTSTRAP_INSTANCE_NAME"
-	envJaegerURL     = "MF_JAEGER_URL"
-	envUsersTimeout  = "MF_BOOTSTRAP_USERS_TIMEOUT"
+	envLogLevel       = "MF_BOOTSTRAP_LOG_LEVEL"
+	envDBHost         = "MF_BOOTSTRAP_DB_HOST"
+	envDBPort         = "MF_BOOTSTRAP_DB_PORT"
+	envDBUser         = "MF_BOOTSTRAP_DB_USER"
+	envDBPass         = "MF_BOOTSTRAP_DB_PASS"
+	envDBName         = "MF_BOOTSTRAP_DB"
+	envDBSSLMode      = "MF_BOOTSTRAP_DB_SSL_MODE"
+	envDBSSLCert      = "MF_BOOTSTRAP_DB_SSL_CERT"
+	envDBSSLKey       = "MF_BOOTSTRAP_DB_SSL_KEY"
+	envDBSSLRootCert  = "MF_BOOTSTRAP_DB_SSL_ROOT_CERT"
+	envEncryptKey     = "MF_BOOTSTRAP_ENCRYPT_KEY"
+	envClientTLS      = "MF_BOOTSTRAP_CLIENT_TLS"
+	envCACerts        = "MF_BOOTSTRAP_CA_CERTS"
+	envPort           = "MF_BOOTSTRAP_PORT"
+	envServerCert     = "MF_BOOTSTRAP_SERVER_CERT"
+	envServerKey      = "MF_BOOTSTRAP_SERVER_KEY"
+	envBaseURL        = "MF_SDK_BASE_URL"
+	envThingsPrefix   = "MF_SDK_THINGS_PREFIX"
+	envThingsESURL    = "MF_THINGS_ES_URL"
+	envThingsESPass   = "MF_THINGS_ES_PASS"
+	envThingsESDB     = "MF_THINGS_ES_DB"
+	envESURL          = "MF_BOOTSTRAP_ES_URL"
+	envESPass         = "MF_BOOTSTRAP_ES_PASS"
+	envESDB           = "MF_BOOTSTRAP_ES_DB"
+	envESConsumerName = "MF_BOOTSTRAP_EVENT_CONSUMER"
+	envJaegerURL      = "MF_JAEGER_URL"
+	envAuthURL        = "MF_AUTH_URL"
+	envAuthTimeout    = "MF_AUTH_TIMEOUT"
 )

 type config struct {
-	logLevel     string
-	dbConfig     postgres.Config
-	clientTLS    bool
-	caCerts      string
-	httpPort     string
-	serverCert   string
-	serverKey    string
-	baseURL      string
-	thingsPrefix string
-	usersURL     string
-	esThingsURL  string
-	esThingsPass string
-	esThingsDB   string
-	esURL        string
-	esPass       string
-	esDB         string
-	instanceName string
-	jaegerURL    string
-	usersTimeout time.Duration
+	logLevel       string
+	dbConfig       postgres.Config
+	clientTLS      bool
+	encKey         []byte
+	caCerts        string
+	httpPort       string
+	serverCert     string
+	serverKey      string
+	baseURL        string
+	thingsPrefix   string
+	esThingsURL    string
+	esThingsPass   string
+	esThingsDB     string
+	esURL          string
+	esPass         string
+	esDB           string
+	esConsumerName string
+	jaegerURL      string
+	authURL        string
+	authTimeout    time.Duration
 }

 func main() {
@@ -129,23 +131,25 @@ func main() {
 	db := connectToDB(cfg.dbConfig, logger)
 	defer db.Close()

-	conn := connectToUsers(cfg, logger)
-	defer conn.Close()
-
 	thingsESConn := connectToRedis(cfg.esThingsURL, cfg.esThingsPass, cfg.esThingsDB, logger)
 	defer thingsESConn.Close()

 	esClient := connectToRedis(cfg.esURL, cfg.esPass, cfg.esDB, logger)
 	defer esClient.Close()

-	usersTracer, usersCloser := initJaeger("users", cfg.jaegerURL, logger)
-	defer usersCloser.Close()
+	authTracer, authCloser := initJaeger("auth", cfg.jaegerURL, logger)
+	defer authCloser.Close()

-	svc := newService(conn, usersTracer, db, logger, esClient, cfg)
+	authConn := connectToAuth(cfg, logger)
+	defer authConn.Close()
+
+	auth := authapi.NewClient(authTracer, authConn, cfg.authTimeout)
+
+	svc := newService(auth, db, logger, esClient, cfg)
 	errs := make(chan error, 2)

 	go startHTTPServer(svc, cfg, logger, errs)
-	go subscribeToThingsES(svc, thingsESConn, cfg.instanceName, logger)
+	go subscribeToThingsES(svc, thingsESConn, cfg.esConsumerName, logger)

 	go func() {
 		c := make(chan os.Signal)
@@ -174,31 +178,42 @@ func loadConfig() config {
 		SSLRootCert: mainflux.Env(envDBSSLRootCert, defDBSSLRootCert),
 	}

-	timeout, err := strconv.ParseInt(mainflux.Env(envUsersTimeout, defUsersTimeout), 10, 64)
+	timeout, err := strconv.ParseInt(mainflux.Env(envAuthTimeout, defAuthTimeout), 10, 64)
 	if err != nil {
-		log.Fatalf("Invalid %s value: %s", envUsersTimeout, err.Error())
+		log.Fatalf("Invalid %s value: %s", envAuthTimeout, err.Error())
+	}
+	encKey, err := hex.DecodeString(mainflux.Env(envEncryptKey, defEncryptKey))
+	if err != nil {
+		log.Fatalf("Invalid %s value: %s", envEncryptKey, err.Error())
+	}
+	if err := os.Unsetenv(envEncryptKey); err != nil {
+		log.Fatalf("Unable to unset %s value: %s", envEncryptKey, err.Error())
+	}
+	if _, err := aes.NewCipher(encKey); err != nil {
+		log.Fatalf("Invalid %s value: %s", envEncryptKey, err.Error())
 	}

 	return config{
-		logLevel:     mainflux.Env(envLogLevel, defLogLevel),
-		dbConfig:     dbConfig,
-		clientTLS:    tls,
-		caCerts:      mainflux.Env(envCACerts, defCACerts),
-		httpPort:     mainflux.Env(envPort, defPort),
-		serverCert:   mainflux.Env(envServerCert, defServerCert),
-		serverKey:    mainflux.Env(envServerKey, defServerKey),
-		baseURL:      mainflux.Env(envBaseURL, defBaseURL),
-		thingsPrefix: mainflux.Env(envThingsPrefix, defThingsPrefix),
-		usersURL:     mainflux.Env(envUsersURL, defUsersURL),
-		esThingsURL:  mainflux.Env(envThingsESURL, defThingsESURL),
-		esThingsPass: mainflux.Env(envThingsESPass, defThingsESPass),
-		esThingsDB:   mainflux.Env(envThingsESDB, defThingsESDB),
-		esURL:        mainflux.Env(envESURL, defESURL),
-		esPass:       mainflux.Env(envESPass, defESPass),
-		esDB:         mainflux.Env(envESDB, defESDB),
-		instanceName: mainflux.Env(envInstanceName, defInstanceName),
-		jaegerURL:    mainflux.Env(envJaegerURL, defJaegerURL),
-		usersTimeout: time.Duration(timeout) * time.Second,
+		logLevel:       mainflux.Env(envLogLevel, defLogLevel),
+		dbConfig:       dbConfig,
+		clientTLS:      tls,
+		encKey:         encKey,
+		caCerts:        mainflux.Env(envCACerts, defCACerts),
+		httpPort:       mainflux.Env(envPort, defPort),
+		serverCert:     mainflux.Env(envServerCert, defServerCert),
+		serverKey:      mainflux.Env(envServerKey, defServerKey),
+		baseURL:        mainflux.Env(envBaseURL, defBaseURL),
+		thingsPrefix:   mainflux.Env(envThingsPrefix, defThingsPrefix),
+		esThingsURL:    mainflux.Env(envThingsESURL, defThingsESURL),
+		esThingsPass:   mainflux.Env(envThingsESPass, defThingsESPass),
+		esThingsDB:     mainflux.Env(envThingsESDB, defThingsESDB),
+		esURL:          mainflux.Env(envESURL, defESURL),
+		esPass:         mainflux.Env(envESPass, defESPass),
+		esDB:           mainflux.Env(envESDB, defESDB),
+		esConsumerName: mainflux.Env(envESConsumerName, defESConsumerName),
+		jaegerURL:      mainflux.Env(envJaegerURL, defJaegerURL),
+		authURL:        mainflux.Env(envAuthURL, defAuthURL),
+		authTimeout:    time.Duration(timeout) * time.Second,
 	}
 }

@@ -226,6 +241,10 @@ func connectToRedis(redisURL, redisPass, redisDB string, logger mflog.Logger) *r
 }

 func initJaeger(svcName, url string, logger logger.Logger) (opentracing.Tracer, io.Closer) {
+	if url == "" {
+		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+	}
+
 	tracer, closer, err := jconfig.Configuration{
 		ServiceName: svcName,
 		Sampler: &jconfig.SamplerConfig{
@@ -245,7 +264,7 @@ func initJaeger(svcName, url string, logger logger.Logger) (opentracing.Tracer,
 	return tracer, closer
 }

-func newService(conn *grpc.ClientConn, usersTracer opentracing.Tracer, db *sqlx.DB, logger mflog.Logger, esClient *r.Client, cfg config) bootstrap.Service {
+func newService(auth mainflux.AuthNServiceClient, db *sqlx.DB, logger mflog.Logger, esClient *r.Client, cfg config) bootstrap.Service {
 	thingsRepo := postgres.NewConfigRepository(db, logger)

 	config := mfsdk.Config{
@@ -254,9 +273,8 @@ func newService(conn *grpc.ClientConn, usersTracer opentracing.Tracer, db *sqlx.
 	}

 	sdk := mfsdk.NewSDK(config)
-	users := usersapi.NewClient(usersTracer, conn, cfg.usersTimeout)

-	svc := bootstrap.New(users, thingsRepo, sdk)
+	svc := bootstrap.New(auth, thingsRepo, sdk, cfg.encKey)
 	svc = redisprod.NewEventStoreMiddleware(svc, esClient)
 	svc = api.NewLoggingMiddleware(svc, logger)
 	svc = api.MetricsMiddleware(
@@ -277,7 +295,7 @@ func newService(conn *grpc.ClientConn, usersTracer opentracing.Tracer, db *sqlx.
 	return svc
 }

-func connectToUsers(cfg config, logger mflog.Logger) *grpc.ClientConn {
+func connectToAuth(cfg config, logger logger.Logger) *grpc.ClientConn {
 	var opts []grpc.DialOption
 	if cfg.clientTLS {
 		if cfg.caCerts != "" {
@@ -293,7 +311,7 @@ func connectToUsers(cfg config, logger mflog.Logger) *grpc.ClientConn {
 		logger.Info("gRPC communication is not encrypted")
 	}

-	conn, err := grpc.Dial(cfg.usersURL, opts...)
+	conn, err := grpc.Dial(cfg.authURL, opts...)
 	if err != nil {
 		logger.Error(fmt.Sprintf("Failed to connect to users service: %s", err))
 		os.Exit(1)
@@ -307,11 +325,11 @@ func startHTTPServer(svc bootstrap.Service, cfg config, logger mflog.Logger, err
 	if cfg.serverCert != "" || cfg.serverKey != "" {
 		logger.Info(fmt.Sprintf("Bootstrap service started using https on port %s with cert %s key %s",
 			cfg.httpPort, cfg.serverCert, cfg.serverKey))
-		errs <- http.ListenAndServeTLS(p, cfg.serverCert, cfg.serverKey, api.MakeHandler(svc, bootstrap.NewConfigReader()))
+		errs <- http.ListenAndServeTLS(p, cfg.serverCert, cfg.serverKey, api.MakeHandler(svc, bootstrap.NewConfigReader(cfg.encKey)))
 		return
 	}
 	logger.Info(fmt.Sprintf("Bootstrap service started using http on port %s", cfg.httpPort))
-	errs <- http.ListenAndServe(p, api.MakeHandler(svc, bootstrap.NewConfigReader()))
+	errs <- http.ListenAndServe(p, api.MakeHandler(svc, bootstrap.NewConfigReader(cfg.encKey)))
 }

 func subscribeToThingsES(svc bootstrap.Service, client *r.Client, consumer string, logger mflog.Logger) {
@@ -1,15 +1,12 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package main

 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -47,7 +44,7 @@ const (
 	defThingsURL     = "localhost:8181"
 	defClientTLS     = "false"
 	defCACerts       = ""
-	defJaegerURL     = "localhost:6831"
+	defJaegerURL     = ""
 	defThingsTimeout = "1" // in seconds

 	envLogLevel      = "MF_CASSANDRA_READER_LOG_LEVEL"
@@ -180,6 +177,10 @@ func connectToThings(cfg config, logger logger.Logger) *grpc.ClientConn {
 }

 func initJaeger(svcName, url string, logger logger.Logger) (opentracing.Tracer, io.Closer) {
+	if url == "" {
+		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+	}
+
 	tracer, closer, err := jconfig.Configuration{
 		ServiceName: svcName,
 		Sampler: &jconfig.SamplerConfig{
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package main

@@ -23,6 +19,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/mainflux/mainflux"
 	"github.com/mainflux/mainflux/logger"
+	"github.com/mainflux/mainflux/transformers/senml"
 	"github.com/mainflux/mainflux/writers"
 	"github.com/mainflux/mainflux/writers/api"
 	"github.com/mainflux/mainflux/writers/cassandra"
@@ -78,7 +75,8 @@ func main() {
 	defer session.Close()

 	repo := newService(session, logger)
-	if err := writers.Start(nc, repo, svcName, cfg.channels, logger); err != nil {
+	st := senml.New()
+	if err := writers.Start(nc, repo, st, svcName, cfg.channels, logger); err != nil {
 		logger.Error(fmt.Sprintf("Failed to create Cassandra writer: %s", err))
 	}

@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package main

@@ -1,15 +1,12 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package main

 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -43,7 +40,7 @@ const (
 	defClientTLS     = "false"
 	defCACerts       = ""
 	defPingPeriod    = "12"
-	defJaegerURL     = "localhost:6831"
+	defJaegerURL     = ""
 	defThingsTimeout = "1" // in seconds

 	envPort          = "MF_COAP_ADAPTER_PORT"
@@ -185,6 +182,10 @@ func connectToThings(cfg config, logger logger.Logger) *grpc.ClientConn {
 }

 func initJaeger(svcName, url string, logger logger.Logger) (opentracing.Tracer, io.Closer) {
+	if url == "" {
+		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+	}
+
 	tracer, closer, err := jconfig.Configuration{
 		ServiceName: svcName,
 		Sampler: &jconfig.SamplerConfig{
@@ -1,15 +1,12 @@
-//
-// Copyright (c) 2019
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package main

 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -41,7 +38,7 @@ const (
 	defLogLevel      = "error"
 	defNatsURL       = broker.DefaultURL
 	defThingsURL     = "localhost:8181"
-	defJaegerURL     = "localhost:6831"
+	defJaegerURL     = ""
 	defThingsTimeout = "1" // in seconds

 	envClientTLS     = "MF_HTTP_ADAPTER_CLIENT_TLS"
@@ -153,6 +150,10 @@ func loadConfig() config {
 }

 func initJaeger(svcName, url string, logger logger.Logger) (opentracing.Tracer, io.Closer) {
+	if url == "" {
+		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+	}
+
 	tracer, closer, err := jconfig.Configuration{
 		ServiceName: svcName,
 		Sampler: &jconfig.SamplerConfig{
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -37,7 +38,7 @@ const (
 	defDBPass        = "mainflux"
 	defClientTLS     = "false"
 	defCACerts       = ""
-	defJaegerURL     = "localhost:6831"
+	defJaegerURL     = ""
 	defThingsTimeout = "1" // in seconds

 	envThingsURL     = "MF_THINGS_URL"
@@ -165,6 +166,10 @@ func connectToThings(cfg config, logger logger.Logger) *grpc.ClientConn {
 }

 func initJaeger(svcName, url string, logger logger.Logger) (opentracing.Tracer, io.Closer) {
+	if url == "" {
+		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+	}
+
 	tracer, closer, err := jconfig.Configuration{
 		ServiceName: svcName,
 		Sampler: &jconfig.SamplerConfig{
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package main

@@ -14,15 +10,14 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
-	"strconv"
 	"syscall"
-	"time"

 	"github.com/BurntSushi/toml"
 	kitprometheus "github.com/go-kit/kit/metrics/prometheus"
 	influxdata "github.com/influxdata/influxdb/client/v2"
 	"github.com/mainflux/mainflux"
 	"github.com/mainflux/mainflux/logger"
+	"github.com/mainflux/mainflux/transformers/senml"
 	"github.com/mainflux/mainflux/writers"
 	"github.com/mainflux/mainflux/writers/api"
 	"github.com/mainflux/mainflux/writers/influxdb"
@@ -33,43 +28,37 @@ import (
 const (
 	svcName = "influxdb-writer"

-	defNatsURL      = nats.DefaultURL
-	defLogLevel     = "error"
-	defPort         = "8180"
-	defBatchSize    = "5000"
-	defBatchTimeout = "5"
-	defDBName       = "mainflux"
-	defDBHost       = "localhost"
-	defDBPort       = "8086"
-	defDBUser       = "mainflux"
-	defDBPass       = "mainflux"
-	defChanCfgPath  = "/config/channels.toml"
+	defNatsURL     = nats.DefaultURL
+	defLogLevel    = "error"
+	defPort        = "8180"
+	defDBName      = "mainflux"
+	defDBHost      = "localhost"
+	defDBPort      = "8086"
+	defDBUser      = "mainflux"
+	defDBPass      = "mainflux"
+	defChanCfgPath = "/config/channels.toml"

-	envNatsURL      = "MF_NATS_URL"
-	envLogLevel     = "MF_INFLUX_WRITER_LOG_LEVEL"
-	envPort         = "MF_INFLUX_WRITER_PORT"
-	envBatchSize    = "MF_INFLUX_WRITER_BATCH_SIZE"
-	envBatchTimeout = "MF_INFLUX_WRITER_BATCH_TIMEOUT"
-	envDBName       = "MF_INFLUX_WRITER_DB_NAME"
-	envDBHost       = "MF_INFLUX_WRITER_DB_HOST"
-	envDBPort       = "MF_INFLUX_WRITER_DB_PORT"
-	envDBUser       = "MF_INFLUX_WRITER_DB_USER"
-	envDBPass       = "MF_INFLUX_WRITER_DB_PASS"
-	envChanCfgPath  = "MF_INFLUX_WRITER_CHANNELS_CONFIG"
+	envNatsURL     = "MF_NATS_URL"
+	envLogLevel    = "MF_INFLUX_WRITER_LOG_LEVEL"
+	envPort        = "MF_INFLUX_WRITER_PORT"
+	envDBName      = "MF_INFLUX_WRITER_DB_NAME"
+	envDBHost      = "MF_INFLUX_WRITER_DB_HOST"
+	envDBPort      = "MF_INFLUX_WRITER_DB_PORT"
+	envDBUser      = "MF_INFLUX_WRITER_DB_USER"
+	envDBPass      = "MF_INFLUX_WRITER_DB_PASS"
+	envChanCfgPath = "MF_INFLUX_WRITER_CHANNELS_CONFIG"
 )

 type config struct {
-	natsURL      string
-	logLevel     string
-	port         string
-	batchSize    string
-	batchTimeout string
-	dbName       string
-	dbHost       string
-	dbPort       string
-	dbUser       string
-	dbPass       string
-	channels     map[string]bool
+	natsURL  string
+	logLevel string
+	port     string
+	dbName   string
+	dbHost   string
+	dbPort   string
+	dbUser   string
+	dbPass   string
+	channels map[string]bool
 }

 func main() {
@@ -94,29 +83,13 @@ func main() {
 	}
 	defer client.Close()

-	batchTimeout, err := strconv.Atoi(cfg.batchTimeout)
-	if err != nil {
-		logger.Error(fmt.Sprintf("Invalid value for batch timeout: %s", err))
-		os.Exit(1)
-	}
-
-	batchSize, err := strconv.Atoi(cfg.batchSize)
-	if err != nil {
-		logger.Error(fmt.Sprintf("Invalid value of batch size: %s", err))
-		os.Exit(1)
-	}
-
-	timeout := time.Duration(batchTimeout) * time.Second
-	repo, err := influxdb.New(client, cfg.dbName, batchSize, timeout)
-	if err != nil {
-		logger.Error(fmt.Sprintf("Failed to create InfluxDB writer: %s", err))
-		os.Exit(1)
-	}
+	repo := influxdb.New(client, cfg.dbName)

 	counter, latency := makeMetrics()
 	repo = api.LoggingMiddleware(repo, logger)
 	repo = api.MetricsMiddleware(repo, counter, latency)
-	if err := writers.Start(nc, repo, svcName, cfg.channels, logger); err != nil {
+	st := senml.New()
+	if err := writers.Start(nc, repo, st, svcName, cfg.channels, logger); err != nil {
 		logger.Error(fmt.Sprintf("Failed to start InfluxDB writer: %s", err))
 		os.Exit(1)
 	}
@@ -137,17 +110,15 @@ func main() {
 func loadConfigs() (config, influxdata.HTTPConfig) {
 	chanCfgPath := mainflux.Env(envChanCfgPath, defChanCfgPath)
 	cfg := config{
-		natsURL:      mainflux.Env(envNatsURL, defNatsURL),
-		logLevel:     mainflux.Env(envLogLevel, defLogLevel),
-		port:         mainflux.Env(envPort, defPort),
-		batchSize:    mainflux.Env(envBatchSize, defBatchSize),
-		batchTimeout: mainflux.Env(envBatchTimeout, defBatchTimeout),
-		dbName:       mainflux.Env(envDBName, defDBName),
-		dbHost:       mainflux.Env(envDBHost, defDBHost),
-		dbPort:       mainflux.Env(envDBPort, defDBPort),
-		dbUser:       mainflux.Env(envDBUser, defDBUser),
-		dbPass:       mainflux.Env(envDBPass, defDBPass),
-		channels:     loadChansConfig(chanCfgPath),
+		natsURL:  mainflux.Env(envNatsURL, defNatsURL),
+		logLevel: mainflux.Env(envLogLevel, defLogLevel),
+		port:     mainflux.Env(envPort, defPort),
+		dbName:   mainflux.Env(envDBName, defDBName),
+		dbHost:   mainflux.Env(envDBHost, defDBHost),
+		dbPort:   mainflux.Env(envDBPort, defDBPort),
+		dbUser:   mainflux.Env(envDBUser, defDBUser),
+		dbPass:   mainflux.Env(envDBPass, defDBPass),
+		channels: loadChansConfig(chanCfgPath),
 	}

 	clientCfg := influxdata.HTTPConfig{
@@ -1,3 +1,6 @@
+// Copyright (c) Mainflux
+// SPDX-License-Identifier: Apache-2.0
+
 package main

 import (
@@ -9,14 +12,14 @@ import (
 	"strconv"
 	"syscall"

-	mqtt "github.com/eclipse/paho.mqtt.golang"
+	mqttPaho "github.com/eclipse/paho.mqtt.golang"
 	r "github.com/go-redis/redis"
 	"github.com/mainflux/mainflux"
 	"github.com/mainflux/mainflux/logger"
 	"github.com/mainflux/mainflux/lora"
 	"github.com/mainflux/mainflux/lora/api"
+	"github.com/mainflux/mainflux/lora/mqtt"
 	pub "github.com/mainflux/mainflux/lora/nats"
-	mqttBroker "github.com/mainflux/mainflux/lora/paho"

 	kitprometheus "github.com/go-kit/kit/metrics/prometheus"
 	"github.com/mainflux/mainflux/lora/redis"
@@ -25,29 +28,29 @@ import (
 )

 const (
-	defHTTPPort     = "8180"
-	defLoraMsgURL   = "tcp://localhost:1883"
-	defNatsURL      = nats.DefaultURL
-	defLogLevel     = "error"
-	defESURL        = "localhost:6379"
-	defESPass       = ""
-	defESDB         = "0"
-	defInstanceName = "lora"
-	defRouteMapURL  = "localhost:6379"
-	defRouteMapPass = ""
-	defRouteMapDB   = "0"
+	defHTTPPort       = "8180"
+	defLoraMsgURL     = "tcp://localhost:1883"
+	defNatsURL        = nats.DefaultURL
+	defLogLevel       = "error"
+	defESURL          = "localhost:6379"
+	defESPass         = ""
+	defESDB           = "0"
+	defESConsumerName = "lora"
+	defRouteMapURL    = "localhost:6379"
+	defRouteMapPass   = ""
+	defRouteMapDB     = "0"

-	envHTTPPort     = "MF_LORA_ADAPTER_HTTP_PORT"
-	envLoraMsgURL   = "MF_LORA_ADAPTER_MESSAGES_URL"
-	envNatsURL      = "MF_NATS_URL"
-	envLogLevel     = "MF_LORA_ADAPTER_LOG_LEVEL"
-	envESURL        = "MF_THINGS_ES_URL"
-	envESPass       = "MF_THINGS_ES_PASS"
-	envESDB         = "MF_THINGS_ES_DB"
-	envInstanceName = "MF_LORA_ADAPTER_INSTANCE_NAME"
-	envRouteMapURL  = "MF_LORA_ADAPTER_ROUTEMAP_URL"
-	envRouteMapPass = "MF_LORA_ADAPTER_ROUTEMAP_PASS"
-	envRouteMapDB   = "MF_LORA_ADAPTER_ROUTEMAP_DB"
+	envHTTPPort       = "MF_LORA_ADAPTER_HTTP_PORT"
+	envLoraMsgURL     = "MF_LORA_ADAPTER_MESSAGES_URL"
+	envNatsURL        = "MF_NATS_URL"
+	envLogLevel       = "MF_LORA_ADAPTER_LOG_LEVEL"
+	envESURL          = "MF_THINGS_ES_URL"
+	envESPass         = "MF_THINGS_ES_PASS"
+	envESDB           = "MF_THINGS_ES_DB"
+	envESConsumerName = "MF_LORA_ADAPTER_EVENT_CONSUMER"
+	envRouteMapURL    = "MF_LORA_ADAPTER_ROUTE_MAP_URL"
+	envRouteMapPass   = "MF_LORA_ADAPTER_ROUTE_MAP_PASS"
+	envRouteMapDB     = "MF_LORA_ADAPTER_ROUTE_MAP_DB"

 	loraServerTopic = "application/+/device/+/rx"

@@ -56,17 +59,17 @@ const (
 )

 type config struct {
-	httpPort     string
-	loraMsgURL   string
-	natsURL      string
-	logLevel     string
-	esURL        string
-	esPass       string
-	esDB         string
-	instanceName string
-	routeMapURL  string
-	routeMapPass string
-	routeMapDB   string
+	httpPort       string
+	loraMsgURL     string
+	natsURL        string
+	logLevel       string
+	esURL          string
+	esPass         string
+	esDB           string
+	esConsumerName string
+	routeMapURL    string
+	routeMapPass   string
+	routeMapDB     string
 }

 func main() {
@@ -112,7 +115,7 @@ func main() {
 	)

 	go subscribeToLoRaBroker(svc, mqttConn, logger)
-	go subscribeToThingsES(svc, esConn, cfg.instanceName, logger)
+	go subscribeToThingsES(svc, esConn, cfg.esConsumerName, logger)

 	errs := make(chan error, 2)

@@ -130,17 +133,17 @@ func main() {

 func loadConfig() config {
 	return config{
-		httpPort:     mainflux.Env(envHTTPPort, defHTTPPort),
-		loraMsgURL:   mainflux.Env(envLoraMsgURL, defLoraMsgURL),
-		natsURL:      mainflux.Env(envNatsURL, defNatsURL),
-		logLevel:     mainflux.Env(envLogLevel, defLogLevel),
-		esURL:        mainflux.Env(envESURL, defESURL),
-		esPass:       mainflux.Env(envESPass, defESPass),
-		esDB:         mainflux.Env(envESDB, defESDB),
-		instanceName: mainflux.Env(envInstanceName, defInstanceName),
-		routeMapURL:  mainflux.Env(envRouteMapURL, defRouteMapURL),
-		routeMapPass: mainflux.Env(envRouteMapPass, defRouteMapPass),
-		routeMapDB:   mainflux.Env(envRouteMapDB, defRouteMapDB),
+		httpPort:       mainflux.Env(envHTTPPort, defHTTPPort),
+		loraMsgURL:     mainflux.Env(envLoraMsgURL, defLoraMsgURL),
+		natsURL:        mainflux.Env(envNatsURL, defNatsURL),
+		logLevel:       mainflux.Env(envLogLevel, defLogLevel),
+		esURL:          mainflux.Env(envESURL, defESURL),
+		esPass:         mainflux.Env(envESPass, defESPass),
+		esDB:           mainflux.Env(envESDB, defESDB),
+		esConsumerName: mainflux.Env(envESConsumerName, defESConsumerName),
+		routeMapURL:    mainflux.Env(envRouteMapURL, defRouteMapURL),
+		routeMapPass:   mainflux.Env(envRouteMapPass, defRouteMapPass),
+		routeMapDB:     mainflux.Env(envRouteMapDB, defRouteMapDB),
 	}
 }

@@ -155,20 +158,20 @@ func connectToNATS(url string, logger logger.Logger) *nats.Conn {
 	return conn
 }

-func connectToMQTTBroker(loraURL string, logger logger.Logger) mqtt.Client {
-	opts := mqtt.NewClientOptions()
+func connectToMQTTBroker(loraURL string, logger logger.Logger) mqttPaho.Client {
+	opts := mqttPaho.NewClientOptions()
 	opts.AddBroker(loraURL)
 	opts.SetUsername("")
 	opts.SetPassword("")
-	opts.SetOnConnectHandler(func(c mqtt.Client) {
+	opts.SetOnConnectHandler(func(c mqttPaho.Client) {
 		logger.Info("Connected to Lora MQTT broker")
 	})
-	opts.SetConnectionLostHandler(func(c mqtt.Client, err error) {
+	opts.SetConnectionLostHandler(func(c mqttPaho.Client, err error) {
 		logger.Error(fmt.Sprintf("MQTT connection lost: %s", err.Error()))
 		os.Exit(1)
 	})

-	client := mqtt.NewClient(opts)
+	client := mqttPaho.NewClient(opts)
 	if token := client.Connect(); token.Wait() && token.Error() != nil {
 		logger.Error(fmt.Sprintf("Failed to connect to Lora MQTT broker: %s", token.Error()))
 		os.Exit(1)
@@ -191,10 +194,10 @@ func connectToRedis(redisURL, redisPass, redisDB string, logger logger.Logger) *
 	})
 }

-func subscribeToLoRaBroker(svc lora.Service, mc mqtt.Client, logger logger.Logger) {
-	mqttBroker := mqttBroker.NewBroker(svc, mc, logger)
+func subscribeToLoRaBroker(svc lora.Service, mc mqttPaho.Client, logger logger.Logger) {
+	mqtt := mqtt.NewBroker(svc, mc, logger)
 	logger.Info("Subscribed to Lora MQTT broker")
-	if err := mqttBroker.Subscribe(loraServerTopic); err != nil {
+	if err := mqtt.Subscribe(loraServerTopic); err != nil {
 		logger.Error(fmt.Sprintf("Failed to subscribe to Lora MQTT broker: %s", err))
 		os.Exit(1)
 	}
@@ -204,17 +207,17 @@ func subscribeToThingsES(svc lora.Service, client *r.Client, consumer string, lo
 	eventStore := redis.NewEventStore(svc, client, consumer, logger)
 	logger.Info("Subscribed to Redis Event Store")
 	if err := eventStore.Subscribe("mainflux.things"); err != nil {
-		logger.Warn(fmt.Sprintf("Lora-adapter service failed to subscribe to event sourcing: %s", err))
+		logger.Warn(fmt.Sprintf("Lora-adapter service failed to subscribe to Redis event source: %s", err))
 	}
 }

 func newRouteMapRepositoy(client *r.Client, prefix string, logger logger.Logger) lora.RouteMapRepository {
-	logger.Info("Connected to Redis Route map")
+	logger.Info(fmt.Sprintf("Connected to %s Redis Route-map", prefix))
 	return redis.NewRouteMapRepository(client, prefix)
 }

 func startHTTPServer(cfg config, logger logger.Logger, errs chan error) {
 	p := fmt.Sprintf(":%s", cfg.httpPort)
-	logger.Info(fmt.Sprintf("Lora-adapter service started, exposed port %s", cfg.httpPort))
+	logger.Info(fmt.Sprintf("lora-adapter service started, exposed port %s", cfg.httpPort))
 	errs <- http.ListenAndServe(p, api.MakeHandler())
 }
@@ -1,9 +1,5 @@
-//
-// Copyright (c) 2018
-// Mainflux
-//
+// Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
-//

 package main

@@ -11,6 +7,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -44,7 +41,7 @@ const (
 	defDBPort        = "27017"
 	defClientTLS     = "false"
 	defCACerts       = ""
-	defJaegerURL     = "localhost:6831"
+	defJaegerURL     = ""
 	defThingsTimeout = "1" // in seconds

 	envThingsURL     = "MF_THINGS_URL"
@@ -141,6 +138,10 @@ func connectToMongoDB(host, port, name string, logger logger.Logger) *mongo.Data
 }

 func initJaeger(svcName, url string, logger logger.Logger) (opentracing.Tracer, io.Closer) {
+	if url == "" {
+		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+	}
+
 	tracer, closer, err := jconfig.Configuration{
 		ServiceName: svcName,
 		Sampler: &jconfig.SamplerConfig{
--- a/Show More
+++ b/Show More