mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-18 10:31:15 +00:00
refactor(core): Post-release refactorings of Public API (#3495)
* ⚡ Post-release refactorings * 🧪 Add `--forceExit` * 🛠 typing refactor (#3486) * 🐛 Fix middleware arguments * 👕 Fix lint * ⚡ Restore commented out block Co-authored-by: Ben Hesseldieck <1849459+BHesseldieck@users.noreply.github.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import express = require('express');
|
||||
import express from 'express';
|
||||
|
||||
import { CredentialsHelper } from '../../../../CredentialsHelper';
|
||||
import { CredentialTypes } from '../../../../CredentialTypes';
|
||||
|
||||
import { CredentialsEntity } from '../../../../databases/entities/CredentialsEntity';
|
||||
import { CredentialRequest } from '../../../../requests';
|
||||
import { CredentialTypeRequest } from '../../../types';
|
||||
@@ -29,7 +29,7 @@ export = {
|
||||
res: express.Response,
|
||||
): Promise<express.Response<Partial<CredentialsEntity>>> => {
|
||||
try {
|
||||
const newCredential = await createCredential(req.body as Partial<CredentialsEntity>);
|
||||
const newCredential = await createCredential(req.body);
|
||||
|
||||
const encryptedData = await encryptCredential(newCredential);
|
||||
|
||||
@@ -56,7 +56,7 @@ export = {
|
||||
res: express.Response,
|
||||
): Promise<express.Response<Partial<CredentialsEntity>>> => {
|
||||
const { id: credentialId } = req.params;
|
||||
let credentials: CredentialsEntity | undefined;
|
||||
let credential: CredentialsEntity | undefined;
|
||||
|
||||
if (req.user.globalRole.name !== 'owner') {
|
||||
const shared = await getSharedCredentials(req.user.id, credentialId, [
|
||||
@@ -65,27 +65,20 @@ export = {
|
||||
]);
|
||||
|
||||
if (shared?.role.name === 'owner') {
|
||||
credentials = shared.credentials;
|
||||
} else {
|
||||
// LoggerProxy.info('Attempt to delete credential blocked due to lack of permissions', {
|
||||
// credentialId,
|
||||
// userId: req.user.id,
|
||||
// });
|
||||
credential = shared.credentials;
|
||||
}
|
||||
} else {
|
||||
credentials = (await getCredentials(credentialId)) as CredentialsEntity;
|
||||
credential = (await getCredentials(credentialId)) as CredentialsEntity;
|
||||
}
|
||||
|
||||
if (!credentials) {
|
||||
return res.status(404).json({
|
||||
message: 'Not Found',
|
||||
});
|
||||
if (!credential) {
|
||||
return res.status(404).json({ message: 'Not Found' });
|
||||
}
|
||||
|
||||
await removeCredential(credentials);
|
||||
credentials.id = Number(credentialId);
|
||||
await removeCredential(credential);
|
||||
credential.id = Number(credentialId);
|
||||
|
||||
return res.json(sanitizeCredentials(credentials));
|
||||
return res.json(sanitizeCredentials(credential));
|
||||
},
|
||||
],
|
||||
|
||||
@@ -97,14 +90,12 @@ export = {
|
||||
try {
|
||||
CredentialTypes().getByName(credentialTypeName);
|
||||
} catch (error) {
|
||||
return res.status(404).json({
|
||||
message: 'Not Found',
|
||||
});
|
||||
return res.status(404).json({ message: 'Not Found' });
|
||||
}
|
||||
|
||||
let schema = new CredentialsHelper('').getCredentialsProperties(credentialTypeName);
|
||||
|
||||
schema = schema.filter((nodeProperty) => nodeProperty.type !== 'hidden');
|
||||
const schema = new CredentialsHelper('')
|
||||
.getCredentialsProperties(credentialTypeName)
|
||||
.filter((property) => property.type !== 'hidden');
|
||||
|
||||
return res.json(toJsonSchema(schema));
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user