Merge pull request #7653 from abpframework/auto-merge/rel-4-2/159

Merge branch dev with rel-4.2

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@abp/aspnetcore.mvc.ui.theme.basic": "^4.2.0",
-	"@abp/prismjs": "^4.2.0"
+    "@abp/prismjs": "^4.2.0"
   },
   "devDependencies": {}
-}
+}

npm/lerna.json

@@ -1,8 +1,6 @@
 {
   "version": "4.2.0",
-  "packages": [
+  "packages": ["packs/*"],
-    "packs/*"
-  ],
   "npmClient": "yarn",
   "lerna": "3.18.4"
 }

npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts

@@ -70,9 +70,7 @@ export class CurrentUserComponent {
     this.authService.initLogin();
   }
 
-  logout() {
+ logout() {
-    this.authService.logout().subscribe(() => {
+    this.authService.logout().subscribe();
-      this.router.navigate(['/'], { state: { redirectUrl: this.router.url } });
-    });
   }
 }