Skip to content
This repository was archived by the owner on Mar 28, 2022. It is now read-only.

Commit 6c7e79c

Browse files
committed
Import paths from admin-api-paths package
1 parent 213b05f commit 6c7e79c

5 files changed

Lines changed: 23 additions & 19 deletions

File tree

package-lock.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"@mocks-server/core": "^1.1.0"
3636
},
3737
"dependencies": {
38+
"@mocks-server/admin-api-paths": "1.0.0",
3839
"@hapi/boom": "8.0.1",
3940
"express": "4.17.1"
4041
},

src/Plugin.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ Unless required by applicable law or agreed to in writing, software distributed
1010
*/
1111

1212
const express = require("express");
13+
const {
14+
DEFAULT_BASE_PATH,
15+
SETTINGS,
16+
BEHAVIORS,
17+
ABOUT,
18+
FIXTURES
19+
} = require("@mocks-server/admin-api-paths");
1320

1421
const DeprecatedApi = require("./deprecated/Api");
1522

@@ -21,13 +28,8 @@ const About = require("./About");
2128
const {
2229
ADMIN_API_PATH_OPTION,
2330
ADMIN_API_DEPRECATED_PATHS_OPTION,
24-
DEFAULT_API_PATH,
2531
PLUGIN_NAME,
26-
SETTINGS_API_PATH,
27-
BEHAVIORS_API_PATH,
28-
FIXTURES_API_PATH,
29-
DEPRECATED_API_PATH,
30-
ABOUT_API_PATH
32+
DEPRECATED_API_PATH
3133
} = require("./constants");
3234

3335
class Plugin {
@@ -44,7 +46,7 @@ class Plugin {
4446
name: ADMIN_API_PATH_OPTION,
4547
type: "string",
4648
description: `Api path for ${PLUGIN_NAME}`,
47-
default: DEFAULT_API_PATH
49+
default: DEFAULT_BASE_PATH
4850
});
4951

5052
core.addSetting({
@@ -67,10 +69,10 @@ class Plugin {
6769

6870
_initRouter() {
6971
this._router = express.Router();
70-
this._router.use(SETTINGS_API_PATH, this._settingsApi.router);
71-
this._router.use(BEHAVIORS_API_PATH, this._behaviorsApi.router);
72-
this._router.use(ABOUT_API_PATH, this._aboutApi.router);
73-
this._router.use(FIXTURES_API_PATH, this._fixturesApi.router);
72+
this._router.use(SETTINGS, this._settingsApi.router);
73+
this._router.use(BEHAVIORS, this._behaviorsApi.router);
74+
this._router.use(ABOUT, this._aboutApi.router);
75+
this._router.use(FIXTURES, this._fixturesApi.router);
7476
}
7577

7678
_addDeprecatedRouter() {

src/constants.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ Unless required by applicable law or agreed to in writing, software distributed
1111
module.exports = {
1212
ADMIN_API_PATH_OPTION: "adminApiPath",
1313
ADMIN_API_DEPRECATED_PATHS_OPTION: "adminApiDeprecatedPaths",
14-
DEFAULT_API_PATH: "/admin",
1514
PLUGIN_NAME: "plugin-admin-api",
16-
SETTINGS_API_PATH: "/settings",
17-
BEHAVIORS_API_PATH: "/behaviors",
18-
FIXTURES_API_PATH: "/fixtures",
19-
DEPRECATED_API_PATH: "/mocks",
20-
ABOUT_API_PATH: "/about"
15+
DEPRECATED_API_PATH: "/mocks"
2116
};

src/deprecated/Api.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ Unless required by applicable law or agreed to in writing, software distributed
1010
*/
1111

1212
const express = require("express");
13+
const { DEFAULT_BASE_PATH } = require("@mocks-server/admin-api-paths");
1314

1415
const Behaviors = require("./Behaviors");
1516
const Settings = require("./Settings");
1617

17-
const { DEFAULT_API_PATH, DEPRECATED_API_PATH, PLUGIN_NAME } = require("../constants");
18+
const { DEPRECATED_API_PATH, PLUGIN_NAME } = require("../constants");
1819

1920
// TODO, deprecate mocks router
2021

@@ -30,7 +31,7 @@ class Api {
3031
this._router.use((req, res, next) => {
3132
this._core.tracer.deprecationWarn(
3233
`"${DEPRECATED_API_PATH}" ${PLUGIN_NAME} path`,
33-
DEFAULT_API_PATH
34+
DEFAULT_BASE_PATH
3435
);
3536
next();
3637
});

0 commit comments

Comments
 (0)