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.

Sign up for GitHub

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

Jump to bottom

Fix several small issues across Boilerplate (#9083) #9084

Merged
merged 1 commit into from
Nov 1, 2024
Merged

Fix several small issues across Boilerplate (#9083) #9084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
//#if (api == "Integrated")
"ServerAddress": "/",
"ServerAddress": "http://localhost:5030/",
//#endif
//#if (IsInsideProjectTemplate)
/*
Expand Down
1 change: 1 addition & 0 deletions ...plate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<BitText>App Name: <b>@appName</b></BitText>
<BitText>App Version: <b>@appVersion</b></BitText>
<BitText>OS: <b>@os</b></BitText>
<BitText>Web View: <b>@webView</b></BitText>
<BitText>OEM: <b>@oem</b></BitText>
<BitText>Environment: <b>@AppEnvironment.Current</b></BitText>
<BitText>Process Id: <b>@processId</b></BitText>
Expand Down
4 changes: 3 additions & 1 deletion ...te/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public partial class AboutPage
private string appVersion = default!;
private string processId = default!;
private string os = default!;
private string webView = default!;
private string oem = default!;

protected async override Task OnInitAsync()
Expand All @@ -23,7 +24,8 @@ protected async override Task OnInitAsync()
// https://stackoverflow.com/a/2941199/2720104
appName = AppInfo.Name;
appVersion = telemetryContext.AppVersion!;
os = $"{telemetryContext.OS} {telemetryContext.WebView}";
os = telemetryContext.OS!;
webView = telemetryContext.WebView!;
processId = Environment.ProcessId.ToString();
oem = DeviceInfo.Current.Manufacturer;

Expand Down
2 changes: 1 addition & 1 deletion ...es/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static void ConfigureServices(this MauiAppBuilder builder)
//#if (appCenter == true)
if (Microsoft.AppCenter.AppCenter.Configured)
{
builder.Logging.AddAppCenter(options => { });
builder.Logging.AddAppCenter(options => options.IncludeScopes = true);
msynk marked this conversation as resolved.
Show resolved Hide resolved
}
//#endif

Expand Down
9 changes: 9 additions & 0 deletions ...ilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/appsettings.Development.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
{
"Logging": {
//#if (appCenter == true)
"AppCenterLoggerProvider": {
"LogLevel": {
"Default": "Information"
}
}
//#endif
},
"$schema": "https://json.schemastore.org/appsettings.json"
}
1 change: 1 addition & 0 deletions ...te/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Components/Pages/AboutPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<BitText>App Name: <b>@appName</b></BitText>
<BitText>App Version: <b>@appVersion</b></BitText>
<BitText>OS: <b>@os</b></BitText>
<BitText>Web View: <b>@webView</b></BitText>
<BitText>Environment: <b>@AppEnvironment.Current</b></BitText>
<BitText>Process Id: <b>@processId</b></BitText>
</BitStack>
Expand Down
4 changes: 3 additions & 1 deletion ...Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Components/Pages/AboutPage.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public partial class AboutPage
private string appName = default!;
private string appVersion = default!;
private string os = default!;
private string webView = default!;
private string processId = default!;


Expand All @@ -21,7 +22,8 @@ protected override async Task OnInitAsync()
var asm = typeof(AboutPage).Assembly;
appName = asm.GetCustomAttribute<AssemblyTitleAttribute>()!.Title;
appVersion = telemetryContext.AppVersion!;
os = $"{telemetryContext.OS} {telemetryContext.WebView}";
os = telemetryContext.OS!;
webView = telemetryContext.WebView!;
processId = Environment.ProcessId.ToString();

await base.OnInitAsync();
Expand Down
2 changes: 1 addition & 1 deletion ...tes/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.Services.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static void AddClientWindowsProjectServices(this IServiceCollection servi
//#if (appCenter == true)
if (Microsoft.AppCenter.AppCenter.Configured)
{
loggingBuilder.AddAppCenter(options => { });
loggingBuilder.AddAppCenter(options => options.IncludeScopes = true);
msynk marked this conversation as resolved.
Show resolved Hide resolved
}
//#endif
//#if (appInsights == true)
Expand Down
5 changes: 4 additions & 1 deletion .../Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/UserController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,10 @@ public async Task<TwoFactorAuthResponseDto> TwoFactorAuth(TwoFactorAuthRequestDt
var unformattedKey = await userManager.GetAuthenticatorKeyAsync(user);
if (string.IsNullOrEmpty(unformattedKey))
{
await userManager.ResetAuthenticatorKeyAsync(user);
IUserAuthenticatorKeyStore<User> userAuthenticatorKeyStore = (IUserAuthenticatorKeyStore<User>)userStore;
await userAuthenticatorKeyStore.SetAuthenticatorKeyAsync(user,
userManager.GenerateNewAuthenticatorKey(), cancellationToken);
await userStore.UpdateAsync(user, cancellationToken);
msynk marked this conversation as resolved.
Show resolved Hide resolved
unformattedKey = await userManager.GetAuthenticatorKeyAsync(user);

if (string.IsNullOrEmpty(unformattedKey))
Expand Down
7 changes: 0 additions & 7 deletions src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.Development.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
"LogLevel": {
"Default": "Information"
},
//#if (appCenter == true)
"AppCenterLoggerProvider": {
"LogLevel": {
"Default": "Information"
}
},
//#endif
//#if (appInsights == true)
"ApplicationInsights": {
"LogLevel": {
Expand Down
Loading