valitydev/org-manager
14
0
Fork 0
mirror of https://github.com/valitydev/org-manager.git synced 2024-11-06 08:25:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
155 Commits 16 Branches 0 Tags 655 KiB
33ef7f49e7
Commit Graph

155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
vitaxa
5419878542
Invitation list test fix (#11) 2021-02-01 17:32:05 +03:00
vitaxa
6097ac754f
Invitation status fix (#10) 2021-02-01 16:44:39 +03:00
vitaxa
49dc6bc60e
Organization limit NPE fix (#9) 2021-02-01 12:52:00 +03:00
vitaxa
6ec7b4205b
Refactor invite creation (#8) 2021-01-29 15:40:14 +03:00
vitaxa
7b3d6965d2
Remove required status from invite (#7) 2021-01-26 17:34:31 +03:00
vitaxa
0515caf6e1
Member role implementation (#6) 2021-01-26 15:16:18 +03:00
vitaxa
ec0eaf2235
Change rest port (#5) 2020-12-24 11:08:31 +03:00
Pospolita Nikita
92a5f92a39
Merge pull request #4 from rbkmoney/ft/BJ-1020/modify-organization 
BJ-1020: modify organization
**dependecy-track не возможно удовлетворить
 2020-12-10 14:26:46 +03:00
vitaxa
405a5b9b1a bump docker base 2020-12-10 14:21:15 +03:00
vitaxa
b2695d003c review fix 2020-12-10 11:58:35 +03:00
vitaxa
e4382c07a7 BJ-1020: modify organization 2020-12-09 15:26:01 +03:00
Pavel Popov
94f56e0549
Merge branch 'master' into ft/BJ/thrift_impl 2020-12-04 12:26:34 +03:00
vitaxa
b3b45c70f4
BJ-1016: Organization join (#3) 
* BJ-1016: Organization join

* tests fix

* keycloak bump

* org find refactor

* Update src/main/java/com/rbkmoney/orgmanager/service/OrganizationService.java

Co-authored-by: Alexander Romanov <a.romanov@rbkmoney.com>

* Update src/main/java/com/rbkmoney/orgmanager/service/OrganizationService.java

Co-authored-by: Alexander Romanov <a.romanov@rbkmoney.com>

* keycloak config refactor

* method name typo

Co-authored-by: vitaxa <v.banin@rbkmoney.com>
Co-authored-by: Alexander Romanov <a.romanov@rbkmoney.com>
 2020-12-04 12:24:37 +03:00