Skip to content

Commit fc129c0

Browse files
ismcagdasismcagdas
committed
2 parents 60da63d + 122e881 commit fc129c0

File tree

18 files changed

+188
-61
lines changed

18 files changed

+188
-61
lines changed

‎src/AbpCompanyName.AbpProjectName.Application/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
"dependencies": {
55
"AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*",
6-
"Abp.EntityFrameworkCore": "0.10.3",
7-
"Abp.AutoMapper": "0.10.3"
6+
"Abp.EntityFrameworkCore": "0.11.0.2",
7+
"Abp.AutoMapper": "0.11.0.2"
88
},
99

1010
"frameworks": {

‎src/AbpCompanyName.AbpProjectName.Core/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": "1.0.0.0-*",
33

44
"dependencies": {
5-
"Abp": "0.10.3",
5+
"Abp": "0.11.0.2",
66
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
77
"Microsoft.Extensions.Configuration.Json": "1.0.0"
88
},

‎src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": "1.0.0.0-*",
33

44
"dependencies": {
5-
"Abp.EntityFrameworkCore": "0.10.3",
5+
"Abp.EntityFrameworkCore": "0.11.0.2",
66
"AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*",
77
"Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
88
"Microsoft.EntityFrameworkCore.SqlServer.Design": {

‎src/AbpCompanyName.AbpProjectName.Web/Startup/Startup.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using System;
22
using Abp.AspNetCore;
3-
using Abp.AspNetCore.Mvc;
3+
using Abp.Castle.Logging.Log4Net;
44
using Abp.EntityFrameworkCore;
55
using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
66
using Castle.Facilities.Logging;
77
using Microsoft.AspNetCore.Builder;
88
using Microsoft.AspNetCore.Hosting;
9+
using Microsoft.AspNetCore.Mvc;
910
using Microsoft.Extensions.DependencyInjection;
1011
using Microsoft.Extensions.Logging;
1112

@@ -23,15 +24,15 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
2324

2425
services.AddMvc(options =>
2526
{
26-
options.AddAbp(services); //Add ABP infrastructure to MVC
27+
options.Filters.Add(new AutoValidateAntiforgeryTokenAttribute());
2728
});
2829

2930
//Configure Abp and Dependency Injection
3031
return services.AddAbp<AbpProjectNameWebModule>(options =>
3132
{
3233
//Configure Log4Net logging
3334
options.IocManager.IocContainer.AddFacility<LoggingFacility>(
34-
f => f.UseLog4Net().WithConfig("log4net.config")
35+
f => f.UseAbpLog4Net().WithConfig("log4net.config")
3536
);
3637
});
3738
}

‎src/AbpCompanyName.AbpProjectName.Web/Views/Shared/_Layout.cshtml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
@using Abp.Timing
44
@using AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.LanguageSelection
55
@using AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.TopMenu
6+
@using Abp.Web.Security.AntiForgery
7+
@inject IAbpAntiForgeryManager AbpAntiForgeryManager
8+
@{
9+
AbpAntiForgeryManager.SetCookie(Context);
10+
}
611
<!DOCTYPE html>
712
<html lang="en">
813
<head>

‎src/AbpCompanyName.AbpProjectName.Web/bower.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
"jquery-validation": "^1.15.0",
1515
"blockUI": "jquery.blockUI#*",
1616
"spin.js": "^2.3.2"
17+
},
18+
"resolutions": {
19+
"abp-web-resources": "^0.11.1"
1720
}
1821
}

‎src/AbpCompanyName.AbpProjectName.Web/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"dependencies": {
33
"AbpCompanyName.AbpProjectName.Application": "1.0.0.0-*",
44
"AbpCompanyName.AbpProjectName.EntityFrameworkCore": "1.0.0.0-*",
5-
"Castle.Windsor-log4net": "3.3.0",
65
"Castle.LoggingFacility.MsLogging": "1.0.0",
76
"Microsoft.AspNetCore.Diagnostics": "1.0.0",
87
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0",
@@ -31,7 +30,8 @@
3130
"version": "1.0.0-preview2-final",
3231
"type": "build"
3332
},
34-
"Abp.AspNetCore": "0.10.3"
33+
"Abp.AspNetCore": "0.11.0.2",
34+
"Abp.Castle.Log4Net": "0.11.0.2"
3535
},
3636

3737
"tools": {

‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/.bower.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"authors": [
55
"Halil İbrahim Kalkan"
66
],
7-
"version": "0.10.3",
7+
"version": "0.11.1",
88
"description": "Script and style resources for ASP.NET Boilerplate based web projects.",
99
"main": "Abp/Framework/scripts/abp.js",
1010
"moduleType": [],
@@ -25,13 +25,14 @@
2525
".nuget",
2626
"packages"
2727
],
28-
"_release": "0.10.3",
28+
"_release": "0.11.1",
2929
"_resolution": {
3030
"type": "version",
31-
"tag": "v0.10.3",
32-
"commit": "756cbf5522a25e09a3604edbaf3aec7e8d7e0d21"
31+
"tag": "v0.11.1",
32+
"commit": "a7d6729adf20dbaada1b271f73c4c6e97ab52cc0"
3333
},
3434
"_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
35-
"_target": "^0.10.0",
36-
"_originalSource": "abp-web-resources"
35+
"_target": "^0.11.1",
36+
"_originalSource": "abp-web-resources",
37+
"_direct": true
3738
}

‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.js‎

Lines changed: 85 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@
504504
var fix = search.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
505505
return str.replace(new RegExp(fix, 'g'), replacement);
506506
};
507-
507+
508508
/* Formats a string just like string.format in C#.
509509
* Example:
510510
* abp.utils.formatString('Hello {0}','Tuana') = 'Hello Tuana'
@@ -580,6 +580,78 @@
580580
return !!(obj && obj.constructor && obj.call && obj.apply);
581581
};
582582

583+
/**
584+
* parameterInfos should be an array of { name, value } objects
585+
* where name is query string parameter name and value is it's value.
586+
* includeQuestionMark is true by default.
587+
*/
588+
abp.utils.buildQueryString = function (parameterInfos, includeQuestionMark) {
589+
if (includeQuestionMark === undefined) {
590+
includeQuestionMark = true;
591+
}
592+
593+
var qs = '';
594+
595+
for (var i = 0; i < parameterInfos.length; ++i) {
596+
var parameterInfo = parameterInfos[i];
597+
if (parameterInfo.value === undefined) {
598+
continue;
599+
}
600+
601+
if (!qs.length) {
602+
if (includeQuestionMark) {
603+
qs = qs + '?';
604+
}
605+
} else {
606+
qs = qs + '&';
607+
}
608+
609+
qs = qs + parameterInfo.name + '=' + escape(parameterInfo.value);
610+
}
611+
612+
return qs;
613+
}
614+
615+
/**
616+
* Sets a cookie value for given key.
617+
* @param {string} key
618+
* @param {string} value
619+
* @param {Date} expireDate Optional expire date (default: 30 days).
620+
*/
621+
abp.utils.setCookieValue = function (key, value, expireDate) {
622+
if (!expireDate) {
623+
expireDate = new Date();
624+
expireDate.setDate(expireDate.getDate() + 30);
625+
}
626+
627+
document.cookie = encodeURIComponent(key) + '=' + encodeURIComponent(value) + "; expires=" + expireDate.toUTCString();
628+
};
629+
630+
/**
631+
* Gets a cookie with given key.
632+
* @param {string} key
633+
* @returns {string} Cookie value
634+
*/
635+
abp.utils.getCookieValue = function (key) {
636+
var equalities = document.cookie.split('; ');
637+
for (var i = 0; i < equalities.length; i++) {
638+
if (!equalities[i]) {
639+
continue;
640+
}
641+
642+
var splitted = equalities[i].split('=');
643+
if (splitted.length != 2) {
644+
continue;
645+
}
646+
647+
if (decodeURIComponent(splitted[0]) === key) {
648+
return decodeURIComponent(splitted[1] || '');
649+
}
650+
}
651+
652+
return null;
653+
};
654+
583655
/* TIMING *****************************************/
584656
abp.timing = abp.timing || {};
585657

@@ -697,4 +769,15 @@
697769

698770
abp.clock.provider = abp.timing.unspecifiedClockProvider;
699771

700-
})(jQuery);
772+
/* SECURITY ***************************************/
773+
abp.security = abp.security || {};
774+
abp.security.antiForgery = abp.security.antiForgery || {};
775+
776+
abp.security.antiForgery.tokenCookieName = 'XSRF-TOKEN';
777+
abp.security.antiForgery.tokenHeaderName = 'X-XSRF-TOKEN';
778+
779+
abp.security.antiForgery.getToken = function () {
780+
return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName);
781+
};
782+
783+
})(jQuery);

‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js‎

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
details: 'You are not allowed to perform this operation.'
5858
},
5959

60+
defaultError404: {
61+
message: 'Resource not found!',
62+
details: 'The resource requested could not found on the server.'
63+
},
64+
6065
logError: function (error) {
6166
abp.log.error(error);
6267
},
@@ -78,19 +83,24 @@
7883
},
7984

8085
handleNonAbpErrorResponse: function (jqXHR, userOptions, $dfd) {
81-
switch (jqXHR.status) {
82-
case 401:
83-
abp.ajax.handleUnAuthorizedRequest(
84-
abp.ajax.showError(abp.ajax.defaultError401),
85-
abp.appPath
86-
);
87-
break;
88-
case 403:
89-
abp.ajax.showError(abp.ajax.defaultError403);
90-
break;
91-
default:
92-
abp.ajax.showError(abp.ajax.defaultError);
93-
break;
86+
if (userOptions.abpHandleError !== false) {
87+
switch (jqXHR.status) {
88+
case 401:
89+
abp.ajax.handleUnAuthorizedRequest(
90+
abp.ajax.showError(abp.ajax.defaultError401),
91+
abp.appPath
92+
);
93+
break;
94+
case 403:
95+
abp.ajax.showError(abp.ajax.defaultError403);
96+
break;
97+
case 404:
98+
abp.ajax.showError(abp.ajax.defaultError404);
99+
break;
100+
default:
101+
abp.ajax.showError(abp.ajax.defaultError);
102+
break;
103+
}
94104
}
95105

96106
$dfd.reject.apply(this, arguments);
@@ -120,7 +130,9 @@
120130
var messagePromise = null;
121131

122132
if (data.error) {
123-
messagePromise = abp.ajax.showError(data.error);
133+
if (userOptions.abpHandleError !== false) {
134+
messagePromise = abp.ajax.showError(data.error);
135+
}
124136
} else {
125137
data.error = abp.ajax.defaultError;
126138
}
@@ -130,7 +142,7 @@
130142
$dfd && $dfd.reject(data.error, jqXHR);
131143
userOptions.error && userOptions.error(data.error, jqXHR);
132144

133-
if (jqXHR.status == 401) {
145+
if (jqXHR.status === 401 && userOptions.abpHandleError !== false) {
134146
abp.ajax.handleUnAuthorizedRequest(messagePromise, data.targetUrl);
135147
}
136148
} else { //not wrapped result
@@ -161,9 +173,19 @@
161173
abp.ui.clearBusy(options.blockUI);
162174
}
163175
}
176+
},
177+
178+
ajaxSendHandler: function (event, request, settings) {
179+
if (!settings.headers || settings.headers[abp.security.antiForgery.tokenHeaderName] === undefined) {
180+
request.setRequestHeader(abp.security.antiForgery.tokenHeaderName, abp.security.antiForgery.getToken());
181+
}
164182
}
165183
});
166184

185+
$(document).ajaxSend(function (event, request, settings) {
186+
return abp.ajax.ajaxSendHandler(event, request, settings);
187+
});
188+
167189
/* JQUERY PLUGIN ENHANCEMENTS ********************************************/
168190

169191
/* jQuery Form Plugin
@@ -209,6 +231,8 @@
209231
abp.ajax.defaultError401.details = abp.localization.abpWeb('DefaultErrorDetail401');
210232
abp.ajax.defaultError403.message = abp.localization.abpWeb('DefaultError403');
211233
abp.ajax.defaultError403.details = abp.localization.abpWeb('DefaultErrorDetail403');
234+
abp.ajax.defaultError404.message = abp.localization.abpWeb('DefaultError404');
235+
abp.ajax.defaultError404.details = abp.localization.abpWeb('DefaultErrorDetail404');
212236
});
213237

214238
})(jQuery);

0 commit comments

Comments
 (0)