Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NOISSUE - Merge authz and authn into new service auth #1313

Merged
merged 15 commits into from
Dec 29, 2020
Merged

NOISSUE - Merge authz and authn into new service auth #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d915af4
remove owner id
mteodor Dec 15, 2020
871da3a
move authz into authn and merge into new service
mteodor Dec 22, 2020
c8945cb
add groups
mteodor Dec 23, 2020
3ccabfd
add groups
mteodor Dec 23, 2020
50fd0d4
add groups endpoints
mteodor Dec 23, 2020
cdff98f
add group type
mteodor Dec 24, 2020
d02eca8
adding mocks, some renaming, refactor
mteodor Dec 25, 2020
3274762
update proto
mteodor Dec 25, 2020
fc493ad
adding mocks, some renaming, refactor
mteodor Dec 25, 2020
74b4e80
fix linter err,and comments
mteodor Dec 26, 2020
06d85d7
undo renaming, add interface for authn and authz
mteodor Dec 28, 2020
237785f
renam some variables
mteodor Dec 29, 2020
781df63
renaming
mteodor Dec 29, 2020
83e930d
remove extra slashes from comment
mteodor Dec 29, 2020
477c5d3
resolving small remarks
mteodor Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 10 additions & 28 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,34 +25,16 @@ MF_JAEGER_URL=jaeger:6831
## Core Services

### AuthN
MF_AUTHN_LOG_LEVEL=debug
MF_AUTHN_HTTP_PORT=8189
MF_AUTHN_GRPC_PORT=8181
MF_AUTHN_GRPC_URL=authn:8181
MF_AUTHN_GRPC_TIMEOUT=1s
MF_AUTHN_DB_PORT=5432
MF_AUTHN_DB_USER=mainflux
MF_AUTHN_DB_PASS=mainflux
MF_AUTHN_DB=authn
MF_AUTHN_SECRET=secret

### AuthZ
MF_AUTHZ_LOG_LEVEL=debug
MF_AUTHZ_HTTP_PORT=8191
MF_AUTHZ_GRPC_PORT=8192
MF_AUTHZ_GRPC_URL=authz:8192
MF_AUTHZ_DB=authz
MF_AUTHZ_MODEL_CONF=/model.conf
MF_AUTHZ_DB_PORT=5432
MF_AUTHZ_DB_USER=mainflux
MF_AUTHZ_DB_PASS=mainflux
MF_AUTHZ_DB_SSL_MODE=
MF_AUTHZ_DB_SSL_CERT=
MF_AUTHZ_DB_SSL_KEY=
MF_AUTHZ_DB_SSL_ROOT_CERT=
MF_AUTHZ_SECRET=
MF_AUTHZ_SERVER_CERT=
MF_AUTHZ_SERVER_KEY=
MF_AUTH_LOG_LEVEL=debug
MF_AUTH_HTTP_PORT=8189
MF_AUTH_GRPC_PORT=8181
MF_AUTH_GRPC_URL=auth:8181
MF_AUTH_GRPC_TIMEOUT=1s
MF_AUTH_DB_PORT=5432
MF_AUTH_DB_USER=mainflux
MF_AUTH_DB_PASS=mainflux
MF_AUTH_DB=auth
MF_AUTH_SECRET=secret

### Users
MF_USERS_LOG_LEVEL=debug
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MF_DOCKER_IMAGE_NAME_PREFIX ?= mainflux
BUILD_DIR = build
SERVICES = users things http coap lora influxdb-writer influxdb-reader mongodb-writer \
mongodb-reader cassandra-writer cassandra-reader postgres-writer postgres-reader cli \
bootstrap opcua authn twins mqtt provision certs authz
bootstrap opcua auth twins mqtt provision certs
DOCKERS = $(addprefix docker_,$(SERVICES))
DOCKERS_DEV = $(addprefix docker_dev_,$(SERVICES))
CGO_ENABLED ?= 0
Expand Down
Loading