Merge branch 'master' of https://github.com/AlexKhymenko/ngx-permissions

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 8.1.0
+Add support for loading roles with permissions at the same time
+Add remove roles with permissions at the same time
+
 ## 7.0.3
 Fix ivy build on different versions (https://github.com/AlexKhymenko/ngx-permissions/issues/112)
 

README.md

@@ -10,7 +10,7 @@ Permission and roles based access control for your angular(angular 2,4,5,6,7,8+)
 [![npm version](https://badge.fury.io/js/ngx-permissions.svg)](https://badge.fury.io/js/ngx-permissions)
 
 ## Documentation and examples
-
+Documentation here is outdated please visit [wiki-page](https://github.com/AlexKhymenko/ngx-permissions/wiki).
 To see better structured documentation go to [wiki-page](https://github.com/AlexKhymenko/ngx-permissions/wiki).  
 In `one month` the detailed functionality description will be available only on wiki page.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "application",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
@@ -51,6 +51,6 @@
     "ts-node": "~8.3.0",
     "tslint": "~5.18.0",
     "typescript": "3.9.6",
-    "codecov": "~3.6.5"
+    "codecov": "~3.7.1"
   }
 }

projects/ngx-permissions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-permissions",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/AlexKhymenko/ngx-permissions"

projects/ngx-permissions/src/lib/router/permissions-guard-isolate.service.spec.ts

@@ -218,7 +218,7 @@ class RootRolesComponent {
 class ParentLazyRolesLoadedComponent {
 }
 
-function getLazyRolesLoadedModule(importedModule: ModuleWithProviders) {
+function getLazyRolesLoadedModule(importedModule: ModuleWithProviders<any>) {
     @Component({selector: 'ngx-permissions-lazy', template: 'lazy-loaded-child'})
     class ChildLazyLoadedComponent {
         constructor(public permissions: NgxRolesService) {

projects/ngx-permissions/src/lib/service/roles.service.spec.ts

@@ -183,6 +183,50 @@ describe('Roles Service', () => {
         });
     }));
 
+    it('should add permissions to roles automatically', fakeAsync(() => {
+        localService.addRoleWithPermissions('test', ['one', 'two']);
+        localService.hasOnlyRoles('test').then((data) => {
+            expect(data).toBe(true);
+        });
+    }));
+
+    it('should remove roles and permissions add the same time', fakeAsync(() => {
+        localService.addRoleWithPermissions('test', ['one', 'two']);
+        localService.hasOnlyRoles('test').then((data) => {
+            expect(data).toBe(true);
+        });
+    }));
+
+    it('should remove all permissions and roles', fakeAsync(() => {
+        expect(Object.keys(localService.getRoles()).length).toEqual(0);
+        localService.addRoleWithPermissions(RoleNamesEnum.ADMIN as any, ['edit', 'remove']);
+        localService.addRoleWithPermissions(RoleNamesEnum.GUEST as any, ['edit1', 'remove2']);
+        expect(Object.keys(localService.getRoles()).length).toEqual(2);
+        expect(Object.keys(permissionsService.getPermissions()).length).toEqual(4);
+        localService.flushRolesAndPermissions();
+        expect(Object.keys(localService.getRoles()).length).toEqual(0);
+        expect(Object.keys(permissionsService.getPermissions()).length).toEqual(0);
+    }));
+
+
+    it('should add multiple roles with permissions', fakeAsync(() => {
+        expect(Object.keys(localService.getRoles()).length).toEqual(0);
+        localService.addRolesWithPermissions({
+            ADMIN: ['Nice'],
+            GUEST: ['Awesome', 'Another awesome']
+        });
+
+        expect(Object.keys(localService.getRoles()).length).toEqual(2);
+        expect(localService.getRoles()).toEqual(
+            {
+                ADMIN: {name: 'ADMIN', validationFunction: ['Nice']},
+                GUEST: {name: 'GUEST', validationFunction: ['Awesome', 'Another awesome']}
+            });
+
+        expect(Object.keys(localService.getRoles()).length).toEqual(2);
+        expect(Object.keys(permissionsService.getPermissions()).length).toEqual(3);
+    }));
+
     xit('maybe add functionality when function returns array', fakeAsync(() => {
         localService.addRole('test', () => ['nice']);
         localService.hasOnlyRoles(['nice']).then((data) => {

projects/ngx-permissions/src/lib/service/roles.service.ts

@@ -39,16 +39,32 @@ export class NgxRolesService {
         this.rolesSource.next(roles);
     }
 
+    public addRoleWithPermissions(name: string, permissions: string[]) {
+        this.permissionsService.addPermission(permissions);
+        this.addRole(name, permissions);
+    }
+
     public addRoles(rolesObj: { [name: string]: ValidationFn | string[] }) {
         Object.keys(rolesObj).forEach((key, index) => {
             this.addRole(key, rolesObj[key]);
         });
     }
 
+    public addRolesWithPermissions(rolesObj: { [name: string]: string[] }) {
+        Object.keys(rolesObj).forEach((key, index) => {
+            this.addRoleWithPermissions(key, rolesObj[key]);
+        });
+    }
+
     public flushRoles() {
         this.rolesSource.next({});
     }
 
+    public flushRolesAndPermissions() {
+        this.flushRoles();
+        this.permissionsService.flushPermissions();
+    }
+
     public removeRole(roleName: string) {
         const roles = {
             ...this.rolesSource.value