diff --git a/docs/en/Background-Jobs-Hangfire.md b/docs/en/Background-Jobs-Hangfire.md
index a690d9d17b..3bde5ea010 100644
--- a/docs/en/Background-Jobs-Hangfire.md
+++ b/docs/en/Background-Jobs-Hangfire.md
@@ -88,17 +88,21 @@ To make it secure by default, only local requests are allowed, however you can c
You can integrate the Hangfire dashboard to [ABP authorization system](Authorization.md) using the **AbpHangfireAuthorizationFilter**
class. This class is defined in the `Volo.Abp.Hangfire` package. The following example, checks if the current user is logged in to the application:
- app.UseHangfireDashboard("/hangfire", new DashboardOptions
- {
- AsyncAuthorization = new[] { new AbpHangfireAuthorizationFilter() }
- });
+```csharp
+app.UseHangfireDashboard("/hangfire", new DashboardOptions
+{
+ AsyncAuthorization = new[] { new AbpHangfireAuthorizationFilter() }
+});
+```
If you want to require an additional permission, you can pass it into the constructor as below:
- app.UseHangfireDashboard("/hangfire", new DashboardOptions
- {
- AsyncAuthorization = new[] { new AbpHangfireAuthorizationFilter("MyHangFireDashboardPermissionName") }
- });
+```csharp
+app.UseHangfireDashboard("/hangfire", new DashboardOptions
+{
+ AsyncAuthorization = new[] { new AbpHangfireAuthorizationFilter("MyHangFireDashboardPermissionName") }
+});
+```
-**Important**: `UseHangfireDashboard` should be called after the authentication middleware in your `Startup` class (probably at the last line). Otherwise,
+**Important**: `UseHangfireDashboard` should be called after the authentication and authorization middlewares in your `Startup` class (probably at the last line). Otherwise,
authorization will always fail!
diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs
index 8d588debe9..82c505f050 100644
--- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs
@@ -15,10 +15,16 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ
///
public string DefaultQueueNamePrefix { get; set; }
+ ///
+ /// Default value: "AbpBackgroundJobsDelayed."
+ ///
+ public string DefaultDelayedQueueNamePrefix { get; set;}
+
public AbpRabbitMqBackgroundJobOptions()
{
JobQueues = new Dictionary();
DefaultQueueNamePrefix = "AbpBackgroundJobs.";
+ DefaultDelayedQueueNamePrefix = "AbpBackgroundJobsDelayed.";
}
}
}
diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs
index 3d7e8c05ff..1d16e12683 100644
--- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Globalization;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
@@ -64,7 +65,8 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ
return AbpRabbitMqBackgroundJobOptions.JobQueues.GetOrDefault(typeof(TArgs)) ??
new JobQueueConfiguration(
typeof(TArgs),
- AbpRabbitMqBackgroundJobOptions.DefaultQueueNamePrefix + JobConfiguration.JobName
+ AbpRabbitMqBackgroundJobOptions.DefaultQueueNamePrefix + JobConfiguration.JobName,
+ AbpRabbitMqBackgroundJobOptions.DefaultDelayedQueueNamePrefix + JobConfiguration.JobName
);
}
@@ -133,6 +135,9 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ
var result = QueueConfiguration.Declare(ChannelAccessor.Channel);
Logger.LogDebug($"RabbitMQ Queue '{QueueConfiguration.QueueName}' has {result.MessageCount} messages and {result.ConsumerCount} consumers.");
+ // Declare delayed queue
+ QueueConfiguration.DeclareDelayed(ChannelAccessor.Channel);
+
if (AbpBackgroundJobOptions.IsJobExecutionEnabled)
{
Consumer = new AsyncEventingBasicConsumer(ChannelAccessor.Channel);
@@ -154,12 +159,21 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ
BackgroundJobPriority priority = BackgroundJobPriority.Normal,
TimeSpan? delay = null)
{
- //TODO: How to handle priority & delay?
+ //TODO: How to handle priority
+
+ var routingKey = QueueConfiguration.QueueName;
+ var basicProperties = CreateBasicPropertiesToPublish();
+
+ if (delay.HasValue)
+ {
+ routingKey = QueueConfiguration.DelayedQueueName;
+ basicProperties.Expiration = delay.Value.TotalMilliseconds.ToString();
+ }
ChannelAccessor.Channel.BasicPublish(
exchange: "",
- routingKey: QueueConfiguration.QueueName,
- basicProperties: CreateBasicPropertiesToPublish(),
+ routingKey: routingKey,
+ basicProperties: basicProperties,
body: Serializer.Serialize(args)
);
diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueConfiguration.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueConfiguration.cs
index 959952de22..453c3f9257 100644
--- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueConfiguration.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueConfiguration.cs
@@ -1,4 +1,6 @@
using System;
+using System.Collections.Generic;
+using RabbitMQ.Client;
using Volo.Abp.RabbitMQ;
namespace Volo.Abp.BackgroundJobs.RabbitMQ
@@ -9,21 +11,42 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ
public string ConnectionName { get; set; }
+ public string DelayedQueueName { get; set; }
+
public JobQueueConfiguration(
- Type jobArgsType,
- string queueName,
+ Type jobArgsType,
+ string queueName,
+ string delayedQueueName,
string connectionName = null,
bool durable = true,
bool exclusive = false,
bool autoDelete = false)
: base(
- queueName,
- durable,
- exclusive,
+ queueName,
+ durable,
+ exclusive,
autoDelete)
{
JobArgsType = jobArgsType;
ConnectionName = connectionName;
+ DelayedQueueName = delayedQueueName;
+ }
+
+ public virtual QueueDeclareOk DeclareDelayed(IModel channel)
+ {
+ var delayedArguments = new Dictionary(Arguments)
+ {
+ ["x-dead-letter-routing-key"] = QueueName,
+ ["x-dead-letter-exchange"] = string.Empty
+ };
+
+ return channel.QueueDeclare(
+ queue: DelayedQueueName,
+ durable: Durable,
+ exclusive: Exclusive,
+ autoDelete: AutoDelete,
+ arguments: delayedArguments
+ );
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ProjectNameValidator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ProjectNameValidator.cs
index 7864b387d0..98de427ee2 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ProjectNameValidator.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ProjectNameValidator.cs
@@ -53,7 +53,7 @@ namespace Volo.Abp.Cli.Utils
{
foreach (var illegalKeyword in IllegalKeywords)
{
- if (projectName.Contains(illegalKeyword))
+ if (projectName.Split(".").Contains(illegalKeyword))
{
throw new CliUsageException("Project name cannot contain the word \"" + illegalKeyword + "\". Specify a different name.");
}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj
index f35ee22f82..15faa2ce82 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj
@@ -18,7 +18,7 @@
-
+
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs
index c4d0d0d181..c72b99c819 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs
@@ -5,6 +5,7 @@ using Volo.Abp.MultiTenancy;
using Volo.Abp.Threading;
using Volo.Abp.Validation;
using Volo.Abp.ExceptionHandling;
+using Volo.Abp.Http.Client.DynamicProxying;
namespace Volo.Abp.Http.Client
{
@@ -22,6 +23,8 @@ namespace Volo.Abp.Http.Client
{
var configuration = context.Services.GetConfiguration();
Configure(configuration);
+
+ context.Services.AddTransient(typeof(DynamicHttpProxyInterceptorClientProxy<>));
}
}
}
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/ApiVersionInfo.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ApiVersionInfo.cs
similarity index 92%
rename from framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/ApiVersionInfo.cs
rename to framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ApiVersionInfo.cs
index d37de5d452..ecf2db7b9f 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/ApiVersionInfo.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ApiVersionInfo.cs
@@ -1,6 +1,6 @@
using System;
-namespace Volo.Abp.Http.Client.Proxying
+namespace Volo.Abp.Http.Client.ClientProxying
{
public class ApiVersionInfo //TODO: Rename to not conflict with api versioning apis
{
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs
index 33a1906114..e45176393b 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs
@@ -1,9 +1,23 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Volo.Abp.Content;
using Volo.Abp.DependencyInjection;
+using Volo.Abp.Http.Client.Authentication;
using Volo.Abp.Http.Client.Proxying;
using Volo.Abp.Http.Modeling;
+using Volo.Abp.Http.ProxyScripting.Generators;
+using Volo.Abp.Json;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Threading;
+using Volo.Abp.Tracing;
namespace Volo.Abp.Http.Client.ClientProxying
{
@@ -11,42 +25,265 @@ namespace Volo.Abp.Http.Client.ClientProxying
{
public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
- protected IHttpProxyExecuter HttpProxyExecuter => LazyServiceProvider.LazyGetRequiredService();
protected IClientProxyApiDescriptionFinder ClientProxyApiDescriptionFinder => LazyServiceProvider.LazyGetRequiredService();
+ protected ICancellationTokenProvider CancellationTokenProvider => LazyServiceProvider.LazyGetRequiredService();
+ protected ICorrelationIdProvider CorrelationIdProvider => LazyServiceProvider.LazyGetRequiredService();
+ protected ICurrentTenant CurrentTenant => LazyServiceProvider.LazyGetRequiredService();
+ protected IOptions AbpCorrelationIdOptions => LazyServiceProvider.LazyGetRequiredService>();
+ protected IProxyHttpClientFactory HttpClientFactory => LazyServiceProvider.LazyGetRequiredService();
+ protected IRemoteServiceConfigurationProvider RemoteServiceConfigurationProvider => LazyServiceProvider.LazyGetRequiredService();
+ protected IOptions ClientOptions => LazyServiceProvider.LazyGetRequiredService>();
+ protected IJsonSerializer JsonSerializer => LazyServiceProvider.LazyGetRequiredService();
+ protected IRemoteServiceHttpClientAuthenticator ClientAuthenticator => LazyServiceProvider.LazyGetRequiredService();
+ protected ClientProxyRequestPayloadBuilder ClientProxyRequestPayloadBuilder => LazyServiceProvider.LazyGetRequiredService();
+ protected ClientProxyUrlBuilder ClientProxyUrlBuilder => LazyServiceProvider.LazyGetRequiredService();
protected virtual async Task RequestAsync(string methodName, params object[] arguments)
{
- await HttpProxyExecuter.MakeRequestAsync(BuildHttpProxyExecuterContext(methodName, arguments));
+ await RequestAsync(BuildHttpProxyClientProxyContext(methodName, arguments));
}
protected virtual async Task RequestAsync(string methodName, params object[] arguments)
{
- return await HttpProxyExecuter.MakeRequestAndGetResultAsync(BuildHttpProxyExecuterContext(methodName, arguments));
+ return await RequestAsync(BuildHttpProxyClientProxyContext(methodName, arguments));
}
- protected virtual HttpProxyExecuterContext BuildHttpProxyExecuterContext(string methodName, params object[] arguments)
+ protected virtual ClientProxyRequestContext BuildHttpProxyClientProxyContext(string methodName, params object[] arguments)
{
- var actionKey = GetActionKey(methodName, arguments);
- var action = ClientProxyApiDescriptionFinder.FindAction(actionKey);
- return new HttpProxyExecuterContext(action, BuildArguments(action, arguments), typeof(TService));
+ var methodUniqueName = $"{typeof(TService).FullName}.{methodName}.{string.Join("-", arguments.Select(x => x.GetType().FullName))}";
+ var action = ClientProxyApiDescriptionFinder.FindAction(methodUniqueName);
+ if (action == null)
+ {
+ throw new AbpException($"The API description of the {typeof(TService).FullName}.{methodName} method was not found!");
+ }
+ return new ClientProxyRequestContext(
+ action,
+ action.Parameters
+ .GroupBy(x => x.NameOnMethod)
+ .Select((x, i) => new KeyValuePair(x.Key, arguments[i]))
+ .ToDictionary(x => x.Key, x => x.Value),
+ typeof(TService));
}
- protected virtual Dictionary BuildArguments(ActionApiDescriptionModel action, object[] arguments)
+ protected virtual async Task RequestAsync(ClientProxyRequestContext requestContext)
{
- var parameters = action.Parameters.GroupBy(x => x.NameOnMethod).Select(x => x.Key).ToList();
- var dict = new Dictionary();
+ var responseContent = await RequestAsync(requestContext);
+
+ if (typeof(T) == typeof(IRemoteStreamContent) ||
+ typeof(T) == typeof(RemoteStreamContent))
+ {
+ /* returning a class that holds a reference to response
+ * content just to be sure that GC does not dispose of
+ * it before we finish doing our work with the stream */
+ return (T)(object)new RemoteStreamContent(
+ await responseContent.ReadAsStreamAsync(),
+ responseContent.Headers?.ContentDisposition?.FileNameStar ??
+ RemoveQuotes(responseContent.Headers?.ContentDisposition?.FileName).ToString(),
+ responseContent.Headers?.ContentType?.ToString(),
+ responseContent.Headers?.ContentLength);
+ }
+
+ var stringContent = await responseContent.ReadAsStringAsync();
+ if (typeof(T) == typeof(string))
+ {
+ return (T)(object)stringContent;
+ }
+
+ if (stringContent.IsNullOrWhiteSpace())
+ {
+ return default;
+ }
+
+ return JsonSerializer.Deserialize(stringContent);
+ }
+
+ protected virtual async Task RequestAsync(ClientProxyRequestContext requestContext)
+ {
+ var clientConfig = ClientOptions.Value.HttpClientProxies.GetOrDefault(requestContext.ServiceType) ?? throw new AbpException($"Could not get HttpClientProxyConfig for {requestContext.ServiceType.FullName}.");
+ var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultAsync(clientConfig.RemoteServiceName);
+
+ var client = HttpClientFactory.Create(clientConfig.RemoteServiceName);
+
+ var apiVersion = await GetApiVersionInfoAsync(requestContext);
+ var url = remoteServiceConfig.BaseUrl.EnsureEndsWith('/') + await GetUrlWithParametersAsync(requestContext, apiVersion);
+
+ var requestMessage = new HttpRequestMessage(requestContext.Action.GetHttpMethod(), url)
+ {
+ Content = ClientProxyRequestPayloadBuilder.BuildContent(requestContext.Action, requestContext.Arguments, JsonSerializer, apiVersion)
+ };
+
+ AddHeaders(requestContext.Arguments, requestContext.Action, requestMessage, apiVersion);
+
+ if (requestContext.Action.AllowAnonymous != true)
+ {
+ await ClientAuthenticator.Authenticate(
+ new RemoteServiceHttpClientAuthenticateContext(
+ client,
+ requestMessage,
+ remoteServiceConfig,
+ clientConfig.RemoteServiceName
+ )
+ );
+ }
+
+ var response = await client.SendAsync(
+ requestMessage,
+ HttpCompletionOption.ResponseHeadersRead /*this will buffer only the headers, the content will be used as a stream*/,
+ GetCancellationToken(requestContext.Arguments)
+ );
- for (var i = 0; i < parameters.Count; i++)
+ if (!response.IsSuccessStatusCode)
{
- dict[parameters[i]] = arguments[i];
+ await ThrowExceptionForResponseAsync(response);
}
- return dict;
+ return response.Content;
+ }
+
+ protected virtual async Task GetApiVersionInfoAsync(ClientProxyRequestContext requestContext)
+ {
+ var apiVersion = await FindBestApiVersionAsync(requestContext);
+
+ //TODO: Make names configurable?
+ var versionParam = requestContext.Action.Parameters.FirstOrDefault(p => p.Name == "apiVersion" && p.BindingSourceId == ParameterBindingSources.Path) ??
+ requestContext.Action.Parameters.FirstOrDefault(p => p.Name == "api-version" && p.BindingSourceId == ParameterBindingSources.Query);
+
+ return new ApiVersionInfo(versionParam?.BindingSourceId, apiVersion);
+ }
+
+ protected virtual Task GetUrlWithParametersAsync(ClientProxyRequestContext requestContext, ApiVersionInfo apiVersion)
+ {
+ return Task.FromResult(ClientProxyUrlBuilder.GenerateUrlWithParameters(requestContext.Action, requestContext.Arguments, apiVersion));
}
- private static string GetActionKey(string methodName, params object[] arguments)
+ protected virtual Task GetHttpContentAsync(ClientProxyRequestContext requestContext, ApiVersionInfo apiVersion)
{
- return $"{typeof(TService).FullName}.{methodName}.{string.Join("-", arguments.Select(x => x.GetType().FullName))}";
+ return Task.FromResult(ClientProxyRequestPayloadBuilder.BuildContent(requestContext.Action, requestContext.Arguments, JsonSerializer, apiVersion));
+ }
+
+ protected virtual async Task FindBestApiVersionAsync(ClientProxyRequestContext requestContext)
+ {
+ var configuredVersion = await GetConfiguredApiVersionAsync(requestContext);
+
+ if (requestContext.Action.SupportedVersions.IsNullOrEmpty())
+ {
+ return configuredVersion ?? "1.0";
+ }
+
+ if (requestContext.Action.SupportedVersions.Contains(configuredVersion))
+ {
+ return configuredVersion;
+ }
+
+ return requestContext.Action.SupportedVersions.Last(); //TODO: Ensure to get the latest version!
+ }
+
+ protected virtual async Task GetConfiguredApiVersionAsync(ClientProxyRequestContext requestContext)
+ {
+ var clientConfig = ClientOptions.Value.HttpClientProxies.GetOrDefault(requestContext.ServiceType)
+ ?? throw new AbpException($"Could not get DynamicHttpClientProxyConfig for {requestContext.ServiceType.FullName}.");
+
+ return (await RemoteServiceConfigurationProvider
+ .GetConfigurationOrDefaultOrNullAsync(clientConfig.RemoteServiceName))?.Version;
+ }
+
+ protected virtual async Task ThrowExceptionForResponseAsync(HttpResponseMessage response)
+ {
+ if (response.Headers.Contains(AbpHttpConsts.AbpErrorFormat))
+ {
+ var errorResponse = JsonSerializer.Deserialize(
+ await response.Content.ReadAsStringAsync()
+ );
+
+ throw new AbpRemoteCallException(errorResponse.Error)
+ {
+ HttpStatusCode = (int) response.StatusCode
+ };
+ }
+
+ throw new AbpRemoteCallException(
+ new RemoteServiceErrorInfo
+ {
+ Message = response.ReasonPhrase,
+ Code = response.StatusCode.ToString()
+ }
+ )
+ {
+ HttpStatusCode = (int) response.StatusCode
+ };
+ }
+
+ protected virtual void AddHeaders(
+ IReadOnlyDictionary argumentsDictionary,
+ ActionApiDescriptionModel action,
+ HttpRequestMessage requestMessage,
+ ApiVersionInfo apiVersion)
+ {
+ //API Version
+ if (!apiVersion.Version.IsNullOrEmpty())
+ {
+ //TODO: What about other media types?
+ requestMessage.Headers.Add("accept", $"{MimeTypes.Text.Plain}; v={apiVersion.Version}");
+ requestMessage.Headers.Add("accept", $"{MimeTypes.Application.Json}; v={apiVersion.Version}");
+ requestMessage.Headers.Add("api-version", apiVersion.Version);
+ }
+
+ //Header parameters
+ var headers = action.Parameters.Where(p => p.BindingSourceId == ParameterBindingSources.Header).ToArray();
+ foreach (var headerParameter in headers)
+ {
+ var value = HttpActionParameterHelper.FindParameterValue(argumentsDictionary, headerParameter);
+ if (value != null)
+ {
+ requestMessage.Headers.Add(headerParameter.Name, value.ToString());
+ }
+ }
+
+ //CorrelationId
+ requestMessage.Headers.Add(AbpCorrelationIdOptions.Value.HttpHeaderName, CorrelationIdProvider.Get());
+
+ //TenantId
+ if (CurrentTenant.Id.HasValue)
+ {
+ //TODO: Use AbpAspNetCoreMultiTenancyOptions to get the key
+ requestMessage.Headers.Add(TenantResolverConsts.DefaultTenantKey, CurrentTenant.Id.Value.ToString());
+ }
+
+ //Culture
+ //TODO: Is that the way we want? Couldn't send the culture (not ui culture)
+ var currentCulture = CultureInfo.CurrentUICulture.Name ?? CultureInfo.CurrentCulture.Name;
+ if (!currentCulture.IsNullOrEmpty())
+ {
+ requestMessage.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(currentCulture));
+ }
+
+ //X-Requested-With
+ requestMessage.Headers.Add("X-Requested-With", "XMLHttpRequest");
+ }
+
+ protected virtual StringSegment RemoveQuotes(StringSegment input)
+ {
+ if (!StringSegment.IsNullOrEmpty(input) && input.Length >= 2 && input[0] == '"' && input[input.Length - 1] == '"')
+ {
+ input = input.Subsegment(1, input.Length - 2);
+ }
+
+ return input;
+ }
+
+ protected virtual CancellationToken GetCancellationToken(IReadOnlyDictionary arguments)
+ {
+ var cancellationTokenArg = arguments.LastOrDefault();
+
+ if (cancellationTokenArg.Value is CancellationToken cancellationToken)
+ {
+ if (cancellationToken != default)
+ {
+ return cancellationToken;
+ }
+ }
+
+ return CancellationTokenProvider.Token;
}
}
}
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/HttpProxyExecuterContext.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyRequestContext.cs
similarity index 85%
rename from framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/HttpProxyExecuterContext.cs
rename to framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyRequestContext.cs
index e61b2af93a..089a61c0d8 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/HttpProxyExecuterContext.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyRequestContext.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
using JetBrains.Annotations;
using Volo.Abp.Http.Modeling;
-namespace Volo.Abp.Http.Client.Proxying
+namespace Volo.Abp.Http.Client.ClientProxying
{
- public class HttpProxyExecuterContext
+ public class ClientProxyRequestContext
{
[NotNull]
public ActionApiDescriptionModel Action { get; }
@@ -16,7 +16,7 @@ namespace Volo.Abp.Http.Client.Proxying
[NotNull]
public Type ServiceType { get; }
- public HttpProxyExecuterContext(
+ public ClientProxyRequestContext(
[NotNull] ActionApiDescriptionModel action,
[NotNull] IReadOnlyDictionary arguments,
[NotNull] Type serviceType)
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/RequestPayloadBuilder.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyRequestPayloadBuilder.cs
similarity index 88%
rename from framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/RequestPayloadBuilder.cs
rename to framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyRequestPayloadBuilder.cs
index 583798f43f..3ba7026c8e 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/RequestPayloadBuilder.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyRequestPayloadBuilder.cs
@@ -6,17 +6,18 @@ using System.Net.Http.Headers;
using System.Text;
using JetBrains.Annotations;
using Volo.Abp.Content;
-using Volo.Abp.Http.Client.DynamicProxying;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Http.Client.Proxying;
using Volo.Abp.Http.Modeling;
using Volo.Abp.Http.ProxyScripting.Generators;
using Volo.Abp.Json;
-namespace Volo.Abp.Http.Client.Proxying
+namespace Volo.Abp.Http.Client.ClientProxying
{
- public static class RequestPayloadBuilder
+ public class ClientProxyRequestPayloadBuilder : ITransientDependency
{
[CanBeNull]
- public static HttpContent BuildContent(ActionApiDescriptionModel action, IReadOnlyDictionary methodArguments, IJsonSerializer jsonSerializer, ApiVersionInfo apiVersion)
+ public virtual HttpContent BuildContent(ActionApiDescriptionModel action, IReadOnlyDictionary methodArguments, IJsonSerializer jsonSerializer, ApiVersionInfo apiVersion)
{
var body = GenerateBody(action, methodArguments, jsonSerializer);
if (body != null)
@@ -29,7 +30,7 @@ namespace Volo.Abp.Http.Client.Proxying
return body;
}
- private static HttpContent GenerateBody(ActionApiDescriptionModel action, IReadOnlyDictionary methodArguments, IJsonSerializer jsonSerializer)
+ protected virtual HttpContent GenerateBody(ActionApiDescriptionModel action, IReadOnlyDictionary methodArguments, IJsonSerializer jsonSerializer)
{
var parameters = action
.Parameters
@@ -57,7 +58,7 @@ namespace Volo.Abp.Http.Client.Proxying
return new StringContent(jsonSerializer.Serialize(value), Encoding.UTF8, MimeTypes.Application.Json);
}
- private static HttpContent GenerateFormPostData(ActionApiDescriptionModel action, IReadOnlyDictionary methodArguments)
+ protected virtual HttpContent GenerateFormPostData(ActionApiDescriptionModel action, IReadOnlyDictionary methodArguments)
{
var parameters = action
.Parameters
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/UrlBuilder.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyUrlBuilder.cs
similarity index 84%
rename from framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/UrlBuilder.cs
rename to framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyUrlBuilder.cs
index 5f916fdd88..e6a9b8ff71 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Proxying/UrlBuilder.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyUrlBuilder.cs
@@ -5,16 +5,17 @@ using System.Globalization;
using System.Linq;
using System.Text;
using JetBrains.Annotations;
-using Volo.Abp.Http.Client.DynamicProxying;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Http.Client.Proxying;
using Volo.Abp.Http.Modeling;
using Volo.Abp.Http.ProxyScripting.Generators;
using Volo.Abp.Localization;
-namespace Volo.Abp.Http.Client.Proxying
+namespace Volo.Abp.Http.Client.ClientProxying
{
- internal static class UrlBuilder
+ public class ClientProxyUrlBuilder : ITransientDependency
{
- public static string GenerateUrlWithParameters(ActionApiDescriptionModel action, IReadOnlyDictionary methodArguments, ApiVersionInfo apiVersion)
+ public string GenerateUrlWithParameters(ActionApiDescriptionModel action, IReadOnlyDictionary methodArguments, ApiVersionInfo apiVersion)
{
// The ASP.NET Core route value provider and query string value provider:
// Treat values as invariant culture.
@@ -30,7 +31,7 @@ namespace Volo.Abp.Http.Client.Proxying
}
}
- private static void ReplacePathVariables(StringBuilder urlBuilder, IList actionParameters, IReadOnlyDictionary methodArguments, ApiVersionInfo apiVersion)
+ protected virtual void ReplacePathVariables(StringBuilder urlBuilder, IList actionParameters, IReadOnlyDictionary methodArguments, ApiVersionInfo apiVersion)
{
var pathParameters = actionParameters
.Where(p => p.BindingSourceId == ParameterBindingSources.Path)
@@ -72,7 +73,7 @@ namespace Volo.Abp.Http.Client.Proxying
}
}
- private static void AddQueryStringParameters(StringBuilder urlBuilder, IList actionParameters, IReadOnlyDictionary methodArguments, ApiVersionInfo apiVersion)
+ protected virtual void AddQueryStringParameters(StringBuilder urlBuilder, IList actionParameters, IReadOnlyDictionary methodArguments, ApiVersionInfo apiVersion)
{
var queryStringParameters = actionParameters
.Where(p => p.BindingSourceId.IsIn(ParameterBindingSources.ModelBinding, ParameterBindingSources.Query))
@@ -100,7 +101,7 @@ namespace Volo.Abp.Http.Client.Proxying
}
}
- private static bool AddQueryStringParameter(
+ protected virtual bool AddQueryStringParameter(
StringBuilder urlBuilder,
bool isFirstParam,
string name,
@@ -133,7 +134,7 @@ namespace Volo.Abp.Http.Client.Proxying
return true;
}
- private static string ConvertValueToString([CanBeNull] object value)
+ protected virtual string ConvertValueToString([CanBeNull] object value)
{
if (value is DateTime dateTimeValue)
{
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
index 68eb146201..c35995447a 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options;
using Volo.Abp.DependencyInjection;
using Volo.Abp.DynamicProxy;
+using Volo.Abp.Http.Client.ClientProxying;
using Volo.Abp.Http.Client.Proxying;
using Volo.Abp.Http.Modeling;
@@ -15,32 +16,32 @@ namespace Volo.Abp.Http.Client.DynamicProxying
{
public class DynamicHttpProxyInterceptor : AbpInterceptor, ITransientDependency
{
+
// ReSharper disable once StaticMemberInGenericType
- protected static MethodInfo MakeRequestAndGetResultAsyncMethod { get; }
+ protected static MethodInfo CallRequestAsyncMethod { get; }
+
+ static DynamicHttpProxyInterceptor()
+ {
+ CallRequestAsyncMethod = typeof(DynamicHttpProxyInterceptor)
+ .GetMethods(BindingFlags.NonPublic | BindingFlags.Instance)
+ .First(m => m.Name == nameof(CallRequestAsync) && m.IsGenericMethodDefinition);
+ }
+ public ILogger> Logger { get; set; }
+ protected DynamicHttpProxyInterceptorClientProxy InterceptorClientProxy { get; }
protected AbpHttpClientOptions ClientOptions { get; }
- protected IHttpProxyExecuter HttpProxyExecuter { get; }
protected IProxyHttpClientFactory HttpClientFactory { get; }
protected IRemoteServiceConfigurationProvider RemoteServiceConfigurationProvider { get; }
protected IApiDescriptionFinder ApiDescriptionFinder { get; }
- public ILogger> Logger { get; set; }
-
- static DynamicHttpProxyInterceptor()
- {
- MakeRequestAndGetResultAsyncMethod = typeof(HttpProxyExecuter)
- .GetMethods(BindingFlags.Public | BindingFlags.Instance)
- .First(m => m.Name == nameof(IHttpProxyExecuter.MakeRequestAndGetResultAsync) && m.IsGenericMethodDefinition);
- }
-
public DynamicHttpProxyInterceptor(
- IHttpProxyExecuter httpProxyExecuter,
+ DynamicHttpProxyInterceptorClientProxy interceptorClientProxy,
IOptions clientOptions,
IProxyHttpClientFactory httpClientFactory,
IRemoteServiceConfigurationProvider remoteServiceConfigurationProvider,
IApiDescriptionFinder apiDescriptionFinder)
{
- HttpProxyExecuter = httpProxyExecuter;
+ InterceptorClientProxy = interceptorClientProxy;
HttpClientFactory = httpClientFactory;
RemoteServiceConfigurationProvider = remoteServiceConfigurationProvider;
ApiDescriptionFinder = apiDescriptionFinder;
@@ -49,34 +50,32 @@ namespace Volo.Abp.Http.Client.DynamicProxying
Logger = NullLogger>.Instance;
}
-
public override async Task InterceptAsync(IAbpMethodInvocation invocation)
{
- var context = new HttpProxyExecuterContext(
+ var context = new ClientProxyRequestContext(
await GetActionApiDescriptionModel(invocation),
invocation.ArgumentsDictionary,
typeof(TService));
if (invocation.Method.ReturnType.GenericTypeArguments.IsNullOrEmpty())
{
- await HttpProxyExecuter.MakeRequestAsync(context);
+ await InterceptorClientProxy.CallRequestAsync(context);
}
else
{
- var result = (Task)MakeRequestAndGetResultAsyncMethod
- .MakeGenericMethod(invocation.Method.ReturnType.GenericTypeArguments[0])
- .Invoke(HttpProxyExecuter, new object[] { context });
+ var returnType = invocation.Method.ReturnType.GenericTypeArguments[0];
+ var result = (Task)CallRequestAsyncMethod
+ .MakeGenericMethod(returnType)
+ .Invoke(this, new object[] { context });
- invocation.ReturnValue = await GetResultAsync(
- result,
- invocation.Method.ReturnType.GetGenericArguments()[0]
- );
+ invocation.ReturnValue = await GetResultAsync(result, returnType);
}
}
- private async Task GetActionApiDescriptionModel(IAbpMethodInvocation invocation)
+ protected virtual async Task GetActionApiDescriptionModel(IAbpMethodInvocation invocation)
{
- var clientConfig = ClientOptions.HttpClientProxies.GetOrDefault(typeof(TService)) ?? throw new AbpException($"Could not get DynamicHttpClientProxyConfig for {typeof(TService).FullName}.");
+ var clientConfig = ClientOptions.HttpClientProxies.GetOrDefault(typeof(TService)) ??
+ throw new AbpException($"Could not get DynamicHttpClientProxyConfig for {typeof(TService).FullName}.");
var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultAsync(clientConfig.RemoteServiceName);
var client = HttpClientFactory.Create(clientConfig.RemoteServiceName);
@@ -88,13 +87,19 @@ namespace Volo.Abp.Http.Client.DynamicProxying
);
}
- private async Task
-
-
-
+
+
+
+
+
-
-
@@ -35,7 +35,9 @@
+
+
diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs
index 4a0d23a0fb..3386da25a5 100644
--- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs
+++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using JetBrains.Annotations;
+using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore;
using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling;
@@ -15,8 +14,7 @@ namespace Volo.Blogging.EntityFrameworkCore
public static class BloggingDbContextModelBuilderExtensions
{
public static void ConfigureBlogging(
- [NotNull] this ModelBuilder builder,
- Action optionsAction = null)
+ [NotNull] this ModelBuilder builder)
{
Check.NotNull(builder, nameof(builder));
@@ -25,16 +23,9 @@ namespace Volo.Blogging.EntityFrameworkCore
return;
}
- var options = new BloggingModelBuilderConfigurationOptions(
- BloggingDbProperties.DbTablePrefix,
- BloggingDbProperties.DbSchema
- );
-
- optionsAction?.Invoke(options);
-
builder.Entity(b =>
{
- b.ToTable(options.TablePrefix + "Users", options.Schema);
+ b.ToTable(BloggingDbProperties.DbTablePrefix + "Users", BloggingDbProperties.DbSchema);
b.ConfigureByConvention();
b.ConfigureAbpUser();
@@ -44,7 +35,7 @@ namespace Volo.Blogging.EntityFrameworkCore
builder.Entity(b =>
{
- b.ToTable(options.TablePrefix + "Blogs", options.Schema);
+ b.ToTable(BloggingDbProperties.DbTablePrefix + "Blogs", BloggingDbProperties.DbSchema);
b.ConfigureByConvention();
@@ -57,7 +48,7 @@ namespace Volo.Blogging.EntityFrameworkCore
builder.Entity(b =>
{
- b.ToTable(options.TablePrefix + "Posts", options.Schema);
+ b.ToTable(BloggingDbProperties.DbTablePrefix + "Posts", BloggingDbProperties.DbSchema);
b.ConfigureByConvention();
@@ -77,7 +68,7 @@ namespace Volo.Blogging.EntityFrameworkCore
builder.Entity(b =>
{
- b.ToTable(options.TablePrefix + "Comments", options.Schema);
+ b.ToTable(BloggingDbProperties.DbTablePrefix + "Comments", BloggingDbProperties.DbSchema);
b.ConfigureByConvention();
@@ -93,7 +84,7 @@ namespace Volo.Blogging.EntityFrameworkCore
builder.Entity(b =>
{
- b.ToTable(options.TablePrefix + "Tags", options.Schema);
+ b.ToTable(BloggingDbProperties.DbTablePrefix + "Tags", BloggingDbProperties.DbSchema);
b.ConfigureByConvention();
@@ -108,7 +99,7 @@ namespace Volo.Blogging.EntityFrameworkCore
builder.Entity(b =>
{
- b.ToTable(options.TablePrefix + "PostTags", options.Schema);
+ b.ToTable(BloggingDbProperties.DbTablePrefix + "PostTags", BloggingDbProperties.DbSchema);
b.ConfigureByConvention();
diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs
deleted file mode 100644
index af888ab402..0000000000
--- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using JetBrains.Annotations;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace Volo.Blogging.EntityFrameworkCore
-{
- public class BloggingModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions
- {
- public BloggingModelBuilderConfigurationOptions(
- [NotNull] string tablePrefix = "",
- [CanBeNull] string schema = null)
- : base(tablePrefix, schema)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs
index 3defbc1287..b04f0a74fc 100644
--- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs
+++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using Volo.Abp;
+using Volo.Abp;
using Volo.Abp.MongoDB;
using Volo.Blogging.Blogs;
using Volo.Blogging.Comments;
@@ -11,40 +10,33 @@ namespace Volo.Blogging.MongoDB
public static class BloggingMongoDbContextExtensions
{
public static void ConfigureBlogging(
- this IMongoModelBuilder builder,
- Action optionsAction = null)
+ this IMongoModelBuilder builder)
{
Check.NotNull(builder, nameof(builder));
- var options = new BloggingMongoModelBuilderConfigurationOptions(
- BloggingDbProperties.DbTablePrefix
- );
-
- optionsAction?.Invoke(options);
-
builder.Entity(b =>
{
- b.CollectionName = options.CollectionPrefix + "Users";
+ b.CollectionName = BloggingDbProperties.DbTablePrefix + "Users";
});
builder.Entity(b =>
{
- b.CollectionName = options.CollectionPrefix + "Blogs";
+ b.CollectionName = BloggingDbProperties.DbTablePrefix + "Blogs";
});
builder.Entity(b =>
{
- b.CollectionName = options.CollectionPrefix + "Posts";
+ b.CollectionName = BloggingDbProperties.DbTablePrefix + "Posts";
});
builder.Entity(b =>
{
- b.CollectionName = options.CollectionPrefix + "Tags";
+ b.CollectionName = BloggingDbProperties.DbTablePrefix + "Tags";
});
builder.Entity(b =>
{
- b.CollectionName = options.CollectionPrefix + "Comments";
+ b.CollectionName = BloggingDbProperties.DbTablePrefix + "Comments";
});
}
}
diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs
deleted file mode 100644
index d2fb415166..0000000000
--- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using JetBrains.Annotations;
-using Volo.Abp.MongoDB;
-
-namespace Volo.Blogging.MongoDB
-{
- public class BloggingMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions
- {
- public BloggingMongoModelBuilderConfigurationOptions(
- [NotNull] string collectionPrefix = "")
- : base(collectionPrefix)
- {
- }
- }
-}
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/CmsKitIdentityServerModule.cs b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/CmsKitIdentityServerModule.cs
index 89a0d57921..d40541188d 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/CmsKitIdentityServerModule.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/CmsKitIdentityServerModule.cs
@@ -49,6 +49,7 @@ namespace Volo.CmsKit
[DependsOn(
typeof(AbpAccountWebIdentityServerModule),
typeof(AbpAccountApplicationModule),
+ typeof(AbpAccountHttpApiModule),
typeof(AbpAspNetCoreMvcUiMultiTenancyModule),
typeof(AbpAspNetCoreMvcModule),
typeof(AbpAspNetCoreMvcUiBasicThemeModule),
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj
index d840257465..423fe78ad3 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj
@@ -23,6 +23,7 @@
+
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.js b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.js
new file mode 100644
index 0000000000..8cbddafe42
--- /dev/null
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.js
@@ -0,0 +1,3123 @@
+/*!
+* sweetalert2 v11.1.5
+* Released under the MIT License.
+*/
+(function (global, factory) {
+ typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+ typeof define === 'function' && define.amd ? define(factory) :
+ (global = global || self, global.Sweetalert2 = factory());
+}(this, function () { 'use strict';
+
+ const DismissReason = Object.freeze({
+ cancel: 'cancel',
+ backdrop: 'backdrop',
+ close: 'close',
+ esc: 'esc',
+ timer: 'timer'
+ });
+
+ const consolePrefix = 'SweetAlert2:';
+ /**
+ * Filter the unique values into a new array
+ * @param arr
+ */
+
+ const uniqueArray = arr => {
+ const result = [];
+
+ for (let i = 0; i < arr.length; i++) {
+ if (result.indexOf(arr[i]) === -1) {
+ result.push(arr[i]);
+ }
+ }
+
+ return result;
+ };
+ /**
+ * Capitalize the first letter of a string
+ * @param str
+ */
+
+ const capitalizeFirstLetter = str => str.charAt(0).toUpperCase() + str.slice(1);
+ /**
+ * Convert NodeList to Array
+ * @param nodeList
+ */
+
+ const toArray = nodeList => Array.prototype.slice.call(nodeList);
+ /**
+ * Standardise console warnings
+ * @param message
+ */
+
+ const warn = message => {
+ console.warn("".concat(consolePrefix, " ").concat(typeof message === 'object' ? message.join(' ') : message));
+ };
+ /**
+ * Standardise console errors
+ * @param message
+ */
+
+ const error = message => {
+ console.error("".concat(consolePrefix, " ").concat(message));
+ };
+ /**
+ * Private global state for `warnOnce`
+ * @type {Array}
+ * @private
+ */
+
+ const previousWarnOnceMessages = [];
+ /**
+ * Show a console warning, but only if it hasn't already been shown
+ * @param message
+ */
+
+ const warnOnce = message => {
+ if (!previousWarnOnceMessages.includes(message)) {
+ previousWarnOnceMessages.push(message);
+ warn(message);
+ }
+ };
+ /**
+ * Show a one-time console warning about deprecated params/methods
+ */
+
+ const warnAboutDeprecation = (deprecatedParam, useInstead) => {
+ warnOnce("\"".concat(deprecatedParam, "\" is deprecated and will be removed in the next major release. Please use \"").concat(useInstead, "\" instead."));
+ };
+ /**
+ * If `arg` is a function, call it (with no arguments or context) and return the result.
+ * Otherwise, just pass the value through
+ * @param arg
+ */
+
+ const callIfFunction = arg => typeof arg === 'function' ? arg() : arg;
+ const hasToPromiseFn = arg => arg && typeof arg.toPromise === 'function';
+ const asPromise = arg => hasToPromiseFn(arg) ? arg.toPromise() : Promise.resolve(arg);
+ const isPromise = arg => arg && Promise.resolve(arg) === arg;
+
+ const isJqueryElement = elem => typeof elem === 'object' && elem.jquery;
+
+ const isElement = elem => elem instanceof Element || isJqueryElement(elem);
+
+ const argsToParams = args => {
+ const params = {};
+
+ if (typeof args[0] === 'object' && !isElement(args[0])) {
+ Object.assign(params, args[0]);
+ } else {
+ ['title', 'html', 'icon'].forEach((name, index) => {
+ const arg = args[index];
+
+ if (typeof arg === 'string' || isElement(arg)) {
+ params[name] = arg;
+ } else if (arg !== undefined) {
+ error("Unexpected type of ".concat(name, "! Expected \"string\" or \"Element\", got ").concat(typeof arg));
+ }
+ });
+ }
+
+ return params;
+ };
+
+ const swalPrefix = 'swal2-';
+ const prefix = items => {
+ const result = {};
+
+ for (const i in items) {
+ result[items[i]] = swalPrefix + items[i];
+ }
+
+ return result;
+ };
+ const swalClasses = prefix(['container', 'shown', 'height-auto', 'iosfix', 'popup', 'modal', 'no-backdrop', 'no-transition', 'toast', 'toast-shown', 'show', 'hide', 'close', 'title', 'html-container', 'actions', 'confirm', 'deny', 'cancel', 'default-outline', 'footer', 'icon', 'icon-content', 'image', 'input', 'file', 'range', 'select', 'radio', 'checkbox', 'label', 'textarea', 'inputerror', 'input-label', 'validation-message', 'progress-steps', 'active-progress-step', 'progress-step', 'progress-step-line', 'loader', 'loading', 'styled', 'top', 'top-start', 'top-end', 'top-left', 'top-right', 'center', 'center-start', 'center-end', 'center-left', 'center-right', 'bottom', 'bottom-start', 'bottom-end', 'bottom-left', 'bottom-right', 'grow-row', 'grow-column', 'grow-fullscreen', 'rtl', 'timer-progress-bar', 'timer-progress-bar-container', 'scrollbar-measure', 'icon-success', 'icon-warning', 'icon-info', 'icon-question', 'icon-error']);
+ const iconTypes = prefix(['success', 'warning', 'info', 'question', 'error']);
+
+ const getContainer = () => document.body.querySelector(".".concat(swalClasses.container));
+ const elementBySelector = selectorString => {
+ const container = getContainer();
+ return container ? container.querySelector(selectorString) : null;
+ };
+
+ const elementByClass = className => {
+ return elementBySelector(".".concat(className));
+ };
+
+ const getPopup = () => elementByClass(swalClasses.popup);
+ const getIcon = () => elementByClass(swalClasses.icon);
+ const getTitle = () => elementByClass(swalClasses.title);
+ const getHtmlContainer = () => elementByClass(swalClasses['html-container']);
+ const getImage = () => elementByClass(swalClasses.image);
+ const getProgressSteps = () => elementByClass(swalClasses['progress-steps']);
+ const getValidationMessage = () => elementByClass(swalClasses['validation-message']);
+ const getConfirmButton = () => elementBySelector(".".concat(swalClasses.actions, " .").concat(swalClasses.confirm));
+ const getDenyButton = () => elementBySelector(".".concat(swalClasses.actions, " .").concat(swalClasses.deny));
+ const getInputLabel = () => elementByClass(swalClasses['input-label']);
+ const getLoader = () => elementBySelector(".".concat(swalClasses.loader));
+ const getCancelButton = () => elementBySelector(".".concat(swalClasses.actions, " .").concat(swalClasses.cancel));
+ const getActions = () => elementByClass(swalClasses.actions);
+ const getFooter = () => elementByClass(swalClasses.footer);
+ const getTimerProgressBar = () => elementByClass(swalClasses['timer-progress-bar']);
+ const getCloseButton = () => elementByClass(swalClasses.close); // https://github.com/jkup/focusable/blob/master/index.js
+
+ const focusable = "\n a[href],\n area[href],\n input:not([disabled]),\n select:not([disabled]),\n textarea:not([disabled]),\n button:not([disabled]),\n iframe,\n object,\n embed,\n [tabindex=\"0\"],\n [contenteditable],\n audio[controls],\n video[controls],\n summary\n";
+ const getFocusableElements = () => {
+ const focusableElementsWithTabindex = toArray(getPopup().querySelectorAll('[tabindex]:not([tabindex="-1"]):not([tabindex="0"])')) // sort according to tabindex
+ .sort((a, b) => {
+ a = parseInt(a.getAttribute('tabindex'));
+ b = parseInt(b.getAttribute('tabindex'));
+
+ if (a > b) {
+ return 1;
+ } else if (a < b) {
+ return -1;
+ }
+
+ return 0;
+ });
+ const otherFocusableElements = toArray(getPopup().querySelectorAll(focusable)).filter(el => el.getAttribute('tabindex') !== '-1');
+ return uniqueArray(focusableElementsWithTabindex.concat(otherFocusableElements)).filter(el => isVisible(el));
+ };
+ const isModal = () => {
+ return !isToast() && !document.body.classList.contains(swalClasses['no-backdrop']);
+ };
+ const isToast = () => {
+ return document.body.classList.contains(swalClasses['toast-shown']);
+ };
+ const isLoading = () => {
+ return getPopup().hasAttribute('data-loading');
+ };
+
+ const states = {
+ previousBodyPadding: null
+ };
+ const setInnerHtml = (elem, html) => {
+ // #1926
+ elem.textContent = '';
+
+ if (html) {
+ const parser = new DOMParser();
+ const parsed = parser.parseFromString(html, "text/html");
+ toArray(parsed.querySelector('head').childNodes).forEach(child => {
+ elem.appendChild(child);
+ });
+ toArray(parsed.querySelector('body').childNodes).forEach(child => {
+ elem.appendChild(child);
+ });
+ }
+ };
+ const hasClass = (elem, className) => {
+ if (!className) {
+ return false;
+ }
+
+ const classList = className.split(/\s+/);
+
+ for (let i = 0; i < classList.length; i++) {
+ if (!elem.classList.contains(classList[i])) {
+ return false;
+ }
+ }
+
+ return true;
+ };
+
+ const removeCustomClasses = (elem, params) => {
+ toArray(elem.classList).forEach(className => {
+ if (!Object.values(swalClasses).includes(className) && !Object.values(iconTypes).includes(className) && !Object.values(params.showClass).includes(className)) {
+ elem.classList.remove(className);
+ }
+ });
+ };
+
+ const applyCustomClass = (elem, params, className) => {
+ removeCustomClasses(elem, params);
+
+ if (params.customClass && params.customClass[className]) {
+ if (typeof params.customClass[className] !== 'string' && !params.customClass[className].forEach) {
+ return warn("Invalid type of customClass.".concat(className, "! Expected string or iterable object, got \"").concat(typeof params.customClass[className], "\""));
+ }
+
+ addClass(elem, params.customClass[className]);
+ }
+ };
+ const getInput = (popup, inputType) => {
+ if (!inputType) {
+ return null;
+ }
+
+ switch (inputType) {
+ case 'select':
+ case 'textarea':
+ case 'file':
+ return getChildByClass(popup, swalClasses[inputType]);
+
+ case 'checkbox':
+ return popup.querySelector(".".concat(swalClasses.checkbox, " input"));
+
+ case 'radio':
+ return popup.querySelector(".".concat(swalClasses.radio, " input:checked")) || popup.querySelector(".".concat(swalClasses.radio, " input:first-child"));
+
+ case 'range':
+ return popup.querySelector(".".concat(swalClasses.range, " input"));
+
+ default:
+ return getChildByClass(popup, swalClasses.input);
+ }
+ };
+ const focusInput = input => {
+ input.focus(); // place cursor at end of text in text input
+
+ if (input.type !== 'file') {
+ // http://stackoverflow.com/a/2345915
+ const val = input.value;
+ input.value = '';
+ input.value = val;
+ }
+ };
+ const toggleClass = (target, classList, condition) => {
+ if (!target || !classList) {
+ return;
+ }
+
+ if (typeof classList === 'string') {
+ classList = classList.split(/\s+/).filter(Boolean);
+ }
+
+ classList.forEach(className => {
+ if (target.forEach) {
+ target.forEach(elem => {
+ condition ? elem.classList.add(className) : elem.classList.remove(className);
+ });
+ } else {
+ condition ? target.classList.add(className) : target.classList.remove(className);
+ }
+ });
+ };
+ const addClass = (target, classList) => {
+ toggleClass(target, classList, true);
+ };
+ const removeClass = (target, classList) => {
+ toggleClass(target, classList, false);
+ };
+ const getChildByClass = (elem, className) => {
+ for (let i = 0; i < elem.childNodes.length; i++) {
+ if (hasClass(elem.childNodes[i], className)) {
+ return elem.childNodes[i];
+ }
+ }
+ };
+ const applyNumericalStyle = (elem, property, value) => {
+ if (value === "".concat(parseInt(value))) {
+ value = parseInt(value);
+ }
+
+ if (value || parseInt(value) === 0) {
+ elem.style[property] = typeof value === 'number' ? "".concat(value, "px") : value;
+ } else {
+ elem.style.removeProperty(property);
+ }
+ };
+ const show = (elem, display = 'flex') => {
+ elem.style.display = display;
+ };
+ const hide = elem => {
+ elem.style.display = 'none';
+ };
+ const setStyle = (parent, selector, property, value) => {
+ const el = parent.querySelector(selector);
+
+ if (el) {
+ el.style[property] = value;
+ }
+ };
+ const toggle = (elem, condition, display) => {
+ condition ? show(elem, display) : hide(elem);
+ }; // borrowed from jquery $(elem).is(':visible') implementation
+
+ const isVisible = elem => !!(elem && (elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length));
+ const allButtonsAreHidden = () => !isVisible(getConfirmButton()) && !isVisible(getDenyButton()) && !isVisible(getCancelButton());
+ const isScrollable = elem => !!(elem.scrollHeight > elem.clientHeight); // borrowed from https://stackoverflow.com/a/46352119
+
+ const hasCssAnimation = elem => {
+ const style = window.getComputedStyle(elem);
+ const animDuration = parseFloat(style.getPropertyValue('animation-duration') || '0');
+ const transDuration = parseFloat(style.getPropertyValue('transition-duration') || '0');
+ return animDuration > 0 || transDuration > 0;
+ };
+ const animateTimerProgressBar = (timer, reset = false) => {
+ const timerProgressBar = getTimerProgressBar();
+
+ if (isVisible(timerProgressBar)) {
+ if (reset) {
+ timerProgressBar.style.transition = 'none';
+ timerProgressBar.style.width = '100%';
+ }
+
+ setTimeout(() => {
+ timerProgressBar.style.transition = "width ".concat(timer / 1000, "s linear");
+ timerProgressBar.style.width = '0%';
+ }, 10);
+ }
+ };
+ const stopTimerProgressBar = () => {
+ const timerProgressBar = getTimerProgressBar();
+ const timerProgressBarWidth = parseInt(window.getComputedStyle(timerProgressBar).width);
+ timerProgressBar.style.removeProperty('transition');
+ timerProgressBar.style.width = '100%';
+ const timerProgressBarFullWidth = parseInt(window.getComputedStyle(timerProgressBar).width);
+ const timerProgressBarPercent = parseInt(timerProgressBarWidth / timerProgressBarFullWidth * 100);
+ timerProgressBar.style.removeProperty('transition');
+ timerProgressBar.style.width = "".concat(timerProgressBarPercent, "%");
+ };
+
+ // Detect Node env
+ const isNodeEnv = () => typeof window === 'undefined' || typeof document === 'undefined';
+
+ const sweetHTML = "\n \n").replace(/(^|\n)\s*/g, '');
+
+ const resetOldContainer = () => {
+ const oldContainer = getContainer();
+
+ if (!oldContainer) {
+ return false;
+ }
+
+ oldContainer.remove();
+ removeClass([document.documentElement, document.body], [swalClasses['no-backdrop'], swalClasses['toast-shown'], swalClasses['has-column']]);
+ return true;
+ };
+
+ const resetValidationMessage = () => {
+ if (Swal.isVisible()) {
+ Swal.resetValidationMessage();
+ }
+ };
+
+ const addInputChangeListeners = () => {
+ const popup = getPopup();
+ const input = getChildByClass(popup, swalClasses.input);
+ const file = getChildByClass(popup, swalClasses.file);
+ const range = popup.querySelector(".".concat(swalClasses.range, " input"));
+ const rangeOutput = popup.querySelector(".".concat(swalClasses.range, " output"));
+ const select = getChildByClass(popup, swalClasses.select);
+ const checkbox = popup.querySelector(".".concat(swalClasses.checkbox, " input"));
+ const textarea = getChildByClass(popup, swalClasses.textarea);
+ input.oninput = resetValidationMessage;
+ file.onchange = resetValidationMessage;
+ select.onchange = resetValidationMessage;
+ checkbox.onchange = resetValidationMessage;
+ textarea.oninput = resetValidationMessage;
+
+ range.oninput = () => {
+ resetValidationMessage();
+ rangeOutput.value = range.value;
+ };
+
+ range.onchange = () => {
+ resetValidationMessage();
+ range.nextSibling.value = range.value;
+ };
+ };
+
+ const getTarget = target => typeof target === 'string' ? document.querySelector(target) : target;
+
+ const setupAccessibility = params => {
+ const popup = getPopup();
+ popup.setAttribute('role', params.toast ? 'alert' : 'dialog');
+ popup.setAttribute('aria-live', params.toast ? 'polite' : 'assertive');
+
+ if (!params.toast) {
+ popup.setAttribute('aria-modal', 'true');
+ }
+ };
+
+ const setupRTL = targetElement => {
+ if (window.getComputedStyle(targetElement).direction === 'rtl') {
+ addClass(getContainer(), swalClasses.rtl);
+ }
+ };
+ /*
+ * Add modal + backdrop to DOM
+ */
+
+
+ const init = params => {
+ // Clean up the old popup container if it exists
+ const oldContainerExisted = resetOldContainer();
+ /* istanbul ignore if */
+
+ if (isNodeEnv()) {
+ error('SweetAlert2 requires document to initialize');
+ return;
+ }
+
+ const container = document.createElement('div');
+ container.className = swalClasses.container;
+
+ if (oldContainerExisted) {
+ addClass(container, swalClasses['no-transition']);
+ }
+
+ setInnerHtml(container, sweetHTML);
+ const targetElement = getTarget(params.target);
+ targetElement.appendChild(container);
+ setupAccessibility(params);
+ setupRTL(targetElement);
+ addInputChangeListeners();
+ };
+
+ const parseHtmlToContainer = (param, target) => {
+ // DOM element
+ if (param instanceof HTMLElement) {
+ target.appendChild(param); // Object
+ } else if (typeof param === 'object') {
+ handleObject(param, target); // Plain string
+ } else if (param) {
+ setInnerHtml(target, param);
+ }
+ };
+
+ const handleObject = (param, target) => {
+ // JQuery element(s)
+ if (param.jquery) {
+ handleJqueryElem(target, param); // For other objects use their string representation
+ } else {
+ setInnerHtml(target, param.toString());
+ }
+ };
+
+ const handleJqueryElem = (target, elem) => {
+ target.textContent = '';
+
+ if (0 in elem) {
+ for (let i = 0; (i in elem); i++) {
+ target.appendChild(elem[i].cloneNode(true));
+ }
+ } else {
+ target.appendChild(elem.cloneNode(true));
+ }
+ };
+
+ const animationEndEvent = (() => {
+ // Prevent run in Node env
+
+ /* istanbul ignore if */
+ if (isNodeEnv()) {
+ return false;
+ }
+
+ const testEl = document.createElement('div');
+ const transEndEventNames = {
+ WebkitAnimation: 'webkitAnimationEnd',
+ OAnimation: 'oAnimationEnd oanimationend',
+ animation: 'animationend'
+ };
+
+ for (const i in transEndEventNames) {
+ if (Object.prototype.hasOwnProperty.call(transEndEventNames, i) && typeof testEl.style[i] !== 'undefined') {
+ return transEndEventNames[i];
+ }
+ }
+
+ return false;
+ })();
+
+ // https://github.com/twbs/bootstrap/blob/master/js/src/modal.js
+
+ const measureScrollbar = () => {
+ const scrollDiv = document.createElement('div');
+ scrollDiv.className = swalClasses['scrollbar-measure'];
+ document.body.appendChild(scrollDiv);
+ const scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth;
+ document.body.removeChild(scrollDiv);
+ return scrollbarWidth;
+ };
+
+ const renderActions = (instance, params) => {
+ const actions = getActions();
+ const loader = getLoader();
+ const confirmButton = getConfirmButton();
+ const denyButton = getDenyButton();
+ const cancelButton = getCancelButton(); // Actions (buttons) wrapper
+
+ if (!params.showConfirmButton && !params.showDenyButton && !params.showCancelButton) {
+ hide(actions);
+ } else {
+ show(actions);
+ } // Custom class
+
+
+ applyCustomClass(actions, params, 'actions'); // Render buttons
+
+ renderButton(confirmButton, 'confirm', params);
+ renderButton(denyButton, 'deny', params);
+ renderButton(cancelButton, 'cancel', params);
+ handleButtonsStyling(confirmButton, denyButton, cancelButton, params);
+
+ if (params.reverseButtons) {
+ actions.insertBefore(cancelButton, loader);
+ actions.insertBefore(denyButton, loader);
+ actions.insertBefore(confirmButton, loader);
+ } // Loader
+
+
+ setInnerHtml(loader, params.loaderHtml);
+ applyCustomClass(loader, params, 'loader');
+ };
+
+ function handleButtonsStyling(confirmButton, denyButton, cancelButton, params) {
+ if (!params.buttonsStyling) {
+ return removeClass([confirmButton, denyButton, cancelButton], swalClasses.styled);
+ }
+
+ addClass([confirmButton, denyButton, cancelButton], swalClasses.styled); // Buttons background colors
+
+ if (params.confirmButtonColor) {
+ confirmButton.style.backgroundColor = params.confirmButtonColor;
+ addClass(confirmButton, swalClasses['default-outline']);
+ }
+
+ if (params.denyButtonColor) {
+ denyButton.style.backgroundColor = params.denyButtonColor;
+ addClass(denyButton, swalClasses['default-outline']);
+ }
+
+ if (params.cancelButtonColor) {
+ cancelButton.style.backgroundColor = params.cancelButtonColor;
+ addClass(cancelButton, swalClasses['default-outline']);
+ }
+ }
+
+ function renderButton(button, buttonType, params) {
+ toggle(button, params["show".concat(capitalizeFirstLetter(buttonType), "Button")], 'inline-block');
+ setInnerHtml(button, params["".concat(buttonType, "ButtonText")]); // Set caption text
+
+ button.setAttribute('aria-label', params["".concat(buttonType, "ButtonAriaLabel")]); // ARIA label
+ // Add buttons custom classes
+
+ button.className = swalClasses[buttonType];
+ applyCustomClass(button, params, "".concat(buttonType, "Button"));
+ addClass(button, params["".concat(buttonType, "ButtonClass")]);
+ }
+
+ function handleBackdropParam(container, backdrop) {
+ if (typeof backdrop === 'string') {
+ container.style.background = backdrop;
+ } else if (!backdrop) {
+ addClass([document.documentElement, document.body], swalClasses['no-backdrop']);
+ }
+ }
+
+ function handlePositionParam(container, position) {
+ if (position in swalClasses) {
+ addClass(container, swalClasses[position]);
+ } else {
+ warn('The "position" parameter is not valid, defaulting to "center"');
+ addClass(container, swalClasses.center);
+ }
+ }
+
+ function handleGrowParam(container, grow) {
+ if (grow && typeof grow === 'string') {
+ const growClass = "grow-".concat(grow);
+
+ if (growClass in swalClasses) {
+ addClass(container, swalClasses[growClass]);
+ }
+ }
+ }
+
+ const renderContainer = (instance, params) => {
+ const container = getContainer();
+
+ if (!container) {
+ return;
+ }
+
+ handleBackdropParam(container, params.backdrop);
+ handlePositionParam(container, params.position);
+ handleGrowParam(container, params.grow); // Custom class
+
+ applyCustomClass(container, params, 'container');
+ };
+
+ /**
+ * This module containts `WeakMap`s for each effectively-"private property" that a `Swal` has.
+ * For example, to set the private property "foo" of `this` to "bar", you can `privateProps.foo.set(this, 'bar')`
+ * This is the approach that Babel will probably take to implement private methods/fields
+ * https://github.com/tc39/proposal-private-methods
+ * https://github.com/babel/babel/pull/7555
+ * Once we have the changes from that PR in Babel, and our core class fits reasonable in *one module*
+ * then we can use that language feature.
+ */
+ var privateProps = {
+ promise: new WeakMap(),
+ innerParams: new WeakMap(),
+ domCache: new WeakMap()
+ };
+
+ const inputTypes = ['input', 'file', 'range', 'select', 'radio', 'checkbox', 'textarea'];
+ const renderInput = (instance, params) => {
+ const popup = getPopup();
+ const innerParams = privateProps.innerParams.get(instance);
+ const rerender = !innerParams || params.input !== innerParams.input;
+ inputTypes.forEach(inputType => {
+ const inputClass = swalClasses[inputType];
+ const inputContainer = getChildByClass(popup, inputClass); // set attributes
+
+ setAttributes(inputType, params.inputAttributes); // set class
+
+ inputContainer.className = inputClass;
+
+ if (rerender) {
+ hide(inputContainer);
+ }
+ });
+
+ if (params.input) {
+ if (rerender) {
+ showInput(params);
+ } // set custom class
+
+
+ setCustomClass(params);
+ }
+ };
+
+ const showInput = params => {
+ if (!renderInputType[params.input]) {
+ return error("Unexpected type of input! Expected \"text\", \"email\", \"password\", \"number\", \"tel\", \"select\", \"radio\", \"checkbox\", \"textarea\", \"file\" or \"url\", got \"".concat(params.input, "\""));
+ }
+
+ const inputContainer = getInputContainer(params.input);
+ const input = renderInputType[params.input](inputContainer, params);
+ show(input); // input autofocus
+
+ setTimeout(() => {
+ focusInput(input);
+ });
+ };
+
+ const removeAttributes = input => {
+ for (let i = 0; i < input.attributes.length; i++) {
+ const attrName = input.attributes[i].name;
+
+ if (!['type', 'value', 'style'].includes(attrName)) {
+ input.removeAttribute(attrName);
+ }
+ }
+ };
+
+ const setAttributes = (inputType, inputAttributes) => {
+ const input = getInput(getPopup(), inputType);
+
+ if (!input) {
+ return;
+ }
+
+ removeAttributes(input);
+
+ for (const attr in inputAttributes) {
+ input.setAttribute(attr, inputAttributes[attr]);
+ }
+ };
+
+ const setCustomClass = params => {
+ const inputContainer = getInputContainer(params.input);
+
+ if (params.customClass) {
+ addClass(inputContainer, params.customClass.input);
+ }
+ };
+
+ const setInputPlaceholder = (input, params) => {
+ if (!input.placeholder || params.inputPlaceholder) {
+ input.placeholder = params.inputPlaceholder;
+ }
+ };
+
+ const setInputLabel = (input, prependTo, params) => {
+ if (params.inputLabel) {
+ input.id = swalClasses.input;
+ const label = document.createElement('label');
+ const labelClass = swalClasses['input-label'];
+ label.setAttribute('for', input.id);
+ label.className = labelClass;
+ addClass(label, params.customClass.inputLabel);
+ label.innerText = params.inputLabel;
+ prependTo.insertAdjacentElement('beforebegin', label);
+ }
+ };
+
+ const getInputContainer = inputType => {
+ const inputClass = swalClasses[inputType] ? swalClasses[inputType] : swalClasses.input;
+ return getChildByClass(getPopup(), inputClass);
+ };
+
+ const renderInputType = {};
+
+ renderInputType.text = renderInputType.email = renderInputType.password = renderInputType.number = renderInputType.tel = renderInputType.url = (input, params) => {
+ if (typeof params.inputValue === 'string' || typeof params.inputValue === 'number') {
+ input.value = params.inputValue;
+ } else if (!isPromise(params.inputValue)) {
+ warn("Unexpected type of inputValue! Expected \"string\", \"number\" or \"Promise\", got \"".concat(typeof params.inputValue, "\""));
+ }
+
+ setInputLabel(input, input, params);
+ setInputPlaceholder(input, params);
+ input.type = params.input;
+ return input;
+ };
+
+ renderInputType.file = (input, params) => {
+ setInputLabel(input, input, params);
+ setInputPlaceholder(input, params);
+ return input;
+ };
+
+ renderInputType.range = (range, params) => {
+ const rangeInput = range.querySelector('input');
+ const rangeOutput = range.querySelector('output');
+ rangeInput.value = params.inputValue;
+ rangeInput.type = params.input;
+ rangeOutput.value = params.inputValue;
+ setInputLabel(rangeInput, range, params);
+ return range;
+ };
+
+ renderInputType.select = (select, params) => {
+ select.textContent = '';
+
+ if (params.inputPlaceholder) {
+ const placeholder = document.createElement('option');
+ setInnerHtml(placeholder, params.inputPlaceholder);
+ placeholder.value = '';
+ placeholder.disabled = true;
+ placeholder.selected = true;
+ select.appendChild(placeholder);
+ }
+
+ setInputLabel(select, select, params);
+ return select;
+ };
+
+ renderInputType.radio = radio => {
+ radio.textContent = '';
+ return radio;
+ };
+
+ renderInputType.checkbox = (checkboxContainer, params) => {
+ const checkbox = getInput(getPopup(), 'checkbox');
+ checkbox.value = 1;
+ checkbox.id = swalClasses.checkbox;
+ checkbox.checked = Boolean(params.inputValue);
+ const label = checkboxContainer.querySelector('span');
+ setInnerHtml(label, params.inputPlaceholder);
+ return checkboxContainer;
+ };
+
+ renderInputType.textarea = (textarea, params) => {
+ textarea.value = params.inputValue;
+ setInputPlaceholder(textarea, params);
+ setInputLabel(textarea, textarea, params);
+
+ const getMargin = el => parseInt(window.getComputedStyle(el).marginLeft) + parseInt(window.getComputedStyle(el).marginRight);
+
+ setTimeout(() => {
+ // #2291
+ if ('MutationObserver' in window) {
+ // #1699
+ const initialPopupWidth = parseInt(window.getComputedStyle(getPopup()).width);
+
+ const textareaResizeHandler = () => {
+ const textareaWidth = textarea.offsetWidth + getMargin(textarea);
+
+ if (textareaWidth > initialPopupWidth) {
+ getPopup().style.width = "".concat(textareaWidth, "px");
+ } else {
+ getPopup().style.width = null;
+ }
+ };
+
+ new MutationObserver(textareaResizeHandler).observe(textarea, {
+ attributes: true,
+ attributeFilter: ['style']
+ });
+ }
+ });
+ return textarea;
+ };
+
+ const renderContent = (instance, params) => {
+ const htmlContainer = getHtmlContainer();
+ applyCustomClass(htmlContainer, params, 'htmlContainer'); // Content as HTML
+
+ if (params.html) {
+ parseHtmlToContainer(params.html, htmlContainer);
+ show(htmlContainer, 'block'); // Content as plain text
+ } else if (params.text) {
+ htmlContainer.textContent = params.text;
+ show(htmlContainer, 'block'); // No content
+ } else {
+ hide(htmlContainer);
+ }
+
+ renderInput(instance, params);
+ };
+
+ const renderFooter = (instance, params) => {
+ const footer = getFooter();
+ toggle(footer, params.footer);
+
+ if (params.footer) {
+ parseHtmlToContainer(params.footer, footer);
+ } // Custom class
+
+
+ applyCustomClass(footer, params, 'footer');
+ };
+
+ const renderCloseButton = (instance, params) => {
+ const closeButton = getCloseButton();
+ setInnerHtml(closeButton, params.closeButtonHtml); // Custom class
+
+ applyCustomClass(closeButton, params, 'closeButton');
+ toggle(closeButton, params.showCloseButton);
+ closeButton.setAttribute('aria-label', params.closeButtonAriaLabel);
+ };
+
+ const renderIcon = (instance, params) => {
+ const innerParams = privateProps.innerParams.get(instance);
+ const icon = getIcon(); // if the given icon already rendered, apply the styling without re-rendering the icon
+
+ if (innerParams && params.icon === innerParams.icon) {
+ // Custom or default content
+ setContent(icon, params);
+ applyStyles(icon, params);
+ return;
+ }
+
+ if (!params.icon && !params.iconHtml) {
+ return hide(icon);
+ }
+
+ if (params.icon && Object.keys(iconTypes).indexOf(params.icon) === -1) {
+ error("Unknown icon! Expected \"success\", \"error\", \"warning\", \"info\" or \"question\", got \"".concat(params.icon, "\""));
+ return hide(icon);
+ }
+
+ show(icon); // Custom or default content
+
+ setContent(icon, params);
+ applyStyles(icon, params); // Animate icon
+
+ addClass(icon, params.showClass.icon);
+ };
+
+ const applyStyles = (icon, params) => {
+ for (const iconType in iconTypes) {
+ if (params.icon !== iconType) {
+ removeClass(icon, iconTypes[iconType]);
+ }
+ }
+
+ addClass(icon, iconTypes[params.icon]); // Icon color
+
+ setColor(icon, params); // Success icon background color
+
+ adjustSuccessIconBackgoundColor(); // Custom class
+
+ applyCustomClass(icon, params, 'icon');
+ }; // Adjust success icon background color to match the popup background color
+
+
+ const adjustSuccessIconBackgoundColor = () => {
+ const popup = getPopup();
+ const popupBackgroundColor = window.getComputedStyle(popup).getPropertyValue('background-color');
+ const successIconParts = popup.querySelectorAll('[class^=swal2-success-circular-line], .swal2-success-fix');
+
+ for (let i = 0; i < successIconParts.length; i++) {
+ successIconParts[i].style.backgroundColor = popupBackgroundColor;
+ }
+ };
+
+ const setContent = (icon, params) => {
+ icon.textContent = '';
+
+ if (params.iconHtml) {
+ setInnerHtml(icon, iconContent(params.iconHtml));
+ } else if (params.icon === 'success') {
+ setInnerHtml(icon, "\n \n \n \n \n ");
+ } else if (params.icon === 'error') {
+ setInnerHtml(icon, "\n \n \n \n \n ");
+ } else {
+ const defaultIconHtml = {
+ question: '?',
+ warning: '!',
+ info: 'i'
+ };
+ setInnerHtml(icon, iconContent(defaultIconHtml[params.icon]));
+ }
+ };
+
+ const setColor = (icon, params) => {
+ if (!params.iconColor) {
+ return;
+ }
+
+ icon.style.color = params.iconColor;
+ icon.style.borderColor = params.iconColor;
+
+ for (const sel of ['.swal2-success-line-tip', '.swal2-success-line-long', '.swal2-x-mark-line-left', '.swal2-x-mark-line-right']) {
+ setStyle(icon, sel, 'backgroundColor', params.iconColor);
+ }
+
+ setStyle(icon, '.swal2-success-ring', 'borderColor', params.iconColor);
+ };
+
+ const iconContent = content => "").concat(content, "
");
+
+ const renderImage = (instance, params) => {
+ const image = getImage();
+
+ if (!params.imageUrl) {
+ return hide(image);
+ }
+
+ show(image, ''); // Src, alt
+
+ image.setAttribute('src', params.imageUrl);
+ image.setAttribute('alt', params.imageAlt); // Width, height
+
+ applyNumericalStyle(image, 'width', params.imageWidth);
+ applyNumericalStyle(image, 'height', params.imageHeight); // Class
+
+ image.className = swalClasses.image;
+ applyCustomClass(image, params, 'image');
+ };
+
+ const createStepElement = step => {
+ const stepEl = document.createElement('li');
+ addClass(stepEl, swalClasses['progress-step']);
+ setInnerHtml(stepEl, step);
+ return stepEl;
+ };
+
+ const createLineElement = params => {
+ const lineEl = document.createElement('li');
+ addClass(lineEl, swalClasses['progress-step-line']);
+
+ if (params.progressStepsDistance) {
+ lineEl.style.width = params.progressStepsDistance;
+ }
+
+ return lineEl;
+ };
+
+ const renderProgressSteps = (instance, params) => {
+ const progressStepsContainer = getProgressSteps();
+
+ if (!params.progressSteps || params.progressSteps.length === 0) {
+ return hide(progressStepsContainer);
+ }
+
+ show(progressStepsContainer);
+ progressStepsContainer.textContent = '';
+
+ if (params.currentProgressStep >= params.progressSteps.length) {
+ warn('Invalid currentProgressStep parameter, it should be less than progressSteps.length ' + '(currentProgressStep like JS arrays starts from 0)');
+ }
+
+ params.progressSteps.forEach((step, index) => {
+ const stepEl = createStepElement(step);
+ progressStepsContainer.appendChild(stepEl);
+
+ if (index === params.currentProgressStep) {
+ addClass(stepEl, swalClasses['active-progress-step']);
+ }
+
+ if (index !== params.progressSteps.length - 1) {
+ const lineEl = createLineElement(params);
+ progressStepsContainer.appendChild(lineEl);
+ }
+ });
+ };
+
+ const renderTitle = (instance, params) => {
+ const title = getTitle();
+ toggle(title, params.title || params.titleText, 'block');
+
+ if (params.title) {
+ parseHtmlToContainer(params.title, title);
+ }
+
+ if (params.titleText) {
+ title.innerText = params.titleText;
+ } // Custom class
+
+
+ applyCustomClass(title, params, 'title');
+ };
+
+ const renderPopup = (instance, params) => {
+ const container = getContainer();
+ const popup = getPopup(); // Width
+
+ if (params.toast) {
+ // #2170
+ applyNumericalStyle(container, 'width', params.width);
+ popup.style.width = '100%';
+ popup.insertBefore(getLoader(), getIcon());
+ } else {
+ applyNumericalStyle(popup, 'width', params.width);
+ } // Padding
+
+
+ applyNumericalStyle(popup, 'padding', params.padding); // Background
+
+ if (params.background) {
+ popup.style.background = params.background;
+ }
+
+ hide(getValidationMessage()); // Classes
+
+ addClasses(popup, params);
+ };
+
+ const addClasses = (popup, params) => {
+ // Default Class + showClass when updating Swal.update({})
+ popup.className = "".concat(swalClasses.popup, " ").concat(isVisible(popup) ? params.showClass.popup : '');
+
+ if (params.toast) {
+ addClass([document.documentElement, document.body], swalClasses['toast-shown']);
+ addClass(popup, swalClasses.toast);
+ } else {
+ addClass(popup, swalClasses.modal);
+ } // Custom class
+
+
+ applyCustomClass(popup, params, 'popup');
+
+ if (typeof params.customClass === 'string') {
+ addClass(popup, params.customClass);
+ } // Icon class (#1842)
+
+
+ if (params.icon) {
+ addClass(popup, swalClasses["icon-".concat(params.icon)]);
+ }
+ };
+
+ const render = (instance, params) => {
+ renderPopup(instance, params);
+ renderContainer(instance, params);
+ renderProgressSteps(instance, params);
+ renderIcon(instance, params);
+ renderImage(instance, params);
+ renderTitle(instance, params);
+ renderCloseButton(instance, params);
+ renderContent(instance, params);
+ renderActions(instance, params);
+ renderFooter(instance, params);
+
+ if (typeof params.didRender === 'function') {
+ params.didRender(getPopup());
+ }
+ };
+
+ /*
+ * Global function to determine if SweetAlert2 popup is shown
+ */
+
+ const isVisible$1 = () => {
+ return isVisible(getPopup());
+ };
+ /*
+ * Global function to click 'Confirm' button
+ */
+
+ const clickConfirm = () => getConfirmButton() && getConfirmButton().click();
+ /*
+ * Global function to click 'Deny' button
+ */
+
+ const clickDeny = () => getDenyButton() && getDenyButton().click();
+ /*
+ * Global function to click 'Cancel' button
+ */
+
+ const clickCancel = () => getCancelButton() && getCancelButton().click();
+
+ function fire(...args) {
+ const Swal = this;
+ return new Swal(...args);
+ }
+
+ /**
+ * Returns an extended version of `Swal` containing `params` as defaults.
+ * Useful for reusing Swal configuration.
+ *
+ * For example:
+ *
+ * Before:
+ * const textPromptOptions = { input: 'text', showCancelButton: true }
+ * const {value: firstName} = await Swal.fire({ ...textPromptOptions, title: 'What is your first name?' })
+ * const {value: lastName} = await Swal.fire({ ...textPromptOptions, title: 'What is your last name?' })
+ *
+ * After:
+ * const TextPrompt = Swal.mixin({ input: 'text', showCancelButton: true })
+ * const {value: firstName} = await TextPrompt('What is your first name?')
+ * const {value: lastName} = await TextPrompt('What is your last name?')
+ *
+ * @param mixinParams
+ */
+ function mixin(mixinParams) {
+ class MixinSwal extends this {
+ _main(params, priorityMixinParams) {
+ return super._main(params, Object.assign({}, mixinParams, priorityMixinParams));
+ }
+
+ }
+
+ return MixinSwal;
+ }
+
+ /**
+ * Shows loader (spinner), this is useful with AJAX requests.
+ * By default the loader be shown instead of the "Confirm" button.
+ */
+
+ const showLoading = buttonToReplace => {
+ let popup = getPopup();
+
+ if (!popup) {
+ Swal.fire();
+ }
+
+ popup = getPopup();
+ const loader = getLoader();
+
+ if (isToast()) {
+ hide(getIcon());
+ } else {
+ replaceButton(popup, buttonToReplace);
+ }
+
+ show(loader);
+ popup.setAttribute('data-loading', true);
+ popup.setAttribute('aria-busy', true);
+ popup.focus();
+ };
+
+ const replaceButton = (popup, buttonToReplace) => {
+ const actions = getActions();
+ const loader = getLoader();
+
+ if (!buttonToReplace && isVisible(getConfirmButton())) {
+ buttonToReplace = getConfirmButton();
+ }
+
+ show(actions);
+
+ if (buttonToReplace) {
+ hide(buttonToReplace);
+ loader.setAttribute('data-button-to-replace', buttonToReplace.className);
+ }
+
+ loader.parentNode.insertBefore(loader, buttonToReplace);
+ addClass([popup, actions], swalClasses.loading);
+ };
+
+ const RESTORE_FOCUS_TIMEOUT = 100;
+
+ const globalState = {};
+
+ const focusPreviousActiveElement = () => {
+ if (globalState.previousActiveElement && globalState.previousActiveElement.focus) {
+ globalState.previousActiveElement.focus();
+ globalState.previousActiveElement = null;
+ } else if (document.body) {
+ document.body.focus();
+ }
+ }; // Restore previous active (focused) element
+
+
+ const restoreActiveElement = returnFocus => {
+ return new Promise(resolve => {
+ if (!returnFocus) {
+ return resolve();
+ }
+
+ const x = window.scrollX;
+ const y = window.scrollY;
+ globalState.restoreFocusTimeout = setTimeout(() => {
+ focusPreviousActiveElement();
+ resolve();
+ }, RESTORE_FOCUS_TIMEOUT); // issues/900
+
+ window.scrollTo(x, y);
+ });
+ };
+
+ /**
+ * If `timer` parameter is set, returns number of milliseconds of timer remained.
+ * Otherwise, returns undefined.
+ */
+
+ const getTimerLeft = () => {
+ return globalState.timeout && globalState.timeout.getTimerLeft();
+ };
+ /**
+ * Stop timer. Returns number of milliseconds of timer remained.
+ * If `timer` parameter isn't set, returns undefined.
+ */
+
+ const stopTimer = () => {
+ if (globalState.timeout) {
+ stopTimerProgressBar();
+ return globalState.timeout.stop();
+ }
+ };
+ /**
+ * Resume timer. Returns number of milliseconds of timer remained.
+ * If `timer` parameter isn't set, returns undefined.
+ */
+
+ const resumeTimer = () => {
+ if (globalState.timeout) {
+ const remaining = globalState.timeout.start();
+ animateTimerProgressBar(remaining);
+ return remaining;
+ }
+ };
+ /**
+ * Resume timer. Returns number of milliseconds of timer remained.
+ * If `timer` parameter isn't set, returns undefined.
+ */
+
+ const toggleTimer = () => {
+ const timer = globalState.timeout;
+ return timer && (timer.running ? stopTimer() : resumeTimer());
+ };
+ /**
+ * Increase timer. Returns number of milliseconds of an updated timer.
+ * If `timer` parameter isn't set, returns undefined.
+ */
+
+ const increaseTimer = n => {
+ if (globalState.timeout) {
+ const remaining = globalState.timeout.increase(n);
+ animateTimerProgressBar(remaining, true);
+ return remaining;
+ }
+ };
+ /**
+ * Check if timer is running. Returns true if timer is running
+ * or false if timer is paused or stopped.
+ * If `timer` parameter isn't set, returns undefined
+ */
+
+ const isTimerRunning = () => {
+ return globalState.timeout && globalState.timeout.isRunning();
+ };
+
+ let bodyClickListenerAdded = false;
+ const clickHandlers = {};
+ function bindClickHandler(attr = 'data-swal-template') {
+ clickHandlers[attr] = this;
+
+ if (!bodyClickListenerAdded) {
+ document.body.addEventListener('click', bodyClickListener);
+ bodyClickListenerAdded = true;
+ }
+ }
+
+ const bodyClickListener = event => {
+ // TODO: replace with event.composedPath()
+ for (let el = event.target; el && el !== document; el = el.parentNode) {
+ for (const attr in clickHandlers) {
+ const template = el.getAttribute(attr);
+
+ if (template) {
+ clickHandlers[attr].fire({
+ template
+ });
+ return;
+ }
+ }
+ }
+ };
+
+ const defaultParams = {
+ title: '',
+ titleText: '',
+ text: '',
+ html: '',
+ footer: '',
+ icon: undefined,
+ iconColor: undefined,
+ iconHtml: undefined,
+ template: undefined,
+ toast: false,
+ showClass: {
+ popup: 'swal2-show',
+ backdrop: 'swal2-backdrop-show',
+ icon: 'swal2-icon-show'
+ },
+ hideClass: {
+ popup: 'swal2-hide',
+ backdrop: 'swal2-backdrop-hide',
+ icon: 'swal2-icon-hide'
+ },
+ customClass: {},
+ target: 'body',
+ backdrop: true,
+ heightAuto: true,
+ allowOutsideClick: true,
+ allowEscapeKey: true,
+ allowEnterKey: true,
+ stopKeydownPropagation: true,
+ keydownListenerCapture: false,
+ showConfirmButton: true,
+ showDenyButton: false,
+ showCancelButton: false,
+ preConfirm: undefined,
+ preDeny: undefined,
+ confirmButtonText: 'OK',
+ confirmButtonAriaLabel: '',
+ confirmButtonColor: undefined,
+ denyButtonText: 'No',
+ denyButtonAriaLabel: '',
+ denyButtonColor: undefined,
+ cancelButtonText: 'Cancel',
+ cancelButtonAriaLabel: '',
+ cancelButtonColor: undefined,
+ buttonsStyling: true,
+ reverseButtons: false,
+ focusConfirm: true,
+ focusDeny: false,
+ focusCancel: false,
+ returnFocus: true,
+ showCloseButton: false,
+ closeButtonHtml: '×',
+ closeButtonAriaLabel: 'Close this dialog',
+ loaderHtml: '',
+ showLoaderOnConfirm: false,
+ showLoaderOnDeny: false,
+ imageUrl: undefined,
+ imageWidth: undefined,
+ imageHeight: undefined,
+ imageAlt: '',
+ timer: undefined,
+ timerProgressBar: false,
+ width: undefined,
+ padding: undefined,
+ background: undefined,
+ input: undefined,
+ inputPlaceholder: '',
+ inputLabel: '',
+ inputValue: '',
+ inputOptions: {},
+ inputAutoTrim: true,
+ inputAttributes: {},
+ inputValidator: undefined,
+ returnInputValueOnDeny: false,
+ validationMessage: undefined,
+ grow: false,
+ position: 'center',
+ progressSteps: [],
+ currentProgressStep: undefined,
+ progressStepsDistance: undefined,
+ willOpen: undefined,
+ didOpen: undefined,
+ didRender: undefined,
+ willClose: undefined,
+ didClose: undefined,
+ didDestroy: undefined,
+ scrollbarPadding: true
+ };
+ const updatableParams = ['allowEscapeKey', 'allowOutsideClick', 'background', 'buttonsStyling', 'cancelButtonAriaLabel', 'cancelButtonColor', 'cancelButtonText', 'closeButtonAriaLabel', 'closeButtonHtml', 'confirmButtonAriaLabel', 'confirmButtonColor', 'confirmButtonText', 'currentProgressStep', 'customClass', 'denyButtonAriaLabel', 'denyButtonColor', 'denyButtonText', 'didClose', 'didDestroy', 'footer', 'hideClass', 'html', 'icon', 'iconColor', 'iconHtml', 'imageAlt', 'imageHeight', 'imageUrl', 'imageWidth', 'preConfirm', 'preDeny', 'progressSteps', 'returnFocus', 'reverseButtons', 'showCancelButton', 'showCloseButton', 'showConfirmButton', 'showDenyButton', 'text', 'title', 'titleText', 'willClose'];
+ const deprecatedParams = {};
+ const toastIncompatibleParams = ['allowOutsideClick', 'allowEnterKey', 'backdrop', 'focusConfirm', 'focusDeny', 'focusCancel', 'returnFocus', 'heightAuto', 'keydownListenerCapture'];
+ /**
+ * Is valid parameter
+ * @param {String} paramName
+ */
+
+ const isValidParameter = paramName => {
+ return Object.prototype.hasOwnProperty.call(defaultParams, paramName);
+ };
+ /**
+ * Is valid parameter for Swal.update() method
+ * @param {String} paramName
+ */
+
+ const isUpdatableParameter = paramName => {
+ return updatableParams.indexOf(paramName) !== -1;
+ };
+ /**
+ * Is deprecated parameter
+ * @param {String} paramName
+ */
+
+ const isDeprecatedParameter = paramName => {
+ return deprecatedParams[paramName];
+ };
+
+ const checkIfParamIsValid = param => {
+ if (!isValidParameter(param)) {
+ warn("Unknown parameter \"".concat(param, "\""));
+ }
+ };
+
+ const checkIfToastParamIsValid = param => {
+ if (toastIncompatibleParams.includes(param)) {
+ warn("The parameter \"".concat(param, "\" is incompatible with toasts"));
+ }
+ };
+
+ const checkIfParamIsDeprecated = param => {
+ if (isDeprecatedParameter(param)) {
+ warnAboutDeprecation(param, isDeprecatedParameter(param));
+ }
+ };
+ /**
+ * Show relevant warnings for given params
+ *
+ * @param params
+ */
+
+
+ const showWarningsForParams = params => {
+ if (!params.backdrop && params.allowOutsideClick) {
+ warn('"allowOutsideClick" parameter requires `backdrop` parameter to be set to `true`');
+ }
+
+ for (const param in params) {
+ checkIfParamIsValid(param);
+
+ if (params.toast) {
+ checkIfToastParamIsValid(param);
+ }
+
+ checkIfParamIsDeprecated(param);
+ }
+ };
+
+
+
+ var staticMethods = /*#__PURE__*/Object.freeze({
+ isValidParameter: isValidParameter,
+ isUpdatableParameter: isUpdatableParameter,
+ isDeprecatedParameter: isDeprecatedParameter,
+ argsToParams: argsToParams,
+ isVisible: isVisible$1,
+ clickConfirm: clickConfirm,
+ clickDeny: clickDeny,
+ clickCancel: clickCancel,
+ getContainer: getContainer,
+ getPopup: getPopup,
+ getTitle: getTitle,
+ getHtmlContainer: getHtmlContainer,
+ getImage: getImage,
+ getIcon: getIcon,
+ getInputLabel: getInputLabel,
+ getCloseButton: getCloseButton,
+ getActions: getActions,
+ getConfirmButton: getConfirmButton,
+ getDenyButton: getDenyButton,
+ getCancelButton: getCancelButton,
+ getLoader: getLoader,
+ getFooter: getFooter,
+ getTimerProgressBar: getTimerProgressBar,
+ getFocusableElements: getFocusableElements,
+ getValidationMessage: getValidationMessage,
+ isLoading: isLoading,
+ fire: fire,
+ mixin: mixin,
+ showLoading: showLoading,
+ enableLoading: showLoading,
+ getTimerLeft: getTimerLeft,
+ stopTimer: stopTimer,
+ resumeTimer: resumeTimer,
+ toggleTimer: toggleTimer,
+ increaseTimer: increaseTimer,
+ isTimerRunning: isTimerRunning,
+ bindClickHandler: bindClickHandler
+ });
+
+ /**
+ * Hides loader and shows back the button which was hidden by .showLoading()
+ */
+
+ function hideLoading() {
+ // do nothing if popup is closed
+ const innerParams = privateProps.innerParams.get(this);
+
+ if (!innerParams) {
+ return;
+ }
+
+ const domCache = privateProps.domCache.get(this);
+ hide(domCache.loader);
+
+ if (isToast()) {
+ if (innerParams.icon) {
+ show(getIcon());
+ }
+ } else {
+ showRelatedButton(domCache);
+ }
+
+ removeClass([domCache.popup, domCache.actions], swalClasses.loading);
+ domCache.popup.removeAttribute('aria-busy');
+ domCache.popup.removeAttribute('data-loading');
+ domCache.confirmButton.disabled = false;
+ domCache.denyButton.disabled = false;
+ domCache.cancelButton.disabled = false;
+ }
+
+ const showRelatedButton = domCache => {
+ const buttonToReplace = domCache.popup.getElementsByClassName(domCache.loader.getAttribute('data-button-to-replace'));
+
+ if (buttonToReplace.length) {
+ show(buttonToReplace[0], 'inline-block');
+ } else if (allButtonsAreHidden()) {
+ hide(domCache.actions);
+ }
+ };
+
+ function getInput$1(instance) {
+ const innerParams = privateProps.innerParams.get(instance || this);
+ const domCache = privateProps.domCache.get(instance || this);
+
+ if (!domCache) {
+ return null;
+ }
+
+ return getInput(domCache.popup, innerParams.input);
+ }
+
+ const fixScrollbar = () => {
+ // for queues, do not do this more than once
+ if (states.previousBodyPadding !== null) {
+ return;
+ } // if the body has overflow
+
+
+ if (document.body.scrollHeight > window.innerHeight) {
+ // add padding so the content doesn't shift after removal of scrollbar
+ states.previousBodyPadding = parseInt(window.getComputedStyle(document.body).getPropertyValue('padding-right'));
+ document.body.style.paddingRight = "".concat(states.previousBodyPadding + measureScrollbar(), "px");
+ }
+ };
+ const undoScrollbar = () => {
+ if (states.previousBodyPadding !== null) {
+ document.body.style.paddingRight = "".concat(states.previousBodyPadding, "px");
+ states.previousBodyPadding = null;
+ }
+ };
+
+ /* istanbul ignore file */
+
+ const iOSfix = () => {
+ const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream || navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1;
+
+ if (iOS && !hasClass(document.body, swalClasses.iosfix)) {
+ const offset = document.body.scrollTop;
+ document.body.style.top = "".concat(offset * -1, "px");
+ addClass(document.body, swalClasses.iosfix);
+ lockBodyScroll();
+ addBottomPaddingForTallPopups(); // #1948
+ }
+ };
+
+ const addBottomPaddingForTallPopups = () => {
+ const safari = !navigator.userAgent.match(/(CriOS|FxiOS|EdgiOS|YaBrowser|UCBrowser)/i);
+
+ if (safari) {
+ const bottomPanelHeight = 44;
+
+ if (getPopup().scrollHeight > window.innerHeight - bottomPanelHeight) {
+ getContainer().style.paddingBottom = "".concat(bottomPanelHeight, "px");
+ }
+ }
+ };
+
+ const lockBodyScroll = () => {
+ // #1246
+ const container = getContainer();
+ let preventTouchMove;
+
+ container.ontouchstart = e => {
+ preventTouchMove = shouldPreventTouchMove(e);
+ };
+
+ container.ontouchmove = e => {
+ if (preventTouchMove) {
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ };
+ };
+
+ const shouldPreventTouchMove = event => {
+ const target = event.target;
+ const container = getContainer();
+
+ if (isStylys(event) || isZoom(event)) {
+ return false;
+ }
+
+ if (target === container) {
+ return true;
+ }
+
+ if (!isScrollable(container) && target.tagName !== 'INPUT' && // #1603
+ target.tagName !== 'TEXTAREA' && // #2266
+ !(isScrollable(getHtmlContainer()) && // #1944
+ getHtmlContainer().contains(target))) {
+ return true;
+ }
+
+ return false;
+ };
+
+ const isStylys = event => {
+ // #1786
+ return event.touches && event.touches.length && event.touches[0].touchType === 'stylus';
+ };
+
+ const isZoom = event => {
+ // #1891
+ return event.touches && event.touches.length > 1;
+ };
+
+ const undoIOSfix = () => {
+ if (hasClass(document.body, swalClasses.iosfix)) {
+ const offset = parseInt(document.body.style.top, 10);
+ removeClass(document.body, swalClasses.iosfix);
+ document.body.style.top = '';
+ document.body.scrollTop = offset * -1;
+ }
+ };
+
+ // Adding aria-hidden="true" to elements outside of the active modal dialog ensures that
+ // elements not within the active modal dialog will not be surfaced if a user opens a screen
+ // reader’s list of elements (headings, form controls, landmarks, etc.) in the document.
+
+ const setAriaHidden = () => {
+ const bodyChildren = toArray(document.body.children);
+ bodyChildren.forEach(el => {
+ if (el === getContainer() || el.contains(getContainer())) {
+ return;
+ }
+
+ if (el.hasAttribute('aria-hidden')) {
+ el.setAttribute('data-previous-aria-hidden', el.getAttribute('aria-hidden'));
+ }
+
+ el.setAttribute('aria-hidden', 'true');
+ });
+ };
+ const unsetAriaHidden = () => {
+ const bodyChildren = toArray(document.body.children);
+ bodyChildren.forEach(el => {
+ if (el.hasAttribute('data-previous-aria-hidden')) {
+ el.setAttribute('aria-hidden', el.getAttribute('data-previous-aria-hidden'));
+ el.removeAttribute('data-previous-aria-hidden');
+ } else {
+ el.removeAttribute('aria-hidden');
+ }
+ });
+ };
+
+ /**
+ * This module containts `WeakMap`s for each effectively-"private property" that a `Swal` has.
+ * For example, to set the private property "foo" of `this` to "bar", you can `privateProps.foo.set(this, 'bar')`
+ * This is the approach that Babel will probably take to implement private methods/fields
+ * https://github.com/tc39/proposal-private-methods
+ * https://github.com/babel/babel/pull/7555
+ * Once we have the changes from that PR in Babel, and our core class fits reasonable in *one module*
+ * then we can use that language feature.
+ */
+ var privateMethods = {
+ swalPromiseResolve: new WeakMap()
+ };
+
+ /*
+ * Instance method to close sweetAlert
+ */
+
+ function removePopupAndResetState(instance, container, returnFocus, didClose) {
+ if (isToast()) {
+ triggerDidCloseAndDispose(instance, didClose);
+ } else {
+ restoreActiveElement(returnFocus).then(() => triggerDidCloseAndDispose(instance, didClose));
+ globalState.keydownTarget.removeEventListener('keydown', globalState.keydownHandler, {
+ capture: globalState.keydownListenerCapture
+ });
+ globalState.keydownHandlerAdded = false;
+ }
+
+ const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent); // workaround for #2088
+ // for some reason removing the container in Safari will scroll the document to bottom
+
+ if (isSafari) {
+ container.setAttribute('style', 'display:none !important');
+ container.removeAttribute('class');
+ container.innerHTML = '';
+ } else {
+ container.remove();
+ }
+
+ if (isModal()) {
+ undoScrollbar();
+ undoIOSfix();
+ unsetAriaHidden();
+ }
+
+ removeBodyClasses();
+ }
+
+ function removeBodyClasses() {
+ removeClass([document.documentElement, document.body], [swalClasses.shown, swalClasses['height-auto'], swalClasses['no-backdrop'], swalClasses['toast-shown']]);
+ }
+
+ function close(resolveValue) {
+ const popup = getPopup();
+
+ if (!popup) {
+ return;
+ }
+
+ resolveValue = prepareResolveValue(resolveValue);
+ const innerParams = privateProps.innerParams.get(this);
+
+ if (!innerParams || hasClass(popup, innerParams.hideClass.popup)) {
+ return;
+ }
+
+ const swalPromiseResolve = privateMethods.swalPromiseResolve.get(this);
+ removeClass(popup, innerParams.showClass.popup);
+ addClass(popup, innerParams.hideClass.popup);
+ const backdrop = getContainer();
+ removeClass(backdrop, innerParams.showClass.backdrop);
+ addClass(backdrop, innerParams.hideClass.backdrop);
+ handlePopupAnimation(this, popup, innerParams); // Resolve Swal promise
+
+ swalPromiseResolve(resolveValue);
+ }
+
+ const prepareResolveValue = resolveValue => {
+ // When user calls Swal.close()
+ if (typeof resolveValue === 'undefined') {
+ return {
+ isConfirmed: false,
+ isDenied: false,
+ isDismissed: true
+ };
+ }
+
+ return Object.assign({
+ isConfirmed: false,
+ isDenied: false,
+ isDismissed: false
+ }, resolveValue);
+ };
+
+ const handlePopupAnimation = (instance, popup, innerParams) => {
+ const container = getContainer(); // If animation is supported, animate
+
+ const animationIsSupported = animationEndEvent && hasCssAnimation(popup);
+
+ if (typeof innerParams.willClose === 'function') {
+ innerParams.willClose(popup);
+ }
+
+ if (animationIsSupported) {
+ animatePopup(instance, popup, container, innerParams.returnFocus, innerParams.didClose);
+ } else {
+ // Otherwise, remove immediately
+ removePopupAndResetState(instance, container, innerParams.returnFocus, innerParams.didClose);
+ }
+ };
+
+ const animatePopup = (instance, popup, container, returnFocus, didClose) => {
+ globalState.swalCloseEventFinishedCallback = removePopupAndResetState.bind(null, instance, container, returnFocus, didClose);
+ popup.addEventListener(animationEndEvent, function (e) {
+ if (e.target === popup) {
+ globalState.swalCloseEventFinishedCallback();
+ delete globalState.swalCloseEventFinishedCallback;
+ }
+ });
+ };
+
+ const triggerDidCloseAndDispose = (instance, didClose) => {
+ setTimeout(() => {
+ if (typeof didClose === 'function') {
+ didClose.bind(instance.params)();
+ }
+
+ instance._destroy();
+ });
+ };
+
+ function setButtonsDisabled(instance, buttons, disabled) {
+ const domCache = privateProps.domCache.get(instance);
+ buttons.forEach(button => {
+ domCache[button].disabled = disabled;
+ });
+ }
+
+ function setInputDisabled(input, disabled) {
+ if (!input) {
+ return false;
+ }
+
+ if (input.type === 'radio') {
+ const radiosContainer = input.parentNode.parentNode;
+ const radios = radiosContainer.querySelectorAll('input');
+
+ for (let i = 0; i < radios.length; i++) {
+ radios[i].disabled = disabled;
+ }
+ } else {
+ input.disabled = disabled;
+ }
+ }
+
+ function enableButtons() {
+ setButtonsDisabled(this, ['confirmButton', 'denyButton', 'cancelButton'], false);
+ }
+ function disableButtons() {
+ setButtonsDisabled(this, ['confirmButton', 'denyButton', 'cancelButton'], true);
+ }
+ function enableInput() {
+ return setInputDisabled(this.getInput(), false);
+ }
+ function disableInput() {
+ return setInputDisabled(this.getInput(), true);
+ }
+
+ function showValidationMessage(error) {
+ const domCache = privateProps.domCache.get(this);
+ const params = privateProps.innerParams.get(this);
+ setInnerHtml(domCache.validationMessage, error);
+ domCache.validationMessage.className = swalClasses['validation-message'];
+
+ if (params.customClass && params.customClass.validationMessage) {
+ addClass(domCache.validationMessage, params.customClass.validationMessage);
+ }
+
+ show(domCache.validationMessage);
+ const input = this.getInput();
+
+ if (input) {
+ input.setAttribute('aria-invalid', true);
+ input.setAttribute('aria-describedby', swalClasses['validation-message']);
+ focusInput(input);
+ addClass(input, swalClasses.inputerror);
+ }
+ } // Hide block with validation message
+
+ function resetValidationMessage$1() {
+ const domCache = privateProps.domCache.get(this);
+
+ if (domCache.validationMessage) {
+ hide(domCache.validationMessage);
+ }
+
+ const input = this.getInput();
+
+ if (input) {
+ input.removeAttribute('aria-invalid');
+ input.removeAttribute('aria-describedby');
+ removeClass(input, swalClasses.inputerror);
+ }
+ }
+
+ function getProgressSteps$1() {
+ const domCache = privateProps.domCache.get(this);
+ return domCache.progressSteps;
+ }
+
+ class Timer {
+ constructor(callback, delay) {
+ this.callback = callback;
+ this.remaining = delay;
+ this.running = false;
+ this.start();
+ }
+
+ start() {
+ if (!this.running) {
+ this.running = true;
+ this.started = new Date();
+ this.id = setTimeout(this.callback, this.remaining);
+ }
+
+ return this.remaining;
+ }
+
+ stop() {
+ if (this.running) {
+ this.running = false;
+ clearTimeout(this.id);
+ this.remaining -= new Date() - this.started;
+ }
+
+ return this.remaining;
+ }
+
+ increase(n) {
+ const running = this.running;
+
+ if (running) {
+ this.stop();
+ }
+
+ this.remaining += n;
+
+ if (running) {
+ this.start();
+ }
+
+ return this.remaining;
+ }
+
+ getTimerLeft() {
+ if (this.running) {
+ this.stop();
+ this.start();
+ }
+
+ return this.remaining;
+ }
+
+ isRunning() {
+ return this.running;
+ }
+
+ }
+
+ var defaultInputValidators = {
+ email: (string, validationMessage) => {
+ return /^[a-zA-Z0-9.+_-]+@[a-zA-Z0-9.-]+\.[a-zA-Z0-9-]{2,24}$/.test(string) ? Promise.resolve() : Promise.resolve(validationMessage || 'Invalid email address');
+ },
+ url: (string, validationMessage) => {
+ // taken from https://stackoverflow.com/a/3809435 with a small change from #1306 and #2013
+ return /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-z]{2,63}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)$/.test(string) ? Promise.resolve() : Promise.resolve(validationMessage || 'Invalid URL');
+ }
+ };
+
+ function setDefaultInputValidators(params) {
+ // Use default `inputValidator` for supported input types if not provided
+ if (!params.inputValidator) {
+ Object.keys(defaultInputValidators).forEach(key => {
+ if (params.input === key) {
+ params.inputValidator = defaultInputValidators[key];
+ }
+ });
+ }
+ }
+
+ function validateCustomTargetElement(params) {
+ // Determine if the custom target element is valid
+ if (!params.target || typeof params.target === 'string' && !document.querySelector(params.target) || typeof params.target !== 'string' && !params.target.appendChild) {
+ warn('Target parameter is not valid, defaulting to "body"');
+ params.target = 'body';
+ }
+ }
+ /**
+ * Set type, text and actions on popup
+ *
+ * @param params
+ * @returns {boolean}
+ */
+
+
+ function setParameters(params) {
+ setDefaultInputValidators(params); // showLoaderOnConfirm && preConfirm
+
+ if (params.showLoaderOnConfirm && !params.preConfirm) {
+ warn('showLoaderOnConfirm is set to true, but preConfirm is not defined.\n' + 'showLoaderOnConfirm should be used together with preConfirm, see usage example:\n' + 'https://sweetalert2.github.io/#ajax-request');
+ }
+
+ validateCustomTargetElement(params); // Replace newlines with
in title
+
+ if (typeof params.title === 'string') {
+ params.title = params.title.split('\n').join('
');
+ }
+
+ init(params);
+ }
+
+ const swalStringParams = ['swal-title', 'swal-html', 'swal-footer'];
+ const getTemplateParams = params => {
+ const template = typeof params.template === 'string' ? document.querySelector(params.template) : params.template;
+
+ if (!template) {
+ return {};
+ }
+
+ const templateContent = template.content;
+ showWarningsForElements(templateContent);
+ const result = Object.assign(getSwalParams(templateContent), getSwalButtons(templateContent), getSwalImage(templateContent), getSwalIcon(templateContent), getSwalInput(templateContent), getSwalStringParams(templateContent, swalStringParams));
+ return result;
+ };
+
+ const getSwalParams = templateContent => {
+ const result = {};
+ toArray(templateContent.querySelectorAll('swal-param')).forEach(param => {
+ showWarningsForAttributes(param, ['name', 'value']);
+ const paramName = param.getAttribute('name');
+ let value = param.getAttribute('value');
+
+ if (typeof defaultParams[paramName] === 'boolean' && value === 'false') {
+ value = false;
+ }
+
+ if (typeof defaultParams[paramName] === 'object') {
+ value = JSON.parse(value);
+ }
+
+ result[paramName] = value;
+ });
+ return result;
+ };
+
+ const getSwalButtons = templateContent => {
+ const result = {};
+ toArray(templateContent.querySelectorAll('swal-button')).forEach(button => {
+ showWarningsForAttributes(button, ['type', 'color', 'aria-label']);
+ const type = button.getAttribute('type');
+ result["".concat(type, "ButtonText")] = button.innerHTML;
+ result["show".concat(capitalizeFirstLetter(type), "Button")] = true;
+
+ if (button.hasAttribute('color')) {
+ result["".concat(type, "ButtonColor")] = button.getAttribute('color');
+ }
+
+ if (button.hasAttribute('aria-label')) {
+ result["".concat(type, "ButtonAriaLabel")] = button.getAttribute('aria-label');
+ }
+ });
+ return result;
+ };
+
+ const getSwalImage = templateContent => {
+ const result = {};
+ const image = templateContent.querySelector('swal-image');
+
+ if (image) {
+ showWarningsForAttributes(image, ['src', 'width', 'height', 'alt']);
+
+ if (image.hasAttribute('src')) {
+ result.imageUrl = image.getAttribute('src');
+ }
+
+ if (image.hasAttribute('width')) {
+ result.imageWidth = image.getAttribute('width');
+ }
+
+ if (image.hasAttribute('height')) {
+ result.imageHeight = image.getAttribute('height');
+ }
+
+ if (image.hasAttribute('alt')) {
+ result.imageAlt = image.getAttribute('alt');
+ }
+ }
+
+ return result;
+ };
+
+ const getSwalIcon = templateContent => {
+ const result = {};
+ const icon = templateContent.querySelector('swal-icon');
+
+ if (icon) {
+ showWarningsForAttributes(icon, ['type', 'color']);
+
+ if (icon.hasAttribute('type')) {
+ result.icon = icon.getAttribute('type');
+ }
+
+ if (icon.hasAttribute('color')) {
+ result.iconColor = icon.getAttribute('color');
+ }
+
+ result.iconHtml = icon.innerHTML;
+ }
+
+ return result;
+ };
+
+ const getSwalInput = templateContent => {
+ const result = {};
+ const input = templateContent.querySelector('swal-input');
+
+ if (input) {
+ showWarningsForAttributes(input, ['type', 'label', 'placeholder', 'value']);
+ result.input = input.getAttribute('type') || 'text';
+
+ if (input.hasAttribute('label')) {
+ result.inputLabel = input.getAttribute('label');
+ }
+
+ if (input.hasAttribute('placeholder')) {
+ result.inputPlaceholder = input.getAttribute('placeholder');
+ }
+
+ if (input.hasAttribute('value')) {
+ result.inputValue = input.getAttribute('value');
+ }
+ }
+
+ const inputOptions = templateContent.querySelectorAll('swal-input-option');
+
+ if (inputOptions.length) {
+ result.inputOptions = {};
+ toArray(inputOptions).forEach(option => {
+ showWarningsForAttributes(option, ['value']);
+ const optionValue = option.getAttribute('value');
+ const optionName = option.innerHTML;
+ result.inputOptions[optionValue] = optionName;
+ });
+ }
+
+ return result;
+ };
+
+ const getSwalStringParams = (templateContent, paramNames) => {
+ const result = {};
+
+ for (const i in paramNames) {
+ const paramName = paramNames[i];
+ const tag = templateContent.querySelector(paramName);
+
+ if (tag) {
+ showWarningsForAttributes(tag, []);
+ result[paramName.replace(/^swal-/, '')] = tag.innerHTML.trim();
+ }
+ }
+
+ return result;
+ };
+
+ const showWarningsForElements = template => {
+ const allowedElements = swalStringParams.concat(['swal-param', 'swal-button', 'swal-image', 'swal-icon', 'swal-input', 'swal-input-option']);
+ toArray(template.children).forEach(el => {
+ const tagName = el.tagName.toLowerCase();
+
+ if (allowedElements.indexOf(tagName) === -1) {
+ warn("Unrecognized element <".concat(tagName, ">"));
+ }
+ });
+ };
+
+ const showWarningsForAttributes = (el, allowedAttributes) => {
+ toArray(el.attributes).forEach(attribute => {
+ if (allowedAttributes.indexOf(attribute.name) === -1) {
+ warn(["Unrecognized attribute \"".concat(attribute.name, "\" on <").concat(el.tagName.toLowerCase(), ">."), "".concat(allowedAttributes.length ? "Allowed attributes are: ".concat(allowedAttributes.join(', ')) : 'To set the value, use HTML within the element.')]);
+ }
+ });
+ };
+
+ const SHOW_CLASS_TIMEOUT = 10;
+ /**
+ * Open popup, add necessary classes and styles, fix scrollbar
+ *
+ * @param params
+ */
+
+ const openPopup = params => {
+ const container = getContainer();
+ const popup = getPopup();
+
+ if (typeof params.willOpen === 'function') {
+ params.willOpen(popup);
+ }
+
+ const bodyStyles = window.getComputedStyle(document.body);
+ const initialBodyOverflow = bodyStyles.overflowY;
+ addClasses$1(container, popup, params); // scrolling is 'hidden' until animation is done, after that 'auto'
+
+ setTimeout(() => {
+ setScrollingVisibility(container, popup);
+ }, SHOW_CLASS_TIMEOUT);
+
+ if (isModal()) {
+ fixScrollContainer(container, params.scrollbarPadding, initialBodyOverflow);
+ setAriaHidden();
+ }
+
+ if (!isToast() && !globalState.previousActiveElement) {
+ globalState.previousActiveElement = document.activeElement;
+ }
+
+ if (typeof params.didOpen === 'function') {
+ setTimeout(() => params.didOpen(popup));
+ }
+
+ removeClass(container, swalClasses['no-transition']);
+ };
+
+ const swalOpenAnimationFinished = event => {
+ const popup = getPopup();
+
+ if (event.target !== popup) {
+ return;
+ }
+
+ const container = getContainer();
+ popup.removeEventListener(animationEndEvent, swalOpenAnimationFinished);
+ container.style.overflowY = 'auto';
+ };
+
+ const setScrollingVisibility = (container, popup) => {
+ if (animationEndEvent && hasCssAnimation(popup)) {
+ container.style.overflowY = 'hidden';
+ popup.addEventListener(animationEndEvent, swalOpenAnimationFinished);
+ } else {
+ container.style.overflowY = 'auto';
+ }
+ };
+
+ const fixScrollContainer = (container, scrollbarPadding, initialBodyOverflow) => {
+ iOSfix();
+
+ if (scrollbarPadding && initialBodyOverflow !== 'hidden') {
+ fixScrollbar();
+ } // sweetalert2/issues/1247
+
+
+ setTimeout(() => {
+ container.scrollTop = 0;
+ });
+ };
+
+ const addClasses$1 = (container, popup, params) => {
+ addClass(container, params.showClass.backdrop); // the workaround with setting/unsetting opacity is needed for #2019 and 2059
+
+ popup.style.setProperty('opacity', '0', 'important');
+ show(popup, 'grid');
+ setTimeout(() => {
+ // Animate popup right after showing it
+ addClass(popup, params.showClass.popup); // and remove the opacity workaround
+
+ popup.style.removeProperty('opacity');
+ }, SHOW_CLASS_TIMEOUT); // 10ms in order to fix #2062
+
+ addClass([document.documentElement, document.body], swalClasses.shown);
+
+ if (params.heightAuto && params.backdrop && !params.toast) {
+ addClass([document.documentElement, document.body], swalClasses['height-auto']);
+ }
+ };
+
+ const handleInputOptionsAndValue = (instance, params) => {
+ if (params.input === 'select' || params.input === 'radio') {
+ handleInputOptions(instance, params);
+ } else if (['text', 'email', 'number', 'tel', 'textarea'].includes(params.input) && (hasToPromiseFn(params.inputValue) || isPromise(params.inputValue))) {
+ showLoading(getConfirmButton());
+ handleInputValue(instance, params);
+ }
+ };
+ const getInputValue = (instance, innerParams) => {
+ const input = instance.getInput();
+
+ if (!input) {
+ return null;
+ }
+
+ switch (innerParams.input) {
+ case 'checkbox':
+ return getCheckboxValue(input);
+
+ case 'radio':
+ return getRadioValue(input);
+
+ case 'file':
+ return getFileValue(input);
+
+ default:
+ return innerParams.inputAutoTrim ? input.value.trim() : input.value;
+ }
+ };
+
+ const getCheckboxValue = input => input.checked ? 1 : 0;
+
+ const getRadioValue = input => input.checked ? input.value : null;
+
+ const getFileValue = input => input.files.length ? input.getAttribute('multiple') !== null ? input.files : input.files[0] : null;
+
+ const handleInputOptions = (instance, params) => {
+ const popup = getPopup();
+
+ const processInputOptions = inputOptions => populateInputOptions[params.input](popup, formatInputOptions(inputOptions), params);
+
+ if (hasToPromiseFn(params.inputOptions) || isPromise(params.inputOptions)) {
+ showLoading(getConfirmButton());
+ asPromise(params.inputOptions).then(inputOptions => {
+ instance.hideLoading();
+ processInputOptions(inputOptions);
+ });
+ } else if (typeof params.inputOptions === 'object') {
+ processInputOptions(params.inputOptions);
+ } else {
+ error("Unexpected type of inputOptions! Expected object, Map or Promise, got ".concat(typeof params.inputOptions));
+ }
+ };
+
+ const handleInputValue = (instance, params) => {
+ const input = instance.getInput();
+ hide(input);
+ asPromise(params.inputValue).then(inputValue => {
+ input.value = params.input === 'number' ? parseFloat(inputValue) || 0 : "".concat(inputValue);
+ show(input);
+ input.focus();
+ instance.hideLoading();
+ }).catch(err => {
+ error("Error in inputValue promise: ".concat(err));
+ input.value = '';
+ show(input);
+ input.focus();
+ instance.hideLoading();
+ });
+ };
+
+ const populateInputOptions = {
+ select: (popup, inputOptions, params) => {
+ const select = getChildByClass(popup, swalClasses.select);
+
+ const renderOption = (parent, optionLabel, optionValue) => {
+ const option = document.createElement('option');
+ option.value = optionValue;
+ setInnerHtml(option, optionLabel);
+ option.selected = isSelected(optionValue, params.inputValue);
+ parent.appendChild(option);
+ };
+
+ inputOptions.forEach(inputOption => {
+ const optionValue = inputOption[0];
+ const optionLabel = inputOption[1]; //