From 20973ff83d88ef8b39085d1c7f8bf767a0a113e3 Mon Sep 17 00:00:00 2001
From: Ivan Paulovich <ivan@paulovich.net>
Date: Wed, 4 Nov 2020 21:17:35 +0100
Subject: [PATCH] Fix docker env variables

---
 .docker/docker-compose.backend-only.yml |   3 +-
 .docker/docker-compose.override.yml     |   3 +-
 .docker/docker-compose.production.yml   |   5 ++-
 .docker/https/localhost.crt             |  30 +++++++-------
 .docker/https/localhost.key             |  52 ++++++++++++------------
 .docker/https/localhost.pfx             | Bin 2566 -> 2566 bytes
 wallet-spa/.env.docker                  |  18 +++++---
 wallet-spa/src/store/oauth.js           |   2 +-
 8 files changed, 62 insertions(+), 51 deletions(-)

diff --git a/.docker/docker-compose.backend-only.yml b/.docker/docker-compose.backend-only.yml
index 49099485..b5dcc1ff 100644
--- a/.docker/docker-compose.backend-only.yml
+++ b/.docker/docker-compose.backend-only.yml
@@ -13,6 +13,7 @@ services:
       - ASPNETCORE_Kestrel__Certificates__Default__Password=MyCertificatePassword
       - ASPNETCORE_Kestrel__Certificates__Default__Path=/https/localhost.pfx
       - PersistenceModule__DefaultConnection=Server=sql1;User Id=sa;Password=<YourStrong!Passw0rd>;Database=Accounts;
+      - AuthenticationModule__AuthorityUrl=https://localhost:5000
     volumes:
       - ../.docker/https:/https:ro
     depends_on:
@@ -40,7 +41,7 @@ services:
       - ASPNETCORE_Kestrel__Certificates__Default__Password=MyCertificatePassword
       - ASPNETCORE_Kestrel__Certificates__Default__Path=/https/localhost.pfx
       - IDENTITY_SERVER_ORIGIN=https://localhost:5000
-      - RedirectUris=https://localhost:5002/callback
+      - RedirectUris=https://localhost:5002/signin-oidc
       - PostLogoutRedirectUris=https://localhost:5002
       - AllowedCorsOrigins=https://localhost:5002
     volumes:
diff --git a/.docker/docker-compose.override.yml b/.docker/docker-compose.override.yml
index b583f59b..f19d3327 100644
--- a/.docker/docker-compose.override.yml
+++ b/.docker/docker-compose.override.yml
@@ -8,11 +8,12 @@ services:
   accounts-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
+      - AuthenticationModule__AuthorityUrl=https://wallet.local:8081
   identity-server:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - IDENTITY_SERVER_ORIGIN=https://wallet.local:8081
-      - RedirectUris=https://wallet.local:8081/callback
+      - RedirectUris=https://wallet.local:8081/signin-oidc
       - PostLogoutRedirectUris=https://wallet.local:8081
       - AllowedCorsOrigins=https://wallet.local:8081
   wallet-spa:
diff --git a/.docker/docker-compose.production.yml b/.docker/docker-compose.production.yml
index fac5c63c..362506da 100644
--- a/.docker/docker-compose.production.yml
+++ b/.docker/docker-compose.production.yml
@@ -8,13 +8,14 @@ services:
   accounts-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
+      - AuthenticationModule__AuthorityUrl=https://wallet.local
   identity-server:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - IDENTITY_SERVER_ORIGIN=https://wallet.local
-      - RedirectUris=https://wallet.local/callback
+      - RedirectUris=https://wallet.local/signin-oidc
       - PostLogoutRedirectUris=https://wallet.local
-      - AllowedCorsOrigins=https://wallet.local
+      - AllowedCorsOrigins=https://wallet.local      
   wallet-spa:
     build:
       args:
diff --git a/.docker/https/localhost.crt b/.docker/https/localhost.crt
index 004c73fe..86585ade 100644
--- a/.docker/https/localhost.crt
+++ b/.docker/https/localhost.crt
@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDHzCCAgegAwIBAgIJAKWhvuT1UDYyMA0GCSqGSIb3DQEBCwUAMDsxFTATBgNV
+MIIDHzCCAgegAwIBAgIJAOIxgeyqdwODMA0GCSqGSIb3DQEBCwUAMDsxFTATBgNV
 BAMTDHdhbGxldC5sb2NhbDEVMBMGA1UEChMMd2FsbGV0LmxvY2FsMQswCQYDVQQG
-EwJVUzAeFw0yMDEwMDUyMjIyNTZaFw0yMTEwMDUyMjIyNTZaMDsxFTATBgNVBAMT
+EwJVUzAeFw0yMDExMDQxOTA2MjFaFw0yMTExMDQxOTA2MjFaMDsxFTATBgNVBAMT
 DHdhbGxldC5sb2NhbDEVMBMGA1UEChMMd2FsbGV0LmxvY2FsMQswCQYDVQQGEwJV
-UzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/q0tioC5QTkYWUEbZo
-b5cEuqLXbkGt8Rab4lSCCwB4vLGhLptumvpue8p4D/Yt45dswt/lETygm5LkgXHk
-SpY+LOX03lLfIvWurkGnFLHdYtnZFHXCYMIDKE2/SR9iKxMQ3mk8Vp+hcmJpcOYQ
-4Ry1zpsjX93GZqQhYXdcW5tPwCaxRF/UGvCsS3mBES9jnT9rs3n4TsxyQSO/RosJ
-/RFZXMLIRluZDj9gFpxL7ulO9JTW8O3yRUU+BMgQr1Z/mNkohlzNUGNcn4IPBU7g
-Grq/bmkvqv1lIHGpl8cVMH+kjYkzRNtosxUrUx4iOJDVQHVLpwDZwR4B77Zy5xcZ
-02cCAwEAAaMmMCQwIgYDVR0RBBswGYIMd2FsbGV0LmxvY2Fsgglsb2NhbGhvc3Qw
-DQYJKoZIhvcNAQELBQADggEBAKiMP0MdInQVed8xreeaNRBH9Zqk7RG27f9VJX/O
-ww8UetPJYaCpgKQBoqqESb7yanSAbgoeBCNlkE8VusRm22vlmi/pMGHXIwk/HDTa
-md6aLs3gcHPaTNGArsD1+BYY0IEqyigp4H3J0w0h0Cz/hDJFTcGZp3m5+XjvrBtm
-3bdeeY/5MGmVIDTLYkvvUxziZ9G3AWKKDVhZ8YxWCJE1veVra2V45Ot5R+jhVkfd
-Zzl9ce61V5Z5l1bwb+zHs51o607adLwOm+bv5P3Am85caYO0Y+m9JnVtleZMWumh
-ryjpaPBiMg/zuyKp1+HptcAOKq2b0rVQr56LHtMbYqsXWmU=
+UzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ6bLoCWRMmgIOxwEFc6
+b3eblbixOvohTTqwfgjwOYfIWgrNad9shcVa8vpI+GIETtuTUvlSUoIE/ZhhbtbA
+tPOPWvH/10ss9LX4HXcm/vPzw2CIka0uT9gnvuTmNF21+c/jVaUmKjkiOMwEBbd8
+5SyyX4m+N6swePjiSnZMEdEx5raQZ1Ubcqh2OmXkJJPG5O1jP3IzqcZA7rDP8Pd1
+jJHvej7LqX8U8EYj+v3laqBZcnHgDn4/rcf+c+FwLEErqPoFsahsGUiyMW6n1kHg
+eG8ihO57FJff4QJKWpethZlEHcqa5MNIJn6Vs0irBlQfErWcsQ78YZM3uSWBI2rR
+bHcCAwEAAaMmMCQwIgYDVR0RBBswGYIMd2FsbGV0LmxvY2Fsgglsb2NhbGhvc3Qw
+DQYJKoZIhvcNAQELBQADggEBAJdNAuDjkna4kuCSsbMBT8xWlxTN5lbDVfUIzgW4
+Iv0qb3YVqYLEbE6o/9AaE70XMMWraSnqs4j2aa5TunbQJlrTQLU45hGci1yZKeuq
+JoJtk8lUseWPzGATX7YSeQVLBUQVEmkO1UbQPr/xr0VdgkXffMNJdfDJvqykDbZn
+vGMTLvptOuj+sA1JthJo5zjwAOzf85znxFWsRYQjYO8pmK795pxN6jpeWYtBZOXA
+pva0kdRugSujjsr9XleB+T/lBWNy5b0QTFbwSc/6SKO3nV02m18ezrWtFiQ/nxYf
+Ha6ToutxjhP2YmfTGRaHvnyXMyxr1/Jkg3hVVP8xcwbcYZs=
 -----END CERTIFICATE-----
diff --git a/.docker/https/localhost.key b/.docker/https/localhost.key
index 2b3b8322..e05f1f95 100644
--- a/.docker/https/localhost.key
+++ b/.docker/https/localhost.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCv6tLYqAuUE5GF
-lBG2aG+XBLqi125BrfEWm+JUggsAeLyxoS6bbpr6bnvKeA/2LeOXbMLf5RE8oJuS
-5IFx5EqWPizl9N5S3yL1rq5BpxSx3WLZ2RR1wmDCAyhNv0kfYisTEN5pPFafoXJi
-aXDmEOEctc6bI1/dxmakIWF3XFubT8AmsURf1BrwrEt5gREvY50/a7N5+E7MckEj
-v0aLCf0RWVzCyEZbmQ4/YBacS+7pTvSU1vDt8kVFPgTIEK9Wf5jZKIZczVBjXJ+C
-DwVO4Bq6v25pL6r9ZSBxqZfHFTB/pI2JM0TbaLMVK1MeIjiQ1UB1S6cA2cEeAe+2
-cucXGdNnAgMBAAECggEBAKdI5YHTo1cHmL1uxb0w6NSyUYyi0h0w/G7kg8Ca/T1Q
-kxdTUA/MiSGWSK+LppoSnzeS3Gmu2cpObEKuew3D6s2eiHGQfo5N1F/O4bRa3woY
-nXTNwnANDJfSCtSMD0wBvTZfNzDZiQI5s50z6YFOEdOMa9EJPZOWpGp1t8qakB5K
-j7CbWkEWD96Odb0Rl5XFzyS89pms4ZLgw88sqE45RfIpKFXgwxvGqoRVsp4RbeZg
-UjpP1Actkp9YtZezeczPc1dc9/GfDB+eMjH7f1GglLkc0oPMU3djbKXJe82R8tgd
-pbNsKm/D710uZlPqhuAYvux8qb/3ZDq/fQM+fsGoN/ECgYEA1YgYvQVhdnrMwrdR
-QXti5XvKksdvte5vxjosXj53v+Mjok6sWbGSWLis75fyq1WUcGyVzMrypC78jnSI
-YwalKQGgLkSMvI7IrRDC2FDe8sLxoI6ApgDwI4zTR3AerWbqaUUcjFoN59auu6tP
-9cuGWU0Mguh77+7UF5cy0gACMS8CgYEA0ueaWmeDaRagBdmh7SzC4UAXEpSbRizA
-AnLGf7yHtLspzSwoNfoyyMEuYaXoKTGVv8/MMRN+TijjHYXgfFKCjPZvHOuCsWdP
-YHwYElYe3skJ9KU50ujZ39njscrGL8hbT4EHKkpoXY3RGkePF21ZpyQO9LjLbYu4
-T0sk0KZtw0kCgYBNWWt8rUJM5NbfggBRNBzy/BC5cr0oriKXL+N6kC5YuDLkTJNq
-OkTFFsCuWeBx6CJJR0xMTwfuKYcbI2N0W6fgXtJjcDl65E4VQwkRytm4Hp3ghz5a
-4+QZPJ4cNqUmMy2ezIY24ThATygkmz3vz7XvC1YI5aZfl6gEk6S5JX+lyQKBgGRR
-X90ioaIp7eH6fAg5o1TLTG49G4KMpKRFfd+iiJZR9HcwSswp/1/4a5xs8votKMK9
-D65ETG7XCfiwBnB8OrbcPUvvRhImRt5pCHYoWrSzwbWJpfCJa6ELnj+iaRSvY6d0
-gzj9fZkKbOzoHssQ63USNL7462Jm9DtbTd6lW05pAoGAZ/0GTnPWNYPvDKUkd/D/
-PQSC4MTJgS98TI68KtpVpOddU9olLwNQx+lpzKMbFrUAdJ9lfgFtarXKRdlGcV/L
-uCGJUhhTqnNt2byFuaFfr8BIsHTCZUDgHy7cRxBk9aFGbq507gbS+QPI1Fy+do7L
-1UNXzCEsxhMo3XFwVMklxKE=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCemy6AlkTJoCDs
+cBBXOm93m5W4sTr6IU06sH4I8DmHyFoKzWnfbIXFWvL6SPhiBE7bk1L5UlKCBP2Y
+YW7WwLTzj1rx/9dLLPS1+B13Jv7z88NgiJGtLk/YJ77k5jRdtfnP41WlJio5IjjM
+BAW3fOUssl+JvjerMHj44kp2TBHRMea2kGdVG3Kodjpl5CSTxuTtYz9yM6nGQO6w
+z/D3dYyR73o+y6l/FPBGI/r95WqgWXJx4A5+P63H/nPhcCxBK6j6BbGobBlIsjFu
+p9ZB4HhvIoTuexSX3+ECSlqXrYWZRB3KmuTDSCZ+lbNIqwZUHxK1nLEO/GGTN7kl
+gSNq0Wx3AgMBAAECggEAZbHwhihToMgYdCGCiLuCHznWLR8ORrU1lIz3svl8mdBf
+049T9BrcRueC5fIFuKs0eNuklxIurwlOJPdMH0xeedCQKpy1SZFgspCNLAoH7Rl+
+S5Yledo4/cq2PoRQTUnSDHaiQosPBaUor79gfv8I3rjcQzCA9zXUSxilT+aEghGv
+dCgCmnldOTl4vRkVhMVe8b6+O+WDOPSlLVNGffXTUUTTlt7yLytp3CY5J+0wqoHf
+4M+UzgoTf0DlaUDhu65xd6S70gPo85QRrGJX8XOUmI5OKUUNFXOKf3MJAl2qf5tQ
+1h2zS8OvWvrZL2DbBlNeJ+4hfG0fiQGgVr+i8HdpqQKBgQDO0kAeotG+nMMcTk4z
+TmLK9JK1WuMGUQqMImtwlfAKvvAAOafXmjZXxCg7gyngqhNWW6/x0CsTbdfLOk3o
+KdpkKIIAp55SHlSJJ37ELNqxLC32kvhGrQVMpR22lpemyqG2opvSHh7IjnWqhzwt
+SegxLKrfeNWb68go/5Tm3hRsVQKBgQDEUfOzz//tv1LfkhIABviZsawBMhRclBUX
+IQRGxAGGMRW7dtjwwBGsKGEBIlIROQKyf6vjsim4pxfO3kdRmzGuDe3xSIwPzLqO
+PkclUpANdHeWs0SHH4E85G+iOQ5uvufNcQa7+xw/7g1ztv8wCpiGEjAQ8SJ3E3+E
+NIUUT2mBmwKBgQCLZdKp03wjSW2ISo8SraaQvL+VVKjnvP+q7BgWTjj4RTFmNXYX
+L22pQiEL26ACOR/HeQzhozklY0erRqTz8iGsmFDnOBLRrnez6dbbSpAsEmb4Zp7I
+pB2KR0/7nQyh8rmEa50yxfJhowNT6Mp6i/HgEwcokD0JVqYWXA10fgKt8QKBgAKY
+3vN7BfS8Ojlw8kID1Zga7J6bbf+HifvjWO4iu65tyc7QFLCiqdkwM5BTRuipa2q3
+G6wIeFrUAxGeiS0AM5kM4B/4CLpQyAsHseNBg1xaNRbOSlLLTOdkUkHAJXu7lM93
+9lHYUZha6tykCB43lar4ZKBkwEL5BA/YrgYFwuyPAoGBAJHOGbBVaUPYICFtq4VP
+zDH80ogxpXf50iswHCYBLIm1YvfQY3IHQjDc3EzVUl1xxbjV7AIpv5bkqdwXQQPb
+nklsJZTLe2nkcR7hQtQ6FAloppSso1/hjxszyTkg2CUvkeKKKlL2DjP+jU1rV9ye
+DZx4GWo1PLU/MJC68JUqJSig
 -----END PRIVATE KEY-----
diff --git a/.docker/https/localhost.pfx b/.docker/https/localhost.pfx
index bc97c861195e32cdfdd822f30ad9c51e5e045d2f..65aae547b4739f99cc416c1fd1223db6f774063c 100644
GIT binary patch
delta 2339
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
JBp?C;2mlGEZV&(f

delta 2339
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
J+bRMA2moi0j}rg@

diff --git a/wallet-spa/.env.docker b/wallet-spa/.env.docker
index 5cc37646..9a9d48a3 100644
--- a/wallet-spa/.env.docker
+++ b/wallet-spa/.env.docker
@@ -1,6 +1,14 @@
-REACT_APP_AUTHORITY=https://wallet.local:8081/identity-server
-REACT_APP_REDIRECT_URI=https://wallet.local:8081/callback
-REACT_APP_POST_LOGOUT_REDIRECT_URI=https://wallet.local:8081
-REACT_APP_ACCOUNTS_API=https://wallet.local:8081/accounts-api
 HTTPS=false
-PORT=3000
\ No newline at end of file
+PORT=3000
+REACT_APP_ACCOUNTS_API=https://wallet.local:8081/accounts-api
+REACT_APP_AUDIENCE=https://wallet.local:8081/identity-server
+REACT_APP_AUTH_URL=https://wallet.local:8081/identity-server
+REACT_APP_AUTHORITY=https://wallet.local:8081/identity-server
+REACT_APP_IDENTITY_CLIENT_ID=spa
+REACT_APP_ISSUER=https://wallet.local:8081/identity-server
+REACT_APP_LOGOFF_REDIRECT_URL=https://wallet.local:8081/logout
+REACT_APP_POST_LOGOUT_REDIRECT_URI=https://wallet.local:8081/logout/callback
+REACT_APP_REDIRECT_URI=https://wallet.local:8081/signin-oidc
+REACT_APP_REDIRECT_URL=https://wallet.local:8081/signin-oidc
+REACT_APP_SCOPE=openid profile api1.full_access
+REACT_APP_SILENT_REDIRECT_URL=https://wallet.local:8081/silentrenew
\ No newline at end of file
diff --git a/wallet-spa/src/store/oauth.js b/wallet-spa/src/store/oauth.js
index 61372895..849feb25 100644
--- a/wallet-spa/src/store/oauth.js
+++ b/wallet-spa/src/store/oauth.js
@@ -4,7 +4,7 @@ const api = axios.create({
     headers: {
       'Content-Type': 'application/json'
     },
-    baseURL: "https://localhost:5001/"
+    baseURL: `${process.env.REACT_APP_ACCOUNTS_API}`
   });
 
 api.interceptors.request.use(