Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-10 22:22:45 -05:00
Code Issues Activity

chore: align routers return process of updating DB (#193)

Browse source 
* chore: align routers return process of updating DB

* chore: align connector router output
This commit is contained in:
Darcy Ye 2022-01-25 13:47:12 +08:00 • committed by GitHub
parent 67843f45db
commit 871789e763
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/core/src/queries/connector.ts
View file

@ -32,4 +32,4 @@ export const insertConnector = buildInsertInto<CreateConnector, Connector>(pool,
returning: true,
});
export const updateConnector = buildUpdateWhere<CreateConnector>(pool, Connectors);
export const updateConnector = buildUpdateWhere<CreateConnector, Connector>(pool, Connectors, true);

16
packages/core/src/routes/connector.ts
View file

@ -4,7 +4,7 @@ import { object, string } from 'zod';
import { getConnectorInstances, getConnectorInstanceById } from '@/connectors';
import { ConnectorInstance } from '@/connectors/types';
import koaGuard from '@/middleware/koa-guard';
import { findConnectorById, updateConnector } from '@/queries/connector';
import { updateConnector } from '@/queries/connector';
import { AuthedRouter } from './types';
@ -48,9 +48,9 @@ export default function connectorRoutes<T extends AuthedRouter>(router: T) {
params: { id },
body: { enabled },
} = ctx.guard;
await findConnectorById(id);
await updateConnector({ set: { enabled }, where: { id } });
ctx.body = { enabled };
const { metadata } = await getConnectorInstanceById(id);
const connector = await updateConnector({ set: { enabled }, where: { id } });
ctx.body = { ...connector, metadata };
return next();
}
@ -69,14 +69,14 @@ export default function connectorRoutes<T extends AuthedRouter>(router: T) {
params: { id },
body,
} = ctx.guard;
const connectorInstance = await getConnectorInstanceById(id);
const { metadata, validateConfig } = await getConnectorInstanceById(id);
if (body.config) {
await connectorInstance.validateConfig(body.config);
await validateConfig(body.config);
}
await updateConnector({ set: body, where: { id } });
ctx.body = transpileConnectorInstance(await getConnectorInstanceById(id));
const connector = await updateConnector({ set: body, where: { id } });
ctx.body = { ...connector, metadata };
return next();
}

3
packages/core/src/routes/user.ts
View file

@ -97,11 +97,10 @@ export default function userRoutes<T extends AnonymousRouter>(router: T, provide
const { passwordEncrypted, passwordEncryptionSalt } = encryptUserPassword(userId, password);
await updateUserById(userId, {
const user = await updateUserById(userId, {
passwordEncryptionSalt,
passwordEncrypted,
});
const user = await findUserById(userId);
ctx.body = pick(user, ...userInfoSelectFields);
return next();
}