File tree Expand file tree Collapse file tree 5 files changed +12
-1
lines changed
apps/meteor/ee/server/startup
ee/apps/authorization-service Expand file tree Collapse file tree 5 files changed +12
-1
lines changed Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ api.registerService(new LicenseService());
1717api . registerService ( new MessageReadsService ( ) ) ;
1818api . registerService ( new OmnichannelEE ( ) ) ;
1919api . registerService ( new VoipFreeSwitchService ( ) ) ;
20- api . registerService ( new AbacService ( ) ) ;
2120
2221// when not running micro services we want to start up the instance intercom
2322if ( ! isRunningMs ( ) ) {
23+ api . registerService ( new AbacService ( ) ) ;
2424 api . registerService ( new InstanceService ( ) ) ;
2525}
Original file line number Diff line number Diff line change @@ -67,6 +67,9 @@ COPY ./packages/ui-kit/dist packages/ui-kit/dist
6767COPY ./packages/http-router/package.json packages/http-router/package.json
6868COPY ./packages/http-router/dist packages/http-router/dist
6969
70+ COPY ./ee/packages/abac/package.json ee/packages/abac/package.json
71+ COPY ./ee/packages/abac/dist ee/packages/abac/dist
72+
7073COPY ./ee/apps/${SERVICE}/dist .
7174
7275COPY ./package.json .
Original file line number Diff line number Diff line change 1515 ],
1616 "author" : " Rocket.Chat" ,
1717 "dependencies" : {
18+ "@rocket.chat/abac" : " workspace:^" ,
1819 "@rocket.chat/core-services" : " workspace:^" ,
1920 "@rocket.chat/core-typings" : " workspace:^" ,
2021 "@rocket.chat/emitter" : " ~0.31.25" ,
Original file line number Diff line number Diff line change 1+ import { AbacService } from '@rocket.chat/abac' ;
12import { api , getConnection , getTrashCollection } from '@rocket.chat/core-services' ;
23import { registerServiceModels } from '@rocket.chat/models' ;
34import { startBroker } from '@rocket.chat/network-broker' ;
@@ -20,6 +21,11 @@ const PORT = process.env.PORT || 3034;
2021
2122 api . registerService ( new Authorization ( ) ) ;
2223
24+ if ( ! process . env . USE_EXTERNAL_ABAC_SERVICE ) {
25+ // Same API as authz service but own core-services proxy
26+ api . registerService ( new AbacService ( ) ) ;
27+ }
28+
2329 await api . start ( ) ;
2430
2531 polka ( )
Original file line number Diff line number Diff line change @@ -8349,6 +8349,7 @@ __metadata:
83498349 version: 0.0.0-use.local
83508350 resolution: "@rocket.chat/authorization-service@workspace:ee/apps/authorization-service"
83518351 dependencies:
8352+ "@rocket.chat/abac": "workspace:^"
83528353 "@rocket.chat/core-services": "workspace:^"
83538354 "@rocket.chat/core-typings": "workspace:^"
83548355 "@rocket.chat/emitter": "npm:~0.31.25"
You can’t perform that action at this time.
0 commit comments