Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

feat(frontend/backend): add `client` auth scope for password-based apps to register servers across desktop apps and CLI

johaven5f131bff0051
diff --git a/backend/src/applications/sync/services/sync-clients-manager.service.ts b/backend/src/applications/sync/services/sync-clients-manager.service.ts
index 0b3976a0..60d13ece 100644
--- a/backend/src/applications/sync/services/sync-clients-manager.service.ts
+++ b/backend/src/applications/sync/services/sync-clients-manager.service.ts
@@ -6,6 +6,7 @@ import crypto from 'node:crypto'
import fs from 'node:fs/promises'
import path from 'node:path'
import { AuthManager } from '../../../authentication/auth.service'
+import { AUTH_SCOPE } from '../../../authentication/constants/scope'
import { FastifyAuthenticatedRequest } from '../../../authentication/interfaces/auth-request.interface'
import { AuthProvider } from '../../../authentication/providers/auth-providers.models'
import { AuthProvider2FA } from '../../../authentication/providers/two-fa/auth-provider-two-fa.service'
@@ -45,7 +46,7 @@ export class SyncClientsManager {
) {}
async register(clientRegistrationDto: SyncClientRegistrationDto, ip: string): Promise<SyncClientAuthRegistration> {
- const user: UserModel = await this.authProvider.validateUser(clientRegistrationDto.login, clientRegistrationDto.password)
+ const user: UserModel = await this.authProvider.validateUser(clientRegistrationDto.login, clientRegistrationDto.password, ip, AUTH_SCOPE.CLIENT)
if (!user) {
this.logger.warn(`${this.register.name} - auth failed for user *${clientRegistrationDto.login}*`)
throw new HttpException('Wrong login or password', HttpStatus.UNAUTHORIZED)
diff --git a/backend/src/authentication/constants/scope.ts b/backend/src/authentication/constants/scope.ts
index 38b43aae..0a14b2e1 100644
--- a/backend/src/authentication/constants/scope.ts
+++ b/backend/src/authentication/constants/scope.ts
@@ -1,3 +1,4 @@
export enum AUTH_SCOPE {
- WEBDAV = 'webdav'
+ WEBDAV = 'webdav',
+ CLIENT = 'client'
}
diff --git a/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.html
index b912ad6d..2cc27d0f 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.html
+++ b/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.html
@@ -22,7 +22,7 @@
<div class="input-group-text" l10nTranslate>Application</div>
<select class="form-select form-select-sm" formControlName="app" style="max-width: 150px">
@for (s of availableApps; track $index) {
- <option [value]="s" l10nTranslate>{{ s }}</option>
+ <option [value]="s" l10nTranslate>{{ s | capitalize }}</option>
}
</select>
<input
diff --git a/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.ts b/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.ts
index 4e87ef62..f1411f76 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.ts
+++ b/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.ts
@@ -4,7 +4,6 @@ import { FormGroup, FormsModule, ReactiveFormsModule, UntypedFormBuilder, Valida
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
import { faCopy, faKey, faPlus } from '@fortawesome/free-solid-svg-icons'
import { UserAppPassword } from '@sync-in-server/backend/src/applications/users/interfaces/user-secrets.interface'
-
import { AUTH_SCOPE } from '@sync-in-server/backend/src/authentication/constants/scope'
import { createLightSlug, currentDate } from '@sync-in-server/backend/src/common/shared'
import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'
@@ -13,6 +12,7 @@ import { BsDatepickerDirective, BsDatepickerInputDirective } from 'ngx-bootstrap
import { ClipboardService } from 'ngx-clipboard'
import { filter } from 'rxjs/operators'
import { AutofocusDirective } from '../../../../common/directives/auto-focus.directive'
+import { CapitalizePipe } from '../../../../common/pipes/capitalize.pipe'
import { TimeDateFormatPipe } from '../../../../common/pipes/time-date-format.pipe'
import { LayoutService } from '../../../../layout/layout.service'
import { UserService } from '../../user.service'
@@ -29,7 +29,8 @@ import { UserService } from '../../user.service'
BsDatepickerDirective,
BsDatepickerInputDirective,
ReactiveFormsModule,
- ButtonCheckboxDirective
+ ButtonCheckboxDirective,
+ CapitalizePipe
],
templateUrl: './user-auth-manage-app-passwords-dialog.component.html'
})