Commit Graph

155 Commits

Author SHA1 Message Date
Elena Kushchenko
33ef7f49e7 JD-206 fix tests 2021-07-21 17:32:49 +03:00
Elena Kushchenko
95747ff5cf JD-206 improve user service to get bouncer auth context & bump parent 2021-07-21 11:13:42 +03:00
ElenaKushchenko
3cc1aef0f1
Merge pull request #48 from rbkmoney/ft/JD-206/exclude-thrift-api-from-spring-security
JD-206 exclude thrift endpoint from spring security
2021-07-14 16:23:38 +03:00
Elena Kushchenko
f3025fc435 JD-206 exclude thrift endpoint from spring security 2021-07-14 15:43:47 +03:00
ElenaKushchenko
a10c8c0374
Merge pull request #47 from rbkmoney/ft/JD-206/expose-thrift-port
JD-206 expose 8022 port
2021-07-14 13:35:30 +03:00
Elena Kushchenko
b249e943f4 exclude Tomcat customization from test config 2021-07-13 19:06:28 +03:00
Elena Kushchenko
9a60bd7857 Merge remote-tracking branch 'origin/ft/JD-206/expose-thrift-port' into ft/JD-206/expose-thrift-port
# Conflicts:
#	pom.xml
#	src/main/java/com/rbkmoney/orgmanager/config/TomcatWebServerCustomizer.java
#	src/main/resources/application.yml
2021-07-13 16:22:38 +03:00
Elena Kushchenko
d704adfe72 JD-206 expose 8022 port
Java new pipeline inside build-java image (#96)

* upd build image name

* added registry address

* added registry address

* removed registry

* fixed typo

* upd postgres version

* added some commands

* added some commands

* added expose ports

* postgres fix?

* remove postgres container, added user with ro

* remove postgres container, added user with ro

* with maven stacktrace

* revert for beginning + postgres removed

* added docker socket link

* Update pipeJavaServiceInsideDocker.groovy

* Update pipeJavaServiceInsideDocker.groovy

* Update pipeJavaServiceInsideDocker.groovy

* Update pipeJavaServiceInsideDocker.groovy

* Update pipeJavaServiceInsideDocker.groovy

* cleanup

* Update pipeJavaServiceInsideDocker.groovy

* Cleanup

Co-authored-by: Ivan Panteleev <amalgamm@users.noreply.github.com>
2021-07-13 16:21:58 +03:00
Elena Kushchenko
7bcdb49268 JD-206 expose 8022 port 2021-07-12 18:38:36 +03:00
Gregory
6fcc1535a8
Merge pull request #46 from rbkmoney/ft/JD-400
don't allow remove last role
2021-06-23 13:28:07 +03:00
ggmaleva
c39daebd15
bump keycloak and spring core 2021-06-22 14:36:43 +03:00
ggmaleva
42ed13eb24
don't allow remove last role 2021-06-21 20:04:45 +03:00
mr-impossibru
6b1585138c
JD-359: bug fix (#45)
* JD-359: fix different users can use magic link to join
* JD-359: add tests for listOrgMembership() when member is removed from organization
2021-06-07 16:19:10 +03:00
Gregory
eefa76afc2
Merge pull request #44 from rbkmoney/ft/JD-320
Refactoring access service
2021-05-25 10:00:27 +03:00
ggmaleva
f825ae7a91
refactoring 2021-05-21 18:31:48 +03:00
ggmaleva
f25e3e07b9
add new common check access method 2021-05-21 18:21:17 +03:00
Gregory
bfadad5d2b
Merge pull request #43 from rbkmoney/ft/thrift_client
change thrift client to thread safe for bouncer
2021-05-14 16:45:54 +03:00
ggmaleva
80779a6476
change thrift client to thread safe for bouncer 2021-05-14 16:17:07 +03:00
Gregory
ca9801579d
Merge pull request #42 from rbkmoney/ft/fix_owned_orgs
fix duplicate in user organizations
2021-05-14 13:06:02 +03:00
ggmaleva
1c55747689
fix duplicate in user organizations 2021-05-14 11:56:37 +03:00
Gregory
6af7be9caa
Merge pull request #41 from rbkmoney/ft/JD-301
add owned organizations to member user
2021-05-14 10:40:52 +03:00
ggmaleva
e0d475099d
add owned organizations to member user 2021-05-13 17:30:14 +03:00
Gregory
b00e36d7ca
Merge pull request #40 from rbkmoney/ft/JD-299
remove access token from response + refactoring
2021-05-13 17:04:13 +03:00
ggmaleva
2e4cb8827d
remove access token from response + refactoring 2021-05-13 15:32:12 +03:00
Gregory
f45ee31f53
Merge pull request #39 from rbkmoney/ft/bouncer_context
add party in bouncer context
2021-05-13 11:05:22 +03:00
ggmaleva
1ccca6b670
add party in bouncer context 2021-05-12 18:31:52 +03:00
Gregory
6048d770f3
Merge pull request #38 from rbkmoney/ft/JD-272
Add service parent pom
2021-05-11 16:32:25 +03:00
ggmaleva
ee3a732363
fix dependencies 2021-05-11 14:33:33 +03:00
ggmaleva
4a00334e48
add parent pom + fix checkstyle 2021-05-11 13:29:34 +03:00
Gregory
ab21cb8ff2
Merge pull request #37 from rbkmoney/ft/JD-268
Refactoring invitation revoked method
2021-05-11 11:18:50 +03:00
ggmaleva
89d7b358f8
revokedAt -> revocation reason 2021-04-30 11:18:29 +03:00
ggmaleva
26f5817050
decline revoked invitation 2021-04-30 10:26:00 +03:00
ggmaleva
d7703ffad2
Merge branch 'master' into ft/JD-268 2021-04-29 16:53:55 +03:00
Gregory
20f0890be4
Merge pull request #36 from rbkmoney/ft/JD-259
fix find user method for owner + fix thrift converters
2021-04-29 15:58:36 +03:00
ggmaleva
5b339165cd
remove enforcer plugin 2021-04-29 15:38:20 +03:00
ggmaleva
b65181314f
isolate invitation repository in invitation service 2021-04-29 15:37:10 +03:00
ggmaleva
7ff8a0275b
fix review 2021-04-29 15:13:33 +03:00
ggmaleva
99163e5d65
fix review 2021-04-29 13:59:59 +03:00
ggmaleva
d59045e6c3
refactoring invitation revoke method 2021-04-29 13:57:48 +03:00
ggmaleva
600de6b12e
update security + add enforce plugin for manage dependency 2021-04-29 13:18:55 +03:00
ggmaleva
8fb286bbcc
update security 2021-04-29 11:58:06 +03:00
ggmaleva
ec992f980a
fix find user method for owner + fix thrift converters 2021-04-29 11:34:35 +03:00
Gregory
31118ecb81
Merge pull request #35 from rbkmoney/ft/JD-248
refactoring test for user service + add log
2021-04-21 11:58:33 +03:00
ggmaleva
8b43d52e84
refactoring test for user service + add log 2021-04-21 11:22:26 +03:00
Gregory
8e87c2ba8a
Merge pull request #34 from rbkmoney/ft/JD-248
add logs
2021-04-19 18:08:50 +03:00
ggmaleva
410e27441e
fix review 2021-04-19 18:02:13 +03:00
ggmaleva
6155882f39
bump tomcat core 2021-04-19 17:35:18 +03:00
ggmaleva
c946d65778
bump tomcat core 2021-04-19 16:48:45 +03:00
ggmaleva
7317b9592b
add logs 2021-04-19 15:59:09 +03:00
Gregory
e8ca700bd7
Merge pull request #33 from rbkmoney/ft/JD-251
deactivate role while remove role and fix get member list query
2021-04-16 17:10:29 +03:00