Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
63346f0
Upgrade to Identity Server v5
StuartFerguson Jun 9, 2021
0878a4c
Docker update
StuartFerguson Jun 9, 2021
dda95ab
:|
StuartFerguson Jun 9, 2021
1754895
workflow tweaks
StuartFerguson Jun 9, 2021
e23ce6c
Add certificates
StuartFerguson Jun 10, 2021
5e27795
.
StuartFerguson Jun 10, 2021
daa2649
..
StuartFerguson Jun 10, 2021
9a47292
:|
StuartFerguson Jun 10, 2021
bc3f27c
:|:|
StuartFerguson Jun 10, 2021
7d10c33
.
StuartFerguson Jun 10, 2021
f5b42f6
tweak
StuartFerguson Jun 10, 2021
a6106d4
.
StuartFerguson Jun 10, 2021
f4471fa
:|
StuartFerguson Jun 10, 2021
fe47cf5
debug
StuartFerguson Jun 10, 2021
19e2471
.
StuartFerguson Jun 10, 2021
d0aa8d9
debugging
StuartFerguson Jun 10, 2021
6eacb92
..
StuartFerguson Jun 10, 2021
72ef1b7
change script
StuartFerguson Jun 10, 2021
3f12fa0
Specflow fixes
StuartFerguson Jun 10, 2021
6bb02f5
bleak
StuartFerguson Jun 10, 2021
1d4eb50
powershell issue
StuartFerguson Jun 10, 2021
959165e
more docker updates
StuartFerguson Jun 10, 2021
bf4cb18
:(
StuartFerguson Jun 10, 2021
10cddf5
...
StuartFerguson Jun 10, 2021
3f9e1e5
:|
StuartFerguson Jun 10, 2021
5d88794
cert stuff...
StuartFerguson Jun 11, 2021
16c969d
wrong image name for UI
StuartFerguson Jun 11, 2021
4e8079a
...
StuartFerguson Jun 11, 2021
c81b18d
Another try on UI tests
StuartFerguson Jun 11, 2021
dd71951
...
StuartFerguson Jun 11, 2021
a83075b
:|
StuartFerguson Jun 11, 2021
a9ceb77
:|
StuartFerguson Jun 11, 2021
2acbda3
insecure :|
StuartFerguson Jun 11, 2021
8e5ceed
.
StuartFerguson Jun 11, 2021
4a2dd8b
upload logs
StuartFerguson Jun 12, 2021
32ffa08
console logging
StuartFerguson Jun 12, 2021
eb1c02f
:|
StuartFerguson Jun 12, 2021
5e14f0e
...
StuartFerguson Jun 12, 2021
4240d41
:|
StuartFerguson Jun 12, 2021
2d04c88
.
StuartFerguson Jun 12, 2021
8bf922c
:|
StuartFerguson Jun 12, 2021
4f32479
.
StuartFerguson Jun 12, 2021
e609487
.
StuartFerguson Jun 13, 2021
2b14d87
:|
StuartFerguson Jun 13, 2021
4cba473
:| grim
StuartFerguson Jun 13, 2021
8ee43bc
.
StuartFerguson Jun 13, 2021
0c2a3d9
hosts
StuartFerguson Jun 14, 2021
a168c11
enable all integration tests
StuartFerguson Jun 14, 2021
36dac7a
:|
StuartFerguson Jun 14, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
.dockerignore
.env
.git
.gitignore
.vs
.vscode
*/bin
*/obj
**/.toolstarget
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md
7 changes: 6 additions & 1 deletion .github/workflows/nightlybuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ jobs:
steps:
- uses: actions/checkout@v2.3.4

- name: Trust Certificate
run: |
$certPath = "$env:GITHUB_WORKSPACE\Certificates\aspnetapp-root-cert.pfx"
Import-PfxCertificate -FilePath $certpath -Password (ConvertTo-SecureString -String 'password' -AsPlainText -Force) -CertStoreLocation Cert:\LocalMachine\Root

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json

Expand All @@ -30,7 +35,7 @@ jobs:
- name: Build Docker Images
run: |
docker build . --file SecurityService/DockerfileWindows --tag securityservice:latest
docker build . --file SecurityServiceTestWebClient/DockerfileWindows --tag securityservicetestwebclient:latest
docker build . --file SecurityServiceTestUI/DockerfileWindows --tag securityservicetestwebclient:latest

- name: Run Integration Tests (Non UI)
run: |
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ jobs:

steps:
- uses: actions/checkout@v2.3.4

- name: Trust Certificate
run: |
$certPath = "$env:GITHUB_WORKSPACE\Certificates\aspnetapp-root-cert.pfx"
Import-PfxCertificate -FilePath $certpath -Password (ConvertTo-SecureString -String 'password' -AsPlainText -Force) -CertStoreLocation Cert:\LocalMachine\Root

- name: Restore Nuget Packages
run: dotnet restore SecurityService.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
Expand All @@ -30,7 +35,7 @@ jobs:
- name: Build Docker Images
run: |
docker build . --file SecurityService/DockerfileWindows --tag securityservice:latest
docker build . --file SecurityServiceTestWebClient/DockerfileWindows --tag securityservicetestwebclient:latest
docker build . --file SecurityServiceTestUI/DockerfileWindows --tag securityservicetestui:latest

- name: Run Integration Tests (Non UI)
run: |
Expand All @@ -54,4 +59,4 @@ jobs:
DriverPath: C:\\SeleniumWebDrivers\\EdgeDriver\\
DriverExe: msedgedriver.exe
run: |
dotnet test "SecurityService.OpenIdConnect.IntegrationTests\SecurityService.OpenIdConnect.IntegrationTests.csproj" --filter Category=PRTest
dotnet test "SecurityService.OpenIdConnect.IntegrationTests\SecurityService.OpenIdConnect.IntegrationTests.csproj" --filter Category=PRTest
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ ClientBin/
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs

Expand Down
Binary file added Certificates/aspnetapp-identity-server.pfx
Binary file not shown.
Binary file added Certificates/aspnetapp-root-cert.cer
Binary file not shown.
Binary file added Certificates/aspnetapp-root-cert.pfx
Binary file not shown.
Binary file added Certificates/aspnetapp-web-api.pfx
Binary file not shown.
19 changes: 0 additions & 19 deletions README.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace SecurityService.Manager.Exceptions
namespace SecurityService.BusinessLogic.Exceptions
{
using System;
using System.Diagnostics.CodeAnalysis;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace SecurityService.Manager.Extensions
namespace SecurityService.BusinessLogic
{
using System;
using System.Collections.Generic;
Expand Down
Loading