Skip to content

Commit 3f5c8d4

Browse files
committed
feat: Register abac service inside authz (#37333)
1 parent 04e9bb4 commit 3f5c8d4

File tree

5 files changed

+12
-1
lines changed

5 files changed

+12
-1
lines changed

apps/meteor/ee/server/startup/services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ api.registerService(new LicenseService());
1717
api.registerService(new MessageReadsService());
1818
api.registerService(new OmnichannelEE());
1919
api.registerService(new VoipFreeSwitchService());
20-
api.registerService(new AbacService());
2120

2221
// when not running micro services we want to start up the instance intercom
2322
if (!isRunningMs()) {
23+
api.registerService(new AbacService());
2424
api.registerService(new InstanceService());
2525
}

ee/apps/authorization-service/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ COPY ./packages/ui-kit/dist packages/ui-kit/dist
6767
COPY ./packages/http-router/package.json packages/http-router/package.json
6868
COPY ./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+
7073
COPY ./ee/apps/${SERVICE}/dist .
7174

7275
COPY ./package.json .

ee/apps/authorization-service/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
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",

ee/apps/authorization-service/src/service.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { AbacService } from '@rocket.chat/abac';
12
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
23
import { registerServiceModels } from '@rocket.chat/models';
34
import { 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()

yarn.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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"

0 commit comments

Comments
 (0)