Commit ff79babc authored by Ratnadeep Rajendra Kharade's avatar Ratnadeep Rajendra Kharade
Browse files

changed token storage mechanism from service based to ionic native storage based.

parent 2c44eb3b
Showing with 26 additions and 20 deletions
+26 -20
...@@ -12,8 +12,8 @@ import { RestService } from '../../rest.service'; ...@@ -12,8 +12,8 @@ import { RestService } from '../../rest.service';
styleUrls: ['./login.page.scss'], styleUrls: ['./login.page.scss'],
}) })
export class LoginPage implements OnInit { export class LoginPage implements OnInit {
username = ""; username = "Bob@mail.com";
password = ""; password = "BobPassword";
correctCredentials = false; correctCredentials = false;
loginApi: Observable<any>; loginApi: Observable<any>;
......
...@@ -3,14 +3,17 @@ import { Geolocation } from '@ionic-native/geolocation/ngx'; ...@@ -3,14 +3,17 @@ import { Geolocation } from '@ionic-native/geolocation/ngx';
import { RestService } from '../rest.service'; import { RestService } from '../rest.service';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { HttpClient, HttpHeaders } from '@angular/common/http'; import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Storage } from '@ionic/storage';
declare var H: any; declare var H: any;
@Component({ @Component({
selector: 'app-home', selector: 'app-home',
templateUrl: 'home.page.html', templateUrl: 'home.page.html',
styleUrls: ['home.page.scss'], styleUrls: ['home.page.scss'],
}) })
export class HomePage { export class HomePage {
private platform: any; private platform: any;
private map: any; private map: any;
...@@ -39,7 +42,8 @@ export class HomePage { ...@@ -39,7 +42,8 @@ export class HomePage {
constructor(private geolocation: Geolocation, constructor(private geolocation: Geolocation,
public restService: RestService, public restService: RestService,
public httpClient: HttpClient) { public httpClient: HttpClient,
private storage: Storage) {
this.platform = new H.service.Platform({ this.platform = new H.service.Platform({
'apikey': 'tiVTgBnPbgV1spie5U2MSy-obhD9r2sGiOCbBzFY2_k' 'apikey': 'tiVTgBnPbgV1spie5U2MSy-obhD9r2sGiOCbBzFY2_k'
...@@ -59,22 +63,21 @@ export class HomePage { ...@@ -59,22 +63,21 @@ export class HomePage {
} }
getBikesList() { getBikesList() {
this.geolocation.getCurrentPosition( this.geolocation.getCurrentPosition({
{ maximumAge: 1000, timeout: 5000,
maximumAge: 1000, timeout: 5000, enableHighAccuracy: true
enableHighAccuracy: true }).then((resp) => {
}
).then((resp) => {
this.currentLocation.lat = resp.coords.latitude; this.currentLocation.lat = resp.coords.latitude;
this.currentLocation.lng = resp.coords.longitude; this.currentLocation.lng = resp.coords.longitude;
let url = 'http://193.196.52.237:8081/admin/bikes' + '?lat=' + this.currentLocation.lat + '&lng=' + this.currentLocation.lng; this.storage.get('token').then((token) => {
const headers = new HttpHeaders().set("Authorization", "Bearer " + this.restService.getToken()); let url = 'http://193.196.52.237:8081/bikes' + '?lat=' + this.currentLocation.lat + '&lng=' + this.currentLocation.lng;
this.bikeApi = this.httpClient.get(url, {headers}); const headers = new HttpHeaders().set("Authorization", "Bearer " + token);
this.bikeApi this.bikeApi = this.httpClient.get(url, { headers });
.subscribe((resp) => { this.bikeApi.subscribe((resp) => {
console.log('my data: ', resp); console.log('my data: ', resp);
this.bikes = resp.data; this.bikes = resp;
}, (error) => console.log(error)); }, (error) => console.log(error));
});
}, er => { }, er => {
alert('Can not retrieve Location') alert('Can not retrieve Location')
}).catch((error) => { }).catch((error) => {
......
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Storage } from '@ionic/storage';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class RestService { export class RestService {
token: String; constructor(private storage: Storage) { }
constructor() { }
setToken(token) { setToken(token) {
this.token = token; // set a key/value
this.storage.set('token', token);
} }
getToken() { getToken() {
return this.token; this.storage.get('token').then((val) => {
console.log('token', val);
return val;
});
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment