Skip to content

Commit 9f19634

Browse files
committedJun 29, 2024·
fix coding style
1 parent 01d2723 commit 9f19634

File tree

7 files changed

+15
-27
lines changed

7 files changed

+15
-27
lines changed
 

‎.editorconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ csharp_indent_labels = one_less_than_current
1818

1919
# Newline options
2020
csharp_new_line_before_open_brace = none
21-
csharp_new_line_before_else = true
22-
csharp_new_line_before_catch = true
21+
csharp_new_line_before_else = false
22+
csharp_new_line_before_catch = false
2323
csharp_new_line_before_finally = true
2424
csharp_new_line_within_parenthesized_expression = true
2525
csharp_preserve_single_line_blocks = true

‎BlazorApp.Client/_Imports.razor

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
@using Microsoft.JSInterop
99
@using BlazorApp.Client
1010
@using BlazorApp.Client.Layout
11+
@using BlazorApp.Shared

‎BlazorApp.Server/Controllers/DataverseController.cs

+5-10
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,23 @@
33
using Microsoft.AspNetCore.Mvc;
44
using Microsoft.Extensions.Logging;
55

6-
namespace BlazorApp.Server.Controllers
7-
{
6+
namespace BlazorApp.Server.Controllers {
87
[ApiController]
98
[Route("api/[controller]")]
10-
public class DataverseController : ControllerBase
11-
{
9+
public class DataverseController : ControllerBase {
1210
private readonly DataverseService _dataverseService;
1311
private readonly ILogger<DataverseController> _logger;
1412

15-
public DataverseController(DataverseService dataverseService, ILogger<DataverseController> logger)
16-
{
13+
public DataverseController(DataverseService dataverseService, ILogger<DataverseController> logger) {
1714
_dataverseService = dataverseService;
1815
_logger = logger;
1916
}
2017

2118
[HttpGet("fetchUserId")]
22-
public async Task<IActionResult> FetchUserId()
23-
{
19+
public async Task<IActionResult> FetchUserId() {
2420
_logger.LogInformation("Fetching user ID from Dataverse.");
2521
var userId = await _dataverseService.FetchUserId();
26-
if (userId == Guid.Empty)
27-
{
22+
if (userId == Guid.Empty) {
2823
_logger.LogError("Failed to fetch user ID.");
2924
return StatusCode(500, "Failed to fetch user ID.");
3025
}

‎BlazorApp.Server/Controllers/ExcelController.cs

-1
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,3 @@ public IActionResult ExportToExcel([FromQuery] string filename, [FromBody] List<
5858
}
5959
}
6060
}
61-

‎BlazorApp.Server/Program.cs

+2-5
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,12 @@
2323
var app = builder.Build();
2424

2525
// Configure the HTTP request pipeline.
26-
if (app.Environment.IsDevelopment())
27-
{
26+
if (app.Environment.IsDevelopment()) {
2827
app.UseDeveloperExceptionPage();
2928

3029
app.UseSwagger();
3130
app.UseSwaggerUI();
32-
}
33-
else
34-
{
31+
} else {
3532
app.UseExceptionHandler("/Error");
3633
app.UseHsts();
3734
}

‎BlazorApp.Server/Services/DataverseService.cs

+3-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public DataverseService(ILogger<DataverseService> logger, HttpClient httpClient,
3030
_scopes = new[] { resource + "/user_impersonation" };
3131

3232
_httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
33-
_httpClient.BaseAddress = new Uri("https://org22ddaee2.api.crm7.dynamics.com/api/data/v9.2/");
33+
_httpClient.BaseAddress = new Uri("https://6e450aad.api.crm7.dynamics.com/api/data/v9.2/");
3434
_httpClient.Timeout = new TimeSpan(0, 2, 0);
3535

3636
_httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
@@ -59,8 +59,7 @@ public async Task<Guid> FetchUserId() {
5959
_logger.LogInformation($"User ID: {userId}");
6060
return userId;
6161
}
62-
}
63-
else {
62+
} else {
6463
_logger.LogError($"Web API call failed. Reason: {response.ReasonPhrase}");
6564
return Guid.Empty;
6665
}
@@ -84,8 +83,7 @@ private async Task<AuthenticationResult> GetTokenAsync() {
8483
var accounts = await _authBuilder.GetAccountsAsync();
8584
tokenResult = await _authBuilder.AcquireTokenSilent(_scopes, accounts.FirstOrDefault()).ExecuteAsync();
8685
_logger.LogInformation("Token acquired silently.");
87-
}
88-
catch (MsalUiRequiredException) {
86+
} catch (MsalUiRequiredException) {
8987
tokenResult = await _authBuilder.AcquireTokenInteractive(_scopes).ExecuteAsync();
9088
_logger.LogInformation("Token acquired interactively.");
9189
}

‎BlazorApp.Shared/DataverseResponse.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using System;
22

3-
namespace BlazorApp.Shared
4-
{
5-
public class DataverseResponse
6-
{
3+
namespace BlazorApp.Shared {
4+
public class DataverseResponse {
75
public Guid BusinessUnitId { get; set; }
86
public Guid UserId { get; set; }
97
public Guid OrganizationId { get; set; }

0 commit comments

Comments
 (0)
Please sign in to comment.