Browse Source

Code format changes.

ipaddr
Halil İbrahim Kalkan 5 years ago
parent
commit
0453e1e53b
  1. 23
      apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbpAuthServerModule.cs
  2. 12
      apps/auth-server/src/EShopOnAbp.AuthServer/EShopUserClaimsPrincipalFactory.cs

23
apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbpAuthServerModule.cs

@ -31,7 +31,6 @@ using Volo.Abp.Emailing;
using Volo.Abp.EventBus.RabbitMq;
using Volo.Abp.IdentityServer;
using Volo.Abp.Modularity;
using Volo.Abp.MultiTenancy;
using Volo.Abp.UI.Navigation.Urls;
using Volo.Abp.VirtualFileSystem;
@ -68,7 +67,7 @@ namespace EShopOnAbp.AuthServer
PreConfigure<IIdentityServerBuilder>(builder =>
{
builder.AddSigningCredential(GetSigningCertificate(hostingEnvironment, configuration));
builder.AddSigningCredential(GetSigningCertificate(hostingEnvironment));
});
}
}
@ -189,7 +188,6 @@ namespace EShopOnAbp.AuthServer
app.UseStaticFiles();
app.UseRouting();
app.UseCors();
// app.UseHttpMetrics();
app.UseAuthentication();
app.UseJwtTokenMiddleware();
app.UseAbpSerilogEnrichers();
@ -204,16 +202,13 @@ namespace EShopOnAbp.AuthServer
options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
});
app.UseAuditing();
app.UseConfiguredEndpoints(endpoints =>
{
// endpoints.MapMetrics();
});
app.UseConfiguredEndpoints();
}
private X509Certificate2 GetSigningCertificate(IWebHostEnvironment hostingEnv, IConfiguration configuration)
private X509Certificate2 GetSigningCertificate(IWebHostEnvironment hostingEnv)
{
var fileName = "eshoponabp-authserver.pfx";
var passPhrase = "780F3C11-0A96-40DE-B335-9848BE88C77D";
const string fileName = "eshoponabp-authserver.pfx";
const string passPhrase = "780F3C11-0A96-40DE-B335-9848BE88C77D";
var file = Path.Combine(hostingEnv.ContentRootPath, fileName);
if (!File.Exists(file))
@ -229,9 +224,13 @@ namespace EShopOnAbp.AuthServer
SwaggerWithAuthConfigurationHelper.Configure(
context: context,
authority: configuration["AuthServer:Authority"],
scopes: new Dictionary<string, string> /* Requested scopes for authorization code request and descriptions for swagger UI only */
scopes: new Dictionary<string, string>
{
{"AccountService", "Account Service API"},
/* Requested scopes for authorization code request and descriptions for swagger UI only */
{
"AccountService",
"Account Service API"
},
},
apiTitle: "Account Service API"
);

12
apps/auth-server/src/EShopOnAbp.AuthServer/EShopUserClaimsPrincipalFactory.cs

@ -48,15 +48,16 @@ public class EShopUserClaimsPrincipalFactory : AbpUserClaimsPrincipalFactory
public override async Task<ClaimsPrincipal> CreateAsync(IdentityUser user)
{
var principal = await base.CreateAsync(user);
if (HttpContext.Request.Cookies.ContainsKey(EShopConstants.AnonymousUserClaimName))
{
HttpContext.Request.Cookies.TryGetValue(EShopConstants.AnonymousUserClaimName, out var anonymousUserId);
await _cache.SetAsync(user.Id, new AnonymousUserItem {AnonymousUserId = anonymousUserId},
options: new DistributedCacheEntryOptions()
{
AbsoluteExpiration = DateTimeOffset.UtcNow.AddSeconds(60)
});
_logger.LogInformation($"Cached anonymousUserId:{anonymousUserId}.");
}
@ -68,8 +69,13 @@ public class EShopUserClaimsPrincipalFactory : AbpUserClaimsPrincipalFactory
}
_logger.LogInformation($"Retrieved anonymousUserId:{cachedItem.AnonymousUserId} from cache.");
principal.Identities.First()
.AddClaim(new Claim(EShopConstants.AnonymousUserClaimName, cachedItem.AnonymousUserId));
principal.Identities.First().AddClaim(
new Claim(
EShopConstants.AnonymousUserClaimName,
cachedItem.AnonymousUserId
)
);
return principal;
}

Loading…
Cancel
Save