Skip to content

Commit e081f2a

Browse files
committed
fix wrong api urls on openapi doc
1 parent 6f1ffdc commit e081f2a

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

packages/build/src/lib/schema-parser/schemaParser.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export class SchemaParser {
4545
for await (const schemaData of this.schemaReader.readSchema()) {
4646
const schema = await this.parseContent(schemaData);
4747
schema.metadata = metadata?.[schema.templateSource || schema.sourceName];
48+
schema.urlPath = `/api${schema.urlPath}`
4849
// execute middleware
4950
await execute(schema);
5051
schemas.push(schema as APISchema);

packages/catalog-server/utils/vulcanSQLAdapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class VulcanSQLAdapter {
108108
return isParam
109109
? result.replace(param, filter[key])
110110
: `${result}${querySymbol}${key}=${filter[key]}`;
111-
}, `/api${schema.urlPath}`);
111+
}, schema.urlPath);
112112

113113
const actualUrl = `${VULCAN_SQL_HOST}${actualPath}`;
114114
console.log('actualUrl: ', actualUrl);

packages/serve/src/lib/catalog-router/catalogRouters.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class CatalogRouters extends CatalogRouter {
4343
const baseUrl = `${ctx.protocol}://${ctx.host}`;
4444
const result = {
4545
...schema,
46-
url: `${baseUrl}/api${schema.urlPath}`,
46+
url: `${baseUrl}${schema.urlPath}`,
4747
apiDocUrl: `${baseUrl}${this.getAPIDocUrl(schema)}`,
4848
shareKey: this.getShareKey(ctx.request.headers.authorization),
4949
responseFormat: responseFormatOption.enabled
@@ -60,7 +60,7 @@ export class CatalogRouters extends CatalogRouter {
6060
const result = schemas.map((schema) => {
6161
return {
6262
...schema,
63-
url: `${baseUrl}/api${schema.urlPath}`,
63+
url: `${baseUrl}${schema.urlPath}`,
6464
apiDocUrl: `${baseUrl}${this.getAPIDocUrl(schema)}`,
6565
shareKey: this.getShareKey(ctx.request.headers.authorization),
6666
};

packages/serve/src/lib/route/route-component/restfulRoute.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export class RestfulRoute extends BaseRoute {
88
constructor(options: RouteOptions) {
99
super(options);
1010
const { apiSchema } = options;
11-
this.urlPath = this.combineURLs('/api', apiSchema.urlPath);
11+
this.urlPath = apiSchema.urlPath;
1212
}
1313

1414
public async respond(ctx: KoaContext) {

packages/serve/test/app.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ describe('Test vulcan server for calling restful APIs', () => {
386386
.listen(faker.datatype.number({ min: 20000, max: 30000 }));
387387

388388
// arrange input api url
389-
const apiUrl = KoaRouter.url('/api' + schema.urlPath, ctx.params);
389+
const apiUrl = KoaRouter.url(schema.urlPath, ctx.params);
390390

391391
// arrange expected result
392392
const expected: RequestParameters = {};

0 commit comments

Comments
 (0)