Merge pull request #1115 from rocket-admin/fixes

lyubov-voloshko · web-flow · commit 4e6beebab124 · 2025-04-04T12:29:29.000+03:00
login: check if saas when checking custom domain
diff --git a/frontend/src/app/components/login/login.component.ts b/frontend/src/app/components/login/login.component.ts
@@ -71,7 +71,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
   ngOnInit(): void {
     const domain = window.location.hostname;
 
-    if (domain !== 'app.rocketadmin.com' && domain !== 'localhost') {
+    if (domain !== 'app.rocketadmin.com' && domain !== 'localhost' && this.isSaas) {
       this.isCustomDomain = true;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ export class LoginComponent implements OnInit, AfterViewInit {`
`71`	`71`	`ngOnInit(): void {`
`72`	`72`	`const domain = window.location.hostname;`
`73`	`73`
`74`		`- if (domain !== 'app.rocketadmin.com' && domain !== 'localhost') {`
	`74`	`+ if (domain !== 'app.rocketadmin.com' && domain !== 'localhost' && this.isSaas) {`
`75`	`75`	`this.isCustomDomain = true;`
`76`	`76`	`}`
`77`	`77`