Merge pull request #1312 from GNS3/bugfix/1307

I added  authentication token for allow IOU or IOS templates to be cr…

src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts

@@ -135,9 +135,9 @@ export class AddIosTemplateComponent implements OnInit {
     this.uploader.queue.forEach((elem) => (elem.url = url));
 
     const itemToUpload = this.uploader.queue[0];
-    (itemToUpload as any).options.disableMultipart = true;
-
+    if ((itemToUpload as any).options) (itemToUpload as any).options.disableMultipart = true; ((itemToUpload as any).options.headers = [{ name: 'Authorization', value: 'Bearer ' + this.server.authToken }])
     this.uploader.uploadItem(itemToUpload);
+
   }
 
   addTemplate() {

src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts

@@ -75,7 +75,6 @@ export class AddIouTemplateComponent implements OnInit {
     this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
       this.server = server;
       this.getImages();
-
       this.templateMocksService.getIouTemplate().subscribe((iouTemplate: IouTemplate) => {
         this.iouTemplate = iouTemplate;
       });
@@ -106,11 +105,13 @@ export class AddIouTemplateComponent implements OnInit {
     this.uploader.queue.forEach((elem) => (elem.url = url));
 
     const itemToUpload = this.uploader.queue[0];
-    (itemToUpload as any).options.disableMultipart = true;
-
+    if ((itemToUpload as any).options) (itemToUpload as any).options.disableMultipart = true; ((itemToUpload as any).options.headers = [{ name: 'Authorization', value: 'Bearer ' + this.server.authToken }])
     this.uploader.uploadItem(itemToUpload);
+
   }
 
+
+
   goBack() {
     this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates']);
   }

src/app/services/appliances.service.ts

@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { Appliance } from '../models/appliance';
 import { Server } from '../models/server';
@@ -17,7 +18,7 @@ export class ApplianceService {
   }
 
   getUploadPath(server: Server, emulator: string, filename: string) {
-    return `${server.protocol}//${server.host}:${server.port}/v3/images/upload/${filename}`;
+    return `${server.protocol}//${server.host}:${server.port}/${environment.current_version}/images/upload/${filename}`;
   }
 
   updateAppliances(server: Server): Observable<Appliance[]> {

src/app/services/image-manager.service.spec.ts

@@ -8,6 +8,7 @@ import { getTestServer } from './testing';
 
 import { ImageManagerService } from './image-manager.service';
 import { Image } from "../models/images";
+import { environment } from 'environments/environment';
 
 describe('ImageManagerService', () => {
   let httpClient: HttpClient;
@@ -34,7 +35,7 @@ describe('ImageManagerService', () => {
 
   it('should be get Images', inject([ImageManagerService], (service: ImageManagerService) => {
     service.getImages(server).subscribe();
-    const req = httpTestingController.expectOne('http://127.0.0.1:3080/v3/images');
+    const req = httpTestingController.expectOne(`http://127.0.0.1:3080/${environment.current_version}/images`);
     expect(req.request.method).toEqual('GET');
     expect(service).toBeTruthy();
   }));
@@ -53,7 +54,7 @@ describe('ImageManagerService', () => {
     };
 
     service.uploadedImage(server, install_appliance, image.filename, image).subscribe();
-    const req = httpTestingController.expectOne('http://127.0.0.1:3080/v3/images/upload/?install_appliances=true');
+    const req = httpTestingController.expectOne(`http://127.0.0.1:3080/${environment.current_version}/images/upload/?install_appliances=true`);
     expect(req.request.method).toEqual('POST');
     expect(req.request.body).toEqual(image);
   }));

src/app/services/ios.service.ts

@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { IosImage } from '../models/images/ios-image';
 import { Server } from '../models/server';
@@ -14,7 +15,7 @@ export class IosService {
   }
 
   getImagePath(server: Server, filename: string): string {
-    return `${server.protocol}//${server.host}:${server.port}/images/upload/${filename}`;
+    return `${server.protocol}//${server.host}:${server.port}/${environment.current_version}/images/upload/${filename}`;
   }
 
   getTemplates(server: Server): Observable<IosTemplate[]> {

src/app/services/iou.service.ts

@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { IouImage } from '../models/iou/iou-image';
 import { Server } from '../models/server';
@@ -22,7 +23,7 @@ export class IouService {
   }
 
   getImagePath(server: Server, filename: string): string {
-    return `${server.protocol}//${server.host}:${server.port}/images/upload/${filename}`;
+    return `${server.protocol}//${server.host}:${server.port}/${environment.current_version}/images/upload/${filename}`;
   }
 
   addTemplate(server: Server, iouTemplate: any): Observable<any> {

src/environments/environment.electron.prod.ts

@@ -2,4 +2,5 @@ export const environment = {
   solarputty_download_url: '',
   production: true,
   electron: true,
+  current_version:'v3'
 };

src/environments/environment.electron.ts

@@ -2,4 +2,5 @@ export const environment = {
   production: false,
   electron: true,
   solarputty_download_url: '',
+  current_version:'v3'
 };

src/environments/environment.github.prod.ts

@@ -3,4 +3,5 @@ export const environment = {
   electron: false,
   githubio: true,
   solarputty_download_url: '',
+  current_version:'v3'
 };

src/environments/environment.prod.ts

@@ -3,4 +3,5 @@ export const environment = {
   electron: false,
   githubio: false,
   solarputty_download_url: '',
+  current_version:'v3'
 };

src/environments/environment.ts

@@ -7,6 +7,7 @@ export const environment = {
   electron: false,
   githubio: false,
   solarputty_download_url: '',
+  current_version:'v3'
 };
 
 /*