Some env changes for making the code 'deployable'

Erazer.API/Erazer.API.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IPAddressRange" Version="4.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.2" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
+    <PackageReference Include="IPAddressRange" Version="4.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.7" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
   </ItemGroup>
 </Project>

Erazer.API/appsettings.Development.json

@@ -1,4 +1,3 @@
 {
   "idsrv_hostname": "http://localhost:5000",
-  "mongodb_connectionString": "mongodb://mongo-1:3000,mongo-2:3001/?replicaSet=rs0&readPreference=primary&serverSelectionTimeoutMS=5000&connectTimeoutMS=10000"
 }

Erazer.IdentityProvider/Erazer.IdentityProvider.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="IdentityServer4" Version="3.1.2" />
-    <PackageReference Include="IPAddressRange" Version="4.0.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
+    <PackageReference Include="IPAddressRange" Version="4.1.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
   </ItemGroup>
 </Project>

Erazer.IdentityProvider/appsettings.json

@@ -1,3 +1,2 @@
 {
-
-}
+}

Erazer.Web/api.js

@@ -24,7 +24,7 @@ module.exports = (apiUrl) => {
             // Epoch check
             const epochNumber = +epoch;
             const now = Date.now();
-            if (epochNumber < now - 15000 || epochNumber > now + 15000) {
+            if (epochNumber < now - 10000 || epochNumber > now + 10000) {
                 return res.status(401).json({ error: 'Signing check failed' });
             }
 
@@ -56,6 +56,7 @@ module.exports = (apiUrl) => {
                     decodedSignature,
                     encoded
                 );
+
                 if (!result) {
                     return res.status(401).json({ error: 'Signing check failed' });
                 }

Erazer.Web/app.js

@@ -34,7 +34,7 @@ module.exports = new Promise(async (resolve, reject) => {
 
     app.use(redirectMiddleware);
     app.use(staticfiles(app.get('config').wwwroot));
-    app.use('/api', await apiProxy('localhost:5002/'));
+    app.use('/api', await apiProxy(app.get('config').api));
 
 
     resolve(app);

Erazer.Web/appsettings.json

@@ -1,5 +1,6 @@
 {
     "host": "http://localhost:8888",
     "idsrv": "http://localhost:5000",
+    "api": "http://localhost:5002",
     "redis": "redis://localhost:6379"
 }

Erazer.Web/auth.js

@@ -45,7 +45,7 @@ module.exports = async (app) => {
     }));
 
     if (isSecure) {
-        app.set('trust proxy', 1) // trust first proxy
+        app.set('trust proxy', true)
     }
 
     app.use(session({

Erazer.Web/client_apps/projects/landing/src/app/landing/landing.service.ts

@@ -1,13 +1,14 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs'; 
+import { environment } from '../../environments/environment';
 
 @Injectable({providedIn: 'root'})
 export class LandingService {
   private baseUrl: string;
 
   constructor(private http: HttpClient) {
-    this.baseUrl = `http://localhost:8888/api`;
+    this.baseUrl = environment.host + "/api";
    }
 
   getMotd(): Observable<string> {

Erazer.Web/client_apps/projects/landing/src/environments/environment.prod.ts

@@ -1,5 +1,5 @@
 export const environment = {
   production: true,
-  host: 'http://localhost:5002'
-  //host: 'https://api.erazerbrecht.me'
+  host: 'https://erazerbrecht.me'
+  //host: 'http://localhost:8888'
 };

Erazer.Web/client_apps/projects/landing/src/environments/environment.ts

@@ -5,5 +5,5 @@
 
 export const environment = {
   production: false,
-  host: 'http://localhost:5002'
+  host: 'http://localhost:8000'
 };

Erazer.Web/client_apps/projects/portal/src/app/auth/token.interceptor.ts

@@ -33,13 +33,15 @@ export class TokenInterceptor implements HttpInterceptor {
 
     handle401Error() {
         if (isDevMode()) {
+            // TODO...
             alert('Session expired/invalid! Press OK to restart a refresh');
             location.reload();
             return throwError('Expiration!!');
         }
         else {
-            alert('TODO')
-            return throwError('Redirecting!!');
+            console.error('Session is unauthenticated. Refresh session...');
+            window.location.href = "/auth/login";
+            return throwError('Redirecting...');
         }
     }
 

Erazer.Web/client_apps/projects/portal/src/environments/environment.prod.ts

@@ -2,8 +2,6 @@ import { IEnvironment } from "./ienvironment";
 
 export const environment: IEnvironment = {
   production: true,
-  api: 'http://localhost:5002/api',
-  idsrv: 'http://localhost:5000',
-  //api: 'https://api.erazerbrecht.me/api',
-  //idsrv: 'https://login.erazerbrecht.me',
+  //idsrv: 'http://localhost:5000',
+  idsrv: 'https://login.erazerbrecht.me',
 };

Erazer.Web/client_apps/projects/portal/src/environments/environment.ts

@@ -9,7 +9,6 @@ import { IEnvironment } from "./ienvironment";
 // They shouldn't be commited into vcs!!
 export const environment: IEnvironment = {
   production: false, 
-  api: 'http://localhost:5002/api',
   idsrv: 'http://localhost:5000',
   username: 'alice',                
   password: 'alice',                

Erazer.Web/client_apps/projects/portal/src/environments/ienvironment.ts

@@ -1,6 +1,5 @@
 export interface IEnvironment {
     production: boolean,
-    api: string,
     idsrv: string,
 
     // DEV only props

Erazer.Web/config.js

@@ -6,8 +6,9 @@ const wwwroot = __dirname + '/wwwroot';
 module.exports = function (app) {
     const host = nconf.get('host');
     const idsrv = nconf.get('idsrv');
+    const api = nconf.get('api');
     const redis = nconf.get('redis');
-    const config = { host, idsrv, redis, wwwroot };
+    const config = { host, idsrv, api, redis, wwwroot };
     console.log(`Config: ${JSON.stringify(config)}`);
 
     app.set('config', config);