@abp/ng.schematics 10.7.0-rc.3 → 10.7.0-rc.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13,6 +13,10 @@ export class <%= name %>Service {
13
13
  const responseType = isBlob ? 'Blob' : body.responseType;
14
14
  const httpResponseType = body.httpResponseType;
15
15
  const acceptHeader = body.acceptHeader;
16
+ const headerEntries = [];
17
+ if (acceptHeader) { headerEntries.push("Accept: '" + acceptHeader + "'"); }
18
+ if (body.contentTypeHeader) { headerEntries.push("'Content-Type': '" + body.contentTypeHeader + "'"); }
19
+ const headers = headerEntries.length ? '{ ' + headerEntries.join(', ') + ' }' : '';
16
20
  const resourceParameters = signature.parameters.filter(p => p.name !== 'config');
17
21
  const resourceType = resourceParameters.length
18
22
  ? `{ ${resourceParameters.map(p => `${p.name}${p.optional}: ${p.type}`).join('; ')} }`
@@ -33,8 +37,8 @@ export class <%= name %>Service {
33
37
  method: '<%= body.method %>',<%
34
38
  if (httpResponseType && httpResponseType !== 'json') { %>
35
39
  responseType: '<%= httpResponseType %>',<% } %><%
36
- if (acceptHeader) { %>
37
- headers: { Accept: '<%= acceptHeader %>' },<% } %>
40
+ if (headers) { %>
41
+ headers: <%= headers %>,<% } %>
38
42
  url: <%= body.url %>,<%
39
43
  if (body.dictParamVar && !body.params.length) { %>
40
44
  params: <%= body.dictParamVar %>,<% } %><%
@@ -53,8 +57,8 @@ export class <%= name %>Service {
53
57
  method: '<%= body.method %>',<%
54
58
  if (httpResponseType && httpResponseType !== 'json') { %>
55
59
  responseType: '<%= httpResponseType %>',<% } %><%
56
- if (acceptHeader) { %>
57
- headers: { Accept: '<%= acceptHeader %>' },<% } %>
60
+ if (headers) { %>
61
+ headers: <%= headers %>,<% } %>
58
62
  url: <%= body.url %>,<%
59
63
  if (body.dictParamVar && !body.params.length) { %>
60
64
  params: <%= body.dictParamVar %>,<% } %><%
@@ -27,6 +27,7 @@ export declare class Body {
27
27
  responseType: string;
28
28
  httpResponseType?: 'json' | 'text' | 'blob' | 'arraybuffer';
29
29
  acceptHeader?: string;
30
+ contentTypeHeader?: string;
30
31
  url: string;
31
32
  registerActionParameter: (param: ParameterInBody) => void;
32
33
  constructor(options: BodyOptions);
package/models/method.js CHANGED
@@ -45,7 +45,15 @@ class Body {
45
45
  this.params.push(paramName === value ? value : `${(0, methods_1.getParamName)(paramName)}: ${value}`);
46
46
  break;
47
47
  case enums_1.eBindingSourceId.FormFile:
48
+ this.body = value;
49
+ break;
48
50
  case enums_1.eBindingSourceId.Body:
51
+ /* Angular sends a plain string body as text/plain, but the endpoint expects a JSON string. */
52
+ if (param.typeSimple === 'string') {
53
+ this.body = `JSON.stringify(${value})`;
54
+ this.contentTypeHeader = 'application/json';
55
+ break;
56
+ }
49
57
  this.body = value;
50
58
  break;
51
59
  case enums_1.eBindingSourceId.Path:
@@ -1 +1 @@
1
- {"version":3,"file":"method.js","sourceRoot":"","sources":["../../../../packages/schematics/src/models/method.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"method.js","sourceRoot":"","sources":["../../../../packages/schematics/src/models/method.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abp/ng.schematics",
3
- "version": "10.7.0-rc.3",
3
+ "version": "10.7.0-rc.5",
4
4
  "author": "",
5
5
  "schematics": "./collection.json",
6
6
  "dependencies": {