Merge pull request #1344 from rocket-admin/saml

Saml

Author: lyubov-voloshko

frontend/CLAUDE.md

@@ -1,9 +1,19 @@
 FROM public.ecr.aws/docker/library/node:18-alpine as builder
+ARG VERSION
 WORKDIR /app
 COPY package.json yarn.lock ./
 RUN yarn global add @angular/cli && yarn install
 COPY angular.json browserslist tsconfig.app.json tsconfig.json tslint.json ./
+COPY scripts ./scripts/
 COPY src ./src/
+
+# Update version if VERSION build arg is provided
+RUN if [ -n "$VERSION" ]; then \
+    echo "Updating package.json version to $VERSION" && \
+    npm version $VERSION --no-git-tag-version && \
+    yarn update-version; \
+  fi
+
 RUN ng build --configuration=production
 
 FROM public.ecr.aws/docker/library/nginx:alpine

frontend/Dockerfile

@@ -1,16 +1,17 @@
 {
   "name": "dissendium-v0",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
+    "start": "node scripts/update-version.js && ng serve",
+    "build": "node scripts/update-version.js && ng build",
     "test": "ng test",
     "test:ci": "ng test --watch=false --browsers=ChromeHeadlessCustom",
     "lint": "ng lint",
     "e2e": "ng e2e",
     "analyze": "webpack-bundle-analyzer dist/dissendium-v0/stats.json",
-    "build:stats": "ng build --stats-json"
+    "build:stats": "node scripts/update-version.js && ng build --stats-json",
+    "update-version": "node scripts/update-version.js"
   },
   "private": true,
   "dependencies": {

frontend/package.json

@@ -0,0 +1,16 @@
+const fs = require('fs');
+const path = require('path');
+
+// Read package.json to get the version
+const packageJsonPath = path.join(__dirname, '..', 'package.json');
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+const version = packageJson.version;
+
+// Update the version.ts file
+const versionTsPath = path.join(__dirname, '..', 'src', 'app', 'version.ts');
+const versionTsContent = `// This file is auto-generated during build
+export const version = '${version}';
+`;
+
+fs.writeFileSync(versionTsPath, versionTsContent);
+console.log(`Updated version.ts with version ${version}`);

frontend/scripts/update-version.js

@@ -29,6 +29,7 @@ import { UserDeletedSuccessComponent } from './components/user-deleted-success/u
 import { UserSettingsComponent } from './components/user-settings/user-settings.component';
 import { UsersComponent } from './components/users/users.component';
 import { ZapierComponent } from './components/zapier/zapier.component';
+import { SsoComponent } from './components/sso/sso.component';
 
 const routes: Routes = [
   {path: '', redirectTo: '/connections-list', pathMatch: 'full'},
@@ -46,6 +47,7 @@ const routes: Routes = [
   // company routes have to be in this specific order
   {path: 'company/:company-id/verify/:verification-token', pathMatch: 'full', component: CompanyMemberInvitationComponent, title: 'Invitation | Rocketadmin'},
   {path: 'company', pathMatch: 'full', component: CompanyComponent, canActivate: [AuthGuard]},
+  {path: 'sso/:company-id', pathMatch: 'full', component: SsoComponent, canActivate: [AuthGuard]},
   {path: 'change-password', component: PasswordChangeComponent, canActivate: [AuthGuard]},
   {path: 'upgrade', component: UpgradeComponent, canActivate: [AuthGuard], title: 'Upgrade | Rocketadmin'},
   {path: 'upgrade/payment', component: PaymentFormComponent, canActivate: [AuthGuard], title: 'Payment | Rocketadmin'},

frontend/src/app/app-routing.module.ts

@@ -220,7 +220,7 @@
         </mat-tab-nav-panel>
 
         <div *ngIf="!authBarTheme" class="footer">
-            <span class="footer__text">&copy; 2025 Rocketadmin</span>
+            <span class="footer__text">&copy; 2025 Rocketadmin • v{{appVersion}}</span>
         </div>
         <app-feature-notification *ngIf="isFeatureNotificationShown" (dismiss)="dismissFeatureNotification()"></app-feature-notification>
     </mat-sidenav-content>

frontend/src/app/app.component.html

@@ -29,6 +29,7 @@ import { UserService } from './services/user.service';
 import amplitude from 'amplitude-js';
 import { differenceInMilliseconds } from 'date-fns';
 import { environment } from '../environments/environment';
+import { version } from './version';
 
 //@ts-ignore
 window.amplitude = amplitude;
@@ -58,6 +59,7 @@ amplitude.getInstance().init("9afd282be91f94da735c11418d5ff4f5");
 export class AppComponent {
 
   public isSaas = (environment as any).saas;
+  public appVersion = version;
   userActivity;
   userInactive: Subject<any> = new Subject();
   currentFeatureNotificationId: string = 'saved-filters';

frontend/src/app/app.component.ts

@@ -77,7 +77,9 @@
     }
 }
 
-.tableHeader__button {
+.tableHeader__actions {
+    display: flex;
+    gap: 8px;
     margin-bottom: 16px;
 }
 

frontend/src/app/components/company/company.component.css

@@ -57,22 +57,35 @@ <h1 class="mat-h1 companyPageHeader">
 
     <div class="tableHeader">
         <h2 class="heading-2 tableHeader__heading">Members <span *ngIf="currentPlan === 'free' && isSaas" data-testid="company-members-max-string">(max 3)</span></h2>
-        <div data-testid="company-invitation-button-wrapper"
-            [matTooltip]="currentPlan === 'free' && usersCount >= 3 && isSaas ? 'To add more members please upgrade your plan.' : null">
-            <button *ngIf="currentUser && currentUser.role === 'ADMIN'"
-                mat-flat-button type="button"
-                data-testid="company-invitation-button"
-                angulartics2On="click"
-                angularticsAction="Company: invite member is clicked"
-                class="tableHeader__button" color="primary"
-                (click)="handleAddMemberDialogOpen()"
-                [disabled]="currentPlan === 'free' && usersCount >= 3 && isSaas">
-                Invite member
-                <mat-icon *ngIf="currentPlan === 'free' && usersCount >= 3 && isSaas">
-                    info_outline
-                </mat-icon>
-            </button>
+        <div class="tableHeader__actions">
+            <div data-testid="sso-button-wrapper"
+                [matTooltip]="currentPlan !== 'enterprise' && isSaas ? 'To turn on SAML SSO upgrade your plan to Enterprise.' : null">
+                <a *ngIf="currentUser && (currentUser.role === 'ADMIN' || currentUser.role === 'DB_ADMIN')"
+                    mat-button
+                    routerLink="/sso/{{company.id}}"
+                    [disabled]="currentPlan !== 'enterprise' && isSaas"
+                    angulartics2On="click"
+                    angularticsAction="Dashboard: add row is clicked">
+                    Configure SAML
+                </a>
+            </div>
+            <div data-testid="company-invitation-button-wrapper"
+                [matTooltip]="currentPlan === 'free' && usersCount >= 3 && isSaas ? 'To add more members please upgrade your plan.' : null">
+                <button *ngIf="currentUser && currentUser.role === 'ADMIN'"
+                    mat-flat-button type="button" color="primary"
+                    data-testid="company-invitation-button"
+                    angulartics2On="click"
+                    angularticsAction="Company: invite member is clicked"
+                    (click)="handleAddMemberDialogOpen()"
+                    [disabled]="currentPlan === 'free' && usersCount >= 3 && isSaas">
+                    Invite member
+                    <mat-icon *ngIf="currentPlan === 'free' && usersCount >= 3 && isSaas">
+                        info_outline
+                    </mat-icon>
+                </button>
+            </div>
         </div>
+
     </div>
 
     <app-placeholder-table-data *ngIf="submittingUsersChange"></app-placeholder-table-data>

frontend/src/app/components/company/company.component.html

@@ -16,6 +16,7 @@ import { SubscriptionPlans } from 'src/app/models/user';
 import { UserService } from 'src/app/services/user.service';
 import { of } from 'rxjs';
 import { provideHttpClient } from '@angular/common/http';
+import { provideRouter } from '@angular/router';
 
 describe('CompanyComponent', () => {
   let component: CompanyComponent;
@@ -128,6 +129,7 @@ describe('CompanyComponent', () => {
         CompanyComponent
     ],
     providers: [
+        provideRouter([]),
         provideHttpClient(),
         { provide: CompanyService, useValue: fakeCompanyService },
         { provide: UserService, useValue: fakeUserService }