ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-19 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1000 from GNS3/API-requests-doesn't-use-HTTPS-when-SSL-is-configured

Browse Source 
Api requests doesn't use https when ssl is configured
This commit is contained in:
piotrpekala7
2020-10-17 00:29:58 +02:00
committed by GitHub
parent 57294f49a7 9861f4a2f5
commit fc34cbf524
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/components/servers/add-server-dialog/add-server-dialog.component.html
View File

@ -48,4 +48,3 @@
<button mat-button (click)="onAddClick()" tabindex="2" mat-raised-button color="primary">Add</button> <button mat-button (click)="onAddClick()" tabindex="2" mat-raised-button color="primary">Add</button>
</div> </div>
</form> </form>

8
src/app/services/http-server.service.ts
View File

@ -177,7 +177,13 @@ export class HttpServer {
private getOptionsForServer<T extends HeadersOptions>(server: Server, url: string, options: T) { private getOptionsForServer<T extends HeadersOptions>(server: Server, url: string, options: T) {
if (server.host && server.port) { if (server.host && server.port) {
url = `http://${server.host}:${server.port}/v2${url}`; if (server.authorization === 'basic') {
url = `https://${server.host}:${server.port}/v2${url}`;
console.log(url);
} else {
url = `http://${server.host}:${server.port}/v2${url}`;
console.log(url);
}
} else { } else {
url = `/v2${url}`; url = `/v2${url}`;
} }