Merge pull request #86 from Mixeway/feature/ProjectOwner

Feature/project owner

angular.json

@@ -198,5 +198,8 @@
     "@schematics/angular:directive": {
       "prefix": "ngx"
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

src/app/@core/Model/ProjectUser.ts

@@ -0,0 +1,3 @@
+export class ProjectUser {
+  user: string;
+}

src/app/@core/constants/AdminConstants.ts

@@ -44,6 +44,10 @@ export class AdminConstants {
       'name': 'Viewer',
       'id': 'ROLE_USER',
     },
+    {
+      'name': 'Project Owner',
+      'id': 'ROLE_PROJECT_OWNER',
+    },
     {
       'name': 'Editor',
       'id': 'ROLE_EDITOR_RUNNER',
@@ -152,6 +156,7 @@ export class AdminConstants {
   ADMIN_FORM_PROJECTS = 'Permissions for projects';
   ADMIN_FORM_PROJECTS2 = 'Select projects...';
   ADMIN_ROLE_USER = 'ROLE_USER';
+  ADMIN_ROLE_PROJECT_OWNER = 'ROLE_PROJECT_OWNER';
   ADMIN_ROLE_USER2 = 'ROLE_EDITOR_RUNNER';
   ADMIN_FORM_EDIT = 'Edit';
   ADMIN_EDIT_USER = 'Editing user';

src/app/@core/service/ShowProjectService.ts

@@ -28,6 +28,7 @@ import {IaasApiType} from '../Model/IaasApiType';
 import {ProjectStats} from '../Model/ProjectStats';
 import {ProjectAudit} from '../Model/ProjectAudit';
 import {ProjectDetailsAudit} from '../Model/ProjectDetailsAudit';
+import {ProjectUser} from '../Model/ProjectUser';
 import {DetailStats} from '../Model/DetailStats';
 
 @Injectable({
@@ -516,4 +517,12 @@ export class ShowProjectService {
         catchError(this.errorHandl),
       );
   }
+
+  saveProjectUser(id, settings) {
+    return this.http.post<ProjectUser[]>(environment.backend + '/show/project/' + id + '/user/add', settings)
+      .pipe(
+        retry(1),
+        catchError(this.errorHandl),
+      );
+  }
 }

src/app/pages/admin/user/user.component.html

@@ -59,7 +59,7 @@
           <label for="userPassword" class="label">{{constants.ADMIN_FORM_USER_PASSWORD}} </label>
           <input type="password" nbInput fullWidth id="userPassword" [placeholder]="constants.ADMIN_FORM_USER_PASSWORD" formControlName="userPassword">
         </div>
-        <div class="form-group" *ngIf="( userForm.value.userRole==constants.ADMIN_ROLE_USER)">
+        <div class="form-group" *ngIf="( userForm.value.userRole==constants.ADMIN_ROLE_USER || userForm.value.userRole==constants.ADMIN_ROLE_PROJECT_OWNER)">
           <label for="permissionsProject" class="label">{{constants.ADMIN_FORM_PROJECTS}}</label>
           <ejs-multiselect formControlName="projects" id="permissionsProject" [dataSource]='projects' [fields]='fields' (filtering)='onFiltering($event)' [allowFiltering]='true'
                            [placeholder]='constants.ADMIN_FORM_PROJECTS2'></ejs-multiselect>

src/app/pages/admin/user/user.component.ts

@@ -167,7 +167,7 @@ export class UserComponent implements OnInit {
   }
 
   changedRole($event: any) {
-    if ($event === 'ROLE_USER' || $event === 'ROLE_ADMIN' || $event === 'ROLE_AUDITOR' || $event === 'ROLE_EDITOR_RUNNER') {
+    if ($event === 'ROLE_USER' || $event === 'ROLE_ADMIN' || $event === 'ROLE_AUDITOR' || $event === 'ROLE_EDITOR_RUNNER' || $event === 'ROLE_PROJECT_OWNER') {
       this.showUsername = true;
       this.showOptions = true;
     } else if ($event === 'ROLE_API') {

src/app/pages/show-project/show-project.component.html

@@ -62,8 +62,19 @@ <h3> {{ risk?.projectName }} <button *ngIf="showVulnAuditor" (click)="displayPro
         </div>
         <button type="submit" nbButton status="danger">{{constants.PROJECT_SAVE}}</button>
       </form>
+
+      <form [formGroup]="projectUserForm" (ngSubmit)="saveProjectUser(ref)">
+
+
+        <div class="form-group">
+          <label for="userProject" class="label">Who grant access to?</label>
+          <input type="text" nbInput fullWidth id="userProject" placeholder="username" formControlName="user">
+        </div>
+        <button type="submit" nbButton status="danger">{{constants.PROJECT_SAVE}}</button>
+      </form>
     </nb-card-body>
   </nb-card>
+
 </ng-template>
 <ng-template #showInstructions let-data let-ref="showInstructions">
   <nb-card>

src/app/pages/show-project/show-project.component.ts

@@ -13,6 +13,8 @@ import {ProjectInfo} from '../../@core/Model/ProjectInfo';
 import {VulnTrendChart} from '../../@core/Model/VulnTrendChart';
 import {Severities} from '../../@core/Model/Severities';
 import {ProjectStats} from '../../@core/Model/ProjectStats';
+import {ProjectUser} from '../../@core/Model/ProjectUser';
+
 
 @Component({
   selector: 'ngx-show-project',
@@ -45,7 +47,10 @@ export class ShowProjectComponent implements OnInit {
   severities: Severities;
   severitiesChartData: any = [];
   projectStats: ProjectStats;
+
   private vulnAuditorForm: any;
+  private projectUserForm: any;
+  projectUser: ProjectUser = new ProjectUser;
   constructor(private showProjectService: ShowProjectService, private _route: ActivatedRoute, private router: Router,
               private cookieService: CookieService, private dialogService: NbDialogService,
               private formBuilder: FormBuilder, private toast: Toast, private windowService: NbWindowService,
@@ -65,6 +70,9 @@ export class ShowProjectComponent implements OnInit {
       dclocation: this.projectInfo.networkdc,
       appClient: this.projectInfo.appClient,
     });
+    this.projectUserForm = this.formBuilder.group({
+      user: this.projectUser.user,
+    });
     this.updateShowDockerInfo();
   }
   loadTrendChartData() {
@@ -197,6 +205,22 @@ export class ShowProjectComponent implements OnInit {
       });
   }
 
+
+  saveProjectUser(ref) {
+      return this.showProjectService.saveProjectUser(this._entityId, this.projectUserForm.value).subscribe(() => {
+        this.toast.showToast('success', this.constants.PROJECT_OPERATION_SUCCESS,
+          'Project Settings saved successfully.');
+        this.loadProjectInfo();
+        ref.close();
+      },
+      () => {
+        this.toast.showToast('danger', this.constants.PROJECT_OPERATION_FAILURE,
+          this.constants.PROJECT_OPERATION_FAILURES);
+      });
+  }
+
+
+
   flipped = false;
 
   toggleView() {