Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
hdastageeri
hft_awado_app
Commits
ff79babc
Commit
ff79babc
authored
Nov 27, 2019
by
Ratnadeep Rajendra Kharade
Browse files
changed token storage mechanism from service based to ionic native storage based.
parent
2c44eb3b
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/app/auth/login/login.page.ts
View file @
ff79babc
...
...
@@ -12,8 +12,8 @@ import { RestService } from '../../rest.service';
styleUrls
:
[
'
./login.page.scss
'
],
})
export
class
LoginPage
implements
OnInit
{
username
=
""
;
password
=
""
;
username
=
"
Bob@mail.com
"
;
password
=
"
BobPassword
"
;
correctCredentials
=
false
;
loginApi
:
Observable
<
any
>
;
...
...
src/app/home/home.page.ts
View file @
ff79babc
...
...
@@ -3,14 +3,17 @@ import { Geolocation } from '@ionic-native/geolocation/ngx';
import
{
RestService
}
from
'
../rest.service
'
;
import
{
Observable
}
from
'
rxjs
'
;
import
{
HttpClient
,
HttpHeaders
}
from
'
@angular/common/http
'
;
import
{
Storage
}
from
'
@ionic/storage
'
;
declare
var
H
:
any
;
@
Component
({
selector
:
'
app-home
'
,
templateUrl
:
'
home.page.html
'
,
styleUrls
:
[
'
home.page.scss
'
],
})
export
class
HomePage
{
private
platform
:
any
;
private
map
:
any
;
...
...
@@ -39,7 +42,8 @@ export class HomePage {
constructor
(
private
geolocation
:
Geolocation
,
public
restService
:
RestService
,
public
httpClient
:
HttpClient
)
{
public
httpClient
:
HttpClient
,
private
storage
:
Storage
)
{
this
.
platform
=
new
H
.
service
.
Platform
({
'
apikey
'
:
'
tiVTgBnPbgV1spie5U2MSy-obhD9r2sGiOCbBzFY2_k
'
...
...
@@ -59,22 +63,21 @@ export class HomePage {
}
getBikesList
()
{
this
.
geolocation
.
getCurrentPosition
(
{
maximumAge
:
1000
,
timeout
:
5000
,
enableHighAccuracy
:
true
}
).
then
((
resp
)
=>
{
this
.
geolocation
.
getCurrentPosition
({
maximumAge
:
1000
,
timeout
:
5000
,
enableHighAccuracy
:
true
}).
then
((
resp
)
=>
{
this
.
currentLocation
.
lat
=
resp
.
coords
.
latitude
;
this
.
currentLocation
.
lng
=
resp
.
coords
.
longitude
;
let
url
=
'
http://193.196.52.237:8081/admin/bikes
'
+
'
?lat=
'
+
this
.
currentLocation
.
lat
+
'
&lng=
'
+
this
.
currentLocation
.
lng
;
const
headers
=
new
HttpHeaders
().
set
(
"
Authorization
"
,
"
Bearer
"
+
this
.
restService
.
getToken
())
;
this
.
bikeApi
=
this
.
httpClient
.
get
(
url
,
{
h
ea
d
er
s
}
);
this
.
bikeApi
.
subscribe
((
resp
)
=>
{
this
.
storage
.
get
(
'
token
'
).
then
((
token
)
=>
{
let
url
=
'
http://193.196.52.237:8081/bikes
'
+
'
?lat=
'
+
this
.
currentLocation
.
lat
+
'
&lng=
'
+
this
.
currentLocation
.
lng
;
const
headers
=
new
HttpHeaders
().
set
(
"
Authorization
"
,
"
B
ea
r
er
"
+
token
);
this
.
bikeApi
=
this
.
httpClient
.
get
(
url
,
{
headers
});
this
.
bikeApi
.
subscribe
((
resp
)
=>
{
console
.
log
(
'
my data:
'
,
resp
);
this
.
bikes
=
resp
.
data
;
this
.
bikes
=
resp
;
},
(
error
)
=>
console
.
log
(
error
));
});
},
er
=>
{
alert
(
'
Can not retrieve Location
'
)
}).
catch
((
error
)
=>
{
...
...
src/app/rest.service.ts
View file @
ff79babc
import
{
Injectable
}
from
'
@angular/core
'
;
import
{
Storage
}
from
'
@ionic/storage
'
;
@
Injectable
({
providedIn
:
'
root
'
})
export
class
RestService
{
token
:
String
;
constructor
()
{
}
constructor
(
private
storage
:
Storage
)
{
}
setToken
(
token
)
{
this
.
token
=
token
;
// set a key/value
this
.
storage
.
set
(
'
token
'
,
token
);
}
getToken
()
{
return
this
.
token
;
this
.
storage
.
get
(
'
token
'
).
then
((
val
)
=>
{
console
.
log
(
'
token
'
,
val
);
return
val
;
});
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment