Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
feat(frontend:auth): route users to their default files location
johavenb6b3b7d42caa
diff --git a/frontend/src/app/app.constants.ts b/frontend/src/app/app.constants.tsindex c5bd0a84..7ed724ae 100644--- a/frontend/src/app/app.constants.ts+++ b/frontend/src/app/app.constants.ts@@ -6,7 +6,8 @@ export const APP_NAME = productNameexport const APP_VERSION = versionexport const APP_PATH = {- BASE: ''+ BASE: '',+ HOME: 'home'} as constexport const APP_MENU: AppMenu = {diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.tsindex 7a0ead30..eda35ded 100644--- a/frontend/src/app/app.routes.ts+++ b/frontend/src/app/app.routes.ts@@ -1,8 +1,8 @@import { Routes } from '@angular/router'import { APP_PATH } from './app.constants'import { adminRoutes } from './applications/admin/admin.routes'+import { homeRoutes } from './applications/home/home.routes'import { linksRoutes } from './applications/links/links.routes'-import { RECENTS_PATH } from './applications/recents/recents.constants'import { recentsRoutes } from './applications/recents/recents.routes'import { searchRoutes } from './applications/search/search.routes'import { spacesRoutes } from './applications/spaces/spaces.routes'@@ -17,9 +17,9 @@ export const routes: Routes = [path: APP_PATH.BASE,component: LayoutComponent,canActivate: [authGuard],- children: [...recentsRoutes, ...searchRoutes, ...spacesRoutes, ...userRoutes, ...syncRoutes, ...adminRoutes]+ children: [...homeRoutes, ...recentsRoutes, ...searchRoutes, ...spacesRoutes, ...userRoutes, ...syncRoutes, ...adminRoutes]},...authRoutes,...linksRoutes,- { path: '**', redirectTo: RECENTS_PATH.BASE }+ { path: '**', redirectTo: APP_PATH.HOME }]diff --git a/frontend/src/app/applications/home/home.component.ts b/frontend/src/app/applications/home/home.component.tsnew file mode 100644index 00000000..75ad7feb--- /dev/null+++ b/frontend/src/app/applications/home/home.component.ts@@ -0,0 +1,7 @@+import { Component } from '@angular/core'++@Component({+ selector: 'app-home',+ template: ''+})+export class HomeComponent {}diff --git a/frontend/src/app/applications/home/home.guard.ts b/frontend/src/app/applications/home/home.guard.tsnew file mode 100644index 00000000..de78e01d--- /dev/null+++ b/frontend/src/app/applications/home/home.guard.ts@@ -0,0 +1,9 @@+import { inject } from '@angular/core'+import { CanActivateFn, Router } from '@angular/router'+import { UserService } from '../users/user.service'++export const homeGuard: CanActivateFn = () => {+ // The parent auth guard has initialized the user before this permission-based redirect runs.+ const defaultLandingPath = inject(UserService).getDefaultLandingPath()+ return inject(Router).createUrlTree([defaultLandingPath])+}diff --git a/frontend/src/app/applications/home/home.routes.ts b/frontend/src/app/applications/home/home.routes.tsnew file mode 100644index 00000000..651561e2--- /dev/null+++ b/frontend/src/app/applications/home/home.routes.ts@@ -0,0 +1,9 @@+import { Routes } from '@angular/router'+import { APP_PATH } from '../../app.constants'+import { HomeComponent } from './home.component'+import { homeGuard } from './home.guard'++export const homeRoutes: Routes = [+ { path: APP_PATH.BASE, pathMatch: 'full', redirectTo: APP_PATH.HOME },+ { path: APP_PATH.HOME, component: HomeComponent, canActivate: [homeGuard] }+]diff --git a/frontend/src/app/applications/recents/recents.routes.ts b/frontend/src/app/applications/recents/recents.routes.tsindex 99101b62..1df4290f 100644--- a/frontend/src/app/applications/recents/recents.routes.ts+++ b/frontend/src/app/applications/recents/recents.routes.ts@@ -1,9 +1,5 @@import { Routes } from '@angular/router'-import { APP_PATH } from '../../app.constants'import { RecentsComponent } from './components/recents.component'import { RECENTS_PATH } from './recents.constants'-export const recentsRoutes: Routes = [- { path: APP_PATH.BASE, pathMatch: 'full', redirectTo: RECENTS_PATH.BASE },- { path: RECENTS_PATH.BASE, component: RecentsComponent }-]+export const recentsRoutes: Routes = [{ path: RECENTS_PATH.BASE, component: RecentsComponent }]diff --git a/frontend/src/app/applications/users/user.service.ts b/frontend/src/app/applications/users/user.service.tsindex bcb7602d..4b68ff36 100644--- a/frontend/src/app/applications/users/user.service.ts+++ b/frontend/src/app/applications/users/user.service.ts@@ -60,7 +60,8 @@ import { AppMenu, AppMenuEntry, isAppMenu, isAppMenuSeparator } from '../../layoimport { LayoutService } from '../../layout/layout.service'import { StoreService } from '../../store/store.service'import { NotificationsService } from '../notifications/notifications.service'-import { SPACES_TITLE } from '../spaces/spaces.constants'+import { RECENTS_PATH } from '../recents/recents.constants'+import { SPACES_MENU, SPACES_TITLE } from '../spaces/spaces.constants'import { UserAuth2FaVerifyDialogComponent } from './components/dialogs/user-auth-2fa-verify-dialog.component'import { UserType } from './interfaces/user.interface'import { GroupBrowseModel } from './models/group-browse.model'@@ -264,6 +265,11 @@ export class UserService {)}+ getDefaultLandingPath(): string {+ this.setMenusVisibility([SPACES_MENU])+ return SPACES_MENU.link || RECENTS_PATH.BASE+ }+setMenusVisibility(menus: AppMenuEntry[]) {for (const menu of menus) {if (isAppMenuSeparator(menu)) {diff --git a/frontend/src/app/auth/auth.component.ts b/frontend/src/app/auth/auth.component.tsindex 2e01d1c3..ae5966e3 100644--- a/frontend/src/app/auth/auth.component.ts+++ b/frontend/src/app/auth/auth.component.ts@@ -11,8 +11,8 @@ import type { AuthOIDCSettings } from '@sync-in-server/backend/src/authenticatioimport type { TwoFaResponseDto, TwoFaVerifyDto } from '@sync-in-server/backend/src/authentication/providers/two-fa/auth-two-fa.dtos'import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'import { finalize } from 'rxjs/operators'+import { APP_PATH } from '../app.constants'import { logoDarkUrl } from '../applications/files/files.constants'-import { RECENTS_PATH } from '../applications/recents/recents.constants'import { AutofocusDirective } from '../common/directives/auto-focus.directive'import type { AuthResult } from './auth.interface'import { AuthService } from './auth.service'@@ -157,7 +157,7 @@ export class AuthComponent {this.loginForm.reset()})} else {- this.router.navigate([RECENTS_PATH.BASE]).then(() => this.loginForm.reset())+ this.router.navigate([APP_PATH.HOME]).then(() => this.loginForm.reset())}} else {this.hasError = res.message || 'Server connection error'diff --git a/frontend/src/app/auth/auth.guards.ts b/frontend/src/app/auth/auth.guards.tsindex 76242dc9..55cc8b44 100644--- a/frontend/src/app/auth/auth.guards.ts+++ b/frontend/src/app/auth/auth.guards.ts@@ -1,6 +1,7 @@import { inject } from '@angular/core'import { ActivatedRouteSnapshot, CanActivateFn, Router, RouterStateSnapshot } from '@angular/router'import { Observable } from 'rxjs'+import { APP_PATH } from '../app.constants'import { AuthOIDCQueryParams } from './auth.interface'import { AuthService } from './auth.service'@@ -10,10 +11,9 @@ export const authGuard: CanActivateFn = (route: ActivatedRouteSnapshot, state: Rreturn inject(AuthService).checkUserAuthAndLoad(state.url, authFromOIDC)}-export const noAuthGuard: CanActivateFn = (): boolean => {+export const noAuthGuard: CanActivateFn = () => {if (inject(AuthService).isLogged()) {- inject(Router).navigate([]).catch(console.error)- return false+ return inject(Router).createUrlTree([APP_PATH.HOME])}return true}diff --git a/frontend/src/app/auth/auth.service.ts b/frontend/src/app/auth/auth.service.tsindex 17aac6af..5483a273 100644--- a/frontend/src/app/auth/auth.service.ts+++ b/frontend/src/app/auth/auth.service.ts@@ -165,12 +165,7 @@ export class AuthService {return of(false)} else if (!this.store.user.getValue()) {return this.userService.loadUser().pipe(- tap((r: Omit<LoginResponseDto, 'token'>) => {- this.initUser(r)- if (authFromOIDC) {- this.router.navigate([]).catch(console.error)- }- }),+ tap((r: Omit<LoginResponseDto, 'token'>) => this.initUser(r)),map(() => true),catchError((e: HttpErrorResponse) => {if (e.status === 401) {