Merge pull request #498 from acjh/patch-27

Update abp-web-resources and abp-ng2-module packages

Author: ismcagdas

angular/package.json

@@ -33,8 +33,8 @@
     "@types/moment": "^2.13.0",
     "@types/moment-timezone": "^0.5.12",
     "@types/toastr": "^2.1.33",
-    "abp-ng2-module": "^4.0.0",
-    "abp-web-resources": "^3.8.4",
+    "abp-ng2-module": "^5.1.1",
+    "abp-web-resources": "^5.1.1",
     "animate.css": "^3.5.2",
     "block-ui": "^2.70.1",
     "bootstrap": "^3.3.7",

angular/src/app/roles/roles.component.ts

@@ -66,6 +66,7 @@ export class RolesComponent extends PagedListingComponentBase<RoleDto> {
     delete(role: RoleDto): void {
         abp.message.confirm(
             this.l('RoleDeleteWarningMessage', role.displayName),
+            undefined,
             (result: boolean) => {
                 if (result) {
                     this._rolesService

angular/src/app/tenants/tenants.component.ts

@@ -67,6 +67,7 @@ export class TenantsComponent extends PagedListingComponentBase<TenantDto> {
     delete(tenant: TenantDto): void {
         abp.message.confirm(
             this.l('TenantDeleteWarningMessage', tenant.name),
+            undefined,
             (result: boolean) => {
                 if (result) {
                     this._tenantService

angular/src/app/users/users.component.ts

@@ -75,6 +75,7 @@ export class UsersComponent extends PagedListingComponentBase<UserDto> {
     protected delete(user: UserDto): void {
         abp.message.confirm(
             this.l('UserDeleteWarningMessage', user.fullName),
+            undefined,
             (result: boolean) => {
                 if (result) {
                     this._userService.delete(user.id).subscribe(() => {

angular/yarn.lock

@@ -1245,14 +1245,15 @@ abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
-abp-ng2-module@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-4.0.0.tgz#de1d952ce91847dc58ac2929654fee2a6c7a4525"
-  integrity sha512-k/KjkAWrNz2Cg2c5IQtEKdKDQA3LGW7nncJneeUz+Hl0KrV+sOi9c2LnaOL0Q7q0hCfUPhO9GkEUrQGpF7c5gQ==
+abp-ng2-module@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-5.1.1.tgz#a3e673656c3081e21b5dfa679f138d79ebbfc55e"
+  integrity sha512-eYtmjQegvjxd7qSYlotqPKbNnJQtFljUXElrpzC85EoVb8wPM2f9SOJcQ0FcgW8w8BXqdipg7YdiujM3bv/LTw==
 
-abp-web-resources@^3.8.2:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.8.2.tgz#b7768eb0757cff0266fd3c4e789af81e15c9dc96"
+abp-web-resources@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-5.1.1.tgz#3db1324179e3f28566f84f02c43fe9f3776bb81c"
+  integrity sha512-/ueU9++2ZGkjGe/oqdOA2rTEQbCkteZAputaP3Mcr2uvBWTJCvII/R7mgeCAC2x90qpH+WSiIBD6nNpgaSqTZA==
 
 accepts@~1.3.4, accepts@~1.3.5:
   version "1.3.5"
@@ -6590,12 +6591,6 @@ [email protected]:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1"
-  dependencies:
-    tslib "^1.9.0"
-
 rxjs@^6.4.0:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
@@ -8256,7 +8251,7 @@ yn@^3.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
   integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
 
-zone.js@~0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.2.tgz#67ca084b3116fc33fc40435e0d5ea40a207e392e"
-  integrity sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg==
+zone.js@~0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bower.json

@@ -25,7 +25,7 @@
     "chart.js": "chartjs#^2.6.0",
     "jquery-sparkline": "^2.1.3",
     "Flot": "jquery-flot#^0.8.3",
-    "abp-web-resources": "^3.5.0"
+    "abp-web-resources": "^4.2.0"
   },
   "resolutions": {
     "jquery": ">=1.6.3"

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/.bower.json

@@ -4,7 +4,7 @@
   "authors": [
     "Halil İbrahim Kalkan"
   ],
-  "version": "3.5.0",
+  "version": "4.2.0",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],
@@ -25,13 +25,13 @@
     ".nuget",
     "packages"
   ],
-  "_release": "3.5.0",
+  "_release": "4.2.0",
   "_resolution": {
     "type": "version",
-    "tag": "v3.5.0",
-    "commit": "5a6ff004cd1a55384dc8697dee3f06009d72e4ae"
+    "tag": "v4.2.0",
+    "commit": "db5593861ad4ffa44587e0be3a1e153735c6e699"
   },
   "_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
-  "_target": "^3.1.0",
+  "_target": "^4.2.0",
   "_originalSource": "abp-web-resources"
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.d.ts

@@ -18,6 +18,8 @@
 
         let isEnabled: boolean;
 
+        let ignoreFeatureCheckForHostUsers: boolean;
+
         let tenantIdCookieName: string;
 
         function setTenantIdCookie(tenantId?: number): void;
@@ -109,6 +111,19 @@
         function getToken(): string;
 
         function clearToken(): void;
+
+        let refreshTokenCookieName: string;
+
+        /**
+         * Saves refreshToken token.
+         * @param refreshToken The token to be saved.
+         * @param expireDate Optional expire date. If not specified, token will be deleted at end of the session.
+         */
+        function setRefreshToken(refreshToken: string, expireDate?: Date): void;
+
+        function getRefreshToken(): string;
+
+        function clearRefreshToken(): void;
     }
 
     namespace features {
@@ -293,17 +308,15 @@
 
         //TODO: these methods return jQuery.Promise instead of any. fix it.
 
-        function info(message: string, title?: string): any;
-
-        function success(message: string, title?: string): any;
+        function info(message: string, title?: string, options?: any): any;
 
-        function warn(message: string, title?: string): any;
+        function success(message: string, title?: string, options?: any): any;
 
-        function error(message: string, title?: string): any;
+        function warn(message: string, title?: string, options?: any): any;
 
-        function confirm(message: string, callback?: (result: boolean) => void): any;
+        function error(message: string, title?: string, options?: any): any;
 
-        function confirm(message: string, title?: string, callback?: (result: boolean) => void): any;
+        function confirm(message: string, title?: string, callback?: (result: boolean) => void, options?: any): any;
 
     }