Merge pull request #124 from vdurante/master

Migrate to new NSwag implementation

Author: ismcagdas

angular/nswag/service.config.nswag

@@ -1,4 +1,5 @@
 {
+  "runtime": "Default",
   "swaggerGenerator": {
     "fromSwagger": {
       "url": "http://localhost:21021/swagger/v1/swagger.json",
@@ -11,33 +12,56 @@
       "moduleName": "",
       "namespace": "",
       "typeScriptVersion": 1.8,
-      "template": "Angular2",
+      "template": "Angular",
       "promiseType": "Promise",
       "dateTimeType": "MomentJS",
+      "nullValue": "Undefined",
       "generateClientClasses": true,
       "generateClientInterfaces": false,
+      "generateOptionalParameters": false,
       "wrapDtoExceptions": false,
+      "wrapResponses": false,
+      "generateResponseClasses": true,
+      "responseClass": "SwaggerResponse",
       "useTransformOptionsMethod": false,
       "useTransformResultMethod": false,
       "generateDtoTypes": true,
       "operationGenerationMode": "MultipleClientsFromPathSegments",
       "markOptionalProperties": false,
+      "generateCloneMethod": true,
       "typeStyle": "Class",
       "extensionCode": "service.extensions.ts",
       "generateDefaultValues": true,
       "excludedTypeNames": [],
+      "handleReferences": false,
+      "generateConstructorInterface": true,
+      "importRequiredTypes": true,
+      "useGetBaseUrlMethod": false,
+      "baseUrlTokenName": "API_BASE_URL",
       "output": "../src/shared/service-proxies/service-proxies.ts"
     },
     "swaggerToCSharpClient": {
-      "exceptionClass": "SwaggerException",
       "generateClientClasses": true,
       "generateClientInterfaces": false,
       "generateDtoTypes": true,
+      "injectHttpClient": false,
+      "disposeHttpClient": true,
+      "generateExceptionClasses": true,
+      "exceptionClass": "SwaggerException",
+      "wrapDtoExceptions": true,
       "useHttpClientCreationMethod": false,
+      "httpClientType": "System.Net.Http.HttpClient",
       "useHttpRequestMessageCreationMethod": false,
+      "useBaseUrl": true,
+      "generateSyncMethods": false,
+      "clientClassAccessModifier": "public",
       "generateContractsOutput": false,
+      "parameterDateTimeFormat": "s",
+      "generateUpdateJsonSerializerSettingsMethod": true,
+      "serializeTypeInformation": false,
       "className": "{controller}Client",
       "namespace": "MyNamespace",
+      "generateOptionalParameters": false,
       "requiredPropertiesMustBeDefined": true,
       "dateType": "System.DateTime",
       "dateTimeType": "System.DateTime",
@@ -48,15 +72,25 @@
       "classStyle": "Inpc",
       "operationGenerationMode": "MultipleClientsFromOperationId",
       "generateDefaultValues": true,
+      "generateDataAnnotations": true,
       "excludedTypeNames": [],
+      "wrapResponses": false,
+      "generateResponseClasses": true,
+      "responseClass": "SwaggerResponse",
+      "handleReferences": false,
+      "generateImmutableArrayProperties": false,
+      "generateImmutableDictionaryProperties": false,
       "output": null
     },
     "swaggerToCSharpController": {
+      "controllerStyle": "Partial",
+      "useCancellationToken": false,
       "className": "{controller}",
       "namespace": "MyNamespace",
       "additionalNamespaceUsages": [
         "System.Web.Http"
       ],
+      "generateOptionalParameters": false,
       "requiredPropertiesMustBeDefined": true,
       "dateType": "System.DateTime",
       "dateTimeType": "System.DateTime",
@@ -67,7 +101,14 @@
       "classStyle": "Inpc",
       "operationGenerationMode": "MultipleClientsFromOperationId",
       "generateDefaultValues": true,
+      "generateDataAnnotations": true,
       "excludedTypeNames": [],
+      "wrapResponses": false,
+      "generateResponseClasses": true,
+      "responseClass": "SwaggerResponse",
+      "handleReferences": false,
+      "generateImmutableArrayProperties": false,
+      "generateImmutableDictionaryProperties": false,
       "output": null
     }
   }

angular/nswag/service.extensions.ts

@@ -1 +1 @@
-import * as moment from 'moment';
+import 'rxjs/add/operator/finally';

angular/package.json

@@ -29,7 +29,6 @@
         "@types/lodash": "^4.14.62",
         "@types/moment": "^2.13.0",
         "@types/moment-timezone": "^0.2.34",
-        "@types/node": "^6.0.42",
         "@types/signalr": "^2.2.33",
         "@types/toastr": "^2.1.33",
         "abp-ng2-module": "^1.2.0",
@@ -66,7 +65,7 @@
         "toastr": "^2.1.2",
         "ts-helpers": "^1.1.2",
         "web-animations-js": "^2.3.1",
-        "zone.js": "0.8.17"
+        "zone.js": "0.8.18"
     },
     "devDependencies": {
         "@angular/cli": "^1.3.2",
@@ -87,6 +86,6 @@
         "protractor": "^5.1.1",
         "ts-node": "^3.3.0",
         "tslint": "^5.7.0",
-        "typescript": "2.5.2"
+        "typescript": "2.5.3"
     }
 }

angular/src/app/roles/create-role/create-role.component.ts

@@ -34,7 +34,8 @@ export class CreateRoleComponent extends AppComponentBase implements OnInit {
 
     show(): void {
         this.active = true;
-        this.role = new CreateRoleDto({ isStatic: false });
+        this.role = new CreateRoleDto();
+        this.role.init({ isStatic: false });
 
         this.modal.show();
     }

angular/src/app/tenants/create-tenant/create-tenant.component.ts

@@ -30,7 +30,8 @@ export class CreateTenantComponent extends AppComponentBase {
     show(): void {
         this.active = true;
         this.modal.show();
-        this.tenant = new CreateTenantDto({isActive:true});
+        this.tenant = new CreateTenantDto();
+        this.tenant.init({isActive:true});
     }
 
     onShown(): void {

angular/src/app/users/create-user/create-user.component.ts

@@ -38,7 +38,8 @@ export class CreateUserComponent extends AppComponentBase implements OnInit {
     show(): void {
         this.active = true;
         this.modal.show();
-        this.user = new CreateUserDto({ isActive: true });
+        this.user = new CreateUserDto();
+        this.user.init({ isActive: true });
     }
 
     onShown(): void {