WEB-233: Improve the OIDC integration with 2FA (#2602)
This commit is contained in:
@@ -7,6 +7,9 @@ import { Router, ActivatedRoute, RouterLink } from '@angular/router';
|
||||
import { SystemService } from '../../system.service';
|
||||
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
|
||||
/** Custom Service Zitadel */
|
||||
import { AuthService } from 'app/zitadel/auth.service';
|
||||
|
||||
/**
|
||||
* Add Role Component.
|
||||
*/
|
||||
@@ -32,7 +35,8 @@ export class AddRoleComponent implements OnInit {
|
||||
private formBuilder: UntypedFormBuilder,
|
||||
private systemService: SystemService,
|
||||
private route: ActivatedRoute,
|
||||
private router: Router
|
||||
private router: Router,
|
||||
private authService: AuthService
|
||||
) {}
|
||||
|
||||
/**
|
||||
@@ -64,6 +68,7 @@ export class AddRoleComponent implements OnInit {
|
||||
*/
|
||||
submit() {
|
||||
this.systemService.createRole(this.roleForm.value).subscribe((response: any) => {
|
||||
this.authService.createRole(response.resourceId, this.roleForm.value.name, this.roleForm.value.description);
|
||||
this.router.navigate(['../'], { relativeTo: this.route });
|
||||
});
|
||||
}
|
||||
|
||||
@@ -7,6 +7,9 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router';
|
||||
import { SystemService } from '../../system.service';
|
||||
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
|
||||
/** Custom Service Zitadel */
|
||||
import { AuthService } from 'app/zitadel/auth.service';
|
||||
|
||||
/**
|
||||
* Edit Role Description Component.
|
||||
*/
|
||||
@@ -35,7 +38,8 @@ export class EditRoleComponent implements OnInit {
|
||||
private formBuilder: UntypedFormBuilder,
|
||||
private systemService: SystemService,
|
||||
private route: ActivatedRoute,
|
||||
private router: Router
|
||||
private router: Router,
|
||||
private authService: AuthService
|
||||
) {
|
||||
this.route.data.subscribe((data: { role: any }) => {
|
||||
this.roleData = data.role;
|
||||
@@ -71,6 +75,7 @@ export class EditRoleComponent implements OnInit {
|
||||
*/
|
||||
submit() {
|
||||
this.systemService.updateRole(this.roleForm.value, this.roleData.id).subscribe(() => {
|
||||
this.authService.updateRole(this.roleData.id, this.roleForm.get('name')?.value, this.roleForm.value.description);
|
||||
this.router.navigate(['../../'], { relativeTo: this.route });
|
||||
});
|
||||
}
|
||||
|
||||
@@ -18,6 +18,9 @@ import { MatDivider } from '@angular/material/divider';
|
||||
import { MatCheckbox } from '@angular/material/checkbox';
|
||||
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
|
||||
/** Custom Service Zitadel */
|
||||
import { AuthService } from 'app/zitadel/auth.service';
|
||||
|
||||
/**
|
||||
* View Role and Permissions Component
|
||||
*/
|
||||
@@ -84,7 +87,8 @@ export class ViewRoleComponent implements OnInit {
|
||||
private router: Router,
|
||||
private formBuilder: UntypedFormBuilder,
|
||||
private translateService: TranslateService,
|
||||
public dialog: MatDialog
|
||||
public dialog: MatDialog,
|
||||
private authService: AuthService
|
||||
) {
|
||||
this.route.data.subscribe((data: { roledetails: any }) => {
|
||||
this.rolePermissionService = data.roledetails;
|
||||
@@ -281,6 +285,7 @@ export class ViewRoleComponent implements OnInit {
|
||||
deleteRoleDialogRef.afterClosed().subscribe((response: any) => {
|
||||
if (response.delete) {
|
||||
this.systemService.deleteRole(this.roleId).subscribe(() => {
|
||||
this.authService.deleteRole(this.roleId);
|
||||
this.router.navigate(['/system/roles-and-permissions']);
|
||||
});
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user