Add admin granting and MS Teams update

Thomah · Thomah · commit 1fa96e829207 · 2022-05-05T16:32:31.000+02:00
diff --git a/src/app/_models/ms-team/ms-team.model.ts b/src/app/_models/ms-team/ms-team.model.ts
@@ -4,5 +4,7 @@ export class MsTeamModel extends AuditModel {
     displayName: string = '';
     tenantId: string = '';
     groupId: string = '';
+    channelId: string = '';
+    companyFilter: string = '';
     organization: GenericModel = new GenericModel();
 }
diff --git a/src/app/_models/user/user.model.ts b/src/app/_models/user/user.model.ts
@@ -9,6 +9,7 @@ export class UserModel extends AuditModel {
     avatarUrl: string = '';
     enabled: boolean = true;
     token: string = '';
+    userAuthoritiesRef: number[] = [];
     userOrganizationAuthoritiesRef: number[] = [];
 
     // Only in web component
diff --git a/src/app/_services/authentication/authentication.service.ts b/src/app/_services/authentication/authentication.service.ts
@@ -61,7 +61,7 @@ export class AuthenticationService {
 
     whoami(): Observable<User> {
         const principal = this.http.get<UserModel>(`${this.configService.get('apiUrl')}/whoami`);
-        const authorities = this.http.get<AuthorityModel[]>(`${this.configService.get('apiUrl')}/authority`);
+        const authorities = this.http.get<AuthorityModel[]>(`${this.configService.get('apiUrl')}/authority/me`);
         const orgauthorities = this.http.get<OrganizationAuthorityModel[]>(`${this.configService.get('apiUrl')}/orgauthorities`);
         const organizations = this.http.get<OrganizationModel[]>(`${this.configService.get('apiUrl')}/organizations`);
         return forkJoin([principal, authorities, orgauthorities, organizations])
diff --git a/src/app/_services/authority/authority.service.ts b/src/app/_services/authority/authority.service.ts
@@ -10,8 +10,8 @@ export class AuthorityService {
 
     constructor(private http: HttpClient, private configService: ConfigService) { }
   
-    getUserAuthorities() {
-      return this.http.get<AuthorityModel[]>(`${this.configService.get('apiUrl')}/authorities`);
+    list() {
+      return this.http.get<AuthorityModel[]>(`${this.configService.get('apiUrl')}/authority`);
     }
   
 }
diff --git a/src/app/_services/ms-team/ms-team.service.ts b/src/app/_services/ms-team/ms-team.service.ts
@@ -18,6 +18,10 @@ export class MsTeamService {
     return this.http.post(`${this.configService.get('apiUrl')}/team/ms`, team);
   }
   
+  update(team: MsTeamModel) {
+    return this.http.put(`${this.configService.get('apiUrl')}/team/ms`, team);
+  }
+  
   delete(id: number) {
     return this.http.delete(`${this.configService.get('apiUrl')}/team/ms/${id}`, {});
   }
diff --git a/src/app/_services/user/user.service.ts b/src/app/_services/user/user.service.ts
@@ -3,7 +3,7 @@ import { HttpClient, HttpParams } from '@angular/common/http';
 
 import { ConfigService } from '../config/config.service';
 
-import { AccountModel, DonationModel, UserModel, OrganizationModel, OrganizationAuthorityModel } from '../../_models';
+import { AccountModel, DonationModel, UserModel, OrganizationModel, OrganizationAuthorityModel, AuthorityModel } from '../../_models';
 
 import { ProjectModel } from '../../_models/project/project.model';
 
@@ -81,7 +81,11 @@ export class UserService {
         return this.http.delete(`${this.configService.get('apiUrl')}/user/${id}`);
     }
 
-    grant(id: number, organizationAuthority: OrganizationAuthorityModel) {
+    grant(id: number, authority: AuthorityModel) {
+        return this.http.post(`${this.configService.get('apiUrl')}/user/${id}/authorities`, authority);
+    }
+
+    grantOrgAuthority(id: number, organizationAuthority: OrganizationAuthorityModel) {
         return this.http.post(`${this.configService.get('apiUrl')}/user/${id}/orgauthorities`, organizationAuthority);
     }
 }
diff --git a/src/app/app/organizations/edit/edit-organization.component.html b/src/app/app/organizations/edit/edit-organization.component.html
@@ -132,6 +132,18 @@ <h3 class="card-title" i18n=@@informations>Informations</h3>
                                 <input type="url" formControlName="logoUrl" class="form-control" id="logoUrl"
                                     placeholder="Enter organization logo URL">
                             </div>
+                            <div *ngIf="msTeam && msTeam.id > 0" class="form-group has-feedback" [ngClass]="{ 'has-error': f['msPublicationGroupId'].errors }">
+                                <label for="msPublicationGroupId" i18n="@@msPublicationGroupId">Microsoft Publication Group ID</label>
+                                <input type="text" formControlName="msPublicationGroupId" [(ngModel)]="msTeam.groupId" class="form-control" id="msPublicationGroupId" placeholder="Microsoft Team Group ID">
+                            </div>
+                            <div *ngIf="msTeam && msTeam.id > 0" class="form-group has-feedback" [ngClass]="{ 'has-error': f['msPublicationChannelId'].errors }">
+                                <label for="msPublicationChannelId" i18n="@@msPublicationChannelId">Microsoft Publication Channel ID</label>
+                                <input type="text" formControlName="msPublicationChannelId" [(ngModel)]="msTeam.channelId" class="form-control" id="msPublicationChannelId" placeholder="Microsoft Team Channel ID">
+                            </div>
+                            <div *ngIf="msTeam && msTeam.id > 0" class="form-group has-feedback" [ngClass]="{ 'has-error': f['msCompanyFilter'].errors }">
+                                <label for="msCompanyFilter" i18n="@@msCompanyFilter">Microsoft Company Filter</label>
+                                <input type="text" formControlName="msCompanyFilter" [(ngModel)]="msTeam.companyFilter" class="form-control" id="msCompanyFilter" placeholder="Microsoft Company Filter">
+                            </div>
                             <div *ngIf="id > 0" class="form-group action-bar">
                                 <label i18n="@@thirdApps">Third Apps</label>
                                 <table class="table table-striped table-valign-middle">
diff --git a/src/app/app/organizations/edit/edit-organization.component.ts b/src/app/app/organizations/edit/edit-organization.component.ts
@@ -24,10 +24,32 @@ export class EditOrganizationComponent implements OnInit {
   organization: Organization = new Organization();
   authorities: Map<string, OrganizationAuthorityModel> = new Map<string, OrganizationAuthorityModel>();
 
+  // Slack OAuth
+  slackSyncStatus: string = 'idle';
+  slackDisconnectStatus: string = 'idle';
+  slackClientId: string = '';
+  redirectUrlSlackOAuth: string = '';
+  code: string = '';
+
+  // Microsoft OAuth
+  microsoftEnabled: boolean = false;
+  microsoftSyncStatus: string = 'idle';
+  microsoftDisconnectStatus: string = 'idle';
+  microsoftTenantId: string = '';
+  microsoftClientId: string = '';
+  microsoftState: string = '';
+  microsoftRedirectUrl: string = '';
+  microsoftCode: string = '';
+  msDisconnectStatus: string = 'idle';
+  msTeam: MsTeamModel = new MsTeamModel();
+
   // Forms
   editOrgForm: FormGroup = this.formBuilder.group({
     name: [this.organization.name, Validators.required],
-    logoUrl: [this.organization.logoUrl]
+    logoUrl: [this.organization.logoUrl],
+    msPublicationGroupId: [this.msTeam.groupId],
+    msPublicationChannelId: [this.msTeam.channelId],
+    msCompanyFilter: [this.msTeam.companyFilter]
   });
   addMemberOrgForm: FormGroup = this.formBuilder.group({
     email: ['', Validators.required]
@@ -46,25 +68,6 @@ export class EditOrganizationComponent implements OnInit {
   addStatus: string = 'idle';
   submitStatus: string = 'idle';
 
-  // Slack OAuth
-  slackSyncStatus: string = 'idle';
-  slackDisconnectStatus: string = 'idle';
-  slackClientId: string = '';
-  redirectUrlSlackOAuth: string = '';
-  code: string = '';
-
-  // Microsoft OAuth
-  microsoftEnabled: boolean = false;
-  microsoftSyncStatus: string = 'idle';
-  microsoftDisconnectStatus: string = 'idle';
-  microsoftTenantId: string = '';
-  microsoftClientId: string = '';
-  microsoftState: string = '';
-  microsoftRedirectUrl: string = '';
-  microsoftCode: string = '';
-  msDisconnectStatus: string = 'idle';
-  msTeam: MsTeamModel = new MsTeamModel();
-
   // Members card
   private rawResponseMembers: any;
   pagerMembers: any = {};
@@ -515,7 +518,7 @@ export class EditOrganizationComponent implements OnInit {
   grant(userId: number, role: string) {
     var organizationAuthority = this.organization.organizationAuthorities.find(authority => authority.name === role);
     if (organizationAuthority !== undefined) {
-      this.userService.grant(userId, organizationAuthority)
+      this.userService.grantOrgAuthority(userId, organizationAuthority)
         .subscribe(() => {
           this.refreshMembers(this.pagerMembers.currentPage);
         });
@@ -538,6 +541,16 @@ export class EditOrganizationComponent implements OnInit {
       organization.logoUrl = "https://eu.ui-avatars.com/api/?name=" + organization.name;
     }
 
+    if(this.msTeam.id > 0) {
+      this.msTeamService.update(this.msTeam)
+        .subscribe(
+          () => {},
+          error => {
+            console.log(error);
+          }
+        )
+    }
+
     if (this.id > 0) {
       organization.id = this.id;
       this.organizationService.update(organization)
diff --git a/src/app/app/users/users.component.html b/src/app/app/users/users.component.html
@@ -11,8 +11,9 @@ <h3 class="card-title" i18n="@@users">Users</h3>
                             [ngClass]="{ 'btn-success': refreshStatus == 'success', 'btn-danger': refreshStatus == 'error' }"
                             (click)="refresh(pager.currentPage)"><i class="fas fa-sync"></i>
                             <span i18n="@@refresh">Refresh</span></button>
-                        <button type="button" class="btn btn-default" (click)="openModalCreateUser(editUserModalTemplate)"><i
-                                class="fa fa-plus"></i> <span i18n="@@add">Add</span></button>
+                        <button type="button" class="btn btn-default"
+                            (click)="openModalCreateUser(editUserModalTemplate)"><i class="fa fa-plus"></i> <span
+                                i18n="@@add">Add</span></button>
                     </div>
                     <div class="col-6">
                         <div class="dataTables_length text-right">
@@ -36,6 +37,7 @@ <h3 class="card-title" i18n="@@users">Users</h3>
                                     <th i18n="@@username">Username</th>
                                     <th i18n="@@email">Email</th>
                                     <th i18n="@@createdAt">Created at</th>
+                                    <th i18n="@@isAdmin">Is Admin</th>
                                     <th i18n="@@enabled">Enabled</th>
                                     <th></th>
                                 </tr>
@@ -46,6 +48,10 @@ <h3 class="card-title" i18n="@@users">Users</h3>
                                     <td>{{ user.firstname }} {{ user.lastname }}</td>
                                     <td>{{ user.email }}</td>
                                     <td>{{ user.createdAt | date:'medium' }}</td>
+                                    <td *ngIf="isAdmin(user)" class="item-clickable text-green" (click)="grant(user.id)">
+                                        <i class="far fa-check-square"></i></td>
+                                    <td *ngIf="!isAdmin(user)" class="item-clickable text-red" (click)="grant(user.id)">
+                                        <i class="far fa-square"></i></td>
                                     <td *ngIf="user.enabled" class="text-green"><i class="far fa-check-square"></i></td>
                                     <td *ngIf="!user.enabled" class="text-red"><i class="far fa-square"></i></td>
                                     <td class="action-bar">
diff --git a/src/app/app/users/users.component.ts b/src/app/app/users/users.component.ts
@@ -3,8 +3,9 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { first } from 'rxjs/operators';
 import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
 
-import { UserModel } from 'src/app/_models';
-import { UserService, PagerService } from 'src/app/_services';
+import { AuthorityModel, UserModel } from 'src/app/_models';
+import { UserService, PagerService, AuthorityService } from 'src/app/_services';
+import { Authority, User } from 'src/app/_entities';
 
 @Component({
   selector: 'app-users',
@@ -23,9 +24,10 @@ export class UsersComponent implements OnInit {
     color: ['']
   });;
   closeResult: string = '';
-  userEdited: UserModel = new UserModel();;
+  userEdited: UserModel = new UserModel();
   submitting: boolean = false;
   refreshStatus: string = "no-refresh";
+  adminAuthority: AuthorityModel = new AuthorityModel();
 
   // Modal
   modalRef: BsModalRef = new BsModalRef();
@@ -37,16 +39,25 @@ export class UsersComponent implements OnInit {
   pageSize: number = 10;
 
   constructor(
+    private modalService: BsModalService,
     private formBuilder: FormBuilder,
     private pagerService: PagerService,
-    private userService: UserService,
-    private modalService: BsModalService) {
+    private authorityService: AuthorityService,
+    private userService: UserService) {
   }
 
   ngOnInit() {
+    this.refreshAuthorities();
     this.refresh();
   }
 
+  refreshAuthorities() {
+    this.authorityService.list()
+      .subscribe(response => {
+          var authority = response.find(element => element.name == 'ROLE_ADMIN');
+          this.adminAuthority = authority != null ? authority : new AuthorityModel();
+      });
+  }
 
   refresh(page: number = 1): void {
     if (this.pagerService.canChangePage(this.pager, page)) {
@@ -152,4 +163,20 @@ export class UsersComponent implements OnInit {
 
   }
 
+  isAdmin(user: UserModel) {
+    var userAdminAuthority = user.userAuthoritiesRef.find(element => element == this.adminAuthority.id)
+    console.log(user.userAuthoritiesRef);
+    console.log(this.adminAuthority.id);
+    return userAdminAuthority != null;
+  }
+
+  grant(userId: number) {
+    if (this.adminAuthority !== undefined) {
+      this.userService.grant(userId, this.adminAuthority)
+        .subscribe(() => {
+          this.refresh(this.pager.currentPage);
+        });
+    }
+  }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,7 @@ export class MsTeamModel extends AuditModel {`
`4`	`4`	`displayName: string = '';`
`5`	`5`	`tenantId: string = '';`
`6`	`6`	`groupId: string = '';`
	`7`	`+ channelId: string = '';`
	`8`	`+ companyFilter: string = '';`
`7`	`9`	`organization: GenericModel = new GenericModel();`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ export class AuthorityService {`
`10`	`10`
`11`	`11`	`constructor(private http: HttpClient, private configService: ConfigService) { }`
`12`	`12`
`13`		`- getUserAuthorities() {`
`14`		- return this.http.get<AuthorityModel[]>(`${this.configService.get('apiUrl')}/authorities`);
	`13`	`+ list() {`
	`14`	+ return this.http.get<AuthorityModel[]>(`${this.configService.get('apiUrl')}/authority`);
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,10 @@ export class MsTeamService {`
`18`	`18`	return this.http.post(`${this.configService.get('apiUrl')}/team/ms`, team);
`19`	`19`	`}`
`20`	`20`
	`21`	`+ update(team: MsTeamModel) {`
	`22`	+ return this.http.put(`${this.configService.get('apiUrl')}/team/ms`, team);
	`23`	`+ }`
	`24`	`+`
`21`	`25`	`delete(id: number) {`
`22`	`26`	return this.http.delete(`${this.configService.get('apiUrl')}/team/ms/${id}`, {});
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { HttpClient, HttpParams } from '@angular/common/http';`
`3`	`3`
`4`	`4`	`import { ConfigService } from '../config/config.service';`
`5`	`5`
`6`		`-import { AccountModel, DonationModel, UserModel, OrganizationModel, OrganizationAuthorityModel } from '../../_models';`
	`6`	`+import { AccountModel, DonationModel, UserModel, OrganizationModel, OrganizationAuthorityModel, AuthorityModel } from '../../_models';`
`7`	`7`
`8`	`8`	`import { ProjectModel } from '../../_models/project/project.model';`
`9`	`9`
`@@ -81,7 +81,11 @@ export class UserService {`
`81`	`81`	return this.http.delete(`${this.configService.get('apiUrl')}/user/${id}`);
`82`	`82`	`}`
`83`	`83`
`84`		`- grant(id: number, organizationAuthority: OrganizationAuthorityModel) {`
	`84`	`+ grant(id: number, authority: AuthorityModel) {`
	`85`	+ return this.http.post(`${this.configService.get('apiUrl')}/user/${id}/authorities`, authority);
	`86`	`+ }`
	`87`	`+`
	`88`	`+ grantOrgAuthority(id: number, organizationAuthority: OrganizationAuthorityModel) {`
`85`	`89`	return this.http.post(`${this.configService.get('apiUrl')}/user/${id}/orgauthorities`, organizationAuthority);
`86`	`90`	`}`
`87`	`91`	`}`