Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set up credentials router for user management backend #2882

Merged
merged 13 commits into from
Feb 28, 2022
Merged

Set up credentials router for user management backend #2882

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
142dd29
:zap: Refactor creds endpoints into router
ivov Feb 24, 2022
11d0f39
:test_tube: Refactor creds tests to use router
ivov Feb 24, 2022
d1d298b
:truck: Rename arg for consistency
ivov Feb 24, 2022
abf0d53
:truck: Move `credentials.api.ts` outside /public
ivov Feb 24, 2022
75acf54
:truck: Rename constant for consistency
ivov Feb 24, 2022
695fa33
:blue_book: Simplify types
ivov Feb 24, 2022
abc631e
:fire: Remove unneeded arg
ivov Feb 24, 2022
e7a4594
:truck: Rename router to controller
ivov Feb 24, 2022
577a380
:zap: Shorten endpoint
ivov Feb 28, 2022
8a36061
:twisted_rightwards_arrows: Merge parent branch
ivov Feb 28, 2022
acc7b53
:zap: Update `initTestServer()` arg
ivov Feb 28, 2022
eb53a7f
:zap: Mutate response body in GET /credentials
ivov Feb 28, 2022
4d914eb
🏎 improve performance of type cast for FE
BHesseldieck Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions packages/cli/src/Server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,12 @@ import { DEFAULT_EXECUTIONS_GET_ALL_LIMIT, validateEntity } from './GenericHelpe
import { ExecutionEntity } from './databases/entities/ExecutionEntity';
import { SharedWorkflow } from './databases/entities/SharedWorkflow';
import { RESPONSE_ERROR_MESSAGES } from './constants';
import { credentialsEndpoints } from './api/namespaces/credentials';
import { credentialsController } from './api/credentials.api';

require('body-parser-xml')(bodyParser);

export const externalHooks: IExternalHooksClass = ExternalHooks();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instantiated outside App to share with credentials router.


class App {
app: express.Application;

Expand Down Expand Up @@ -260,7 +262,7 @@ class App {
this.sslKey = config.get('ssl_key');
this.sslCert = config.get('ssl_cert');

this.externalHooks = ExternalHooks();
this.externalHooks = externalHooks;

this.presetCredentialsLoaded = false;
this.endpointPresetCredentials = config.get('credentials.overwrite.endpoint') as string;
Expand Down Expand Up @@ -653,6 +655,8 @@ class App {
// ----------------------------------------
await userManagementRouter.addRoutes.apply(this, [ignoredEndpoints, this.restEndpoint]);

this.app.use(`/${this.restEndpoint}/credentials`, credentialsController);

// ----------------------------------------
// Healthcheck
// ----------------------------------------
Expand Down Expand Up @@ -1557,12 +1561,6 @@ class App {
}),
);

// ----------------------------------------
// Credentials
// ----------------------------------------

credentialsEndpoints.apply(this);

// ----------------------------------------
// Credential-Types
// ----------------------------------------
Expand Down
Loading