Skip to content

Commit fef8ac6

Browse files
csharpfritzcsharpfritz
authored
Introduced Common.Client (#465)
* Introduced Common.Client * Moved interfaces and base objects to Common.Client * Fixed references to ConfigureTagzAppFactory * Updated postgres EF
1 parent 8d10d04 commit fef8ac6

32 files changed

+812
-340
lines changed

‎scripts/AddPostgresSecurityMigration.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dotnet ef migrations add --context TagzApp.Web.Data.SecurityContext -p ..\src\TagzApp.Storage.Postgres.Security\ -s ..\src\TagzApp.Web %1
1+
dotnet ef migrations add --context TagzApp.Security.SecurityContext -p ..\src\TagzApp.Storage.Postgres.Security\ -s ..\src\TagzApp.Blazor %1

‎src/TagzApp.AppHost/DatabaseService.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ this IDistributedApplicationBuilder builder
1313
var dbPassword = builder.AddParameter("dbPassword", false);
1414

1515
var dbServer = builder.AddPostgres("dbServer", password: dbPassword)
16+
.WithImageTag("16.4")
1617
.WithPgAdmin()
1718
.WithDataVolume("tagzapp-dev");
1819

‎src/TagzApp.Blazor.Client/Components/Admin/AzureQueue.Config.Ui.razor‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@using System.ComponentModel.DataAnnotations
22
@inject ToastService ToastService
3+
@inject IConfigureTagzApp Config
34

45
<UiProviderConfig ProviderName="AzureQueue" Health="@Health" ProviderIconCssClass="bi-globe2">
56

@@ -36,7 +37,7 @@
3637

3738
protected override async Task OnParametersSetAsync()
3839
{
39-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
40+
var providerConfiguration = await Provider.GetConfiguration(Config);
4041

4142
Model = new ViewModel
4243
{
@@ -52,12 +53,12 @@
5253
private async Task SaveConfig()
5354
{
5455

55-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
56+
var providerConfiguration = await Provider.GetConfiguration(Config);
5657

5758
providerConfiguration.SetConfigurationByKey("QueueConnectionString", Model.QueueConnectionString);
5859
providerConfiguration.SetConfigurationByKey("Enabled", Model.Enabled.ToString());
5960

60-
await Provider.SaveConfiguration(ConfigureTagzAppFactory.Current, providerConfiguration);
61+
await Provider.SaveConfiguration(Config, providerConfiguration);
6162
ToastService.Add($"Saved {providerConfiguration.Name} Configuration", MessageSeverity.Success);
6263
}
6364

‎src/TagzApp.Blazor.Client/Components/Admin/Blazot.Config.Ui.razor‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@using System.ComponentModel.DataAnnotations
22
@using System.Text.Json
3+
@inject IConfigureTagzApp Config
34

45
<UiProviderConfig ProviderName="Blazot" Health="@_Health" ProviderIconCssClass="bi-blazot">
56
<EditForm Model="_Model" OnValidSubmit="SaveConfigAsync">
@@ -64,7 +65,7 @@
6465

6566
protected override async Task OnParametersSetAsync()
6667
{
67-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
68+
var providerConfiguration = await Provider.GetConfiguration(Config);
6869
var headers = providerConfiguration.GetConfigurationByKey("DefaultHeaders");
6970
var headerDictionary = JsonSerializer.Deserialize<Dictionary<string, string>>(headers) ?? new Dictionary<string, string>();
7071
int.TryParse(providerConfiguration.GetConfigurationByKey(nameof(_Model.WindowRequests)), out var windowRequests);
@@ -91,7 +92,7 @@
9192

9293
private async Task SaveConfigAsync()
9394
{
94-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
95+
var providerConfiguration = await Provider.GetConfiguration(Config);
9596

9697
_Model.DefaultHeaders.Remove(string.Empty);
9798

@@ -105,7 +106,7 @@
105106
providerConfiguration.SetConfigurationByKey(nameof(_Model.UseHttp2), _Model.UseHttp2.ToString());
106107
providerConfiguration.SetConfigurationByKey(nameof(_Model.Enabled), _Model.Enabled.ToString());
107108

108-
await Provider.SaveConfiguration(ConfigureTagzAppFactory.Current, providerConfiguration);
109+
await Provider.SaveConfiguration(Config, providerConfiguration);
109110
ToastService.Add($"Saved {providerConfiguration.Name} Configuration", MessageSeverity.Success);
110111
}
111112

‎src/TagzApp.Blazor.Client/Components/Admin/Bluesky.Config.Ui.razor‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@using System.ComponentModel.DataAnnotations
22
@using System.Text.Json
33
@inject ToastService ToastService
4+
@inject IConfigureTagzApp Config
5+
46

57
<UiProviderConfig ProviderName="Bluesky" Health="@Health" ProviderIconCssClass="icon-bluesky">
68

@@ -33,7 +35,7 @@
3335
protected override async Task OnParametersSetAsync()
3436
{
3537

36-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
38+
var providerConfiguration = await Provider.GetConfiguration(Config);
3739

3840
var headers = providerConfiguration.GetConfigurationByKey("DefaultHeaders");
3941
var headerDictionary = string.IsNullOrEmpty(headers) ? new() : JsonSerializer.Deserialize<Dictionary<string, string>>(headers);
@@ -50,11 +52,11 @@
5052

5153
private async Task SaveConfig()
5254
{
53-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
55+
var providerConfiguration = await Provider.GetConfiguration(Config);
5456

5557
providerConfiguration.SetConfigurationByKey("Enabled", Model.Enabled.ToString());
5658

57-
await Provider.SaveConfiguration(ConfigureTagzAppFactory.Current, providerConfiguration);
59+
await Provider.SaveConfiguration(Config, providerConfiguration);
5860
ToastService.Add($"Saved {providerConfiguration.Name} Configuration", MessageSeverity.Success);
5961

6062
// Update the health of the service after changes applied

‎src/TagzApp.Blazor.Client/Components/Admin/Mastodon.Config.Ui.razor‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@using System.ComponentModel.DataAnnotations
22
@using System.Text.Json
33
@inject ToastService ToastService
4+
@inject IConfigureTagzApp Config
5+
46

57
<UiProviderConfig ProviderName="Mastodon" Health="@Health" ProviderIconCssClass="bi-mastodon">
68

@@ -53,7 +55,7 @@
5355
protected override async Task OnParametersSetAsync()
5456
{
5557

56-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
58+
var providerConfiguration = await Provider.GetConfiguration(Config);
5759

5860
var headers = providerConfiguration.GetConfigurationByKey("DefaultHeaders");
5961
var headerDictionary = string.IsNullOrEmpty(headers) ? new() : JsonSerializer.Deserialize<Dictionary<string, string>>(headers);
@@ -76,7 +78,7 @@
7678
private async Task SaveConfig()
7779
{
7880

79-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
81+
var providerConfiguration = await Provider.GetConfiguration(Config);
8082

8183
Model.DefaultHeaders.Remove(string.Empty);
8284

@@ -86,7 +88,7 @@
8688
providerConfiguration.SetConfigurationByKey("UseHttp2", Model.UseHttp2.ToString());
8789
providerConfiguration.SetConfigurationByKey("Enabled", Model.Enabled.ToString());
8890

89-
await Provider.SaveConfiguration(ConfigureTagzAppFactory.Current, providerConfiguration);
91+
await Provider.SaveConfiguration(Config, providerConfiguration);
9092
ToastService.Add($"Saved {providerConfiguration.Name} Configuration", MessageSeverity.Success);
9193
}
9294

‎src/TagzApp.Blazor.Client/Components/Admin/TwitchChat.Config.Ui.razor‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
@inject ToastService ToastService
33
@inject HttpClient Http
44
@inject NavigationManager NavMgr
5-
@inject IConfiguration Config
5+
@inject IConfigureTagzApp Config
6+
@inject IConfiguration Configuration
67

78
<UiProviderConfig ProviderName="TwitchChat" Health="@Health" ProviderIconCssClass="bi-twitch">
89

@@ -74,7 +75,7 @@
7475
{
7576

7677
// Twitch Relay URI
77-
var twitchRelayUri = new Uri(new Uri(Config["TwitchRelayUri"]), "/api/GetLoginUrl");
78+
var twitchRelayUri = new Uri(new Uri(Configuration["TwitchRelayUri"]), "/api/GetLoginUrl");
7879
Console.WriteLine($"BaseUrl: {NavMgr.BaseUri}");
7980

8081
try
@@ -94,7 +95,7 @@
9495
protected override async Task OnParametersSetAsync()
9596
{
9697

97-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
98+
var providerConfiguration = await Provider.GetConfiguration(Config);
9899

99100
Model = new ViewModel
100101
{
@@ -113,14 +114,14 @@
113114
private async Task SaveConfig()
114115
{
115116

116-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
117+
var providerConfiguration = await Provider.GetConfiguration(Config);
117118

118119
providerConfiguration.SetConfigurationByKey("ChatBotName", Model.ChatBotName);
119120
providerConfiguration.SetConfigurationByKey("OAuthToken", Model.OAuthToken);
120121
providerConfiguration.SetConfigurationByKey("ChannelName", Model.ChannelName);
121122
providerConfiguration.SetConfigurationByKey("Enabled", Model.Enabled.ToString());
122123

123-
await Provider.SaveConfiguration(ConfigureTagzAppFactory.Current, providerConfiguration);
124+
await Provider.SaveConfiguration(Config, providerConfiguration);
124125
ToastService.Add($"Saved {providerConfiguration.Name} Configuration", MessageSeverity.Success);
125126

126127
// get the new health status

‎src/TagzApp.Blazor.Client/Components/Admin/Twitter.Config.Ui.razor‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@using System.ComponentModel.DataAnnotations
22
@using System.Text.Json
33
@inject ToastService ToastService
4+
@inject IConfigureTagzApp Config
5+
46

57
<UiProviderConfig ProviderName="Twitter" Health="@Health" ProviderIconCssClass="bi-twitter-x">
68

@@ -53,7 +55,7 @@
5355
protected override async Task OnParametersSetAsync()
5456
{
5557

56-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
58+
var providerConfiguration = await Provider.GetConfiguration(Config);
5759

5860
var headers = providerConfiguration.GetConfigurationByKey("DefaultHeaders");
5961
var headerDictionary = string.IsNullOrEmpty(headers) ? new() : JsonSerializer.Deserialize<Dictionary<string, string>>(headers);
@@ -76,7 +78,7 @@
7678
private async Task SaveConfig()
7779
{
7880

79-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
81+
var providerConfiguration = await Provider.GetConfiguration(Config);
8082

8183
Model.DefaultHeaders.Remove(string.Empty);
8284

@@ -86,7 +88,7 @@
8688
providerConfiguration.SetConfigurationByKey("UseHttp2", Model.UseHttp2.ToString());
8789
providerConfiguration.SetConfigurationByKey("Enabled", Model.Enabled.ToString());
8890

89-
await Provider.SaveConfiguration(ConfigureTagzAppFactory.Current, providerConfiguration);
91+
await Provider.SaveConfiguration(Config, providerConfiguration);
9092
ToastService.Add($"Saved {providerConfiguration.Name} Configuration", MessageSeverity.Success);
9193
}
9294

‎src/TagzApp.Blazor.Client/Components/Admin/YouTubeChat.Config.Ui.razor‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@using System.ComponentModel.DataAnnotations
22
@using System.Text.Json
33
@inject ToastService ToastService
4+
@inject IConfigureTagzApp Config
45

56
<UiProviderConfig ProviderName="YouTubeChat" Health="@Health" ProviderIconCssClass="bi-youtube">
67

@@ -37,7 +38,7 @@
3738
protected override async Task OnParametersSetAsync()
3839
{
3940

40-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
41+
var providerConfiguration = await Provider.GetConfiguration(Config);
4142

4243
Model = new ViewModel
4344
{
@@ -56,12 +57,12 @@
5657
private async Task SaveConfig()
5758
{
5859

59-
var providerConfiguration = await Provider.GetConfiguration(ConfigureTagzAppFactory.Current);
60+
var providerConfiguration = await Provider.GetConfiguration(Config);
6061

6162
providerConfiguration.SetConfigurationByKey("YouTubeApiKey", Model.YouTubeApiKey);
6263
providerConfiguration.SetConfigurationByKey("Enabled", Model.Enabled.ToString());
6364

64-
await Provider.SaveConfiguration(ConfigureTagzAppFactory.Current, providerConfiguration);
65+
await Provider.SaveConfiguration(Config, providerConfiguration);
6566
ToastService.Add($"Saved {providerConfiguration.Name} Configuration", MessageSeverity.Success);
6667
}
6768

‎src/TagzApp.Blazor.Client/TagzApp.Blazor.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Using Include="TagzApp.Common.Models" />
2323
</ItemGroup>
2424
<ItemGroup>
25-
<ProjectReference Include="..\TagzApp.Common\TagzApp.Common.csproj" />
25+
<ProjectReference Include="..\TagzApp.Common.Client\TagzApp.Common.Client.csproj" />
2626
<ProjectReference Include="..\TagzApp.Components\TagzApp.Components.csproj" />
2727
<ProjectReference Include="..\TagzApp.ViewModels\TagzApp.ViewModels.csproj" />
2828
</ItemGroup>

0 commit comments

Comments
 (0)