feat: use signals to update user settings over sessions

closes #24981

Signed-off-by: Heikki Hellgren <heikki.hellgren@op.fi>
This commit is contained in:
Heikki Hellgren
2024-05-30 13:17:59 +03:00
parent ee9e1737b3
commit e6ec17948d
19 changed files with 234 additions and 11 deletions
+5 -3
View File
@@ -15,10 +15,11 @@
*/
import {
createBackendPlugin,
coreServices,
createBackendPlugin,
} from '@backstage/backend-plugin-api';
import { createRouter } from './service/router';
import { signalsServiceRef } from '@backstage/plugin-signals-node';
/**
* The user settings backend plugin.
@@ -33,9 +34,10 @@ export default createBackendPlugin({
database: coreServices.database,
identity: coreServices.identity,
httpRouter: coreServices.httpRouter,
signals: signalsServiceRef,
},
async init({ database, identity, httpRouter }) {
httpRouter.use(await createRouter({ database, identity }));
async init({ database, identity, httpRouter, signals }) {
httpRouter.use(await createRouter({ database, identity, signals }));
},
});
},
@@ -22,6 +22,7 @@ import express from 'express';
import request from 'supertest';
import { UserSettingsStore } from '../database/UserSettingsStore';
import { createRouterInternal } from './router';
import { SignalsService } from '@backstage/plugin-signals-node';
describe('createRouter', () => {
const userSettingsStore: jest.Mocked<UserSettingsStore> = {
@@ -36,6 +37,9 @@ describe('createRouter', () => {
const identityApi: jest.Mocked<Partial<IdentityApi>> = {
getIdentity: getIdentityMock,
};
const signalService: jest.Mocked<SignalsService> = {
publish: jest.fn(),
};
let app: express.Express;
@@ -43,6 +47,7 @@ describe('createRouter', () => {
const router = await createRouterInternal({
userSettingsStore,
identity: identityApi as IdentityApi,
signals: signalService as SignalsService,
});
app = express().use(router);
@@ -118,6 +123,11 @@ describe('createRouter', () => {
bucket: 'my-bucket',
key: 'my-key',
});
expect(signalService.publish).toHaveBeenCalledWith({
recipients: { type: 'user', entityRef: 'user-1' },
channel: `user-settings`,
message: { type: 'key-deleted', key: 'my-key' },
});
});
it('returns an error if the Authorization header is missing', async () => {
@@ -167,6 +177,11 @@ describe('createRouter', () => {
bucket: 'my-bucket',
key: 'my-key',
});
expect(signalService.publish).toHaveBeenCalledWith({
recipients: { type: 'user', entityRef: 'user-1' },
channel: `user-settings`,
message: { type: 'key-changed', key: 'my-key' },
});
});
it('returns an error if the value is not given', async () => {
@@ -21,6 +21,8 @@ import express, { Request } from 'express';
import Router from 'express-promise-router';
import { DatabaseUserSettingsStore } from '../database/DatabaseUserSettingsStore';
import { UserSettingsStore } from '../database/UserSettingsStore';
import { SignalsService } from '@backstage/plugin-signals-node';
import { UserSettingsSignal } from '@backstage/plugin-user-settings-common';
/**
* @public
@@ -28,6 +30,7 @@ import { UserSettingsStore } from '../database/UserSettingsStore';
export interface RouterOptions {
database: PluginDatabaseManager;
identity: IdentityApi;
signals?: SignalsService;
}
/**
@@ -45,12 +48,14 @@ export async function createRouter(
return await createRouterInternal({
userSettingsStore,
identity: options.identity,
signals: options.signals,
});
}
export async function createRouterInternal(options: {
identity: IdentityApi;
userSettingsStore: UserSettingsStore;
signals?: SignalsService;
}): Promise<express.Router> {
const router = Router();
router.use(express.json());
@@ -104,6 +109,14 @@ export async function createRouterInternal(options: {
key,
});
if (options.signals) {
await options.signals.publish<UserSettingsSignal>({
recipients: { type: 'user', entityRef: userEntityRef },
channel: `user-settings`,
message: { type: 'key-changed', key },
});
}
res.json(setting);
});
@@ -113,6 +126,13 @@ export async function createRouterInternal(options: {
const { bucket, key } = req.params;
await options.userSettingsStore.delete({ userEntityRef, bucket, key });
if (options.signals) {
await options.signals.publish<UserSettingsSignal>({
recipients: { type: 'user', entityRef: userEntityRef },
channel: 'user-settings',
message: { type: 'key-deleted', key },
});
}
res.status(204).end();
});