Add basic auth header to native http

librenms · Jun 20, 2018 · da598f8 · da598f8
1 parent 27d3f67
commit da598f8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts
@@ -59,18 +59,13 @@ export class Login {
     }
 
     login(item) {
-        this.api.authenticate(item.url, item.token).subscribe((data) => {
-            this.menu.enable(true);
-            this.storage.set('_session', { 'url': item.url, 'token': item.token, 'version': '/api/v0' });
-            this.navCtrl.setRoot('Dashboard');
+        this.api.authenticate(item.url, item.token, item.basic).subscribe((data) => {
+                this.menu.enable(true);
+                this.storage.set('_session', { 'url': item.url, 'token': item.token, 'version': '/api/v0', 'basic': item.basic });
+                this.navCtrl.setRoot('Dashboard');
         }, (error) => {
-            console.log(JSON.stringify(error));
-            if (error.status == 0) {
-                this.presentToast('Unable to reach the server.');
-            }
-            else {
-                this.presentToast((error.status ? error.status : '') + ':' + (error.statusText ? error.statusText : '') + "\n" + error.json().message);
-            }
+            error = JSON.parse(error);
+            this.presentToast((error.status ? error.status : '') + ':' + (error.message ? error.message : ''));
         });
     }
 

diff --git a/src/providers/libre-nms.ts b/src/providers/libre-nms.ts
@@ -28,11 +28,18 @@ export class LibreNMS {
      * @param token API Token
      * @return Observable Object
      */
-    authenticate(url: string, token: string): Observable<any> {
+    authenticate(url: string, token: string, basic: any = {enabled: false}): Observable<any> {
         return Observable.create((observer) => {
             this.platform.ready().then(() => {
-                this.http.get(`${url}${this.api_version}`, { headers: this.headers(token) }).subscribe((response) => {
-                    observer.next({ 'success': true });
+                if (basic.enabled) this.nativeHttp.useBasicAuth(basic.username, basic.password);
+
+                this.http.get(`${url}${this.api_version}`, { headers: this.headers(token) }).subscribe((response: any) => {
+                    if (response.status == "error") {
+                        observer.error(JSON.stringify(response));
+                    }
+                    else {
+                        observer.next({ 'success': true });
+                    }
                 }, (error) => {
                     observer.error(JSON.stringify(error));
                 }, () => {
@@ -47,6 +54,7 @@ export class LibreNMS {
      */
     logout(): boolean {
         this.storage.set('_session', { 'url': null, 'token': null });
+        this.nativeHttp.useBasicAuth('','');
         return true;
     }