Commit Graph

68 Commits

Author SHA1 Message Date
Gregory
8f0a6fa5da
Merge pull request #24 from rbkmoney/ft/JD-143
Add userId in list membership method + refactoring tests
2021-03-24 11:07:09 +03:00
ggmaleva
284d8b5f8c remove redundant dto 2021-03-24 09:38:57 +03:00
ggmaleva
05d978fb44 refactoring 2021-03-22 18:21:49 +03:00
ggmaleva
631fa26993 add userId in list membership method + refactoring tests 2021-03-22 17:53:36 +03:00
Gregory
09cf25e24f
Merge pull request #23 from rbkmoney/ft/JAVA-114
Add checking invitation rights in orgs controller
2021-03-10 17:59:12 +03:00
ggmaleva
5b5d4919ac update bouncer proto + add invitation id in context 2021-03-10 17:26:55 +03:00
ggmaleva
57cae09d82 Merge branch 'master' into ft/JAVA-114 2021-03-10 16:43:29 +03:00
Gregory
d1e75914c0
Merge pull request #22 from rbkmoney/ft/JAVA-103
add checking rights in rest methods in user controller
2021-03-10 16:31:38 +03:00
ggmaleva
d0dea25aad add checking invitation method with id 2021-03-10 13:30:39 +03:00
ggmaleva
b97e0ea5f5 add checking invitation method 2021-03-10 12:20:33 +03:00
ggmaleva
196e689775 up postgresql 2021-03-09 18:18:34 +03:00
ggmaleva
735608e577 up postgresql for up security severity 2021-03-09 18:12:26 +03:00
ggmaleva
f7394f8cf2 up guava for up security severity 2021-03-09 18:04:29 +03:00
ggmaleva
03caa877a9 add exception 2021-03-09 17:54:23 +03:00
ggmaleva
b473ddb8ac add compiler plugin for debug error 2021-03-09 17:51:55 +03:00
ggmaleva
9ce059cba3 add checking rights in rest methods in user controller 2021-03-09 17:11:03 +03:00
Gregory
6f5a31ac0b
Merge pull request #21 from rbkmoney/ft/JAVA-103
Add checking role for access
2021-03-05 18:57:02 +03:00
ggmaleva
e6f399c168 fix error message 2021-03-05 15:26:27 +03:00
ggmaleva
bc301acf67 Merge branch 'master' into ft/JAVA-104 2021-03-05 15:10:17 +03:00
Gregory
24c75fee6c
Merge pull request #20 from rbkmoney/ft/JAVA-103
Add checking rights in org-manager controllers
2021-03-05 15:09:15 +03:00
ggmaleva
a88353e54d add controller test + fix check method 2021-03-05 14:43:32 +03:00
ggmaleva
e177a2a275 add test for check roles 2021-03-05 14:36:08 +03:00
ggmaleva
3c9c0997ea remove todo 2021-03-05 13:27:33 +03:00
ggmaleva
bd41a8017e add checking role 2021-03-05 13:27:02 +03:00
ggmaleva
69f37c1fa4 fix after review 2021-03-04 16:54:34 +03:00
ggmaleva
a454a09f7b add rights service + add checking rights in controllers 2021-03-03 14:55:25 +03:00
ggmaleva
563321d947 add bouncer service with bouncer call 2021-03-02 18:07:08 +03:00
Gregory
2ad7308bd8
Merge pull request #19 from rbkmoney/ft/JAVA-103
add TODO + add org manager operation context
2021-03-02 16:34:23 +03:00
ggmaleva
30a7515227 add TODO + add org manager operation context 2021-03-01 17:53:59 +03:00
Gregory
d387dbd01e
Merge pull request #18 from rbkmoney/ft/JAVA-77
Add bouncer context builder
2021-02-25 15:59:47 +03:00
ggmaleva
b4d1fa1fd8 fix date after review 2021-02-24 19:03:59 +03:00
ggmaleva
adad92d240 fix after review 2021-02-24 18:29:15 +03:00
ggmaleva
cdac4541bf bump bouncy castle 2021-02-24 16:52:40 +03:00
ggmaleva
d7741d6203 bump keycloak 2021-02-24 16:05:57 +03:00
ggmaleva
4e68252b2d exclude bouncer-proto from org-manager proto 2021-02-24 15:43:40 +03:00
ggmaleva
9a2fc5f1f3 fix tests for AuthContextService 2021-02-24 15:07:50 +03:00
ggmaleva
979ccd6ca4 add BouncerContextFactory 2021-02-24 14:53:15 +03:00
ggmaleva
f5edebd4d8 Merge branch 'master' into ft/PT-679
# Conflicts:
#	pom.xml
2021-02-19 15:15:50 +03:00
Gregory
6ce771d419
Merge pull request #2 from rbkmoney/ft/BJ/thrift_impl
Added thrift impl
2021-02-19 15:13:17 +03:00
ggmaleva
d4bfba8978 fix after review 2021-02-19 15:02:50 +03:00
ggmaleva
0cf22dee7a fix test 2021-02-19 13:42:40 +03:00
ggmaleva
9fac32491b Merge branch 'master' into ft/BJ/thrift_impl
# Conflicts:
#	pom.xml
#	src/main/java/com/rbkmoney/orgmanager/service/OrganizationRoleService.java
#	src/test/java/com/rbkmoney/orgmanager/converter/OrganizationConverterTest.java
2021-02-19 11:10:57 +03:00
ggmaleva
9d3c8d2f1f add bouncer dependency 2021-02-18 17:50:24 +03:00
ggmaleva
48b34973bf add draft bouncer service 2021-02-18 17:47:22 +03:00
Anatolii Karlov
40e5fe7993
Create README.md (#17) 2021-02-12 20:25:13 +07:00
Anatolii Karlov
57122b381a
add mail invite (#16) 2021-02-12 20:22:50 +07:00
vitaxa
63b60592de
Fix organization owner id (#15) 2021-02-11 13:30:26 +03:00
vitaxa
5b783e14cd
Invitation role and status fix (#14) 2021-02-08 13:04:09 +03:00
vitaxa
644ad8b3bd
Fixed work with expired invites (#13) 2021-02-05 13:41:45 +03:00
vitaxa
0fb4c03548
Invitation list remove test (#12) 2021-02-01 17:50:07 +03:00