Fix bugs

Author: rohitrp

client/src/app/app.module.ts

@@ -21,6 +21,12 @@ import { ShelterCardComponent } from './shelters/shelter-card/shelter-card.compo
 import { RequestShelterComponent } from './request-shelter/request-shelter.component';
 import { ShelterInfoComponent } from './shelters/shelter-info/shelter-info.component';
 
+export function tokenGetter() {
+  const user = JSON.parse(localStorage.getItem('user'));
+  if (!user) return '';
+  return user.token;
+}
+
 @NgModule({
   declarations: [
     AppComponent,
@@ -39,13 +45,9 @@ import { ShelterInfoComponent } from './shelters/shelter-info/shelter-info.compo
     HttpClientModule,
     JwtModule.forRoot({
       config: {
-        tokenGetter: () => {
-          const user = JSON.parse(localStorage.getItem('user'));
-          if (!user) return '';
-          return user.token;
-        },
-        whitelistedDomains: ['localhost:3000'],
-        blacklistedRoutes: ['localhost:3000/api/users/']
+        tokenGetter: tokenGetter,
+        whitelistedDomains: ['localhost:3000', 'gymkhana.iitb.ac.in'],
+        blacklistedRoutes: ['localhost:3000/api/users/', 'gymkhana.iitb.ac.in/codefundo/api/users/']
       }
     }),
     AppRoutingModule,

client/src/environments/environment.prod.ts

@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-  apiBaseUrl: 'http://localhost:3000/api',
+  apiBaseUrl: 'https://gymkhana.iitb.ac.in/codefundo/api',
   mapboxAccessToken: 'pk.eyJ1Ijoicm9oaXRycCIsImEiOiJjam5vejdtYmYyMG1tM3FzNXA1YnVib3JiIn0.5x5lvYoSAxmmc3EQAg19og',
   googleMapsAPIKey: 'AIzaSyDoaA5lB4-JbSXElDWllnNU3QcArgxdreM'
 };

server/app.js

@@ -13,14 +13,16 @@ require('dotenv').config();
 const SECRET = process.env.SECRET;
 const DB_HOST = process.env.DB_HOST;
 const DB_PORT = process.env.DB_PORT;
+const DB_USER = process.env.DB_USER;
+const DB_PASS = process.env.DB_PASS;
 const SERVER_PORT = process.env.SERVER_PORT || 3000
 const SERVER_HOST = process.env.SERVER_HOST || 'localhost'
 const SWAGGER_JSON_PATH = process.env.SWAGGER_JSON_PATH || '/swagger.json'
 const SWAGGER_DOCUMENTATION_PATH = process.env.SWAGGER_DOCUMENTATION_PATH || '/documentation'
 const SWAGGER_UI_PATH = process.env.SWAGGER_UI_PATH || '/swaggerui/'
 const BASE_PATH = process.env.BASE_PATH || ''
 
-const dbUrl = `mongodb://${DB_HOST}:${DB_PORT}/reliefshelter`;
+const dbUrl = `mongodb://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/reliefshelter`;
 
 const validate = async function (decoded, request) {
     const user = await User.findOne({_id: decoded.id})