Minor bug fix

Author: rohitrp

client/src/app/_services/auth.service.ts

@@ -64,18 +64,30 @@ export class AuthService {
     return user.verifiedMobile;
   }
 
-  public generateOtp(){
+  public refreshToken() {
+    this.http.post(
+      `${this.apiBaseUrl}/token/refresh`,
+      {}
+    ).subscribe(
+      (res) => {
+        localStorage.setItem('user', JSON.stringify(res['user']));
+        this.router.navigate(['']);
+      }
+    );
+  }
+
+  public generateOtp() {
     return this.http.post(
-      `${this.apiBaseUrl}/users/otp`,{}
+      `${this.apiBaseUrl}/users/otp`, {}
     );
   }
 
-  public verifyOtp(otp){
+  public verifyOtp(otp) {
     const params = {
       otp: otp
     };
     return this.http.get(
-      `${this.apiBaseUrl}/users/otp`,{
+      `${this.apiBaseUrl}/users/otp`, {
         params: params
       }
     );

client/src/app/app.component.ts

@@ -33,7 +33,7 @@ export class AppComponent {
     this.authService.verifyOtp(this.otp)
       .subscribe(
         (res) => {
-          this.user.verifiedMobile = true;
+          this.authService.refreshToken();
         }
       )
 

client/src/app/home/home.component.ts

@@ -40,30 +40,34 @@ export class HomeComponent implements AfterViewInit {
       accessToken: mapboxgl.accessToken
     }));
 
-    this.sheltersService.getAllShelters(72,72,50)
+    this.sheltersService.getLatLng()
       .subscribe(
         (res) => {
-          var i = 0;
-          for (i = 0; i < res.length; i++) {
-            var shelterMarkerDiv = document.createElement('div');
-            shelterMarkerDiv.style.backgroundImage = 'url("assets/shelter.png")';
-            shelterMarkerDiv.style.width = '64px';
-            shelterMarkerDiv.style.height = '64px';
-            shelterMarkerDiv.style.backgroundRepeat = 'no-repeat'
+          this.sheltersService.getAllShelters(res.lat, res.lon, 50)
+            .subscribe(
+              (res) => {
+                var i = 0;
+                for (i = 0; i < res.length; i++) {
+                  var shelterMarkerDiv = document.createElement('div');
+                  shelterMarkerDiv.style.backgroundImage = 'url("assets/shelter.png")';
+                  shelterMarkerDiv.style.width = '64px';
+                  shelterMarkerDiv.style.height = '64px';
+                  shelterMarkerDiv.style.backgroundRepeat = 'no-repeat'
 
-            const shelter = res[i];
+                  const shelter = res[i];
 
-            new mapboxgl.Marker(shelterMarkerDiv)
-              .setLngLat(shelter.lngLat.split(','))
-              .setPopup(
-                new mapboxgl.Popup({ offset: 25 }) // add popups
-                  .setHTML('<h3 class="subtitle">' + shelter.name + '</h3><p>' + shelter.contact + '</p>')
-              )
-              .addTo(map);
-          }
-        },
-        (err) => this.alertService.error(err)
-      );
+                  new mapboxgl.Marker(shelterMarkerDiv)
+                    .setLngLat(shelter.lngLat.split(','))
+                    .setPopup(
+                      new mapboxgl.Popup({ offset: 25 }) // add popups
+                        .setHTML('<h3 class="subtitle">' + shelter.name + '</h3><p>' + shelter.contact + '</p>')
+                    )
+                    .addTo(map);
+                }
+              },
+              (err) => this.alertService.error(err)
+            );
+        }
 
     // this.sheltersService.getAllSheltersRequests()
     //   .subscribe(

client/src/app/request-shelter/request-shelter.component.ts

@@ -30,7 +30,7 @@ export class RequestShelterComponent implements AfterViewInit, OnInit {
 
     var map = new mapboxgl.Map({
       container: 'map',
-      style: 'mapbox://styles/mapbox/nsatellite-streets-v10',
+      style: 'mapbox://styles/mapbox/satellite-streets-v10',
       center: [72.914294, 19.130722],
       zoom: 12
     });

server/api/users/routes/generateUserOTP.js

@@ -20,7 +20,6 @@ module.exports = {
             }
 
         }
-        console.log(options)
         let res = await rp(options).then(console.log, console.log)
         return {message: 'successful'}
       },

server/api/users/routes/refreshToken.js

@@ -0,0 +1,21 @@
+const authenticateUserSchema = require('../schemas/authenticateUser')
+const verifyCredentials = require('../util/userFunctions').verifyCredentials
+const getUserDetails = require('../util/userFunctions').getUserDetails
+const User = require('../model/User')
+
+module.exports = {
+    method: 'POST',
+    path: '/api/token/refresh',
+    options: {
+        handler: async (request, h) => {
+          const user = await User.findOne({ _id: request.auth.credentials.id })
+            return getUserDetails(user)
+        },
+        auth: {
+          strategy: 'jwt'
+        },
+        description: 'Refresh token',
+        notes: 'Returns a token on correct user credentials',
+        tags: ['api', 'user']
+    }
+}

server/api/users/routes/verifyUserOTP.js

@@ -23,9 +23,9 @@ module.exports = {
         }
         // console.log(options)
         let res = await rp(options)
-        
+        console.log(res)
         await User.updateOne({ _id: user._id }, { verifiedMobile: true })
-        
+
         return res
       },
       auth: {