fix typescript angular2 model - optional/required

modules/swagger-codegen/src/main/resources/typescript-angular2/model.mustache

@@ -19,7 +19,7 @@ export interface {{classname}} {{#parent}}extends models.{{{parent}}} {{/parent}
      * {{{description}}}
      */
 {{/description}}
-    {{name}}?: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+    {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
 
 {{/vars}}
 }

samples/client/petstore/typescript-angular2/default/api/PetApi.ts

@@ -395,17 +395,17 @@ export class PetApi {
             'application/xml'
         ];
         
+        // authentication (api_key) required
+        if (this.configuration.apiKey)
+        {
+            headers.set('api_key', this.configuration.apiKey);
+        }
         // authentication (petstore_auth) required
         // oauth required
         if (this.configuration.accessToken)
         {
             headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
         }
-        // authentication (api_key) required
-        if (this.configuration.apiKey)
-        {
-            headers.set('api_key', this.configuration.apiKey);
-        }
             
 
 

samples/client/petstore/typescript-angular2/default/model/Pet.ts

@@ -29,9 +29,9 @@ export interface Pet {
 
     category?: models.Category;
 
-    name?: string;
+    name: string;
 
-    photoUrls?: Array<string>;
+    photoUrls: Array<string>;
 
     tags?: Array<models.Tag>;
 

samples/client/petstore/typescript-angular2/npm/README.md

@@ -1,4 +1,4 @@
-## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201609141041
+## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201609212006
 
 ### Building
 
@@ -19,7 +19,7 @@ navigate to the folder of your consuming project and run one of next commando's.
 _published:_
 
 ```
-npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201609141041 --save
+npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201609212006 --save
 ```
 
 _unPublished (not recommended):_

samples/client/petstore/typescript-angular2/npm/api/PetApi.ts

@@ -32,6 +32,7 @@ import 'rxjs/add/operator/map';
 
 import * as models                                           from '../model/models';
 import { BASE_PATH }                                         from '../variables';
+import { Configuration }                                     from '../configuration';
 
 /* tslint:disable:no-unused-variable member-ordering */
 
@@ -40,11 +41,15 @@ import { BASE_PATH }                                         from '../variables'
 export class PetApi {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders: Headers = new Headers();
+    public configuration: Configuration = new Configuration();
 
-    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string) {
+    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
         if (basePath) {
             this.basePath = basePath;
         }
+        if (configuration) {
+            this.configuration = configuration;
+        }
     }
 
     /**
@@ -204,7 +209,14 @@ export class PetApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
 
         headers.set('Content-Type', 'application/json');
 
@@ -246,7 +258,14 @@ export class PetApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
 
 
 
@@ -284,7 +303,14 @@ export class PetApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
 
 
 
@@ -322,7 +348,14 @@ export class PetApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
 
 
 
@@ -361,7 +394,19 @@ export class PetApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+        // authentication (api_key) required
+        if (this.configuration.apiKey)
+        {
+            headers.set('api_key', this.configuration.apiKey);
+        }
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
 
 
 
@@ -398,7 +443,14 @@ export class PetApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
 
         headers.set('Content-Type', 'application/json');
 
@@ -444,15 +496,22 @@ export class PetApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
         headers.set('Content-Type', 'application/x-www-form-urlencoded');
 
 
         if (name !== undefined) {
-        	formParams.set('name', <any>name); 
+            formParams.set('name', <any>name); 
         }
         if (status !== undefined) {
-        	formParams.set('status', <any>status); 
+            formParams.set('status', <any>status); 
         }
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -496,15 +555,22 @@ export class PetApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
         headers.set('Content-Type', 'application/x-www-form-urlencoded');
 
 
         if (additionalMetadata !== undefined) {
-        	formParams.set('additionalMetadata', <any>additionalMetadata); 
+            formParams.set('additionalMetadata', <any>additionalMetadata); 
         }
         if (file !== undefined) {
-        	formParams.set('file', <any>file); 
+            formParams.set('file', <any>file); 
         }
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({

samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts

@@ -32,6 +32,7 @@ import 'rxjs/add/operator/map';
 
 import * as models                                           from '../model/models';
 import { BASE_PATH }                                         from '../variables';
+import { Configuration }                                     from '../configuration';
 
 /* tslint:disable:no-unused-variable member-ordering */
 
@@ -40,11 +41,15 @@ import { BASE_PATH }                                         from '../variables'
 export class StoreApi {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders: Headers = new Headers();
+    public configuration: Configuration = new Configuration();
 
-    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string) {
+    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
         if (basePath) {
             this.basePath = basePath;
         }
+        if (configuration) {
+            this.configuration = configuration;
+        }
     }
 
     /**
@@ -136,7 +141,8 @@ export class StoreApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
 
 
@@ -170,7 +176,13 @@ export class StoreApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+        // authentication (api_key) required
+        if (this.configuration.apiKey)
+        {
+            headers.set('api_key', this.configuration.apiKey);
+        }
+            
 
 
 
@@ -209,7 +221,8 @@ export class StoreApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
 
 
@@ -244,7 +257,8 @@ export class StoreApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
         headers.set('Content-Type', 'application/json');
 

samples/client/petstore/typescript-angular2/npm/api/UserApi.ts

@@ -32,6 +32,7 @@ import 'rxjs/add/operator/map';
 
 import * as models                                           from '../model/models';
 import { BASE_PATH }                                         from '../variables';
+import { Configuration }                                     from '../configuration';
 
 /* tslint:disable:no-unused-variable member-ordering */
 
@@ -40,11 +41,15 @@ import { BASE_PATH }                                         from '../variables'
 export class UserApi {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders: Headers = new Headers();
+    public configuration: Configuration = new Configuration();
 
-    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string) {
+    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
         if (basePath) {
             this.basePath = basePath;
         }
+        if (configuration) {
+            this.configuration = configuration;
+        }
     }
 
     /**
@@ -198,7 +203,8 @@ export class UserApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
         headers.set('Content-Type', 'application/json');
 
@@ -235,7 +241,8 @@ export class UserApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
         headers.set('Content-Type', 'application/json');
 
@@ -272,7 +279,8 @@ export class UserApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
         headers.set('Content-Type', 'application/json');
 
@@ -313,7 +321,8 @@ export class UserApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
 
 
@@ -352,7 +361,8 @@ export class UserApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
 
 
@@ -394,7 +404,8 @@ export class UserApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
 
 
@@ -428,7 +439,8 @@ export class UserApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
 
 
@@ -468,7 +480,8 @@ export class UserApi {
             'application/json', 
             'application/xml'
         ];
-
+        
+            
 
         headers.set('Content-Type', 'application/json');
 

samples/client/petstore/typescript-angular2/npm/configuration.ts

@@ -0,0 +1,6 @@
+export class Configuration {
+    apiKey: string;
+    username: string;
+    password: string;
+    accessToken: string;
+}

samples/client/petstore/typescript-angular2/npm/index.ts

@@ -1,3 +1,4 @@
 export * from './api/api';
 export * from './model/models';
-export * from './variables';
+export * from './variables';
+export * from './configuration';

samples/client/petstore/typescript-angular2/npm/model/Pet.ts

@@ -29,9 +29,9 @@ export interface Pet {
 
     category?: models.Category;
 
-    name?: string;
+    name: string;
 
-    photoUrls?: Array<string>;
+    photoUrls: Array<string>;
 
     tags?: Array<models.Tag>;
 

samples/client/petstore/typescript-angular2/npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger/angular2-typescript-petstore",
-  "version": "0.0.1-SNAPSHOT.201609141041",
+  "version": "0.0.1-SNAPSHOT.201609212006",
   "description": "swagger client for @swagger/angular2-typescript-petstore",
   "author": "Swagger Codegen Contributors",
   "keywords": [