feat: rename project to tenant

Author: EndyKaufman

.gitignore

@@ -53,3 +53,6 @@ access.log
 
 apps/client-e2e/src/video
 .vercel
+
+
+error.log

app-swagger.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "projectType": "application",
+  "$schema": "../../node_modules/nx/schemas/tenant-schema.json",
+  "tenantType": "application",
   "prefix": "app",
   "sourceRoot": "apps/client/src",
   "tags": [],
@@ -153,7 +153,7 @@
     },
     "test": {
       "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "outputs": ["{workspaceRoot}/coverage/{tenantRoot}"],
       "options": {
         "jestConfig": "apps/client/jest.config.ts"
       }

apps/client/project.json

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { TranslocoService } from '@jsverse/transloco';
-import { SsoActiveLangService, SsoActiveProjectService, SsoService, TokensService } from '@nestjs-mod-sso/sso-afat';
+import { SsoActiveLangService, SsoActiveTenantService, SsoService, TokensService } from '@nestjs-mod-sso/sso-afat';
 import { FilesRestSdkAngularService } from '@nestjs-mod/files-afat';
 import { SsoRestSdkAngularService } from '@nestjs-mod/sso-rest-sdk-angular';
 import { WebhookRestSdkAngularService } from '@nestjs-mod/webhook-afat';
@@ -15,7 +15,7 @@ export class AppInitializer {
     private readonly translocoService: TranslocoService,
     private readonly tokensService: TokensService,
     private readonly ssoActiveLangService: SsoActiveLangService,
-    private readonly ssoActiveProjectService: SsoActiveProjectService,
+    private readonly ssoActiveTenantService: SsoActiveTenantService,
     private readonly ssoRestSdkAngularService: SsoRestSdkAngularService,
     private readonly webhookRestSdkAngularService: WebhookRestSdkAngularService,
     private readonly filesRestSdkAngularService: FilesRestSdkAngularService,
@@ -42,7 +42,7 @@ export class AppInitializer {
       this.ssoService.updateHeaders$.asObservable(),
       this.tokensService.getStream(),
       this.translocoService.langChanges$,
-      this.ssoActiveProjectService.activePublicProject$,
+      this.ssoActiveTenantService.activePublicTenant$,
     )
       .pipe(tap(() => this.updateHeaders()))
       .subscribe();

apps/client/src/app/app-initializer.ts

@@ -12,7 +12,7 @@
         <li nz-menu-item routerLink="/users" transloco="Users"></li>
       }
       @if ([SsoRoleInterface.admin] | checkUserRoles | async) {
-        <li nz-menu-item routerLink="/projects" transloco="Projects"></li>
+        <li nz-menu-item routerLink="/tenants" transloco="Tenants"></li>
       }
       @if ([SsoRoleInterface.user, SsoRoleInterface.manager, SsoRoleInterface.admin] | checkUserRoles | async) {
         <ng-template #iconRef>
@@ -51,26 +51,26 @@
           </li>
         </ul>
       </li>
-      @if (publicProjects$ | async; as publicProjects) {
+      @if (publicTenants$ | async; as publicTenants) {
         @if (([SsoRoleInterface.admin] | checkUserRoles | async) || ([] | checkUserRoles | async)) {
           <li
             nz-submenu
-            [nzTitle]="(activePublicProject$ | async)?.name || ('Select active project' | transloco)"
+            [nzTitle]="(activePublicTenant$ | async)?.name || ('Select active tenant' | transloco)"
             [style]="{ float: 'right' }"
           >
             <ul>
               <li
-                *ngFor="let publicProject of publicProjects$ | async"
+                *ngFor="let publicTenant of publicTenants$ | async"
                 nz-menu-item
-                (click)="setActivePublicProject(publicProject)"
+                (click)="setActivePublicTenant(publicTenant)"
               >
-                {{ publicProject.name }}
+                {{ publicTenant.name }}
               </li>
             </ul>
           </li>
         } @else {
           <a nzDisabled="true" nz-menu-item [style]="{ float: 'right' }">{{
-            (activePublicProject$ | async)?.name || ('Select active project' | transloco)
+            (activePublicTenant$ | async)?.name || ('Select active tenant' | transloco)
           }}</a>
         }
       }

apps/client/src/app/app.component.html

@@ -13,8 +13,8 @@ import { Title } from '@angular/platform-browser';
 import {
   CheckUserRolesPipe,
   SsoActiveLangService,
-  SsoActiveProjectService,
-  SsoProjectModel,
+  SsoActiveTenantService,
+  SsoTenantModel,
   SsoService,
   TokensService,
   UserPipe,
@@ -59,8 +59,8 @@ export class AppComponent implements OnInit {
   availableLangs$ = new BehaviorSubject<LangDefinition[]>([]);
   SsoRoleInterface = SsoRoleInterface;
 
-  publicProjects$?: Observable<SsoProjectModel[] | undefined>;
-  activePublicProject$?: Observable<SsoProjectModel | undefined>;
+  publicTenants$?: Observable<SsoTenantModel[] | undefined>;
+  activePublicTenant$?: Observable<SsoTenantModel | undefined>;
 
   constructor(
     private readonly ssoRestSdkAngularService: SsoRestSdkAngularService,
@@ -69,7 +69,7 @@ export class AppComponent implements OnInit {
     private readonly translocoService: TranslocoService,
     private readonly tokensService: TokensService,
     private readonly ssoActiveLangService: SsoActiveLangService,
-    private readonly ssoActiveProjectService: SsoActiveProjectService,
+    private readonly ssoActiveTenantService: SsoActiveTenantService,
     private readonly titleService: Title,
     private readonly filesService: FilesService,
   ) {
@@ -78,7 +78,7 @@ export class AppComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.loadAvailablePublicProjects();
+    this.loadAvailablePublicTenants();
 
     this.loadAvailableLangs();
     this.subscribeToChangeProfile();
@@ -94,15 +94,15 @@ export class AppComponent implements OnInit {
     return (!value.toLowerCase().startsWith('http') ? this.filesService.getMinioURL() : '') + value;
   }
 
-  setActivePublicProject(activePublicProject?: SsoProjectModel) {
-    this.ssoActiveProjectService.setActivePublicProject(activePublicProject);
+  setActivePublicTenant(activePublicTenant?: SsoTenantModel) {
+    this.ssoActiveTenantService.setActivePublicTenant(activePublicTenant);
   }
 
-  private loadAvailablePublicProjects() {
-    this.publicProjects$ = this.ssoActiveProjectService.publicProjects$.asObservable();
-    this.activePublicProject$ = this.ssoActiveProjectService.activePublicProject$.asObservable();
+  private loadAvailablePublicTenants() {
+    this.publicTenants$ = this.ssoActiveTenantService.publicTenants$.asObservable();
+    this.activePublicTenant$ = this.ssoActiveTenantService.activePublicTenant$.asObservable();
 
-    this.ssoActiveProjectService.loadAvailablePublicProjects();
+    this.ssoActiveTenantService.loadAvailablePublicTenants();
   }
 
   private subscribeToChangeProfile() {
@@ -143,7 +143,7 @@ export class AppComponent implements OnInit {
       .pipe(
         tap((lang) => {
           this.lang$.next(lang);
-          this.ssoActiveProjectService.loadAvailablePublicProjects();
+          this.ssoActiveTenantService.loadAvailablePublicTenants();
         }),
         untilDestroyed(this),
       )

apps/client/src/app/app.component.ts

@@ -19,7 +19,7 @@ import { CompleteSignUpComponent } from './pages/complete-sign-up/complete-sign-
 import { ForgotPasswordComponent } from './pages/forgot-password/forgot-password.component';
 import { HomeComponent } from './pages/home/home.component';
 import { ProfileComponent } from './pages/profile/profile.component';
-import { ProjectsComponent } from './pages/projects/projects.component';
+import { TenantsComponent } from './pages/tenants/tenants.component';
 import { SignInComponent } from './pages/sign-in/sign-in.component';
 import { SignUpComponent } from './pages/sign-up/sign-up.component';
 import { TemplatesComponent } from './pages/templates/templates.component';
@@ -92,9 +92,9 @@ export const appRoutes: Route[] = [
     },
   },
   {
-    path: 'projects',
-    component: ProjectsComponent,
-    title: marker('Projects'),
+    path: 'tenants',
+    component: TenantsComponent,
+    title: marker('Tenants'),
     canActivate: [SsoGuardService],
     data: {
       [SSO_GUARD_DATA_ROUTE_KEY]: new SsoGuardData({
@@ -189,7 +189,7 @@ export const appRoutes: Route[] = [
           if (!redirectUri) {
             if (options.ssoService && options.router) {
               if (searchIn(SsoRoleInterface.admin, options.ssoService.profile$.value?.roles)) {
-                options.router.navigate(['/projects']);
+                options.router.navigate(['/tenants']);
               } else {
                 options.router.navigate(['/home']);
               }
@@ -228,7 +228,7 @@ export const appRoutes: Route[] = [
           if (!redirectUri) {
             if (options.ssoService && options.router) {
               if (searchIn(SsoRoleInterface.admin, options.ssoService.profile$.value?.roles)) {
-                options.router.navigate(['/projects']);
+                options.router.navigate(['/tenants']);
               } else {
                 options.router.navigate(['/home']);
               }

apps/client/src/app/app.routes.ts

@@ -11,7 +11,7 @@ import {
   OAuthProvider,
   OAuthVerificationInput,
   SSO_CONFIGURATION_TOKEN,
-  SsoActiveProjectService,
+  SsoActiveTenantService,
   SsoCompleteForgotPasswordInput,
   SsoCompleteSignUpInput,
   SsoConfiguration,
@@ -32,25 +32,25 @@ export class SsoIntegrationConfiguration implements SsoConfiguration {
     private readonly filesService: FilesService,
     private readonly translocoService: TranslocoService,
     private readonly tokensService: TokensService,
-    private readonly ssoActiveProjectService: SsoActiveProjectService,
+    private readonly ssoActiveTenantService: SsoActiveTenantService,
     private readonly fingerprintService: FingerprintService,
     private readonly nzMessageService: NzMessageService,
   ) {}
 
   getAuthorizationHeaders(): Record<string, string> {
     const lang = this.translocoService.getActiveLang();
     const accessToken = this.tokensService.getAccessToken();
-    const activeProjectAuthorizationHeaders = this.ssoActiveProjectService.getAuthorizationHeaders();
+    const activeTenantAuthorizationHeaders = this.ssoActiveTenantService.getAuthorizationHeaders();
     if (!accessToken) {
       return {
         'Accept-language': lang,
-        ...activeProjectAuthorizationHeaders,
+        ...activeTenantAuthorizationHeaders,
       };
     }
     return {
       ...(accessToken ? { Authorization: `Bearer ${accessToken}` } : {}),
       'Accept-language': lang,
-      ...activeProjectAuthorizationHeaders,
+      ...activeTenantAuthorizationHeaders,
     };
   }
 
@@ -327,7 +327,7 @@ export function provideSsoConfiguration(): Provider {
       FilesService,
       TranslocoService,
       TokensService,
-      SsoActiveProjectService,
+      SsoActiveTenantService,
       FingerprintService,
       NzMessageService,
     ],

apps/client/src/app/integrations/sso.configuration.ts

@@ -38,7 +38,7 @@ export class CompleteForgotPasswordComponent {
   onAfterCompleteForgotPassword() {
     if (!this.redirectUri) {
       if (searchIn(SsoRoleInterface.admin, this.ssoService.profile$.value?.roles)) {
-        this.router.navigate(['/projects']);
+        this.router.navigate(['/tenants']);
       } else {
         this.router.navigate(['/home']);
       }

apps/client/src/app/pages/complete-forgot-password/complete-forgot-password.component.ts

@@ -39,7 +39,7 @@ export class CompleteInviteComponent {
   onAfterCompleteForgotPassword() {
     if (!this.redirectUri) {
       if (searchIn(SsoRoleInterface.admin, this.ssoService.profile$.value?.roles)) {
-        this.router.navigate(['/projects']);
+        this.router.navigate(['/tenants']);
       } else {
         this.router.navigate(['/home']);
       }