Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V1 Release #484

Merged
merged 175 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
1db55d6
Bump Microsoft.AspNetCore.Identity.EntityFrameworkCore
dependabot[bot] Jun 3, 2024
d8a1766
Bump Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Abs…
dependabot[bot] Jun 3, 2024
a853618
Bump Microsoft.EntityFrameworkCore.Abstractions from 7.0.19 to 7.0.20
dependabot[bot] Jun 3, 2024
5f6b272
Handle missing groups
jacobsen9026 Jun 10, 2024
b6260dc
Sort Children #386
jacobsen9026 Jun 10, 2024
c74f017
Use BetaDev tag
jacobsen9026 Jun 14, 2024
ed27f66
Back to dev
jacobsen9026 Jun 14, 2024
e3b58c4
Fix for Up To Date message not showing
jacobsen9026 Jun 20, 2024
5fa200d
Get BitLocker Recoveries by computer
jacobsen9026 Jun 21, 2024
8681697
Search for bitlocker recovery almost complete
jacobsen9026 Jun 22, 2024
029b865
Fix for IsMemberOf nested search
jacobsen9026 Jun 25, 2024
64d4cf2
Changes for getting parent of BitLocker objects
jacobsen9026 Jun 25, 2024
c9b1c08
Fix for crash on startup if database is unreachable
jacobsen9026 Jun 25, 2024
87efbc0
Merge branch 'Beta-Dev' into 360-computer-bitlocker-recovery-passwords
jacobsen9026 Jun 29, 2024
e2d015a
Merge pull request #407 from Blazam-App/360-computer-bitlocker-recove…
jacobsen9026 Jun 29, 2024
bfa69bf
Fix for error when modifying custom field #406
jacobsen9026 Jun 29, 2024
1f735c0
Merge branch '360-computer-bitlocker-recovery-passwords' of https://g…
jacobsen9026 Jun 29, 2024
90a7ac8
Merge pull request #408 from Blazam-App/360-computer-bitlocker-recove…
jacobsen9026 Jun 29, 2024
0c572fc
Inccrement version
jacobsen9026 Jun 29, 2024
5c1941d
Increment build
jacobsen9026 Jun 29, 2024
3cbc26f
Merge branch 'v1-Dev' into 0.9.4-1.0.0
jacobsen9026 Jun 29, 2024
eed5f6e
Merge pull request #409 from Blazam-App/0.9.4-1.0.0
jacobsen9026 Jun 29, 2024
c7d977e
Update Serilog
jacobsen9026 Jun 29, 2024
396f4cd
Merge pull request #390 from Blazam-App/dependabot/nuget/Microsoft.En…
jacobsen9026 Jun 29, 2024
73b015e
Merge branch 'Beta-Dev' into dependabot/nuget/multi-a5a52c7d45
jacobsen9026 Jun 29, 2024
1e92857
Merge pull request #388 from Blazam-App/dependabot/nuget/multi-a5a52c…
jacobsen9026 Jun 29, 2024
6b686a7
Merge pull request #387 from Blazam-App/dependabot/nuget/Microsoft.As…
jacobsen9026 Jun 29, 2024
2d3c1c3
Bump Microsoft.EntityFrameworkCore and Microsoft.EntityFrameworkCore.…
dependabot[bot] Jun 29, 2024
d6e33f0
Update dependencies
jacobsen9026 Jun 29, 2024
1c8bacb
Merge pull request #410 from Blazam-App/dependabot/nuget/multi-ba664f…
jacobsen9026 Jun 29, 2024
46d4a58
Allow update to .NET 8 version
jacobsen9026 Jun 29, 2024
03742ac
Merge branch 'Beta-Dev' of https://github.com/Blazam-App/BLAZAM into …
jacobsen9026 Jun 29, 2024
a5e70c8
Fixes to updating
jacobsen9026 Jun 30, 2024
8478882
Pull beta stable releases as well
jacobsen9026 Jul 1, 2024
b1d4383
Remove CI Pipeline caching
jacobsen9026 Jul 1, 2024
816ba4c
Try different token
jacobsen9026 Jul 1, 2024
c8bbfab
Add permissions
jacobsen9026 Jul 1, 2024
d2c8f3c
Switch to AutoGen GitHub Token
jacobsen9026 Jul 1, 2024
7f351fb
Switch to AutoGen GitHub Token
jacobsen9026 Jul 1, 2024
547e8eb
Include Beta Update in history and allow further beta updates before …
jacobsen9026 Jul 2, 2024
31a8aec
Add stale issue workflow
jacobsen9026 Jul 4, 2024
db945c7
Create completly custom MudSelectList
jacobsen9026 Jul 5, 2024
6ad284d
Merge pull request #416 from Blazam-App/394-caused-by-commit-id-c4159…
jacobsen9026 Jul 5, 2024
bacc3e3
Merge branch 'v1-Dev' into Beta-Dev
jacobsen9026 Jul 5, 2024
2c88fd6
Merge pull request #417 from Blazam-App/Beta-Dev
jacobsen9026 Jul 5, 2024
015b34e
Revert beta workflows to beta
jacobsen9026 Jul 5, 2024
fe380ff
Rename workflows
jacobsen9026 Jul 5, 2024
88fa9b1
Fix assembly version for beta
jacobsen9026 Jul 6, 2024
17a3202
Lot of update fixes and accidental v1 inclusions
jacobsen9026 Jul 6, 2024
ffaa4ef
Back to current 0.9.3
jacobsen9026 Jul 6, 2024
f5f3b39
Bump DuoUniversal from 1.2.4 to 1.2.5
dependabot[bot] Jul 6, 2024
9dd8ce4
Merge pull request #412 from Blazam-App/dependabot/nuget/DuoUniversal…
jacobsen9026 Jul 6, 2024
da25307
Fix for links applying search object type filters #405
jacobsen9026 Jul 6, 2024
032f2f6
Fix for common test packages targeting net8
jacobsen9026 Jul 6, 2024
bbfae36
Merge pull request #421 from Blazam-App/LinkFilteringBug
jacobsen9026 Jul 6, 2024
5cab26d
Merge pull request #422 from Blazam-App/Beta-Dev
jacobsen9026 Jul 6, 2024
8604b59
Prepare for Email Notification Subscriptions
jacobsen9026 Jul 7, 2024
165f552
Merge pull request #423 from Blazam-App/Beta-Dev
jacobsen9026 Jul 7, 2024
4e45a6f
Migration created, boilerplate started
jacobsen9026 Jul 7, 2024
00a518f
Improved subscription foundation
jacobsen9026 Jul 8, 2024
57adb0b
Need to add noification types
jacobsen9026 Jul 9, 2024
f42456e
Notification subscription walls built
jacobsen9026 Jul 17, 2024
c5853c1
Functional In-App notifications
jacobsen9026 Jul 21, 2024
8004e51
Fill out notification triggers
jacobsen9026 Jul 21, 2024
e4b1ca9
Job Monitor Addeed
jacobsen9026 Jul 21, 2024
052a33a
Merge pull request #434 from Blazam-App/email-templates
jacobsen9026 Jul 21, 2024
9876b77
Allow step reuse
jacobsen9026 Jul 22, 2024
f15c0e7
Merge pull request #435 from Blazam-App/email-templates
jacobsen9026 Jul 22, 2024
4a2ac91
Merge pull request #436 from Blazam-App/email-templates
jacobsen9026 Jul 22, 2024
9af5699
.net 8 update v2
jacobsen9026 Jul 22, 2024
cd34971
Missed one file
jacobsen9026 Jul 22, 2024
d768b24
Bump MailKit from 4.6.0 to 4.7.1.1
dependabot[bot] Jul 22, 2024
6d3c462
Revert Dev and Nightly branch update to v1
jacobsen9026 Jul 22, 2024
f606738
Merge pull request #438 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 22, 2024
23e27fb
Update test
jacobsen9026 Jul 23, 2024
ab5e03c
Merge pull request #439 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 23, 2024
a387318
Merge pull request #440 from Blazam-App/Beta-Dev
jacobsen9026 Jul 23, 2024
78b2a18
Merge pull request #437 from Blazam-App/dependabot/nuget/MailKit-4.7.1.1
jacobsen9026 Jul 23, 2024
a85daae
Bump Microsoft.AspNetCore.Identity.UI from 6.0.30 to 6.0.32
jacobsen9026 Jul 23, 2024
4424f35
Bump Microsoft.VisualStudio.Web.CodeGeneration.Design from 6.0.16 to …
jacobsen9026 Jul 23, 2024
7857794
Bump Microsoft.Playwright.NUnit from 1.44.0 to 1.45.1
jacobsen9026 Jul 23, 2024
e759797
Update all other dependencies
jacobsen9026 Jul 23, 2024
75e9100
Update Octokit
jacobsen9026 Jul 23, 2024
8a2d489
Remove redundant group post creation triggers
jacobsen9026 Jul 23, 2024
b22c886
Fix for first OU not being alphabetical in tree views #386
jacobsen9026 Jul 23, 2024
a2e6e77
Merge pull request #443 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 23, 2024
a187fc3
Unused code from another project
jacobsen9026 Jul 23, 2024
cf64aaa
Move OU create audit and notification triggers
jacobsen9026 Jul 23, 2024
e0dcb22
Detect group changes for notifications
jacobsen9026 Jul 23, 2024
80619a8
Merge pull request #444 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 23, 2024
fda03f8
Merge pull request #445 from Blazam-App/Beta-Dev
jacobsen9026 Jul 23, 2024
dae1f90
Remove assign and unassign from User and Computer appropriate Object …
jacobsen9026 Jul 24, 2024
a160880
Add printer object actions
jacobsen9026 Jul 24, 2024
c79f61c
Add Bitlock delete object action
jacobsen9026 Jul 24, 2024
8837310
Merge pull request #446 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 24, 2024
651a51c
Security update against potential DOS
jacobsen9026 Jul 24, 2024
c1c6120
Merge pull request #448 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 24, 2024
362d2a5
Merge pull request #449 from Blazam-App/Beta-Dev
jacobsen9026 Jul 24, 2024
12348d1
Implement Email Notifications
jacobsen9026 Jul 26, 2024
542d27f
Merge pull request #450 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 26, 2024
970ad0f
Self Notification Subscription Management
jacobsen9026 Jul 27, 2024
a854a23
Merge pull request #451 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 27, 2024
6d523d2
App news improvemnts
jacobsen9026 Jul 27, 2024
c2efaa1
Auto Update registers actions as Jobs
jacobsen9026 Jul 27, 2024
e9a04b7
Async refresh modal
jacobsen9026 Jul 27, 2024
c6a062e
Fix for unable to save email in user profile settings
jacobsen9026 Jul 27, 2024
2e26663
Default user to System
jacobsen9026 Jul 27, 2024
1392700
Global import for notifications gui
jacobsen9026 Jul 27, 2024
488845a
Merge pull request #452 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 27, 2024
9873569
Merge branch 'Beta-Dev' of https://github.com/Blazam-App/BLAZAM into …
jacobsen9026 Jul 27, 2024
8ef5795
Increment version
jacobsen9026 Jul 27, 2024
95c0699
Fix for possible email exception on email setttings page
jacobsen9026 Jul 27, 2024
547ab6a
Merge pull request #453 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 27, 2024
6b6c6a3
Fix for null insertion error when creating mulitiple notification sub…
jacobsen9026 Jul 27, 2024
bbf37e5
Fully functional email notifications
jacobsen9026 Jul 27, 2024
261dbe9
Merge pull request #454 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 27, 2024
c64c24f
Increment minor version
jacobsen9026 Jul 27, 2024
5fc4fd8
Update dependencies
jacobsen9026 Jul 27, 2024
b4fc86b
Remove unused class
jacobsen9026 Jul 27, 2024
c8a636a
Remove unused class
jacobsen9026 Jul 27, 2024
2d271fa
Merge pull request #455 from Blazam-App/Beta-Dev
jacobsen9026 Jul 27, 2024
f1b6f59
Merge pull request #456 from Blazam-App/Beta-Nightly
jacobsen9026 Jul 28, 2024
6b6f98d
Bump Serilog from 4.0.0 to 4.0.1
dependabot[bot] Jul 29, 2024
7f07b59
Bump NUnit3TestAdapter from 4.5.0 to 4.6.0
dependabot[bot] Jul 29, 2024
27e0a56
Merge pull request #459 from Blazam-App/dependabot/nuget/NUnit3TestAd…
jacobsen9026 Jul 30, 2024
545e4f5
Merge pull request #457 from Blazam-App/dependabot/nuget/Serilog-4.0.1
jacobsen9026 Jul 30, 2024
8db28de
Update README
jacobsen9026 Jul 30, 2024
8e1def2
Merge pull request #461 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 30, 2024
202af21
Merge pull request #462 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Jul 30, 2024
9e19127
MudBlazor update progress
jacobsen9026 Jul 30, 2024
0887ba1
Template TreeView update
jacobsen9026 Jul 31, 2024
26d7fcc
Implement proper encyption salting
jacobsen9026 Aug 2, 2024
ec7b0e5
Skip checks pre install finalization
jacobsen9026 Aug 3, 2024
bdec647
Fix for service installations failing to start when no SSL cert is pr…
jacobsen9026 Aug 3, 2024
373002f
Skip UserSeedService pre install finalization
jacobsen9026 Aug 3, 2024
38ba62d
Don't throw for missing CurrentUser
jacobsen9026 Aug 3, 2024
95cbd3b
Rename CurrentUserStateService source file
jacobsen9026 Aug 3, 2024
75fe794
Merge branch 'Beta-Dev' into Stable-Dev-Common-Code
jacobsen9026 Aug 3, 2024
a34fdd4
Allow null decryption
jacobsen9026 Aug 3, 2024
fb54721
Merge branch 'Stable-Dev-Common-Code' of https://github.com/Blazam-Ap…
jacobsen9026 Aug 3, 2024
5e989de
Merge branch 'v1-Dev' into Stable-Dev-Common-Code
jacobsen9026 Aug 4, 2024
c96ee15
Merge pull request #467 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Aug 4, 2024
e746ddb
Audit completed
jacobsen9026 Aug 4, 2024
31651cc
Merge branch 'Stable-Dev-Common-Code' of https://github.com/Blazam-Ap…
jacobsen9026 Aug 4, 2024
2eb5cab
Merge pull request #470 from Blazam-App/Stable-Dev-Common-Code
jacobsen9026 Aug 5, 2024
f339bf6
Update all MudBlazor components except TreeViews
jacobsen9026 Aug 5, 2024
91476c1
Fix for assign only permissions on View Group page
jacobsen9026 Aug 5, 2024
165d9de
TreeViews updated for latest MudBlazor
jacobsen9026 Aug 5, 2024
082c156
Fix for changed entries widget showing wrong results
jacobsen9026 Aug 6, 2024
6b8ff04
MudBlazor upgrade compled
jacobsen9026 Aug 6, 2024
44f2263
Merge branch 'v1-Nightly' into v1-Dev
jacobsen9026 Aug 6, 2024
5e0e378
Merge pull request #474 from Blazam-App/v1-Dev
jacobsen9026 Aug 6, 2024
934d1c7
Implement Per-Object permission mapping
jacobsen9026 Aug 7, 2024
1d31636
Build v1 dev
jacobsen9026 Aug 7, 2024
9901f49
Fix for error in Browse member when AD not connected
jacobsen9026 Aug 7, 2024
d4dd5b4
Warning squashing
jacobsen9026 Aug 7, 2024
b539f87
Rename tags
jacobsen9026 Aug 8, 2024
ce89923
Bump version to 1.0
jacobsen9026 Aug 8, 2024
7fbe358
Merge pull request #476 from Blazam-App/v1-Dev
jacobsen9026 Aug 8, 2024
a745c58
Fix for possible privilege escalation in Blazam
jacobsen9026 Aug 8, 2024
3ccd3a6
Add security updates to release notes
jacobsen9026 Aug 8, 2024
afecbd8
Merge pull request #477 from Blazam-App/v1-Dev
jacobsen9026 Aug 8, 2024
237983f
Remove unused project
jacobsen9026 Aug 9, 2024
b4e82fa
Bump MudBlazor to 7.6.0
jacobsen9026 Aug 9, 2024
7f3a51a
Merge pull request #479 from Blazam-App/v1-Dev
jacobsen9026 Aug 9, 2024
b492e18
Bump NUnit.Analyzers to 4.3.0
jacobsen9026 Aug 9, 2024
e105f32
Merge pull request #480 from Blazam-App/v1-Dev
jacobsen9026 Aug 9, 2024
800b4fc
Bump Microsoft.Playwright.NUnit to 1.45.1
jacobsen9026 Aug 9, 2024
7c3357c
Merge pull request #481 from Blazam-App/v1-Dev
jacobsen9026 Aug 9, 2024
2472058
Bump Serilog.AspNetCore to 8.0.2
jacobsen9026 Aug 9, 2024
80b542c
Merge pull request #482 from Blazam-App/v1-Dev
jacobsen9026 Aug 9, 2024
e72486b
Code cleanup
jacobsen9026 Aug 9, 2024
6ca2a3c
Minor improvements
jacobsen9026 Aug 9, 2024
e7b2627
Deploy nightly to demo site
jacobsen9026 Aug 9, 2024
e6e5d27
Merge pull request #483 from Blazam-App/v1-Dev
jacobsen9026 Aug 9, 2024
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
3 changes: 3 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ changelog:
- title: Exciting New Features 🎉
labels:
- enhancement
- title: Security Updates 🔐
labels:
- security
- title: Fixes 🏗
labels:
- bug
Expand Down
15 changes: 4 additions & 11 deletions .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build v1 Dev
name: Build Dev v1

on:
workflow_dispatch:
Expand All @@ -10,18 +10,11 @@ on:
jobs:
build:
runs-on: windows-latest

permissions: write-all

steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Cache Nuget Packages
uses: actions/cache@v1
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: Setup .NET Core SDK 8
uses: actions/setup-dotnet@v1
with:
Expand Down Expand Up @@ -68,10 +61,10 @@ jobs:
- name: Update dev release
uses: andelf/nightly-release@main
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: 'Dev1'
name: 'Dev1'
name: 'v1-Dev'
prerelease: true
body: This release is highly unstable. Expect bugs and crashes on this branch. Developers Only!
files: |
Expand Down
18 changes: 4 additions & 14 deletions .github/workflows/build-nightly.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build v1 Nightly
name: Build Nightly

on:
workflow_dispatch:
Expand All @@ -10,22 +10,12 @@ on:
jobs:
build:
runs-on: windows-latest
permissions: write-all


steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Cache Nuget Packages
uses: actions/cache@v1
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: Setup .NET Core SDK 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.x
- name: Setup .NET Core SDK 8
uses: actions/setup-dotnet@v1
with:
Expand Down Expand Up @@ -70,10 +60,10 @@ jobs:
- name: Update nightly release
uses: andelf/nightly-release@main
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: 'Nightly1'
name: 'Nightly1'
name: 'v1-Nightly'
prerelease: true
body: This release is always the latest nightly release. These versions are unstable and may break your application. You've been warned.
files: |
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/deploy-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,16 @@ name: Build and deploy ASP.Net Core app to Azure Web App - blazam
on:
push:
branches:
- Beta-Nightly
- v1-Nightly
workflow_dispatch:

jobs:
build:
runs-on: windows-latest
permissions: write-all

steps:
- uses: actions/checkout@v2

- name: Set up .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.x
- name: Setup .NET Core SDK 8
uses: actions/setup-dotnet@v1
with:
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/mark-stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Close inactive issues
on:
workflow_dispatch:
schedule:
- cron: "30 1 * * *"

jobs:
close-issues:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v5
with:
days-before-issue-stale: 14
days-before-issue-close: 14
stale-issue-label: "stale"
stale-issue-message: "This issue is stale because it has been open for 14 days with no activity."
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
days-before-pr-stale: -1
days-before-pr-close: -1
repo-token: ${{ secrets.GITHUB_TOKEN }}
7 changes: 4 additions & 3 deletions .github/workflows/release-stable.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish and Release v1 Stable
name: Publish and Release Stable

on:
workflow_dispatch:
Expand All @@ -10,6 +10,7 @@ on:
jobs:
build:
runs-on: windows-latest
permissions: write-all


steps:
Expand Down Expand Up @@ -48,7 +49,7 @@ jobs:
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

with:
tag_name: Release-v${{ env.ASSEMBLY_VERSION }}
Expand All @@ -60,7 +61,7 @@ jobs:
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: blazam-stable-v${{ env.ASSEMBLY_VERSION }}.zip
Expand Down
8 changes: 2 additions & 6 deletions BLAZAM.Tests/BLAZAM.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
1 change: 1 addition & 0 deletions BLAZAM/App.razor
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@

<MudThemeProvider IsDarkMode="@darkMode" Theme="@activeTheme.Theme" />
<MudDialogProvider />
<MudPopoverProvider />
<MudSnackbarProvider />

<SessionExpirationWarningProvider />
Expand Down
52 changes: 27 additions & 25 deletions BLAZAM/BLAZAM.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<ServerGarbageCollection>false</ServerGarbageCollection>
<AssemblyVersion>1.0.0</AssemblyVersion>
<Version>2024.06.14.2332</Version>
<Version>2024.08.09.1713</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<RootNamespace>BLAZAM</RootNamespace>
<GenerateDocumentationFile>False</GenerateDocumentationFile>
Expand All @@ -29,7 +29,7 @@
<None Remove="static\img\default_logo5.png" />
</ItemGroup>





Expand All @@ -56,35 +56,31 @@
<ItemGroup>
<PackageReference Include="BlazorTemplater" Version="1.5.1" />
<PackageReference Include="Cassia" Version="2.0.0.60" />
<PackageReference Include="DuoUniversal" Version="1.2.4" />
<PackageReference Include="MailKit" Version="4.6.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
<PackageReference Include="DuoUniversal" Version="1.2.5" />
<PackageReference Include="MailKit" Version="4.7.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
<PackageReference Include="MudBlazor.Markdown" Version="0.1.3" />
<PackageReference Include="MudBlazor.ThemeManager" Version="1.0.9" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.3" />
<PackageReference Include="MudBlazor" Version="7.6.0" />
<PackageReference Include="MudBlazor.Markdown" Version="1.0.2" />
<PackageReference Include="MudBlazor.ThemeManager" Version="2.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Octokit" Version="11.0.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Octokit" Version="13.0.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />

<PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.0" />
Expand All @@ -110,9 +106,14 @@
</ItemGroup>

<ItemGroup>
<Content Include="static\img\default_logo5.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="static\img\default_logo5.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<None Include="..\BLAZAMGui\UI\Settings\JobsMonitor.razor" Link="JobsMonitor.razor" />
<None Include="..\BLAZAMGui\UI\Settings\Notifications\EditNotificationSubscriptionRow.razor" Link="EditNotificationSubscriptionRow.razor" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -151,3 +152,4 @@
<Exec Condition="'$(Configuration)' == 'Debug'" Command="powershell -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\IncrementBuildNumber.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)" />
</Target>
</Project>

3 changes: 2 additions & 1 deletion BLAZAM/GlobalUsings.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
global using BLAZAM.Logger;
global using BLAZAM.FileSystem;
global using BLAZAM.Helpers;
global using BLAZAM.Common.Exceptions;
global using BLAZAM.Services.Background;


43 changes: 25 additions & 18 deletions BLAZAM/Middleware/HttpsRedirectionMiddleware.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using BLAZAM.Database.Context;
using BLAZAM.Common.Data;
using BLAZAM.Database.Context;
using BLAZAM.Services.Background;

namespace BLAZAM.Server.Middleware
Expand All @@ -7,41 +8,47 @@ public class HttpsRedirectionMiddleware
{
private readonly RequestDelegate _next;
private readonly ConnMonitor _monitor;
private readonly ApplicationInfo _applicationInfo;

public HttpsRedirectionMiddleware(
RequestDelegate next,
ConnMonitor monitor)
ConnMonitor monitor,
ApplicationInfo applicationInfo)
{
_next = next;
_monitor = monitor;
_applicationInfo = applicationInfo;
}

public async Task InvokeAsync(HttpContext context)
{
bool forceHttps;
// If the value is not cached, retrieve it from the database.

try
{
forceHttps = DatabaseCache.ApplicationSettings.ForceHTTPS;
}catch (NullReferenceException ex)
if (_applicationInfo.InstallationCompleted)
{
Loggers.SystemLogger.Warning("Error while checking database cache for Force HTTPS {@Error}", ex);
forceHttps = false;
}
try
{
forceHttps = DatabaseCache.ApplicationSettings.ForceHTTPS;
}
catch (NullReferenceException ex)
{
Loggers.SystemLogger.Warning("Error while checking database cache for Force HTTPS {@Error}", ex);
forceHttps = false;
}




// If the ForceHttps flag is set to true, redirect to HTTPS.
if (forceHttps
&& !context.Request.IsHttps)
{
string httpsUrl = "https://" + context.Request.Host + context.Request.Path;
context.Response.Redirect(httpsUrl);
return;
}
// If the ForceHttps flag is set to true, redirect to HTTPS.
if (forceHttps
&& !context.Request.IsHttps)
{
string httpsUrl = "https://" + context.Request.Host + context.Request.Path;
context.Response.Redirect(httpsUrl);
return;
}

}
// If the ForceHttps flag is not set or if the request is already HTTPS, proceed with the request.
await _next(context);
}
Expand Down
3 changes: 3 additions & 0 deletions BLAZAM/Pages/Browse/ViewDirectoryEntry.razor
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
case ActiveDirectoryObjectType.Printer:
<ViewPrinter DirectoryEntry="DirectoryEntry" />
break;
case ActiveDirectoryObjectType.BitLocker:
<ViewBitLocker DirectoryEntry="DirectoryEntry" />
break;
}
</CascadingValue>
<AppModal Title=@AppLocalization["Change History"] @ref=@ChangeHistoryModal Options=@(new DialogOptions(){FullWidth=true,MaxWidth=MaxWidth.ExtraExtraLarge})>
Expand Down
Loading
Loading