{{ notification.time }}
diff --git a/apps/red-ui/src/app/modules/account/account-routing.module.ts b/apps/red-ui/src/app/modules/account/account-routing.module.ts
index 447f6ad99..3afb6b6e4 100644
--- a/apps/red-ui/src/app/modules/account/account-routing.module.ts
+++ b/apps/red-ui/src/app/modules/account/account-routing.module.ts
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard, CompositeRouteGuard } from '@iqser/common-ui';
-import { RedRoleGuard } from '../auth/red-role.guard';
+import { CompositeRouteGuard, IqserAuthGuard } from '@iqser/common-ui';
+import { RedRoleGuard } from '@users/red-role.guard';
import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component';
const routes: Routes = [
@@ -11,7 +11,7 @@ const routes: Routes = [
component: BaseAccountScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
},
loadChildren: () => import('./screens/user-profile/user-profile.module').then(m => m.UserProfileModule),
},
@@ -20,7 +20,7 @@ const routes: Routes = [
component: BaseAccountScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
requiredRoles: ['RED_USER'],
},
loadChildren: () => import('./screens/notifications/notifications.module').then(m => m.NotificationsModule),
diff --git a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts
index a3405ac88..ffbd2978f 100644
--- a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts
+++ b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts
@@ -1,6 +1,6 @@
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { UserService } from '@services/user.service';
+import { UserService } from '@users/user.service';
interface NavItem {
readonly label: string;
diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts
index bd65107f8..7e20a3d37 100644
--- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts
+++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts
@@ -6,10 +6,10 @@ import { BaseFormComponent, LanguageService, LoadingService } from '@iqser/commo
import { IProfile } from '@red/domain';
import { languagesTranslations } from '@translations/languages-translations';
import { PermissionsService } from '@services/permissions.service';
-import { UserService } from '@services/user.service';
+import { UserService } from '@users/user.service';
import { ConfigService } from '@services/config.service';
import { firstValueFrom } from 'rxjs';
-import { UserPreferenceService } from '@services/user-preference.service';
+import { UserPreferenceService } from '@users/user-preference.service';
@Component({
selector: 'redaction-user-profile-screen',
diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
index cf74be383..81597e8d8 100644
--- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
-import { AuthGuard, CompositeRouteGuard } from '@iqser/common-ui';
-import { RedRoleGuard } from '../auth/red-role.guard';
+import { CompositeRouteGuard, IqserAuthGuard } from '@iqser/common-ui';
+import { RedRoleGuard } from '@users/red-role.guard';
import { EntitiesListingScreenComponent } from './screens/entities-listing/entities-listing-screen.component';
import { PendingChangesGuard } from '@guards/can-deactivate.guard';
import { FileAttributesListingScreenComponent } from './screens/file-attributes-listing/file-attributes-listing-screen.component';
@@ -36,7 +36,7 @@ const dossierTemplateIdRoutes: Routes = [
component: EntitiesListingScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
},
},
{
@@ -45,7 +45,7 @@ const dossierTemplateIdRoutes: Routes = [
canActivate: [CompositeRouteGuard],
loadChildren: () => import('./screens/entities/entities.module').then(m => m.EntitiesModule),
data: {
- routeGuards: [AuthGuard, RedRoleGuard, EntityExistsGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard, EntityExistsGuard],
},
},
],
@@ -55,7 +55,7 @@ const dossierTemplateIdRoutes: Routes = [
component: BaseDossierTemplateScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
},
loadChildren: () => import('./screens/rules/rules.module').then(m => m.RulesModule),
},
@@ -64,7 +64,7 @@ const dossierTemplateIdRoutes: Routes = [
component: FileAttributesListingScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
},
},
{
@@ -77,7 +77,7 @@ const dossierTemplateIdRoutes: Routes = [
component: BaseDossierTemplateScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
},
loadChildren: () => import('./screens/reports/reports.module').then(m => m.ReportsModule),
},
@@ -86,7 +86,7 @@ const dossierTemplateIdRoutes: Routes = [
component: DossierAttributesListingScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
},
},
{
@@ -94,7 +94,7 @@ const dossierTemplateIdRoutes: Routes = [
component: DossierStatesListingScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
},
},
{
@@ -102,7 +102,7 @@ const dossierTemplateIdRoutes: Routes = [
component: DefaultColorsScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
},
},
{
@@ -120,7 +120,7 @@ const dossierTemplatesRoutes: Routes = [
component: BaseAdminScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
},
loadChildren: () =>
import('./screens/dossier-templates-listing/dossier-templates-listing.module').then(m => m.DossierTemplatesListingModule),
@@ -140,7 +140,7 @@ const routes: Routes = [
children: dossierTemplatesRoutes,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard, DossierTemplatesGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard, DossierTemplatesGuard],
requiredRoles: ['RED_MANAGER', 'RED_ADMIN'],
},
},
@@ -155,7 +155,7 @@ const routes: Routes = [
],
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
requiredRoles: ['RED_USER_ADMIN'],
},
},
@@ -164,7 +164,7 @@ const routes: Routes = [
component: BaseAdminScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard, PermissionsGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard, PermissionsGuard],
requiredRoles: ['RED_ADMIN'],
permissionsObject: 'Dossier',
},
@@ -175,7 +175,7 @@ const routes: Routes = [
component: BaseAdminScreenComponent,
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
requiredRoles: ['RED_ADMIN'],
},
loadChildren: () => import('./screens/license/license.module').then(m => m.LicenseModule),
@@ -191,7 +191,7 @@ const routes: Routes = [
],
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
requiredRoles: ['RED_ADMIN'],
},
},
@@ -206,7 +206,7 @@ const routes: Routes = [
],
canActivate: [CompositeRouteGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
requiredRoles: ['RED_ADMIN'],
},
},
@@ -222,7 +222,7 @@ const routes: Routes = [
canActivate: [CompositeRouteGuard],
canDeactivate: [PendingChangesGuard],
data: {
- routeGuards: [AuthGuard, RedRoleGuard],
+ routeGuards: [IqserAuthGuard, RedRoleGuard],
requiredRoles: ['RED_ADMIN'],
},
},
diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
index 47b8f12ab..9290bd348 100644
--- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
+++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
@@ -1,8 +1,8 @@
import { Component, HostBinding, Input, OnInit } from '@angular/core';
-import { UserPreferenceService } from '@services/user-preference.service';
+import { UserPreferenceService } from '@users/user-preference.service';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { adminSideNavTranslations } from '@translations/admin-side-nav-translations';
-import { UserService } from '@services/user.service';
+import { UserService } from '@users/user.service';
import { ActivatedRoute } from '@angular/router';
import { AdminSideNavType, AdminSideNavTypes, ENTITY_TYPE } from '@red/domain';
diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts
index ec6c82e40..429a6c558 100644
--- a/apps/red-ui/src/app/modules/admin/admin.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin.module.ts
@@ -45,6 +45,7 @@ import { SystemPreferencesFormComponent } from './screens/general-config/system-
import { ConfigureCertificateDialogComponent } from './dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component';
import { PkcsSignatureConfigurationComponent } from './dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component';
import { KmsSignatureConfigurationComponent } from './dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component';
+import { IqserUsersModule } from '@iqser/common-ui';
const dialogs = [
AddEditCloneDossierTemplateDialogComponent,
@@ -97,6 +98,6 @@ const components = [
@NgModule({
declarations: [...components],
providers: [AdminDialogService, AuditService, DigitalSignatureService, RulesService, SmtpConfigService],
- imports: [CommonModule, SharedModule, AdminRoutingModule, SharedAdminModule, A11yModule],
+ imports: [CommonModule, SharedModule, AdminRoutingModule, SharedAdminModule, A11yModule, IqserUsersModule],
})
export class AdminModule {}
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts
index 76f730234..72283a849 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts
@@ -1,6 +1,6 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
-import { UserService } from '@services/user.service';
+import { UserService } from '@users/user.service';
import { LoadingService, Toaster } from '@iqser/common-ui';
import { User } from '@red/domain';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts
index 3b329464a..7a0bd35f8 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts
@@ -5,7 +5,7 @@ import { BaseFormComponent, IconButtonTypes, IProfileUpdateRequest, LoadingServi
import { rolesTranslations } from '@translations/roles-translations';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { User } from '@red/domain';
-import { UserService } from '@services/user.service';
+import { UserService } from '@users/user.service';
import { HttpStatusCode } from '@angular/common/http';
import { firstValueFrom } from 'rxjs';
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts
index 759f5759e..0919ebbee 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts
@@ -1,7 +1,7 @@
import { Component, Inject } from '@angular/core';
import { UntypedFormGroup, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { getCurrentUser } from '@services/user.service';
+import { getCurrentUser } from '@users/user.service';
import { ISmtpConfiguration } from '@red/domain';
import { BaseDialogComponent } from '@iqser/common-ui';
diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
index 70408fd7e..6ea98fdf8 100644
--- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
@@ -38,19 +38,18 @@
-
+ >
+
+
-
+
+
@@ -91,7 +90,7 @@