From faf24810a044d681fe8626cd906fafa538d07885 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Sat, 16 Dec 2017 01:48:51 +0000
Subject: [PATCH] SSL dev server & publish fixes

---
 .working/ssl/api.ssl.csr                      | 16 ++++++++++
 .working/ssl/privkey.pem                      | 30 +++++++++++++++++++
 .../app/components/debug/debug.component.html | 15 ++++++++--
 .../app/components/debug/debug.component.ts   | 26 ++++++++++------
 .../components/sidebar/sidebar.component.html |  2 +-
 client/src/app/services/auth.service.ts       |  1 +
 client/src/app/services/debug.service.ts      |  4 +++
 client/src/environments/environment.ts        |  2 +-
 server/PodNoms.Api.csproj                     |  1 -
 server/Program.cs                             |  2 --
 server/private.pem                            | 27 +++++++++++++++++
 server/public.pem                             | 21 +++++++++++++
 12 files changed, 130 insertions(+), 17 deletions(-)
 create mode 100644 .working/ssl/api.ssl.csr
 create mode 100644 .working/ssl/privkey.pem
 create mode 100644 server/private.pem
 create mode 100644 server/public.pem

diff --git a/.working/ssl/api.ssl.csr b/.working/ssl/api.ssl.csr
new file mode 100644
index 0000000..7238991
--- /dev/null
+++ b/.working/ssl/api.ssl.csr
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICijCCAXICAQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
+ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMCYPXWv5uqhpELgII2AljwmdZ+8OTxiJlgQv++Y
+kuQif04zyWrHDXx0qZjRRh6CwRpJHP8NsjHjee3EteWUvztgJYd5S53eLSkVvTSL
+7KGZy4Xk8opoviPdhbMRAdDw69P6b6unlDKtKNrCVzPbr5wisXWvQzmBDfBf/MLz
+8biulhVITBTPYrz43ijF1s7fhoQi/Pi391vpE10iMNjLAfT10lYk3wfrEaMcNAyJ
+nLol03eWLyBQxUkla8yuYqUOeHhUHKEly49jc9tpUztVsikaFx8BOIU5689EKxUd
+VoupqTNmue5EY74ooxyagi4e8nzsJ6/DodIxMfx8AqEz450CAwEAAaAAMA0GCSqG
+SIb3DQEBCwUAA4IBAQBwiK9dZaY3abLHGWcvdJ49ASiC+rUohdk1jnGVNzlEviIV
+vQGQ27PWDIndpVaURs1ZK4BxLE9X3//hDjVHUVQC4hMsRarn+6nLyAM6ip+ZBOIR
+GOd4tkjuLuGkuqxhWCe9K4DQn9DriLJKmA4Jjt095duYmqWoeqplKWDepfkFeYni
+X844vrhWSi8RRfzc8/Xh8m0r0VEEt8RnJI1ouvEZpvdS0nDJKhY3kr6UA48E3Y6+
+Xs7mQgjKoDpzw/JMNm3eZ7fEjo5PeRXm1k3QdsUq84bStGTkXXy29i9tb7kjR58i
+sbwzBtibI+ou7Zml0iN/bXw3o3ZANu6oQ52zD1vi
+-----END CERTIFICATE REQUEST-----
diff --git a/.working/ssl/privkey.pem b/.working/ssl/privkey.pem
new file mode 100644
index 0000000..72e3b4e
--- /dev/null
+++ b/.working/ssl/privkey.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIofGOafBpUOECAggA
+MBQGCCqGSIb3DQMHBAidsaXiCyz8VASCBMjkzzSCvmYAuVn5Kn92J188FryLC5+u
+zNMRKeYQcguZmIAZc95/hDeeHHZc2eGdXJ03cNfVsm4RnU8XvB/Cef/89UX0FsaJ
+C0ZwmqSUVDHhRmbOsQHZV4ndAYLypeO/GNl4QF6OusyeDq+MW73szC9Q/fzw7AhM
+s2+zF+Co2MeAfO4AMyMbzEtbwPLy3Gb7BkpoYS03qvKE581a4ijvpnLCirCeZgsu
+VyWU6EZoes2BB6/in+2GCOrkoGzKMq4iTGUdXGAne/pHp98Jbtjk6nBCWN93BXYf
+qrHenRJPrkDmkZPjv7+N7mLdCnOEjkZAlY0UHadxfxOmXrnChuESPjYGNjzT3VAM
+hMxRx9Rwp5JQPyG155ylnyodoqJ7Y9cREWcw15HgOeVCR0WQQ75OZLeUqktnZQi3
+TNpqQjX/Vvy1MCSsMG358gd/L4MLNdnXsmS0rma6/dS1fLRzAPhQirxiTLwtDfyZ
+QHYgpim8F90abGXAZvqwuaXKPDzhGCrOw5Pk/27EvqmbwULJhCr/CWHALzj3o9rt
+Hpp2mlxNBUu+50EigC4TnwzWz3UeW/L4vSXP86A/xoufw3YYdBDv3ObqBVi9/QkE
+HSliB95WPpxTkTirtNCiiVzXkZgpebXbwxcSLzZitkHLjm0ol5VPedsYqo3gEfAG
+hOapAx3/RRuOGi/6sOjUuXtoyPGnUGCUtVYscjRfiuLvOrJyRZ1PKy0ri32PfT0T
+THRM3isxvq21IUctJyeaoddRQnOvMSGyuKgTjMvSVEOhyK2RpH3NBE0nDskN7jBW
+21Dleb4GeabNktOLOeGLJB5aYBCQs1SIM2YBkBqXyPlHicWqvHbIZo6kFVUjhZyi
+ttyQuIrVJKxbTVFM3AooAIh0Wj+ILwaKGubiGncLwpXBSHSREHS8HXLfQfezZKjH
+Ond3aLtx+9HXDO8uD3qAXO8OoBnrxRaDaiZI+phPvSvdyLAYbr6JHmAmxQhHVerg
+yN68JB27Cekz0RiUuYM0oECqBC2leiUn0kgu0J25z2C7Jzlb/6YZwu8ta5n16u/l
+a8gf+j0Usv2chY0inci/gybVthPApmN225oTS267B08wXFkhOIdj7EeBvFIx3ZX+
+jLMLVXQDC6aqrLOBr8cqFbq5nTe2ZRH4wMu3HmyZswAzXse+fF+RIqjLAYBDKUvC
+KFinerP7YnT2wMzTbYRUhIatYte+uf/2HhR548lW7wadwqCLfeP7M5YCRvKqg9b+
+DJRsGxfPD1W3V6DmkDtDeJTtiR/FQoE2M5Vq+F4BzHoGQQ7/Qb1MvdqyWkAnlLXC
+SbiO9YW2tVcaGSmYBO6Ydv+gcgeKVUtaSon2iRDfZBTLdijrAlMG1oe7wgUeK4dA
+xABXocN/U0TYwLc+dtXv/5ITfE6uP0I77SNgSyou++Bi2PDdX+hbxHDLfhYq0B6B
+XIPGT1DAaQ68Mo6fD2/2eMGgfkiO11uQNtOe1CdRQHvtQeaasqM1vh4pVE6Z5BJM
+H0UT7Y0jjqD6nQH1lEMsZBALgqYViCXe+Sr19QqvOrGyvapbGh6gR0MgCybHmzRX
+eYVkg1pMmEvJrWbiEHx3oYVtX4/pwSxWr21bMq/mi5agpFGk3A1V3io0LNKpgR5Z
+qc4=
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/client/src/app/components/debug/debug.component.html b/client/src/app/components/debug/debug.component.html
index eecccdf..5385721 100644
--- a/client/src/app/components/debug/debug.component.html
+++ b/client/src/app/components/debug/debug.component.html
@@ -7,8 +7,11 @@
                         Realtime
                     </div>
                     <div class="block-content">
-                        <input type="text" id="text" [(ngModel)]="realtimeMessage">
-                        <button class="btn btn-primary" (click)="sendMessage()">Send Realtime</button>
+                        <input type="text"
+                               id="text"
+                               [(ngModel)]="realtimeMessage">
+                        <button class="btn btn-primary"
+                                (click)="sendMessage()">Send Realtime</button>
                         <ul class="list-unstyled">
                             <li *ngFor="let message of messagesReceived">
                                 {{message}}
@@ -22,8 +25,14 @@
             <div class="block">
                 <div class="block-header">Debug Info</div>
                 <div class="block-content">
-                    <pre [innerHtml]="(debugInfo$ | async) | prettyprint">
+                    <div class="row">
+                        <pre [innerHtml]="(debugInfo$ | async) | prettyprint">
                     </pre>
+                    </div>
+                    <div class="row">
+                        API Host: {{apiHost}} <br /> 
+                        SignalR Host: {{signalrHost}} <br /> 
+                        Ping: {{pingPong}} </div>
                 </div>
             </div>
         </div>
diff --git a/client/src/app/components/debug/debug.component.ts b/client/src/app/components/debug/debug.component.ts
index 01399c1..5761d38 100644
--- a/client/src/app/components/debug/debug.component.ts
+++ b/client/src/app/components/debug/debug.component.ts
@@ -1,9 +1,9 @@
 import { Observable } from 'rxjs/Observable';
-import { environment } from 'environments/environment';
 import { SignalRService } from 'app/services/signalr.service';
 import { HubConnection } from '@aspnet/signalr-client';
 import { Component, OnInit } from '@angular/core';
 import { DebugService } from 'app/services/debug.service';
+import { environment } from 'environments/environment';
 
 @Component({
     selector: 'app-debug',
@@ -15,17 +15,25 @@ export class DebugComponent implements OnInit {
     messagesReceived: string[] = [];
 
     debugInfo$: Observable<string>;
+    apiHost = environment.API_HOST;
+    signalrHost = environment.SIGNALR_HOST;
+    pingPong = '';
 
     constructor(private _debugService: DebugService, private _signalrService: SignalRService) {}
     ngOnInit() {
-        this._signalrService.init(`${environment.SIGNALR_HOST}hubs/debug`).then(() => {
-            this._signalrService.connection.on('Send', data => {
-                console.log('DebugService', 'signalr', data);
-                this.messagesReceived.push(data);
-                this.realtimeMessage = '';
-            });
-            this.debugInfo$ = this._debugService.getDebugInfo();
-        }).catch((err) => console.error('debug.component.ts', '_signalrService.init', err));
+        this._signalrService
+            .init(`${environment.SIGNALR_HOST}hubs/debug`)
+            .then(() => {
+                this._signalrService.connection.on('Send', data => {
+                    console.log('DebugService', 'signalr', data);
+                    this.messagesReceived.push(data);
+                    this.realtimeMessage = '';
+                });
+                this.debugInfo$ = this._debugService.getDebugInfo();
+            })
+            .catch(err => console.error('debug.component.ts', '_signalrService.init', err));
+
+        this._debugService.ping().subscribe(r => (this.pingPong = r));
     }
 
     sendMessage() {
diff --git a/client/src/app/components/sidebar/sidebar.component.html b/client/src/app/components/sidebar/sidebar.component.html
index b8b212c..308bd09 100644
--- a/client/src/app/components/sidebar/sidebar.component.html
+++ b/client/src/app/components/sidebar/sidebar.component.html
@@ -11,7 +11,7 @@
                 <i class="fa fa-times text-danger"></i>
             </button>
             <div class="content-header-item">
-                <a class="link-effect font-w700" [routerLink]="['home']">
+                <a class="link-effect font-w700" [routerLink]="['']">
                     <img src="/assets/img/logo-icon.png" style="width: 18px; height: 18px;">
                     <span class="font-size-xl text-dual-primary-dark">pod</span>
                     <span class="font-size-xl text-primary">noms</span>
diff --git a/client/src/app/services/auth.service.ts b/client/src/app/services/auth.service.ts
index 44d4390..e3d88dd 100755
--- a/client/src/app/services/auth.service.ts
+++ b/client/src/app/services/auth.service.ts
@@ -105,6 +105,7 @@ export class AuthService {
         localStorage.removeItem('expires_at');
 
         this._router.navigate(['/']);
+        window.location.reload();
     }
     public isAuthenticated(): boolean {
         const expiresAt = JSON.parse(localStorage.getItem('expires_at'));
diff --git a/client/src/app/services/debug.service.ts b/client/src/app/services/debug.service.ts
index 646aa63..e6518f9 100644
--- a/client/src/app/services/debug.service.ts
+++ b/client/src/app/services/debug.service.ts
@@ -15,4 +15,8 @@ export class DebugService {
     getDebugInfo(): Observable<string> {
         return this._http.get(environment.API_HOST + '/debug').map(r => r.json());
     }
+
+    ping(): Observable<string> {
+        return this._http.get(environment.API_HOST + '/debug/ping').map(r => r.text());
+    }
 }
diff --git a/client/src/environments/environment.ts b/client/src/environments/environment.ts
index 73c4b0f..16ea2c4 100755
--- a/client/src/environments/environment.ts
+++ b/client/src/environments/environment.ts
@@ -4,5 +4,5 @@ export const environment = {
     SIGNALR_HOST: 'https://dev.podnoms.com:5000/',
     // API_HOST: 'https://podnoms.com/api',
     // SIGNALR_HOST: 'https://rt.podnoms.com/',
-    AUTH0_REDIRECT_URL: 'http://dev.podnoms.com:4200/callback'
+    AUTH0_REDIRECT_URL: 'https://dev.podnoms.com:4200/callback'
 };
diff --git a/server/PodNoms.Api.csproj b/server/PodNoms.Api.csproj
index 40106e2..03cf593 100644
--- a/server/PodNoms.Api.csproj
+++ b/server/PodNoms.Api.csproj
@@ -16,7 +16,6 @@
     <PackageReference Include="Hangfire" Version="1.6.14" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.0-alpha2-final" />
     <PackageReference Include="Polly" Version="5.2.0" />
     <PackageReference Include="ImageSharp" Version="1.0.0-*" />
diff --git a/server/Program.cs b/server/Program.cs
index cd65c9e..bda4f9f 100644
--- a/server/Program.cs
+++ b/server/Program.cs
@@ -18,8 +18,6 @@ namespace PodNoms.Api {
             WebHost.CreateDefaultBuilder (args)
             .UseStartup<Startup> ()
             .UseKestrel (options => {
-                options.Listen (IPAddress.Any, 5000, listenOptions =>
-                    listenOptions.UseHttps ("localhost.pfx"));
                 options.Limits.MaxRequestBodySize = 1073741824;
             })
             .Build ();
diff --git a/server/private.pem b/server/private.pem
new file mode 100644
index 0000000..d98f2e1
--- /dev/null
+++ b/server/private.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAsZ9Us3myhsI0dENEE9zcafY9tAnu0Y+ET8H02OCPOBwF1x7l
+YVc6HcULBdqw8XgLtHGzfTzECUT9R1e0GF+ojC9dIp8nIkQVoSGPMQfZJmM//Moj
+F6gW/x1NwZPbnsNXdqEMpVFh503Jy+haC0/xz2rgXHiOZPrr42bby7Esk0QL+jMe
+4gNIVm9yrXXx/VQmFYUwnU5A1i16CXf63dkuLBHAgXY1thWbj9FvIzAPldNgPBry
+X9h4deY+L3V0qa57RpEbFqihg/AT59Z0BYNLvxse3sgwenTjjHk15zfrosBQ6DuM
+86db+3mu7OONOwKtFRbKXL2EqEoSv6gruAsiZQIDAQABAoIBAFmkUsf9TDcsffKL
+HCl2Fps3le5t8OQ8LQdfmKV3t3AW3G+z/QnCTudFUYnT0+cZsbaQh4hWCY2wDq9Z
+uN9wL40IPlXBwqtNdykJ2c1h65qvDlUS4uEGiQyZimt+pqEabuLE5q/sQZ/Np2FM
+U11QLHaEttSUVzDpXfE3MQg804VCQwrgFcRlH/W4z7vXWR9/LdxlrknAIMx+knF/
+gR6RFMKuJEoJVCkTZCm+zyOy9AC6OvJH1+sda0ppdKlKtb8EjGANAHzikH1/XSvI
+6b2K9SFJG/eGkbIJg+8gmqHebEsyCE5HXp1FQYOLY50xBl3nL1A18j+XiSq7+O+O
+cZRNFaUCgYEA62VWagtyq/CmEdN8AZgq7NsQON6c0O0gMsw3w5JO06AvNxmpzbo8
+fa0HWzDsUUdxHJDwhYms5OwSBoD2BIQYYyBtwM8RZIAdqnzvz1bNTneFpVNLKFTy
+F3HfEq3+flyOygggyHxG9ILyRHrGYcvCvlefQlv6o7EnLPe/wbOdV78CgYEAwStt
+VK47j6yb+NggNqrtSkJ0swSqxslwW7n5Lm6nu23+bJSTxWzszi+rvPHqZTK+GBK0
+gz6CpeQmGSY7hPgwY0yyHsiD6ptZRp4RwD2zo5JB5X9NMHOhA7AAu6K6RetYw8Ny
+JxeMgCPC62miOy2iNJsbbADXHuYNl4qA7fKDbtsCgYA3RUgRBjcaoBqePOX1CeGq
+U5VvhPWVKNhSlRjS1tujXQ05BtGT+JKTf7kmdEpIm1m3t2CCOl1aMwPYexdI4CtJ
+uyeKChSvYFWW3lcAfAUg03eR5gjTo35ketxB6pDC4sC0N0xbRrLyXny8D4fdFpbX
+UoOWdTpYjRQBvvpLZP0gyQKBgQC6uTXH41vjt+BVHOWWsocJf0+7NEm4OkQIBq8d
++QzeGqcTYlOtRWtqq54A2H/RLsmeD4a6TxSPMwi4ysJB+H8dnaeYJg+OGnij0Gws
+PfiFpv1X0ERXD46XN+ydc+FHcQWuxiB0NUk1HFxwnv2Y4rWm0EAjmHRZg9ujntie
+KgxufQKBgQCH334RhFA/8lUHings3WDcDuTqW0TeMDGPMRfJUAkW/46oWS4Vs5BV
+sqYX6c3lt9d5ioaRG6uzEjALtqN0kdDHtIPDEBYrCQ3ahSTiiF/1Xw3KuGcruYYq
+x6fXEdVGQvy7xHb4bZXqqXTWQAFltkJmxNYZ1qjFBIfIFGoBhshwCw==
+-----END RSA PRIVATE KEY-----
diff --git a/server/public.pem b/server/public.pem
new file mode 100644
index 0000000..c8b6d20
--- /dev/null
+++ b/server/public.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDXTCCAkWgAwIBAgIJAKNrDHc8aycuMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQwHhcNMTcxMjE1MTgzNjA5WhcNMTgwMTE0MTgzNjA5WjBF
+MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
+ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAsZ9Us3myhsI0dENEE9zcafY9tAnu0Y+ET8H02OCPOBwF1x7lYVc6HcUL
+Bdqw8XgLtHGzfTzECUT9R1e0GF+ojC9dIp8nIkQVoSGPMQfZJmM//MojF6gW/x1N
+wZPbnsNXdqEMpVFh503Jy+haC0/xz2rgXHiOZPrr42bby7Esk0QL+jMe4gNIVm9y
+rXXx/VQmFYUwnU5A1i16CXf63dkuLBHAgXY1thWbj9FvIzAPldNgPBryX9h4deY+
+L3V0qa57RpEbFqihg/AT59Z0BYNLvxse3sgwenTjjHk15zfrosBQ6DuM86db+3mu
+7OONOwKtFRbKXL2EqEoSv6gruAsiZQIDAQABo1AwTjAdBgNVHQ4EFgQUq/LTrNLQ
+qVKr6Ab2scVlnb3l+wwwHwYDVR0jBBgwFoAUq/LTrNLQqVKr6Ab2scVlnb3l+www
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAOPMbrUYZJZpIAloUD8Jz
+h94KwuqGFVlQk9Z3pXXVPrADzj3EvJxafLcub6SitH5jXEbCa8gY8Qzzm8dbmzu/
+8OcNd7jVcGiTTixR7LaBX5RgldlFRpR/XTlVSxrV674/HZWC/+BzP6i/PoT3qvVQ
+aQFj9frn5Tniy59Llwj06pKLPIbPGPYRPvO8bL1qvFM4AgxWl7fVOgKyw5TFKnVW
+0rjEf/V4utQ9hDWlcAHmwvFduPO1Fc3GxfXkxQE8QpFMgi4Kv4n2h0pyBkEdRW6L
+a6V7p+/JhVBXyv9SpSoza5iliX2qHfJFkumteOjkgI0R0qh8rr+UfFj15nBT57XJ
+Dw==
+-----END CERTIFICATE-----