From f8645fcc6ba9d5d1e00b383ceda81fe68e80ee1e Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Thu, 11 Nov 2021 18:13:26 +0300 Subject: [PATCH 1/4] issue-84: create o2-auth.yml for o2-sso --- .github/workflows/o2-auth.yml | 42 +++++++++++++++++++ .../Manage/EnableAuthenticator.cshtml.cs | 2 +- .../O2NextGen.Auth.Reference.csproj | 1 + .../Pages/Shared/_Layout.cshtml | 6 +-- .../Data/AuthDbContext.cs | 0 .../Data/O2User.cs | 0 .../20211107024126_InitDb.Designer.cs | 10 ++--- .../Migrations/20211107024126_InitDb.cs | 0 .../Migrations/AuthDbContextModelSnapshot.cs | 10 ++--- .../O2NextGen.Auth.Web.csproj} | 1 + .../Pages/Register.cshtml | 0 .../Pages/Register.cshtml.cs | 0 .../Pages/_ViewImports.cshtml | 0 .../Program.cs | 0 .../Properties/launchSettings.json | 0 .../Startup.cs | 0 .../appsettings.Development.json | 0 .../appsettings.json | 0 .../auth/O2NextGen.Auth/O2NextGen.Auth.sln | 23 +++++++++- ...IntegrationTests.O2NextGen.Auth.Web.csproj | 15 +++++++ .../UnitTest1.cs | 14 +++++++ .../Tests.O2NextGen.Auth.Web.csproj | 15 +++++++ .../Tests.O2NextGen.Auth.Web/UnitTest1.cs | 18 ++++++++ 23 files changed, 142 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/o2-auth.yml rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Data/AuthDbContext.cs (100%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Data/O2User.cs (100%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Migrations/20211107024126_InitDb.Designer.cs (95%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Migrations/20211107024126_InitDb.cs (100%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Migrations/AuthDbContextModelSnapshot.cs (95%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth/O2NextGen.Auth.csproj => O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj} (86%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Pages/Register.cshtml (100%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Pages/Register.cshtml.cs (100%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Pages/_ViewImports.cshtml (100%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Program.cs (100%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Properties/launchSettings.json (100%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/Startup.cs (100%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/appsettings.Development.json (100%) rename src/Services/auth/O2NextGen.Auth/{O2NextGen.Auth => O2NextGen.Auth.Web}/appsettings.json (100%) create mode 100644 src/Services/auth/O2NextGen.Auth/Tests/IntegrationTests.O2NextGen.Auth.Web/IntegrationTests.O2NextGen.Auth.Web.csproj create mode 100644 src/Services/auth/O2NextGen.Auth/Tests/IntegrationTests.O2NextGen.Auth.Web/UnitTest1.cs create mode 100644 src/Services/auth/O2NextGen.Auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj create mode 100644 src/Services/auth/O2NextGen.Auth/Tests/Tests.O2NextGen.Auth.Web/UnitTest1.cs diff --git a/.github/workflows/o2-auth.yml b/.github/workflows/o2-auth.yml new file mode 100644 index 00000000..3cf6019f --- /dev/null +++ b/.github/workflows/o2-auth.yml @@ -0,0 +1,42 @@ +name: .NET + +on: + push: + branches: + - master + - dev + pull_request: + branches: + - master + - dev + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 2.2.x + - name: Restore dependencies + run: dotnet restore + working-directory: src/Services/auth + - name: Build + run: dotnet build --no-restore + working-directory: src/Services/auth + + - name: Unit Tests + run: dotnet test Tests.O2NextGen.Auth.Web.csproj --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutput=TestResults/Tests.O2NextGen.Auth.Web.info /p:CoverletOutputFormat=lcov + working-directory: src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/ + + - name: Integration Tests + run: dotnet test src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/IntegrationTests.O2NextGen.Auth.Web.csproj --no-build --verbosity normal /p:MergeWith=src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/TestResults/Tests.O2NextGen.Auth.Web.info /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=lcov + + - name: Publish coverage report to coveralls.io + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + path-to-lcov: src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/TestResults/coverage.info \ No newline at end of file diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs b/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs index e3b60960..f32b6a5b 100644 --- a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs +++ b/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs @@ -148,7 +148,7 @@ private string GenerateQrCodeUri(string email, string unformattedKey) { return string.Format( AuthenticatorUriFormat, - _urlEncoder.Encode("O2NextGen.Auth.Sample"), + _urlEncoder.Encode("O2NextGen.Auth.Web.Sample"), _urlEncoder.Encode(email), unformattedKey); } diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/O2NextGen.Auth.Reference.csproj b/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/O2NextGen.Auth.Reference.csproj index 2c60e09c..c060b625 100644 --- a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/O2NextGen.Auth.Reference.csproj +++ b/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/O2NextGen.Auth.Reference.csproj @@ -7,6 +7,7 @@ + diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_Layout.cshtml b/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_Layout.cshtml index 49038813..ca991645 100644 --- a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_Layout.cshtml +++ b/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - O2NextGen.Auth.Sample + @ViewData["Title"] - O2NextGen.Auth.Web.Sample @@ -21,7 +21,7 @@