mirror of https://github.com/abpframework/abp.git
Mon
8 years ago
committed by
GitHub
GitHub
144 changed files with 1543 additions and 703 deletions
@ -0,0 +1,28 @@ |
|||
using Serilog.Core; |
|||
using Serilog.Events; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Tracing; |
|||
|
|||
namespace Volo.AbpWebSite |
|||
{ |
|||
//This is for trial for now
|
|||
public class CorrelationIdLogEventEnricher : ILogEventEnricher, ITransientDependency |
|||
{ |
|||
private readonly ICorrelationIdProvider _correlationIdProvider; |
|||
|
|||
public CorrelationIdLogEventEnricher(ICorrelationIdProvider correlationIdProvider) |
|||
{ |
|||
_correlationIdProvider = correlationIdProvider; |
|||
} |
|||
|
|||
public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory) |
|||
{ |
|||
logEvent.AddOrUpdateProperty( |
|||
new LogEventProperty( |
|||
"CorrelationId", |
|||
new ScalarValue("CorrId:" + _correlationIdProvider.Get()) |
|||
) |
|||
); |
|||
} |
|||
} |
|||
} |
|||
@ -1,50 +0,0 @@ |
|||
# COMMON PATHS |
|||
|
|||
$buildFolder = (Get-Item -Path "./" -Verbose).FullName |
|||
$slnFolder = Join-Path $buildFolder "../" |
|||
$outputFolder = Join-Path $buildFolder "outputs" |
|||
$abpDeskFolder = Join-Path $slnFolder "src/AbpDesk" |
|||
$abpDeskWebFolder = Join-Path $abpDeskFolder "AbpDesk.Web.Mvc" |
|||
|
|||
## CLEAR ###################################################################### |
|||
|
|||
Remove-Item $outputFolder -Force -Recurse |
|||
New-Item -Path $outputFolder -ItemType Directory |
|||
|
|||
## RESTORE NUGET PACKAGES ##################################################### |
|||
|
|||
Set-Location $slnFolder |
|||
dotnet restore |
|||
|
|||
## PUBLISH ASPDESK WEB ######################################################## |
|||
|
|||
Set-Location $abpDeskWebFolder |
|||
dotnet publish --output (Join-Path $outputFolder "AbpDesk/Web") |
|||
|
|||
New-Item -Path (Join-Path $outputFolder "AbpDesk/Web/PlugIns") -ItemType Directory |
|||
Copy-Item (Join-Path $abpDeskFolder "Web_PlugIns/*") (Join-Path $outputFolder "AbpDesk/Web/PlugIns/") |
|||
|
|||
## PUBLISH IDENTITY HTTP API HOST ############################################# |
|||
|
|||
Set-Location (Join-Path $slnFolder "src/Volo.Abp.Identity.HttpApi.Host") |
|||
dotnet publish --output (Join-Path $outputFolder "AbpIdentity/HttpApiHost") |
|||
|
|||
## CREATE DOCKER IMAGES ####################################################### |
|||
|
|||
Set-Location (Join-Path $outputFolder "AbpDesk/Web") |
|||
|
|||
docker rmi abpdesk/web -f |
|||
docker build -t abpdesk/web . |
|||
|
|||
Set-Location (Join-Path $outputFolder "AbpIdentity/HttpApiHost") |
|||
|
|||
docker rmi abpidentity/httpapihost -f |
|||
docker build -t abpidentity/httpapihost . |
|||
|
|||
## DOCKER COMPOSE FILES ####################################################### |
|||
|
|||
Copy-Item (Join-Path $slnFolder "docker/*.*") $outputFolder |
|||
|
|||
## FINALIZE ################################################################### |
|||
|
|||
Set-Location $outputFolder |
|||
@ -1,28 +0,0 @@ |
|||
version: '2' |
|||
|
|||
services: |
|||
|
|||
mongodb: |
|||
image: tutum/mongodb |
|||
environment: |
|||
- AUTH=no |
|||
ports: |
|||
- "27017:27017" |
|||
- "28017:28017" |
|||
|
|||
abpidentity_httpapihost: |
|||
image: abpidentity/httpapihost |
|||
environment: |
|||
- ASPNETCORE_ENVIRONMENT=Staging |
|||
|
|||
abpdesk_web: |
|||
image: abpdesk/web |
|||
environment: |
|||
- ASPNETCORE_ENVIRONMENT=Staging |
|||
|
|||
load_balancer: |
|||
image: haproxy:1.7.1 |
|||
volumes: |
|||
- "./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg" |
|||
ports: |
|||
- "9005:8080" |
|||
@ -1 +0,0 @@ |
|||
docker-compose down -v --rmi local |
|||
@ -1,18 +0,0 @@ |
|||
global |
|||
maxconn 4096 |
|||
|
|||
defaults |
|||
mode http |
|||
timeout connect 5s |
|||
timeout client 50s |
|||
timeout server 50s |
|||
|
|||
listen http-in |
|||
bind *:8080 |
|||
|
|||
server web-1 outputs_abpdesk_web_1:80 |
|||
server web-2 outputs_abpdesk_web_2:80 |
|||
|
|||
stats enable |
|||
stats uri /haproxy |
|||
stats refresh 1s |
|||
@ -1,8 +0,0 @@ |
|||
docker rm $(docker ps -aq) |
|||
docker-compose up -d mongodb |
|||
docker-compose up -d abpidentity_httpapihost |
|||
docker-compose up -d abpdesk_web |
|||
sleep 2 |
|||
docker-compose scale abpdesk_web=2 |
|||
sleep 2 |
|||
docker-compose up -d load_balancer |
|||
@ -0,0 +1,54 @@ |
|||
# Microservice Demo, Projects Status and Road Map |
|||
|
|||
After [the first announcement](https://abp.io/blog/abp/Abp-vNext-Announcement) on the ABP vNext, we have a lot of improvements on the codebase (1100+ commits on the [GitHub repository](https://github.com/abpframework/abp)). We've created features, samples, documentation and much more. In this post, I want to inform you about some news and the status of the project. |
|||
|
|||
## Microservice Demo Solution |
|||
|
|||
One of the major goals of the ABP framework is to provide a [convenient infrastructure to create microservice solutions](https://abp.io/documents/abp/latest/Microservice-Architecture). |
|||
|
|||
We've been working to develop a microservice solution demo. Initial version was completed and [documented](https://abp.io/documents/abp/latest/Samples/Microservice-Demo). This sample solution aims to demonstrate a simple yet complete microservice solution; |
|||
|
|||
- Has multiple, independent, self-deployable **microservices**. |
|||
- Multiple **web applications**, each uses a different API gateway. |
|||
- Has multiple **gateways** / BFFs (Backend for Frontends) developed using the [Ocelot](https://github.com/ThreeMammals/Ocelot) library. |
|||
- Has an **authentication service** developed using the [IdentityServer](https://identityserver.io/) framework. It's also a SSO (Single Sign On) application with necessary UIs. |
|||
- Has **multiple databases**. Some microservices has their own database while some services/applications shares a database (to demonstrate different use cases). |
|||
- Has different types of databases: **SQL Server** (with **Entity Framework Core** ORM) and **MongoDB**. |
|||
- Has a **console application** to show the simplest way of using a service by authenticating. |
|||
- Uses [Redis](https://redis.io/) for **distributed caching**. |
|||
- Uses [RabbitMQ](https://www.rabbitmq.com/) for service-to-service **messaging**. |
|||
- Uses [Docker](https://www.docker.com/) & [Kubernates](https://kubernetes.io/) to **deploy** & run all services and applications. |
|||
- Uses [Elasticsearch](https://www.elastic.co/products/elasticsearch) & [Kibana](https://www.elastic.co/products/kibana) to store and visualize the logs (written using [Serilog](https://serilog.net/)). |
|||
|
|||
See [its documentation](https://abp.io/documents/abp/latest/Samples/Microservice-Demo) for a detailed explanation of the solution. |
|||
|
|||
## Improvements/Features |
|||
|
|||
We've worked on so many features including **distributed event bus** (with RabbitMQ integration), **IdentityServer4 integration** and enhancements for almost all features. We are continuously refactoring and adding tests to make the framework more stable and production ready. It is [rapidly growing](https://github.com/abpframework/abp/graphs/contributors). |
|||
|
|||
## Road Map |
|||
|
|||
There are still too much work to be done before the first stable release (v1.0). You can see [prioritized backlog items](https://github.com/abpframework/abp/issues?q=is%3Aopen+is%3Aissue+milestone%3ABacklog) on the GitHub repo. |
|||
|
|||
According to our estimation, we have planned to release v1.0 in Q2 of 2019 (probably in May or June). So, not too much time to wait. We are also very excited for the first stable release. |
|||
|
|||
We will also work on [the documentation](https://abp.io/documents/abp/latest) since it is far from complete now. |
|||
|
|||
First release may not include a SPA template. However, we want to prepare a simple one if it can be possible. Haven't decided yet about the SPA framework. Alternatives: **Angular, React and Blazor**. Please write your thought as a comment to this post. |
|||
|
|||
## Chinese Web Site |
|||
|
|||
There is a big ABP community in China. They have created a Chinese version of the abp.io web site: https://cn.abp.io/ They are keeping it up to date. Thanks to the Chinese developers and especially to [Liming Ma](https://github.com/maliming). |
|||
|
|||
## NDC {London} 2019 |
|||
|
|||
It was a pleasure to be in [NDC {London}](https://ndc-london.com/) 2019 as a partner. We've talked to many developers about the current ASP.NET Boilerplate and the ABP vNext and we got good feedbacks. |
|||
|
|||
We also had a chance to talk with [Scott Hanselman](https://twitter.com/shanselman) and [Jon Galloway](https://twitter.com/jongalloway). They visited our booth and we talked about the ideas for ABP vNext. They liked features, approaches and the goal of new ABP framework. See some photos and comments on twitter: |
|||
|
|||
 |
|||
|
|||
## Follow It |
|||
|
|||
* You can star and follow the **GitHub** repository: https://github.com/abpframework/abp |
|||
* You can follow the official **Twitter** account for news: https://twitter.com/abpframework |
|||
|
After Width: | Height: | Size: 477 KiB |
@ -1,14 +1,17 @@ |
|||
@using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.Components.TenantSwitch |
|||
@model TenantSwitchViewComponent.TenantSwitchViewModel |
|||
<li class="nav-item"> |
|||
<a abp-button="Link" id="TenantSwitchToolbarLink" href="#"> |
|||
@if (Model.Tenant == null) |
|||
{ |
|||
<text>@@host</text> |
|||
} |
|||
else |
|||
{ |
|||
<text>@@@Model.Tenant.Name</text> |
|||
} |
|||
</a> |
|||
</li> |
|||
@if (!Model.CurrentUser.IsAuthenticated) |
|||
{ |
|||
<li class="nav-item"> |
|||
<a abp-button="Link" id="TenantSwitchToolbarLink" href="#"> |
|||
@if (Model.Tenant == null) |
|||
{ |
|||
<text>@@host</text> |
|||
} |
|||
else |
|||
{ |
|||
<text>@@@Model.Tenant.Name</text> |
|||
} |
|||
</a> |
|||
</li> |
|||
} |
|||
@ -0,0 +1,12 @@ |
|||
using Volo.Abp.AspNetCore.Mvc.UI.Bundling; |
|||
|
|||
namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling |
|||
{ |
|||
public class BasicThemeGlobalScriptContributor : BundleContributor |
|||
{ |
|||
public override void ConfigureBundle(BundleConfigurationContext context) |
|||
{ |
|||
context.Files.Add("/themes/basic/layout.js"); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,36 @@ |
|||
@using Volo.Abp.UI.Navigation |
|||
@model ApplicationMenuItem |
|||
@{ |
|||
var elementId = string.IsNullOrEmpty(Model.ElementId) ? string.Empty : $"id=\"{Model.ElementId}\""; |
|||
var cssClass = string.IsNullOrEmpty(Model.CssClass) ? string.Empty : Model.CssClass; |
|||
var disabled = Model.IsDisabled ? "disabled" : string.Empty; |
|||
} |
|||
@if (Model.IsLeaf) |
|||
{ |
|||
@if (Model.Url != null) |
|||
{ |
|||
<a class="dropdown-item @cssClass @disabled" href="@(Model.Url ?? "#")" @Html.Raw(elementId)> |
|||
@Model.DisplayName |
|||
</a> |
|||
} |
|||
} |
|||
else |
|||
{ |
|||
<div class="dropdown-submenu"> |
|||
<a role="button" class="btn dropdown-toggle" data-toggle="dropdown" |
|||
aria-haspopup="true" aria-expanded="false"> |
|||
<span class="lp-icon"> |
|||
<i class="@(Model.Icon ?? "")"></i> |
|||
</span> |
|||
<span class="lp-text"> |
|||
@Model.DisplayName |
|||
</span> |
|||
</a> |
|||
<div class="dropdown-menu"> |
|||
@foreach (var childMenuItem in Model.Items) |
|||
{ |
|||
@await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem) |
|||
} |
|||
</div> |
|||
</div> |
|||
} |
|||
@ -0,0 +1,16 @@ |
|||
$(function () { |
|||
$('.dropdown-menu a.dropdown-toggle').on('click', function (e) { |
|||
if (!$(this).next().hasClass('show')) { |
|||
$(this).parents('.dropdown-menu').first().find('.show').removeClass("show"); |
|||
} |
|||
|
|||
var $subMenu = $(this).next(".dropdown-menu"); |
|||
$subMenu.toggleClass('show'); |
|||
|
|||
$(this).parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', function (e) { |
|||
$('.dropdown-submenu .show').removeClass("show"); |
|||
}); |
|||
|
|||
return false; |
|||
}); |
|||
}); |
|||
@ -0,0 +1,43 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Globalization; |
|||
using Volo.Abp.Reflection; |
|||
|
|||
namespace Volo.Abp.Data |
|||
{ |
|||
public static class HasExtraPropertiesExtensions |
|||
{ |
|||
public static bool HasProperty(this IHasExtraProperties source, string name) |
|||
{ |
|||
return source.ExtraProperties.ContainsKey(name); |
|||
} |
|||
|
|||
public static object GetProperty(this IHasExtraProperties source, string name) |
|||
{ |
|||
return source.ExtraProperties?.GetOrDefault(name); |
|||
} |
|||
|
|||
public static TProperty GetProperty<TProperty>(this IHasExtraProperties source, string name) |
|||
{ |
|||
var value = source.GetProperty(name); |
|||
if (value == default) |
|||
{ |
|||
return default; |
|||
} |
|||
|
|||
if (TypeHelper.IsPrimitiveExtended(typeof(TProperty), includeEnums: true)) |
|||
{ |
|||
return (TProperty)Convert.ChangeType(value, typeof(TProperty), CultureInfo.InvariantCulture); |
|||
} |
|||
|
|||
throw new AbpException("GetProperty<TProperty> does not support non-primitive types. Use non-generic GetProperty method and handle type casting manually."); |
|||
} |
|||
|
|||
public static TSource SetProperty<TSource>(this TSource source, string name, object value) |
|||
where TSource : IHasExtraProperties |
|||
{ |
|||
source.ExtraProperties[name] = value; |
|||
return source; |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,9 @@ |
|||
using Volo.Abp.TestApp.Testing; |
|||
|
|||
namespace Volo.Abp.EntityFrameworkCore.Domain |
|||
{ |
|||
public class ExtraProperties_Tests : ExtraProperties_Tests<AbpEntityFrameworkCoreTestModule> |
|||
{ |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,9 @@ |
|||
using Volo.Abp.TestApp.Testing; |
|||
|
|||
namespace Volo.Abp.MongoDB.Domain |
|||
{ |
|||
public class ExtraProperties_Tests : ExtraProperties_Tests<AbpMongoDbTestModule> |
|||
{ |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,53 @@ |
|||
using System.Threading.Tasks; |
|||
using Shouldly; |
|||
using Volo.Abp.Data; |
|||
using Volo.Abp.Modularity; |
|||
using Volo.Abp.TestApp.Domain; |
|||
using Xunit; |
|||
|
|||
namespace Volo.Abp.TestApp.Testing |
|||
{ |
|||
public abstract class ExtraProperties_Tests<TStartupModule> : TestAppTestBase<TStartupModule> |
|||
where TStartupModule : IAbpModule |
|||
{ |
|||
protected readonly ICityRepository CityRepository; |
|||
|
|||
protected ExtraProperties_Tests() |
|||
{ |
|||
CityRepository = GetRequiredService<ICityRepository>(); |
|||
} |
|||
|
|||
[Fact] |
|||
public async Task Should_Get_An_Extra_Property() |
|||
{ |
|||
var london = await CityRepository.FindByNameAsync("London"); |
|||
london.HasProperty("Population").ShouldBeTrue(); |
|||
london.GetProperty<int>("Population").ShouldBe(10_470_000); |
|||
} |
|||
|
|||
[Fact] |
|||
public async Task Should_Add_An_Extra_Property() |
|||
{ |
|||
var london = await CityRepository.FindByNameAsync("London"); |
|||
london.SetProperty("AreaAsKm", 1572); |
|||
await CityRepository.UpdateAsync(london); |
|||
|
|||
var london2 = await CityRepository.FindByNameAsync("London"); |
|||
london2.HasProperty("AreaAsKm").ShouldBeTrue(); |
|||
london2.GetProperty<int>("AreaAsKm").ShouldBe(1572); |
|||
} |
|||
|
|||
[Fact] |
|||
public async Task Should_Update_An_Existing_Extra_Property() |
|||
{ |
|||
var london = await CityRepository.FindByNameAsync("London"); |
|||
|
|||
london.ExtraProperties["Population"] = 11_000_042; |
|||
await CityRepository.UpdateAsync(london); |
|||
|
|||
var london2 = await CityRepository.FindByNameAsync("London"); |
|||
london2.HasProperty("Population").ShouldBeTrue(); |
|||
london2.GetProperty<int>("Population").ShouldBe(11_000_042); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,113 @@ |
|||
@page |
|||
@using Volo.Abp.Account.Web.Pages |
|||
@using Volo.Abp.Account.Web.Pages.Account |
|||
@model ConsentModel |
|||
<abp-card id="IdentityServerConsentWrapper"> |
|||
<abp-card-header> |
|||
<div class="row"> |
|||
<div class="col-md-12"> |
|||
<h2> |
|||
@if (Model.ClientInfo.ClientLogoUrl != null) |
|||
{ |
|||
<img src="@Model.ClientInfo.ClientLogoUrl"> |
|||
} |
|||
|
|||
@Model.ClientInfo.ClientName |
|||
<small>is requesting your permission</small> |
|||
</h2> |
|||
</div> |
|||
</div> |
|||
</abp-card-header> |
|||
<abp-card-body> |
|||
<form method="post" asp-page="/Consent"> |
|||
<input type="hidden" asp-for="ReturnUrl" /> |
|||
<input type="hidden" asp-for="ReturnUrlHash" /> |
|||
|
|||
<div>Uncheck the permissions you do not wish to grant.</div> |
|||
|
|||
@if (Model.ConsentInput.IdentityScopes.Any()) |
|||
{ |
|||
<h3>Personal Information</h3> |
|||
|
|||
<ul class="list-group"> |
|||
@for (var i = 0; i < Model.ConsentInput.IdentityScopes.Count; i++) |
|||
{ |
|||
<li class="list-group-item"> |
|||
<div class="form-check"> |
|||
<label asp-for="@Model.ConsentInput.IdentityScopes[i].Checked" class="form-check-label"> |
|||
<input asp-for="@Model.ConsentInput.IdentityScopes[i].Checked" class="form-check-input" /> |
|||
@Model.ConsentInput.IdentityScopes[i].DisplayName |
|||
@if (Model.ConsentInput.IdentityScopes[i].Required) |
|||
{ |
|||
<span><em>(required)</em></span> |
|||
} |
|||
</label> |
|||
</div> |
|||
<input asp-for="@Model.ConsentInput.IdentityScopes[i].Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@ |
|||
@if (Model.ConsentInput.IdentityScopes[i].Description != null) |
|||
{ |
|||
<div class="consent-description"> |
|||
@Model.ConsentInput.IdentityScopes[i].Description |
|||
</div> |
|||
} |
|||
</li> |
|||
} |
|||
</ul> |
|||
} |
|||
|
|||
@if (Model.ConsentInput.ApiScopes.Any()) |
|||
{ |
|||
<h3>Application Access</h3> |
|||
|
|||
<ul class="list-group"> |
|||
@for (var i = 0; i < Model.ConsentInput.ApiScopes.Count; i++) |
|||
{ |
|||
<li class="list-group-item"> |
|||
<div class="form-check"> |
|||
<label asp-for="@Model.ConsentInput.ApiScopes[i].Checked" class="form-check-label"> |
|||
<input asp-for="@Model.ConsentInput.ApiScopes[i].Checked" class="form-check-input" disabled="@Model.ConsentInput.ApiScopes[i].Required" /> |
|||
@Model.ConsentInput.ApiScopes[i].DisplayName |
|||
@if (Model.ConsentInput.ApiScopes[i].Required) |
|||
{ |
|||
<span><em>(required)</em></span> |
|||
} |
|||
</label> |
|||
</div> |
|||
<input asp-for="@Model.ConsentInput.ApiScopes[i].Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@ |
|||
@if (Model.ConsentInput.ApiScopes[i].Description != null) |
|||
{ |
|||
<div class="consent-description"> |
|||
@Model.ConsentInput.ApiScopes[i].Description |
|||
</div> |
|||
} |
|||
</li> |
|||
} |
|||
</ul> |
|||
} |
|||
|
|||
@if (Model.ClientInfo.AllowRememberConsent) |
|||
{ |
|||
<div class="form-check"> |
|||
<label asp-for="@Model.ConsentInput.RememberConsent" class="form-check-label"> |
|||
<input asp-for="@Model.ConsentInput.RememberConsent" class="form-check-input" /> |
|||
<strong>Remember My Decision</strong> |
|||
</label> |
|||
</div> |
|||
} |
|||
|
|||
<div> |
|||
<button name="UserDecision" value="yes" class="btn btn-primary" autofocus>Yes, Allow</button> |
|||
<button name="UserDecision" value="no" class="btn">No, Do Not Allow</button> |
|||
@if (Model.ClientInfo.ClientUrl != null) |
|||
{ |
|||
<a class="pull-right btn btn-secondary" target="_blank" href="@Model.ClientInfo.ClientUrl"> |
|||
<strong>@Model.ClientInfo.ClientName</strong> |
|||
</a> |
|||
} |
|||
</div> |
|||
|
|||
<div asp-validation-summary="All" class="text-danger"></div> |
|||
|
|||
</form> |
|||
</abp-card-body> |
|||
</abp-card> |
|||
@ -0,0 +1,240 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.ComponentModel.DataAnnotations; |
|||
using System.Linq; |
|||
using System.Threading.Tasks; |
|||
using IdentityServer4.Models; |
|||
using IdentityServer4.Services; |
|||
using IdentityServer4.Stores; |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; |
|||
using Volo.Abp.UI; |
|||
|
|||
namespace Volo.Abp.Account.Web.Pages |
|||
{ |
|||
//TODO: Move this into the Account folder!!!
|
|||
public class ConsentModel : AbpPageModel |
|||
{ |
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrl { get; set; } |
|||
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrlHash { get; set; } |
|||
|
|||
[BindProperty] |
|||
public ConsentModel.ConsentInputModel ConsentInput { get; set; } |
|||
|
|||
public ClientInfoModel ClientInfo { get; set; } |
|||
|
|||
private readonly IIdentityServerInteractionService _interaction; |
|||
private readonly IClientStore _clientStore; |
|||
private readonly IResourceStore _resourceStore; |
|||
|
|||
public ConsentModel( |
|||
IIdentityServerInteractionService interaction, |
|||
IClientStore clientStore, |
|||
IResourceStore resourceStore) |
|||
{ |
|||
_interaction = interaction; |
|||
_clientStore = clientStore; |
|||
_resourceStore = resourceStore; |
|||
} |
|||
|
|||
public virtual async Task OnGet() |
|||
{ |
|||
var request = await _interaction.GetAuthorizationContextAsync(ReturnUrl); |
|||
if (request == null) |
|||
{ |
|||
throw new ApplicationException($"No consent request matching request: {ReturnUrl}"); |
|||
} |
|||
|
|||
var client = await _clientStore.FindEnabledClientByIdAsync(request.ClientId); |
|||
if (client == null) |
|||
{ |
|||
throw new ApplicationException($"Invalid client id: {request.ClientId}"); |
|||
} |
|||
|
|||
var resources = await _resourceStore.FindEnabledResourcesByScopeAsync(request.ScopesRequested); |
|||
if (resources == null || (!resources.IdentityResources.Any() && !resources.ApiResources.Any())) |
|||
{ |
|||
throw new ApplicationException($"No scopes matching: {request.ScopesRequested.Aggregate((x, y) => x + ", " + y)}"); |
|||
} |
|||
|
|||
ClientInfo = new ClientInfoModel(client); |
|||
ConsentInput = new ConsentInputModel |
|||
{ |
|||
RememberConsent = true, |
|||
IdentityScopes = resources.IdentityResources.Select(x => CreateScopeViewModel(x, true)).ToList(), |
|||
ApiScopes = resources.ApiResources.SelectMany(x => x.Scopes).Select(x => CreateScopeViewModel(x, true)).ToList() |
|||
}; |
|||
|
|||
if (resources.OfflineAccess) |
|||
{ |
|||
ConsentInput.ApiScopes.Add(GetOfflineAccessScope(true)); |
|||
} |
|||
} |
|||
|
|||
public virtual async Task<IActionResult> OnPost(string userDecision) |
|||
{ |
|||
var result = await ProcessConsentAsync(); |
|||
|
|||
if (result.IsRedirect) |
|||
{ |
|||
return Redirect(result.RedirectUri); |
|||
} |
|||
|
|||
if (result.HasValidationError) |
|||
{ |
|||
//ModelState.AddModelError("", result.ValidationError);
|
|||
throw new ApplicationException("Error: " + result.ValidationError); |
|||
} |
|||
|
|||
throw new ApplicationException("Unknown Error!"); |
|||
} |
|||
|
|||
protected virtual async Task<ConsentModel.ProcessConsentResult> ProcessConsentAsync() |
|||
{ |
|||
var result = new ConsentModel.ProcessConsentResult(); |
|||
|
|||
ConsentResponse grantedConsent; |
|||
|
|||
if (ConsentInput.UserDecision == "no") |
|||
{ |
|||
grantedConsent = ConsentResponse.Denied; |
|||
} |
|||
else |
|||
{ |
|||
if (ConsentInput.IdentityScopes.Any() || ConsentInput.ApiScopes.Any()) |
|||
{ |
|||
grantedConsent = new ConsentResponse |
|||
{ |
|||
RememberConsent = ConsentInput.RememberConsent, |
|||
ScopesConsented = ConsentInput.GetAllowedScopeNames() |
|||
}; |
|||
} |
|||
else |
|||
{ |
|||
throw new UserFriendlyException("You must pick at least one permission"); //TODO: How to handle this
|
|||
} |
|||
} |
|||
|
|||
if (grantedConsent != null) |
|||
{ |
|||
var request = await _interaction.GetAuthorizationContextAsync(ReturnUrl); |
|||
if (request == null) |
|||
{ |
|||
return result; |
|||
} |
|||
|
|||
await _interaction.GrantConsentAsync(request, grantedConsent); |
|||
|
|||
result.RedirectUri = ReturnUrl; //TODO: ReturnUrlHash?
|
|||
} |
|||
|
|||
return result; |
|||
} |
|||
|
|||
protected virtual ConsentModel.ScopeViewModel CreateScopeViewModel(IdentityResource identity, bool check) |
|||
{ |
|||
return new ConsentModel.ScopeViewModel |
|||
{ |
|||
Name = identity.Name, |
|||
DisplayName = identity.DisplayName, |
|||
Description = identity.Description, |
|||
Emphasize = identity.Emphasize, |
|||
Required = identity.Required, |
|||
Checked = check || identity.Required |
|||
}; |
|||
} |
|||
|
|||
protected virtual ConsentModel.ScopeViewModel CreateScopeViewModel(Scope scope, bool check) |
|||
{ |
|||
return new ConsentModel.ScopeViewModel |
|||
{ |
|||
Name = scope.Name, |
|||
DisplayName = scope.DisplayName, |
|||
Description = scope.Description, |
|||
Emphasize = scope.Emphasize, |
|||
Required = scope.Required, |
|||
Checked = check || scope.Required |
|||
}; |
|||
} |
|||
|
|||
protected virtual ConsentModel.ScopeViewModel GetOfflineAccessScope(bool check) |
|||
{ |
|||
return new ConsentModel.ScopeViewModel |
|||
{ |
|||
Name = IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess, |
|||
DisplayName = "Offline Access", //TODO: Localize
|
|||
Description = "Access to your applications and resources, even when you are offline", |
|||
Emphasize = true, |
|||
Checked = check |
|||
}; |
|||
} |
|||
|
|||
public class ConsentInputModel |
|||
{ |
|||
public List<ConsentModel.ScopeViewModel> IdentityScopes { get; set; } |
|||
|
|||
public List<ConsentModel.ScopeViewModel> ApiScopes { get; set; } |
|||
|
|||
[Required] |
|||
public string UserDecision { get; set; } |
|||
|
|||
public bool RememberConsent { get; set; } |
|||
|
|||
public List<string> GetAllowedScopeNames() |
|||
{ |
|||
return IdentityScopes.Union(ApiScopes).Where(s => s.Checked).Select(s => s.Name).ToList(); |
|||
} |
|||
} |
|||
|
|||
public class ScopeViewModel |
|||
{ |
|||
[Required] |
|||
[HiddenInput] |
|||
public string Name { get; set; } |
|||
|
|||
public bool Checked { get; set; } |
|||
|
|||
public string DisplayName { get; set; } |
|||
|
|||
public string Description { get; set; } |
|||
|
|||
public bool Emphasize { get; set; } |
|||
|
|||
public bool Required { get; set; } |
|||
} |
|||
|
|||
public class ProcessConsentResult |
|||
{ |
|||
public bool IsRedirect => RedirectUri != null; |
|||
public string RedirectUri { get; set; } |
|||
|
|||
public bool HasValidationError => ValidationError != null; |
|||
public string ValidationError { get; set; } |
|||
} |
|||
|
|||
public class ClientInfoModel |
|||
{ |
|||
public string ClientName { get; set; } |
|||
|
|||
public string ClientUrl { get; set; } |
|||
|
|||
public string ClientLogoUrl { get; set; } |
|||
|
|||
public bool AllowRememberConsent { get; set; } |
|||
|
|||
public ClientInfoModel(Client client) |
|||
{ |
|||
//TODO: Automap
|
|||
ClientName = client.ClientId; |
|||
ClientUrl = client.ClientUri; |
|||
ClientLogoUrl = client.LogoUri; |
|||
AllowRememberConsent = client.AllowRememberConsent; |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,14 @@ |
|||
using System; |
|||
|
|||
namespace Volo.Blogging |
|||
{ |
|||
public class BloggingWebConsts |
|||
{ |
|||
public class FileUploading |
|||
{ |
|||
public const int MaxFileSize = 5242880; //5MB
|
|||
|
|||
public static int MaxFileSizeAsMegabytes => Convert.ToInt32((MaxFileSize / 1024f) / 1024f); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,13 @@ |
|||
using System.ComponentModel.DataAnnotations; |
|||
|
|||
namespace Volo.Blogging.Files |
|||
{ |
|||
public class FileUploadInputDto |
|||
{ |
|||
[Required] |
|||
public byte[] Bytes { get; set; } |
|||
|
|||
[Required] |
|||
public string Name { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,7 @@ |
|||
namespace Volo.Blogging.Files |
|||
{ |
|||
public class FileUploadOutputDto |
|||
{ |
|||
public string Url { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,10 @@ |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Application.Services; |
|||
|
|||
namespace Volo.Blogging.Files |
|||
{ |
|||
public interface IFileAppService : IApplicationService |
|||
{ |
|||
Task<FileUploadOutputDto> UploadAsync(FileUploadInputDto input); |
|||
} |
|||
} |
|||
@ -0,0 +1,13 @@ |
|||
namespace Volo.Blogging.Files |
|||
{ |
|||
/* TODO: |
|||
* - It is not to have different options for all different modules. We should find a more generic way. |
|||
* - Actually, it is not good to assume to save to a local folder. Instead, use file storage once implemented. |
|||
*/ |
|||
public class BlogFileOptions |
|||
{ |
|||
public string FileUploadLocalFolder { get; set; } |
|||
|
|||
public string FileUploadUrlRoot { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,65 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.ComponentModel.DataAnnotations; |
|||
using System.IO; |
|||
using System.Threading.Tasks; |
|||
using Microsoft.Extensions.Options; |
|||
using Volo.Abp; |
|||
using Volo.Abp.Application.Services; |
|||
using Volo.Abp.Validation; |
|||
using Volo.Blogging.Areas.Blog.Helpers; |
|||
|
|||
namespace Volo.Blogging.Files |
|||
{ |
|||
public class FileAppService : ApplicationService, IFileAppService |
|||
{ |
|||
public BlogFileOptions Options { get; } |
|||
|
|||
public FileAppService(IOptions<BlogFileOptions> options) |
|||
{ |
|||
Options = options.Value; |
|||
} |
|||
|
|||
public virtual Task<FileUploadOutputDto> UploadAsync(FileUploadInputDto input) |
|||
{ |
|||
if (input.Bytes.IsNullOrEmpty()) |
|||
{ |
|||
ThrowValidationException("Bytes can not be null or empty!", "Bytes"); |
|||
} |
|||
|
|||
if (input.Bytes.Length > BloggingWebConsts.FileUploading.MaxFileSize) |
|||
{ |
|||
throw new UserFriendlyException($"File exceeds the maximum upload size ({BloggingWebConsts.FileUploading.MaxFileSizeAsMegabytes} MB)!"); |
|||
} |
|||
|
|||
if (!ImageFormatHelper.IsValidImage(input.Bytes, FileUploadConsts.AllowedImageUploadFormats)) |
|||
{ |
|||
throw new UserFriendlyException("Not a valid image format!"); |
|||
} |
|||
|
|||
var uniqueFileName = GenerateUniqueFileName(Path.GetExtension(input.Name)); |
|||
var filePath = Path.Combine(Options.FileUploadLocalFolder, uniqueFileName); |
|||
|
|||
File.WriteAllBytes(filePath, input.Bytes); //TODO: Previously was using WriteAllBytesAsync, but it's only in .netcore.
|
|||
|
|||
return Task.FromResult(new FileUploadOutputDto |
|||
{ |
|||
Url = Options.FileUploadUrlRoot.EnsureEndsWith('/') + uniqueFileName |
|||
}); |
|||
} |
|||
|
|||
private static void ThrowValidationException(string message, string memberName) |
|||
{ |
|||
throw new AbpValidationException(message, |
|||
new List<ValidationResult> |
|||
{ |
|||
new ValidationResult(message, new[] {memberName}) |
|||
}); |
|||
} |
|||
|
|||
protected virtual string GenerateUniqueFileName(string extension, string prefix = null, string postfix = null) |
|||
{ |
|||
return prefix + GuidGenerator.Create().ToString("N") + postfix + extension; |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
using System.Collections.Generic; |
|||
using System.Collections.ObjectModel; |
|||
using System.Drawing.Imaging; |
|||
using System.Linq; |
|||
|
|||
namespace Volo.Blogging.Files |
|||
{ |
|||
public class FileUploadConsts |
|||
{ |
|||
public static readonly ICollection<ImageFormat> AllowedImageUploadFormats = new Collection<ImageFormat> |
|||
{ |
|||
ImageFormat.Jpeg, |
|||
ImageFormat.Png, |
|||
ImageFormat.Gif, |
|||
ImageFormat.Bmp |
|||
}; |
|||
|
|||
public static string AllowedImageFormatsJoint => string.Join(",", AllowedImageUploadFormats.Select(x => x.ToString())); |
|||
} |
|||
} |
|||
@ -1,31 +1,55 @@ |
|||
using System.Threading.Tasks; |
|||
using Microsoft.AspNetCore.Http; |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using Volo.Abp; |
|||
using Volo.Abp.AspNetCore.Mvc; |
|||
using Volo.Blogging.Areas.Blog.Models; |
|||
using Volo.Blogging.Files; |
|||
using Volo.Blogging.Hosting; |
|||
|
|||
namespace Volo.Blogging.Areas.Blog.Controllers |
|||
{ |
|||
//TODO: This may be moved to HttpApi project since it may be needed by a SPA too.
|
|||
[Area("Blog")] |
|||
[Route("Blog/[controller]/[action]")]
|
|||
public class FilesController : AbpController |
|||
{ |
|||
private readonly IFileService _fileService; |
|||
private readonly IFileAppService _fileAppService; |
|||
|
|||
public FilesController(IFileService fileService) |
|||
public FilesController(IFileAppService fileAppService) |
|||
{ |
|||
_fileService = fileService; |
|||
_fileAppService = fileAppService; |
|||
} |
|||
|
|||
[HttpPost] |
|||
public async Task<JsonResult> UploadImage(IFormFile file) |
|||
{ |
|||
file.ValidateImage(out var fileBytes); |
|||
//TODO: localize exception messages
|
|||
|
|||
var fileUrl = await _fileService.SaveFileAsync(fileBytes, file.FileName); |
|||
if (file == null) |
|||
{ |
|||
throw new UserFriendlyException("No file found!"); |
|||
} |
|||
|
|||
return Json(new FileUploadResult(fileUrl)); |
|||
if (file.Length <= 0) |
|||
{ |
|||
throw new UserFriendlyException("File is empty!"); |
|||
} |
|||
|
|||
if (!file.ContentType.Contains("image")) |
|||
{ |
|||
throw new UserFriendlyException("Not a valid image!"); |
|||
} |
|||
|
|||
var output = await _fileAppService.UploadAsync( |
|||
new FileUploadInputDto |
|||
{ |
|||
Bytes = file.AsBytes(), |
|||
Name = file.FileName |
|||
} |
|||
); |
|||
|
|||
return Json(new FileUploadResult(output.Url)); |
|||
} |
|||
} |
|||
} |
|||
@ -1,30 +0,0 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Collections.ObjectModel; |
|||
using System.Drawing.Imaging; |
|||
using System.Linq; |
|||
|
|||
namespace Volo.Blogging |
|||
{ |
|||
public class BloggingWebConsts |
|||
{ |
|||
public class FileUploading |
|||
{ |
|||
public const string DefaultFileUploadFolderName = "files"; |
|||
|
|||
public static readonly ICollection<ImageFormat> AllowedImageUploadFormats = new Collection<ImageFormat> |
|||
{ |
|||
ImageFormat.Jpeg, |
|||
ImageFormat.Png, |
|||
ImageFormat.Gif, |
|||
ImageFormat.Bmp |
|||
}; |
|||
|
|||
public static string AllowedImageFormatsJoint => string.Join(",", AllowedImageUploadFormats.Select(x => x.ToString())); |
|||
|
|||
public const int MaxFileSize = 5242880; //5MB
|
|||
|
|||
public static int MaxFileSizeAsMegabytes => Convert.ToInt32((MaxFileSize / 1024f) / 1024f); |
|||
} |
|||
} |
|||
} |
|||
@ -1,72 +0,0 @@ |
|||
using System.IO; |
|||
using System.Threading.Tasks; |
|||
using Microsoft.AspNetCore.Hosting; |
|||
using Microsoft.AspNetCore.Http; |
|||
using Volo.Abp; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Guids; |
|||
|
|||
namespace Volo.Blogging.Hosting |
|||
{ |
|||
public class FileService : IFileService, ITransientDependency |
|||
{ |
|||
private readonly IHostingEnvironment _hostingEnvironment; |
|||
private readonly IGuidGenerator _guidGenerator; |
|||
|
|||
public FileService(IHostingEnvironment hostingEnvironment, IGuidGenerator guidGenerator) |
|||
{ |
|||
_hostingEnvironment = hostingEnvironment; |
|||
_guidGenerator = guidGenerator; |
|||
} |
|||
|
|||
public string FileUploadDirectory |
|||
{ |
|||
get |
|||
{ |
|||
var uploadDirectory = Path.Combine(_hostingEnvironment.WebRootPath, BloggingWebConsts.FileUploading.DefaultFileUploadFolderName); |
|||
if (!Directory.Exists(uploadDirectory)) |
|||
{ |
|||
Directory.CreateDirectory(uploadDirectory); |
|||
} |
|||
|
|||
return uploadDirectory; |
|||
} |
|||
} |
|||
|
|||
public string GenerateUniqueFileName(string extension, string prefix = null, string postfix = null) |
|||
{ |
|||
return prefix + _guidGenerator.Create().ToString("N") + postfix + extension; |
|||
} |
|||
|
|||
public async Task<string> SaveFormFileAndGetUrlAsync(IFormFile file) |
|||
{ |
|||
var uniqueFileName = await SaveFileInternalAsync(file.FileName, file.AsBytes()); |
|||
return GetFileUrl(uniqueFileName); |
|||
} |
|||
|
|||
public async Task<string> SaveFileAsync(byte[] fileBytes, string originalFileName) |
|||
{ |
|||
if (fileBytes == null || fileBytes.Length == 0) |
|||
{ |
|||
throw new UserFriendlyException("File is empty!"); |
|||
} |
|||
|
|||
var uniqueFileName = await SaveFileInternalAsync(originalFileName, fileBytes); |
|||
return GetFileUrl(uniqueFileName); |
|||
} |
|||
|
|||
private static string GetFileUrl(string uniqueFileName) |
|||
{ |
|||
return "/" + BloggingWebConsts.FileUploading.DefaultFileUploadFolderName + "/" + uniqueFileName; |
|||
} |
|||
|
|||
private async Task<string> SaveFileInternalAsync(string originalFileName, byte[] fileBytes) |
|||
{ |
|||
var uniqueFileName = GenerateUniqueFileName(Path.GetExtension(originalFileName)); |
|||
var filePath = Path.Combine(FileUploadDirectory, uniqueFileName); |
|||
File.WriteAllBytes(filePath, fileBytes); //TODO: Previously was using WriteAllBytesAsync, but it's only in .netcore.
|
|||
return uniqueFileName; |
|||
} |
|||
|
|||
} |
|||
} |
|||
@ -1,16 +0,0 @@ |
|||
using System.Threading.Tasks; |
|||
using Microsoft.AspNetCore.Http; |
|||
|
|||
namespace Volo.Blogging.Hosting |
|||
{ |
|||
public interface IFileService |
|||
{ |
|||
string FileUploadDirectory { get; } |
|||
|
|||
string GenerateUniqueFileName(string extension, string prefix = null, string postfix = null); |
|||
|
|||
Task<string> SaveFormFileAndGetUrlAsync(IFormFile file); |
|||
|
|||
Task<string> SaveFileAsync(byte[] fileBytes, string originalFileName); |
|||
} |
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue