From 17d147c252e3f436d8c3d9978b34e9a38286a069 Mon Sep 17 00:00:00 2001
From: Vazhin Tayeb <vazhintayeb@gmail.com>
Date: Sun, 17 Jan 2021 10:49:25 +0300
Subject: [PATCH] fix things

---
 .../OidcSamples.AuthorizationServer.csproj    |  2 +-
 .../Startup.cs                                | 11 ++++++++
 .../OidcSamples.AuthorizationServer/cert.pem  | 21 +++++++++++++++
 .../OidcSamples.AuthorizationServer/key.pem   | 27 +++++++++++++++++++
 React/traffic-police/package.json             |  2 +-
 .../src/pages/components/LoginWindow.js       | 19 ++++++++-----
 React/traffic-police/src/pages/login.js       |  5 ----
 7 files changed, 74 insertions(+), 13 deletions(-)
 create mode 100644 CSharp/OidcSamples/OidcSamples.AuthorizationServer/cert.pem
 create mode 100644 CSharp/OidcSamples/OidcSamples.AuthorizationServer/key.pem

diff --git a/CSharp/OidcSamples/OidcSamples.AuthorizationServer/OidcSamples.AuthorizationServer.csproj b/CSharp/OidcSamples/OidcSamples.AuthorizationServer/OidcSamples.AuthorizationServer.csproj
index 19aade1..dd1b6d0 100644
--- a/CSharp/OidcSamples/OidcSamples.AuthorizationServer/OidcSamples.AuthorizationServer.csproj
+++ b/CSharp/OidcSamples/OidcSamples.AuthorizationServer/OidcSamples.AuthorizationServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/CSharp/OidcSamples/OidcSamples.AuthorizationServer/Startup.cs b/CSharp/OidcSamples/OidcSamples.AuthorizationServer/Startup.cs
index fa12954..8340727 100644
--- a/CSharp/OidcSamples/OidcSamples.AuthorizationServer/Startup.cs
+++ b/CSharp/OidcSamples/OidcSamples.AuthorizationServer/Startup.cs
@@ -23,6 +23,15 @@ namespace OidcSamples.AuthorizationServer
         {
             services.AddControllersWithViews();
 
+            services.AddCors(options =>
+        {
+            options.AddPolicy(name: "Default",
+                    builder =>
+                    {
+                        builder.AllowAnyHeader().AllowAnyOrigin().AllowAnyMethod();
+                    });
+        });
+
             var builder = services.AddIdentityServer(options =>
             {
                 // see https://identityserver4.readthedocs.io/en/latest/topics/resources.html
@@ -48,6 +57,8 @@ namespace OidcSamples.AuthorizationServer
             app.UseStaticFiles();
             app.UseRouting();
 
+            app.UseCors("Default");
+
             app.UseIdentityServer();
 
             app.UseAuthorization();
diff --git a/CSharp/OidcSamples/OidcSamples.AuthorizationServer/cert.pem b/CSharp/OidcSamples/OidcSamples.AuthorizationServer/cert.pem
new file mode 100644
index 0000000..f9f7c47
--- /dev/null
+++ b/CSharp/OidcSamples/OidcSamples.AuthorizationServer/cert.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDazCCAlOgAwIBAgIUT3DoD4EzVjOECDlLV/skOjH4sNIwDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTAxMDcwNjU0NTdaFw0yMjAx
+MDcwNjU0NTdaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCiLrQItvpfLiVGXbe/6tml5PTjKc0az7KReMFFlTc0
+3KvvD/7bAfwk2RqPEVF3pUTOJ3rGbYBtYi0GdgQbgiSJuuvbUtL+Pf1RRfNR2XZq
+vfcJiytsVGOvD6JiFEFTn1P+7W2zIYlO7MuqGK2f2Fjb6zeEMG/7rRGvo3YIGfx/
+vQE6JTWm1HhU0vDpc3pxm2ajW5NjG++7FgoycfQ+BDoQ0XitvWj2b+jt9m2/yPdz
+9ptj41mDJWvtrPyJti2/3Bprccv/+qWSZGR7Io9+31e35R85sUpFZS91zTNWyy0Z
+CoSgfpqFg/3ul/ROrAYdtfP2U5TJI4GGxaqFV9QP78DrAgMBAAGjUzBRMB0GA1Ud
+DgQWBBSgHQxgyIpioCFuWirLuW/ZEwVYvTAfBgNVHSMEGDAWgBSgHQxgyIpioCFu
+WirLuW/ZEwVYvTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBF
+uZzW4vwdFfeCt8rqUjDcqnz7FM1al2GccHJ7ofDQYJo8gaWuSH2SeJ11eXKDux8M
+xP83Nxr4s4rh6DaSybo3wqineMmEJ2F/ikjOMdgvoeTvFV32WAn+UBcmSjvfP6C9
+HSSryc13nWS31xJ2SuMHkkBeOn4ZhwiRZYcsduVFFhkBpwzQx2HD0Dr0VaEefig4
+pBQy2llCFGF/u6HoGeB87Cjs0rnWguvseYl28hgsX8fkZY+IWbY8OXL+jy0g0LSc
+ap9lpqst3WfyFp0UvM7EPjdsxChsSOf4KbC/aHZCqTISRcg8snEHp5Rb6zE8NP/0
+k62LJlKMPn0z8dS4JEp0
+-----END CERTIFICATE-----
diff --git a/CSharp/OidcSamples/OidcSamples.AuthorizationServer/key.pem b/CSharp/OidcSamples/OidcSamples.AuthorizationServer/key.pem
new file mode 100644
index 0000000..f18ab14
--- /dev/null
+++ b/CSharp/OidcSamples/OidcSamples.AuthorizationServer/key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAoi60CLb6Xy4lRl23v+rZpeT04ynNGs+ykXjBRZU3NNyr7w/+
+2wH8JNkajxFRd6VEzid6xm2AbWItBnYEG4Ikibrr21LS/j39UUXzUdl2ar33CYsr
+bFRjrw+iYhRBU59T/u1tsyGJTuzLqhitn9hY2+s3hDBv+60Rr6N2CBn8f70BOiU1
+ptR4VNLw6XN6cZtmo1uTYxvvuxYKMnH0PgQ6ENF4rb1o9m/o7fZtv8j3c/abY+NZ
+gyVr7az8ibYtv9waa3HL//qlkmRkeyKPft9Xt+UfObFKRWUvdc0zVsstGQqEoH6a
+hYP97pf0TqwGHbXz9lOUySOBhsWqhVfUD+/A6wIDAQABAoIBAATc258LRXSHIKz8
+cF77vqzfsYwCG9k68wKzmS/p6m7WUv1nAGA2rgW40LgLb+LjfK2lt2OtstUUxX7V
+GQhuHYRXq2y3DgZ7e1Xtf/8rQwauTXLmzlWALkD4egjwzIiiVVVmbwyY69IG/ZBL
+DyGkzf1CDzcScLkeFlKq1wYlKVH3H43rlhpP0+VvsVkPMdv3rO/N6tZGD4Dh3wY4
+Pnf6RQcQVcolD7l2reLxJW7CIBJbnRFuSmtWkRNR+nii0KPxrRFMOLWRpPQlMVs3
+Ho0x0C+qFghvYTHyQnIPaCsveAyeaQos4ltKSBiYT0+nABdpI39A43DOuTJIcOs4
+2G4/FokCgYEA1/8sDm9zZeFUX/86dVfixOeWpP6xKqp/XlyvxHbSqLLfn8WaJ9dF
+azmZWo40o7z2/gTPAVaN3PEnuU3KPCWBVWSFm3bHLzuslXF/Z5l8uqiFvhZNcNNq
+mGCqMmPxqxgkIMF/aqs+0uj2DkiKvEgWeb7AfyDYPHY/tPpKlqUe8WcCgYEAwDgW
+uUX6xnastpkeMV/fVl6CA5pdxVUyf4cqMMqdcFza7+dgHLSLX6jDr81zph57UzyC
+MJ4RUPznhVYSFGtIRLRq83ZDrd2J4obGO0RPzbj2JxiF5o+fmo73uJDtJkZo2EPX
+50OVXsJa6IES3FiGNxJlAV+TkxnzXjOqJGQ77d0CgYAQqC7/lfyyOKRHGumpLvPf
+93QYmUOUZL2Zy1AKuJcaR2ETcyumMuW5lSGMaDcLAYGSqVBFbCVYiohjs+oKpWHJ
+8gyTpp9JtzJh+/S1SpLh2ikmNZYXQ1aPFbVKWYbDiQMQO5vV4AriPPDsvQ9l4bFK
+BjnWE/RZBU14aWzjHSy7tQKBgCJ+rk1Haq6NA4etSMbRjrHgOfLNlABivrI2HnMt
+GT3d3AhrfEsKd2yOS7fT5eos1DLmy/JPm4nuKNo7zPjPG+QAgKT6V0DvXdxCFXbz
+VmLzy3DOrNDoe1rwRzJfB7/zqMMOwcMl1Ltxo4DQEQNr+4IMkgXCEii24n7IRMNN
+HZgdAoGBALzFDienCJmCUwpYXSLcN6ZqNYSDNQNgjwkWoRjpCYrzpRrcTxLF5o8L
+Gz6QTXbkYOTZ0UaE9AlR6Aci/4o6RfucLsmbc0EvvyVbrVoX7i3rnH4HOK+RuAvj
+7KlMPWiIQx4KciuUr8gHCufeCDb1RGvbRPIege8XGnJlQCf4s9sh
+-----END RSA PRIVATE KEY-----
diff --git a/React/traffic-police/package.json b/React/traffic-police/package.json
index 1a2564e..df6161b 100644
--- a/React/traffic-police/package.json
+++ b/React/traffic-police/package.json
@@ -17,7 +17,7 @@
     "tailwindcss": "^2.0.2"
   },
   "scripts": {
-    "start": "set HTTPS=true set SSL_CRT_FILE=cert.pem set SSL_KEY_FILE=key.pem && react-scripts start",
+    "start": "HTTPS=true react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
diff --git a/React/traffic-police/src/pages/components/LoginWindow.js b/React/traffic-police/src/pages/components/LoginWindow.js
index 0070b48..368673d 100644
--- a/React/traffic-police/src/pages/components/LoginWindow.js
+++ b/React/traffic-police/src/pages/components/LoginWindow.js
@@ -5,12 +5,19 @@ import store from "../../store";
 import Heading1 from "./Heading1";
 import Card from "./Card";
 
+// Services
+import { signinRedirect } from "../../services/userService";
+
 const LoginWindow = () => {
-  const onUserLogin = () => {
-    const user = { profile: { given_name: "John Doe" } };
-    console.log(`User logged in!`);
-    store.dispatch(storeUser(user));
-  };
+  // const onUserLogin = () => {
+  //   const user = { profile: { given_name: "John Doe" } };
+  //   console.log(`User logged in!`);
+  //   store.dispatch(storeUser(user));
+  // };
+
+  function login() {
+    signinRedirect();
+  }
 
   return (
     <Card>
@@ -19,7 +26,7 @@ const LoginWindow = () => {
       <p className="text-black-custom font-light text-3xl mb-20">
         Login to your account to view your dashboard and register a new vehicle.
       </p>
-      <Button onClickEvent={onUserLogin} text={"Login"} />
+      <Button onClickEvent={login} text={"Login"} />
     </Card>
   );
 };
diff --git a/React/traffic-police/src/pages/login.js b/React/traffic-police/src/pages/login.js
index aeab182..a49b8cd 100644
--- a/React/traffic-police/src/pages/login.js
+++ b/React/traffic-police/src/pages/login.js
@@ -1,5 +1,4 @@
 import React from "react";
-import { signinRedirect } from "../services/userService";
 import { Redirect } from "react-router-dom";
 import { useSelector } from "react-redux";
 import Navbar from "./components/Navbar";
@@ -9,10 +8,6 @@ import LoginWindow from "./components/LoginWindow";
 function Login() {
   const user = useSelector((state) => state.auth.user);
 
-  function login() {
-    signinRedirect();
-  }
-
   return user ? (
     <Redirect to={"/"} />
   ) : (