From 6d7c9bdece603319bcca6464ebe3b32356b7f525 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Thu, 20 Feb 2020 16:58:48 +0100 Subject: [PATCH] request to sketch working now --- src/pages/configuration/configuration.ts | 2 +- src/providers/LoginProvider/LoginProvider.ts | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pages/configuration/configuration.ts b/src/pages/configuration/configuration.ts index bbeb32d..d63ee7e 100644 --- a/src/pages/configuration/configuration.ts +++ b/src/pages/configuration/configuration.ts @@ -46,7 +46,7 @@ export class ConfigurationPage { async uploadStandardSketch() { const sketch = await this.loginProvider.getUserSketch(this.token,this.box._id,this.ssid,this.pw) console.log(sketch); - this.navCtrl.push(OtaWizardPage,{sketch}) + this.navCtrl.push(OtaWizardPage,{sketch}) } diff --git a/src/providers/LoginProvider/LoginProvider.ts b/src/providers/LoginProvider/LoginProvider.ts index 4190c45..11a2459 100644 --- a/src/providers/LoginProvider/LoginProvider.ts +++ b/src/providers/LoginProvider/LoginProvider.ts @@ -58,13 +58,14 @@ export class LoginProvider { async getUserSketch(token:string,id:string,ssid:string,password:string):Promise{ let URL_sketch_final = URL_sketch+id+"/script"; - console.log(URL_sketch_final) - const headers = new HttpHeaders({'Authorization':"Bearer "+token,responseType:'text'}) - const params = new HttpParams({fromObject:{ - ssid, - password - }}) - return this.http.get(URL_sketch_final,{headers,params}) + const headers = new HttpHeaders({'Authorization':"Bearer "+token}) + const params = new HttpParams({fromObject:{ssid,password}}) + const options = { + headers, + params, + 'responseType':'text' + } + return this.http.get(URL_sketch_final,options) .pipe(timeout(30000)) .toPromise() .catch(err=>{