From a94faf06a99236524d662e3f25bbc6e2484870f0 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Wed, 21 Jul 2021 11:32:27 +0200 Subject: [PATCH] [Provider] Add support for managing providers (#1014) --- .../src/app/app-routing.module.ts | 15 + bitwarden_license/src/app/app.module.ts | 11 +- bitwarden_license/src/app/main.ts | 2 +- .../clients/add-organization.component.html | 35 ++ .../clients/add-organization.component.ts | 81 +++++ .../providers/clients/clients.component.html | 61 ++++ .../providers/clients/clients.component.ts | 144 ++++++++ .../create-organization.component.html | 5 + .../clients/create-organization.component.ts | 26 ++ .../manage/accept-provider.component.html | 35 ++ .../manage/accept-provider.component.ts | 48 +++ .../manage/bulk/bulk-confirm.component.ts | 38 +++ .../manage/bulk/bulk-remove.component.ts | 21 ++ .../providers/manage/events.component.html | 68 ++++ .../app/providers/manage/events.component.ts | 71 ++++ .../providers/manage/manage.component.html | 22 ++ .../app/providers/manage/manage.component.ts | 27 ++ .../providers/manage/people.component.html | 149 ++++++++ .../app/providers/manage/people.component.ts | 286 ++++++++++++++++ .../manage/user-add-edit.component.html | 71 ++++ .../manage/user-add-edit.component.ts | 104 ++++++ .../providers/providers-layout.component.html | 44 +++ .../providers/providers-layout.component.ts | 47 +++ .../app/providers/providers-routing.module.ts | 117 +++++++ .../src/app/providers/providers.module.ts | 62 ++++ .../services/provider-guard.service.ts | 32 ++ .../services/provider-type-guard.service.ts | 31 ++ .../providers/services/provider.service.ts | 32 ++ .../providers/settings/account.component.html | 35 ++ .../providers/settings/account.component.ts | 62 ++++ .../settings/settings.component.html | 17 + .../providers/settings/settings.component.ts | 20 ++ .../setup/setup-provider.component.html | 31 ++ .../setup/setup-provider.component.ts | 22 ++ .../app/providers/setup/setup.component.html | 38 +++ .../app/providers/setup/setup.component.ts | 96 ++++++ bitwarden_license/webpack.config.js | 7 + package.json | 4 +- src/app/app.module.ts | 4 +- src/app/common/base.events.component.ts | 157 +++++++++ src/app/common/base.people.component.ts | 314 +++++++++++++++++ .../organization-layout.component.html | 6 + .../manage/bulk/bulk-confirm.component.ts | 45 ++- .../manage/bulk/bulk-remove.component.html | 8 +- .../manage/bulk/bulk-remove.component.ts | 14 +- .../manage/bulk/bulk-status.component.ts | 11 +- .../manage/entity-events.component.ts | 6 +- .../organizations/manage/events.component.ts | 172 +++------- .../manage/people.component.html | 28 +- .../organizations/manage/people.component.ts | 322 +++--------------- .../manage/user-confirm.component.ts | 17 +- .../organization-subscription.component.html | 8 + .../organization-subscription.component.ts | 10 +- ...outing.module.ts => oss-routing.module.ts} | 2 +- src/app/oss.module.ts | 18 + src/app/providers/providers.component.html | 20 ++ src/app/providers/providers.component.ts | 36 ++ src/app/services/event.service.ts | 26 +- src/app/services/services.module.ts | 2 + .../settings/organization-plans.component.ts | 22 +- src/app/vault/vault.component.html | 12 + src/app/vault/vault.component.ts | 3 + src/locales/en/messages.json | 118 +++++++ tsconfig.json | 3 + 64 files changed, 2910 insertions(+), 491 deletions(-) create mode 100644 bitwarden_license/src/app/app-routing.module.ts create mode 100644 bitwarden_license/src/app/providers/clients/add-organization.component.html create mode 100644 bitwarden_license/src/app/providers/clients/add-organization.component.ts create mode 100644 bitwarden_license/src/app/providers/clients/clients.component.html create mode 100644 bitwarden_license/src/app/providers/clients/clients.component.ts create mode 100644 bitwarden_license/src/app/providers/clients/create-organization.component.html create mode 100644 bitwarden_license/src/app/providers/clients/create-organization.component.ts create mode 100644 bitwarden_license/src/app/providers/manage/accept-provider.component.html create mode 100644 bitwarden_license/src/app/providers/manage/accept-provider.component.ts create mode 100644 bitwarden_license/src/app/providers/manage/bulk/bulk-confirm.component.ts create mode 100644 bitwarden_license/src/app/providers/manage/bulk/bulk-remove.component.ts create mode 100644 bitwarden_license/src/app/providers/manage/events.component.html create mode 100644 bitwarden_license/src/app/providers/manage/events.component.ts create mode 100644 bitwarden_license/src/app/providers/manage/manage.component.html create mode 100644 bitwarden_license/src/app/providers/manage/manage.component.ts create mode 100644 bitwarden_license/src/app/providers/manage/people.component.html create mode 100644 bitwarden_license/src/app/providers/manage/people.component.ts create mode 100644 bitwarden_license/src/app/providers/manage/user-add-edit.component.html create mode 100644 bitwarden_license/src/app/providers/manage/user-add-edit.component.ts create mode 100644 bitwarden_license/src/app/providers/providers-layout.component.html create mode 100644 bitwarden_license/src/app/providers/providers-layout.component.ts create mode 100644 bitwarden_license/src/app/providers/providers-routing.module.ts create mode 100644 bitwarden_license/src/app/providers/providers.module.ts create mode 100644 bitwarden_license/src/app/providers/services/provider-guard.service.ts create mode 100644 bitwarden_license/src/app/providers/services/provider-type-guard.service.ts create mode 100644 bitwarden_license/src/app/providers/services/provider.service.ts create mode 100644 bitwarden_license/src/app/providers/settings/account.component.html create mode 100644 bitwarden_license/src/app/providers/settings/account.component.ts create mode 100644 bitwarden_license/src/app/providers/settings/settings.component.html create mode 100644 bitwarden_license/src/app/providers/settings/settings.component.ts create mode 100644 bitwarden_license/src/app/providers/setup/setup-provider.component.html create mode 100644 bitwarden_license/src/app/providers/setup/setup-provider.component.ts create mode 100644 bitwarden_license/src/app/providers/setup/setup.component.html create mode 100644 bitwarden_license/src/app/providers/setup/setup.component.ts create mode 100644 src/app/common/base.events.component.ts create mode 100644 src/app/common/base.people.component.ts rename src/app/{app-routing.module.ts => oss-routing.module.ts} (99%) create mode 100644 src/app/providers/providers.component.html create mode 100644 src/app/providers/providers.component.ts diff --git a/bitwarden_license/src/app/app-routing.module.ts b/bitwarden_license/src/app/app-routing.module.ts new file mode 100644 index 0000000000..3d03f7e348 --- /dev/null +++ b/bitwarden_license/src/app/app-routing.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; + +const routes: Routes = [ + { + path: 'providers', + loadChildren: async () => (await import('./providers/providers.module')).ProvidersModule, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class AppRoutingModule { } diff --git a/bitwarden_license/src/app/app.module.ts b/bitwarden_license/src/app/app.module.ts index 5719b35cc7..cdf705c1c3 100644 --- a/bitwarden_license/src/app/app.module.ts +++ b/bitwarden_license/src/app/app.module.ts @@ -6,10 +6,12 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { AppRoutingModule } from '../../../src/app/app-routing.module'; -import { AppComponent } from '../../../src/app/app.component'; -import { OssModule } from '../../../src/app/oss.module'; -import { ServicesModule } from '../../../src/app/services/services.module'; +import { AppRoutingModule } from './app-routing.module'; + +import { AppComponent } from 'src/app/app.component'; +import { OssRoutingModule } from 'src/app/oss-routing.module'; +import { OssModule } from 'src/app/oss.module'; +import { ServicesModule } from 'src/app/services/services.module'; @NgModule({ imports: [ @@ -21,6 +23,7 @@ import { ServicesModule } from '../../../src/app/services/services.module'; InfiniteScrollModule, DragDropModule, AppRoutingModule, + OssRoutingModule, ], bootstrap: [AppComponent], }) diff --git a/bitwarden_license/src/app/main.ts b/bitwarden_license/src/app/main.ts index 0bf25df7d4..9fe086495e 100644 --- a/bitwarden_license/src/app/main.ts +++ b/bitwarden_license/src/app/main.ts @@ -6,7 +6,7 @@ import 'jquery'; import 'popper.js'; // tslint:disable-next-line -require('../../../src/scss/styles.scss'); +require('src/scss/styles.scss'); import { AppModule } from './app.module'; diff --git a/bitwarden_license/src/app/providers/clients/add-organization.component.html b/bitwarden_license/src/app/providers/clients/add-organization.component.html new file mode 100644 index 0000000000..0ddda52d6e --- /dev/null +++ b/bitwarden_license/src/app/providers/clients/add-organization.component.html @@ -0,0 +1,35 @@ + diff --git a/bitwarden_license/src/app/providers/clients/add-organization.component.ts b/bitwarden_license/src/app/providers/clients/add-organization.component.ts new file mode 100644 index 0000000000..1186f505c3 --- /dev/null +++ b/bitwarden_license/src/app/providers/clients/add-organization.component.ts @@ -0,0 +1,81 @@ +import { + Component, + EventEmitter, + Input, + OnInit, + Output +} from '@angular/core'; +import { ToasterService } from 'angular2-toaster'; + +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; + +import { ValidationService } from 'jslib-angular/services/validation.service'; + +import { ProviderService } from '../services/provider.service'; + +import { Organization } from 'jslib-common/models/domain/organization'; +import { Provider } from 'jslib-common/models/domain/provider'; + + +@Component({ + selector: 'provider-add-organization', + templateUrl: 'add-organization.component.html', +}) +export class AddOrganizationComponent implements OnInit { + + @Input() providerId: string; + @Output() onAddedOrganization = new EventEmitter(); + + provider: Provider; + formPromise: Promise; + loading = true; + organizations: Organization[]; + + constructor(private userService: UserService, private providerService: ProviderService, + private toasterService: ToasterService, private i18nService: I18nService, + private platformUtilsService: PlatformUtilsService, private validationService: ValidationService) { } + + async ngOnInit() { + await this.load(); + } + + async load() { + if (this.providerId == null) { + return; + } + + this.provider = await this.userService.getProvider(this.providerId); + + this.organizations = (await this.userService.getAllOrganizations()).filter(p => p.providerId == null); + this.loading = false; + } + + async add(organization: Organization) { + if (this.formPromise) { + return; + } + + const confirmed = await this.platformUtilsService.showDialog( + this.i18nService.t('addOrganizationConfirmation', organization.name, this.provider.name), organization.name, + this.i18nService.t('yes'), this.i18nService.t('no'), 'warning'); + + if (!confirmed) { + return false; + } + + try { + this.formPromise = this.providerService.addOrganizationToProvider(this.providerId, organization.id); + await this.formPromise; + } catch (e) { + this.validationService.showError(e); + return; + } finally { + this.formPromise = null; + } + + this.toasterService.popAsync('success', null, this.i18nService.t('organizationJoinedProvider')); + this.onAddedOrganization.emit(); + } +} diff --git a/bitwarden_license/src/app/providers/clients/clients.component.html b/bitwarden_license/src/app/providers/clients/clients.component.html new file mode 100644 index 0000000000..234d3e90ef --- /dev/null +++ b/bitwarden_license/src/app/providers/clients/clients.component.html @@ -0,0 +1,61 @@ +
+

{{'clients' | i18n}}

+ +
+
+ + +
+ + + {{'newClientOrganization' | i18n}} + + +
+
+ + + + {{'loading' | i18n}} + + + +

{{'noClientsInList' | i18n}}

+ + + + + + + + + +
+ + + {{o.organizationName}} + +
+ +
+ + + {{'remove' | i18n}} + +
+
+
+ + + + diff --git a/bitwarden_license/src/app/providers/clients/clients.component.ts b/bitwarden_license/src/app/providers/clients/clients.component.ts new file mode 100644 index 0000000000..4ed3293672 --- /dev/null +++ b/bitwarden_license/src/app/providers/clients/clients.component.ts @@ -0,0 +1,144 @@ +import { + Component, + ComponentFactoryResolver, + OnInit, + ViewChild, + ViewContainerRef +} from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { ToasterService } from 'angular2-toaster'; + +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; + +import { ValidationService } from 'jslib-angular/services/validation.service'; + +import { + ProviderOrganizationOrganizationDetailsResponse +} from 'jslib-common/models/response/provider/providerOrganizationResponse'; + +import { LogService } from 'jslib-common/abstractions'; +import { ModalComponent } from 'src/app/modal.component'; +import { ProviderService } from '../services/provider.service'; +import { AddOrganizationComponent } from './add-organization.component'; + +@Component({ + templateUrl: 'clients.component.html', +}) +export class ClientsComponent implements OnInit { + + @ViewChild('add', { read: ViewContainerRef, static: true }) addModalRef: ViewContainerRef; + + providerId: any; + searchText: string; + loading = true; + showAddExisting = false; + + clients: ProviderOrganizationOrganizationDetailsResponse[]; + pagedClients: ProviderOrganizationOrganizationDetailsResponse[]; + modal: ModalComponent; + + protected didScroll = false; + protected pageSize = 100; + protected actionPromise: Promise; + private pagedClientsCount = 0; + + constructor(private route: ActivatedRoute, private userService: UserService, + private apiService: ApiService, private searchService: SearchService, + private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, + private toasterService: ToasterService, private validationService: ValidationService, + private providerService: ProviderService, private componentFactoryResolver: ComponentFactoryResolver, + private logService: LogService) { } + + async ngOnInit() { + this.route.parent.params.subscribe(async params => { + this.providerId = params.providerId; + + await this.load(); + }); + } + + async load() { + const response = await this.apiService.getProviderClients(this.providerId); + this.clients = response.data != null && response.data.length > 0 ? response.data : []; + this.showAddExisting = (await this.userService.getAllOrganizations()).some(org => org.providerId == null); + this.loading = false; + } + + isPaging() { + const searching = this.isSearching(); + if (searching && this.didScroll) { + this.resetPaging(); + } + return !searching && this.clients && this.clients.length > this.pageSize; + } + + isSearching() { + return this.searchService.isSearchable(this.searchText); + } + + async resetPaging() { + this.pagedClients = []; + this.loadMore(); + } + + + loadMore() { + if (!this.clients || this.clients.length <= this.pageSize) { + return; + } + const pagedLength = this.pagedClients.length; + let pagedSize = this.pageSize; + if (pagedLength === 0 && this.pagedClientsCount > this.pageSize) { + pagedSize = this.pagedClientsCount; + } + if (this.clients.length > pagedLength) { + this.pagedClients = this.pagedClients.concat(this.clients.slice(pagedLength, pagedLength + pagedSize)); + } + this.pagedClientsCount = this.pagedClients.length; + this.didScroll = this.pagedClients.length > this.pageSize; + } + + addExistingOrganization() { + const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent); + this.modal = this.addModalRef.createComponent(factory).instance; + const childComponent = this.modal.show(AddOrganizationComponent, this.addModalRef); + + childComponent.providerId = this.providerId; + childComponent.onAddedOrganization.subscribe(async () => { + try { + await this.load(); + this.modal.close(); + } catch (e) { + this.logService.error(`Handled exception: ${e}`); + } + }); + + this.modal.onClosed.subscribe(() => { + this.modal = null; + }); + } + + async remove(organization: ProviderOrganizationOrganizationDetailsResponse) { + const confirmed = await this.platformUtilsService.showDialog( + this.i18nService.t('detachOrganizationConfirmation'), organization.organizationName, + this.i18nService.t('yes'), this.i18nService.t('no'), 'warning'); + + if (!confirmed) { + return false; + } + + this.actionPromise = this.providerService.detachOrganizastion(this.providerId, organization.id); + try { + await this.actionPromise; + this.toasterService.popAsync('success', null, this.i18nService.t('detachedOrganization', organization.organizationName)); + await this.load(); + } catch (e) { + this.validationService.showError(e); + } + this.actionPromise = null; + } +} diff --git a/bitwarden_license/src/app/providers/clients/create-organization.component.html b/bitwarden_license/src/app/providers/clients/create-organization.component.html new file mode 100644 index 0000000000..6abe22d983 --- /dev/null +++ b/bitwarden_license/src/app/providers/clients/create-organization.component.html @@ -0,0 +1,5 @@ +
+

{{'newClientOrganization' | i18n}}

+
+

{{'newClientOrganizationDesc' | i18n}}

+ diff --git a/bitwarden_license/src/app/providers/clients/create-organization.component.ts b/bitwarden_license/src/app/providers/clients/create-organization.component.ts new file mode 100644 index 0000000000..be29d544b6 --- /dev/null +++ b/bitwarden_license/src/app/providers/clients/create-organization.component.ts @@ -0,0 +1,26 @@ +import { + Component, + OnInit, + ViewChild, +} from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { OrganizationPlansComponent } from 'src/app/settings/organization-plans.component'; + +@Component({ + selector: 'app-create-organization', + templateUrl: 'create-organization.component.html', +}) +export class CreateOrganizationComponent implements OnInit { + @ViewChild(OrganizationPlansComponent, { static: true }) orgPlansComponent: OrganizationPlansComponent; + + providerId: string; + + constructor(private route: ActivatedRoute) { } + + ngOnInit() { + this.route.parent.params.subscribe(async params => { + this.providerId = params.providerId; + }); + } +} diff --git a/bitwarden_license/src/app/providers/manage/accept-provider.component.html b/bitwarden_license/src/app/providers/manage/accept-provider.component.html new file mode 100644 index 0000000000..e9a6014eaa --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/accept-provider.component.html @@ -0,0 +1,35 @@ +
+
+ +

+ + {{'loading' | i18n}} +

+
+
+
+
+
+

{{'joinProvider' | i18n}}

+
+
+

+ {{providerName}} + {{email}} +

+

{{'joinProviderDesc' | i18n}}

+
+
+ + {{'logIn' | i18n}} + + + {{'createAccount' | i18n}} + +
+
+
+
+
+
diff --git a/bitwarden_license/src/app/providers/manage/accept-provider.component.ts b/bitwarden_license/src/app/providers/manage/accept-provider.component.ts new file mode 100644 index 0000000000..1788f67cd5 --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/accept-provider.component.ts @@ -0,0 +1,48 @@ +import { Component } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Toast, ToasterService } from 'angular2-toaster'; + +import { BaseAcceptComponent } from 'src/app/common/base.accept.component'; + +import { ApiService } from 'jslib-common/abstractions/api.service'; + +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; +import { ProviderUserAcceptRequest } from 'jslib-common/models/request/provider/providerUserAcceptRequest'; + +@Component({ + selector: 'app-accept-provider', + templateUrl: 'accept-provider.component.html', +}) +export class AcceptProviderComponent extends BaseAcceptComponent { + providerName: string; + + failedMessage = 'providerInviteAcceptFailed'; + + requiredParameters = ['providerId', 'providerUserId', 'token']; + + constructor(router: Router, toasterService: ToasterService, i18nService: I18nService, route: ActivatedRoute, + userService: UserService, stateService: StateService, private apiService: ApiService) { + super(router, toasterService, i18nService, route, userService, stateService); + } + + async authedHandler(qParams: any) { + const request = new ProviderUserAcceptRequest(); + request.token = qParams.token; + + await this.apiService.postProviderUserAccept(qParams.providerId, qParams.providerUserId, request); + const toast: Toast = { + type: 'success', + title: this.i18nService.t('inviteAccepted'), + body: this.i18nService.t('providerInviteAcceptedDesc'), + timeout: 10000, + }; + this.toasterService.popAsync(toast); + this.router.navigate(['/vault']); + } + + async unauthedHandler(qParams: any) { + this.providerName = qParams.providerName; + } +} diff --git a/bitwarden_license/src/app/providers/manage/bulk/bulk-confirm.component.ts b/bitwarden_license/src/app/providers/manage/bulk/bulk-confirm.component.ts new file mode 100644 index 0000000000..ddfdd06ee7 --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/bulk/bulk-confirm.component.ts @@ -0,0 +1,38 @@ +import { + Component, + Input, +} from '@angular/core'; + +import { ProviderUserBulkConfirmRequest } from 'jslib-common/models/request/provider/providerUserBulkConfirmRequest'; +import { ProviderUserBulkRequest } from 'jslib-common/models/request/provider/providerUserBulkRequest'; + +import { ProviderUserStatusType } from 'jslib-common/enums/providerUserStatusType'; + +import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from 'src/app/organizations/manage/bulk/bulk-confirm.component'; +import { BulkUserDetails } from 'src/app/organizations/manage/bulk/bulk-status.component'; + +@Component({ + templateUrl: '/src/app/organizations/manage/bulk/bulk-confirm.component.html', +}) +export class BulkConfirmComponent extends OrganizationBulkConfirmComponent { + + @Input() providerId: string; + + protected isAccepted(user: BulkUserDetails) { + return user.status === ProviderUserStatusType.Accepted; + } + + protected async getPublicKeys() { + const request = new ProviderUserBulkRequest(this.filteredUsers.map(user => user.id)); + return await this.apiService.postProviderUsersPublicKey(this.providerId, request); + } + + protected getCryptoKey() { + return this.cryptoService.getProviderKey(this.providerId); + } + + protected async postConfirmRequest(userIdsWithKeys: any[]) { + const request = new ProviderUserBulkConfirmRequest(userIdsWithKeys); + return await this.apiService.postProviderUserBulkConfirm(this.providerId, request); + } +} diff --git a/bitwarden_license/src/app/providers/manage/bulk/bulk-remove.component.ts b/bitwarden_license/src/app/providers/manage/bulk/bulk-remove.component.ts new file mode 100644 index 0000000000..7a0f7cf58e --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/bulk/bulk-remove.component.ts @@ -0,0 +1,21 @@ +import { + Component, + Input, +} from '@angular/core'; + +import { ProviderUserBulkRequest } from 'jslib-common/models/request/provider/providerUserBulkRequest'; + +import { BulkRemoveComponent as OrganizationBulkRemoveComponent } from 'src/app/organizations/manage/bulk/bulk-remove.component'; + +@Component({ + templateUrl: '/src/app/organizations/manage/bulk/bulk-remove.component.html', +}) +export class BulkRemoveComponent extends OrganizationBulkRemoveComponent { + + @Input() providerId: string; + + async deleteUsers() { + const request = new ProviderUserBulkRequest(this.users.map(user => user.id)); + return await this.apiService.deleteManyProviderUsers(this.providerId, request); + } +} diff --git a/bitwarden_license/src/app/providers/manage/events.component.html b/bitwarden_license/src/app/providers/manage/events.component.html new file mode 100644 index 0000000000..9b50717fe4 --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/events.component.html @@ -0,0 +1,68 @@ +
+

{{'eventLogs' | i18n}}

+
+
+ + + - + + +
+
+ +
+
+ +
+
+
+ + + {{'loading' | i18n}} + + +

{{'noEventsInList' | i18n}}

+ + + + + + + + + + + + + + + + + +
{{'timestamp' | i18n}} + {{'device' | i18n}} + {{'user' | i18n}}{{'event' | i18n}}
{{e.date | date:'medium'}} + + {{e.appName}}, {{e.ip}} + + {{e.userName}} +
+ + diff --git a/bitwarden_license/src/app/providers/manage/events.component.ts b/bitwarden_license/src/app/providers/manage/events.component.ts new file mode 100644 index 0000000000..2b9ce76d14 --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/events.component.ts @@ -0,0 +1,71 @@ +import { + Component, + OnInit, +} from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ToasterService } from 'angular2-toaster'; + +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { ExportService } from 'jslib-common/abstractions/export.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { LogService } from 'jslib-common/abstractions/log.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; + +import { UserNamePipe } from 'jslib-angular/pipes/user-name.pipe'; + +import { EventResponse } from 'jslib-common/models/response/eventResponse'; + +import { EventService } from 'src/app/services/event.service'; + +import { BaseEventsComponent } from 'src/app/common/base.events.component'; + +@Component({ + selector: 'provider-events', + templateUrl: 'events.component.html', +}) +export class EventsComponent extends BaseEventsComponent implements OnInit { + exportFileName: string = 'provider-events'; + providerId: string; + + private providerUsersUserIdMap = new Map(); + private providerUsersIdMap = new Map(); + + constructor(private apiService: ApiService, private route: ActivatedRoute, eventService: EventService, + i18nService: I18nService, toasterService: ToasterService, private userService: UserService, + exportService: ExportService, platformUtilsService: PlatformUtilsService, private router: Router, + logService: LogService, private userNamePipe: UserNamePipe) { + super(eventService, i18nService, toasterService, exportService, platformUtilsService, logService); + } + + async ngOnInit() { + this.route.parent.parent.params.subscribe(async params => { + this.providerId = params.providerId; + const provider = await this.userService.getProvider(this.providerId); + if (provider == null || !provider.useEvents) { + this.router.navigate(['/providers', this.providerId]); + return; + } + await this.load(); + }); + } + + async load() { + const response = await this.apiService.getProviderUsers(this.providerId); + response.data.forEach(u => { + const name = this.userNamePipe.transform(u); + this.providerUsersIdMap.set(u.id, { name: name, email: u.email }); + this.providerUsersUserIdMap.set(u.userId, { name: name, email: u.email }); + }); + await this.loadEvents(true); + this.loaded = true; + } + + protected requestEvents(startDate: string, endDate: string, continuationToken: string) { + return this.apiService.getEventsProvider(this.providerId, startDate, endDate, continuationToken); + } + + protected getUserName(r: EventResponse, userId: string) { + return userId != null && this.providerUsersUserIdMap.has(userId) ? this.providerUsersUserIdMap.get(userId) : null; + } +} diff --git a/bitwarden_license/src/app/providers/manage/manage.component.html b/bitwarden_license/src/app/providers/manage/manage.component.html new file mode 100644 index 0000000000..8941baaa54 --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/manage.component.html @@ -0,0 +1,22 @@ +
+
+
+
+
{{'manage' | i18n}}
+
+ + {{'people' | i18n}} + + + {{'eventLogs' | i18n}} + +
+
+
+
+ +
+
+
diff --git a/bitwarden_license/src/app/providers/manage/manage.component.ts b/bitwarden_license/src/app/providers/manage/manage.component.ts new file mode 100644 index 0000000000..708f22064e --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/manage.component.ts @@ -0,0 +1,27 @@ +import { + Component, + OnInit, +} from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { UserService } from 'jslib-common/abstractions/user.service'; + +import { Provider } from 'jslib-common/models/domain/provider'; + +@Component({ + selector: 'provider-manage', + templateUrl: 'manage.component.html', +}) +export class ManageComponent implements OnInit { + provider: Provider; + accessEvents = false; + + constructor(private route: ActivatedRoute, private userService: UserService) { } + + ngOnInit() { + this.route.parent.params.subscribe(async params => { + this.provider = await this.userService.getProvider(params.providerId); + this.accessEvents = this.provider.useEvents; + }); + } +} diff --git a/bitwarden_license/src/app/providers/manage/people.component.html b/bitwarden_license/src/app/providers/manage/people.component.html new file mode 100644 index 0000000000..e97b24ad50 --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/people.component.html @@ -0,0 +1,149 @@ +
+

{{'people' | i18n}}

+
+
+ + + +
+
+ + +
+
+ +
+ + + +
+ + +
+
+ +
+
+ + + {{'loading' | i18n}} + + +

{{'noUsersInList' | i18n}}

+ + + {{'providerUsersNeedConfirmed' | i18n}} + + + + + + + + + + + + +
+ + + + + {{u.email}} + {{'invited' | i18n}} + {{'accepted' | i18n}} + {{u.name}} + + + + {{'userUsingTwoStep' | i18n}} + + + {{'providerAdmin' | i18n}} + {{'serviceUser' | i18n}} + {{'custom' | i18n}} + +
+ +
+ + + {{'resendInvitation' | i18n}} + + + + {{'confirm' | i18n}} + + + + {{'groups' | i18n}} + + + + {{'eventLogs' | i18n}} + + + + {{'remove' | i18n}} + +
+
+
+ + + + + + + + diff --git a/bitwarden_license/src/app/providers/manage/people.component.ts b/bitwarden_license/src/app/providers/manage/people.component.ts new file mode 100644 index 0000000000..6741f99c4a --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/people.component.ts @@ -0,0 +1,286 @@ +import { + Component, + ComponentFactoryResolver, + OnInit, + ViewChild, + ViewContainerRef +} from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ToasterService } from 'angular2-toaster'; + +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { LogService } from 'jslib-common/abstractions/log.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; + +import { ValidationService } from 'jslib-angular/services/validation.service'; + +import { ProviderUserStatusType } from 'jslib-common/enums/providerUserStatusType'; +import { ProviderUserType } from 'jslib-common/enums/providerUserType'; + +import { SearchPipe } from 'jslib-angular/pipes/search.pipe'; +import { UserNamePipe } from 'jslib-angular/pipes/user-name.pipe'; + +import { ListResponse } from 'jslib-common/models/response/listResponse'; +import { ProviderUserUserDetailsResponse } from 'jslib-common/models/response/provider/providerUserResponse'; + +import { ProviderUserBulkRequest } from 'jslib-common/models/request/provider/providerUserBulkRequest'; +import { ProviderUserConfirmRequest } from 'jslib-common/models/request/provider/providerUserConfirmRequest'; +import { ProviderUserBulkResponse } from 'jslib-common/models/response/provider/providerUserBulkResponse'; + +import { BasePeopleComponent } from 'src/app/common/base.people.component'; +import { ModalComponent } from 'src/app/modal.component'; +import { BulkStatusComponent } from 'src/app/organizations/manage/bulk/bulk-status.component'; +import { EntityEventsComponent } from 'src/app/organizations/manage/entity-events.component'; +import { BulkConfirmComponent } from './bulk/bulk-confirm.component'; +import { BulkRemoveComponent } from './bulk/bulk-remove.component'; +import { UserAddEditComponent } from './user-add-edit.component'; + +@Component({ + selector: 'provider-people', + templateUrl: 'people.component.html', +}) +export class PeopleComponent extends BasePeopleComponent implements OnInit { + + @ViewChild('addEdit', { read: ViewContainerRef, static: true }) addEditModalRef: ViewContainerRef; + @ViewChild('groupsTemplate', { read: ViewContainerRef, static: true }) groupsModalRef: ViewContainerRef; + @ViewChild('eventsTemplate', { read: ViewContainerRef, static: true }) eventsModalRef: ViewContainerRef; + @ViewChild('bulkStatusTemplate', { read: ViewContainerRef, static: true }) bulkStatusModalRef: ViewContainerRef; + @ViewChild('bulkConfirmTemplate', { read: ViewContainerRef, static: true }) bulkConfirmModalRef: ViewContainerRef; + @ViewChild('bulkRemoveTemplate', { read: ViewContainerRef, static: true }) bulkRemoveModalRef: ViewContainerRef; + + userType = ProviderUserType; + userStatusType = ProviderUserStatusType; + providerId: string; + accessEvents = false; + + constructor(apiService: ApiService, private route: ActivatedRoute, + i18nService: I18nService, componentFactoryResolver: ComponentFactoryResolver, + platformUtilsService: PlatformUtilsService, toasterService: ToasterService, + cryptoService: CryptoService, private userService: UserService, private router: Router, + storageService: StorageService, searchService: SearchService, validationService: ValidationService, + logService: LogService, searchPipe: SearchPipe, userNamePipe: UserNamePipe) { + super(apiService, searchService, i18nService, platformUtilsService, toasterService, cryptoService, + storageService, validationService, componentFactoryResolver, logService, searchPipe, userNamePipe); + } + + ngOnInit() { + this.route.parent.params.subscribe(async params => { + this.providerId = params.providerId; + const provider = await this.userService.getProvider(this.providerId); + + if (!provider.canManageUsers) { + this.router.navigate(['../'], { relativeTo: this.route }); + return; + } + + this.accessEvents = provider.useEvents; + + await this.load(); + + const queryParamsSub = this.route.queryParams.subscribe(async qParams => { + this.searchText = qParams.search; + if (qParams.viewEvents != null) { + const user = this.users.filter(u => u.id === qParams.viewEvents); + if (user.length > 0 && user[0].status === ProviderUserStatusType.Confirmed) { + this.events(user[0]); + } + } + if (queryParamsSub != null) { + queryParamsSub.unsubscribe(); + } + }); + }); + } + + getUsers(): Promise> { + return this.apiService.getProviderUsers(this.providerId); + } + + deleteUser(id: string): Promise { + return this.apiService.deleteProviderUser(this.providerId, id); + } + + reinviteUser(id: string): Promise { + return this.apiService.postProviderUserReinvite(this.providerId, id); + } + + async confirmUser(user: ProviderUserUserDetailsResponse, publicKey: Uint8Array): Promise { + const providerKey = await this.cryptoService.getProviderKey(this.providerId); + const key = await this.cryptoService.rsaEncrypt(providerKey.key, publicKey.buffer); + const request = new ProviderUserConfirmRequest(); + request.key = key.encryptedString; + await this.apiService.postProviderUserConfirm(this.providerId, user.id, request); + } + + edit(user: ProviderUserUserDetailsResponse) { + if (this.modal != null) { + this.modal.close(); + } + + const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent); + this.modal = this.addEditModalRef.createComponent(factory).instance; + const childComponent = this.modal.show( + UserAddEditComponent, this.addEditModalRef); + + childComponent.name = this.userNamePipe.transform(user); + childComponent.providerId = this.providerId; + childComponent.providerUserId = user != null ? user.id : null; + childComponent.onSavedUser.subscribe(() => { + this.modal.close(); + this.load(); + }); + childComponent.onDeletedUser.subscribe(() => { + this.modal.close(); + this.removeUser(user); + }); + + this.modal.onClosed.subscribe(() => { + this.modal = null; + }); + } + + async events(user: ProviderUserUserDetailsResponse) { + if (this.modal != null) { + this.modal.close(); + } + + const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent); + this.modal = this.eventsModalRef.createComponent(factory).instance; + const childComponent = this.modal.show( + EntityEventsComponent, this.eventsModalRef); + + childComponent.name = this.userNamePipe.transform(user); + childComponent.providerId = this.providerId; + childComponent.entityId = user.id; + childComponent.showUser = false; + childComponent.entity = 'user'; + + this.modal.onClosed.subscribe(() => { + this.modal = null; + }); + } + + async bulkRemove() { + if (this.actionPromise != null) { + return; + } + + if (this.modal != null) { + this.modal.close(); + } + + const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent); + this.modal = this.bulkRemoveModalRef.createComponent(factory).instance; + const childComponent = this.modal.show(BulkRemoveComponent, this.bulkRemoveModalRef); + + childComponent.providerId = this.providerId; + childComponent.users = this.getCheckedUsers(); + + this.modal.onClosed.subscribe(async () => { + await this.load(); + this.modal = null; + }); + } + + async bulkReinvite() { + if (this.actionPromise != null) { + return; + } + + const users = this.getCheckedUsers(); + const filteredUsers = users.filter(u => u.status === ProviderUserStatusType.Invited); + + if (filteredUsers.length <= 0) { + this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'), + this.i18nService.t('noSelectedUsersApplicable')); + return; + } + + try { + const request = new ProviderUserBulkRequest(filteredUsers.map(user => user.id)); + const response = this.apiService.postManyProviderUserReinvite(this.providerId, request); + this.showBulkStatus(users, filteredUsers, response, this.i18nService.t('bulkReinviteMessage')); + } catch (e) { + this.validationService.showError(e); + } + this.actionPromise = null; + } + + async bulkConfirm() { + if (this.actionPromise != null) { + return; + } + + if (this.modal != null) { + this.modal.close(); + } + + const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent); + this.modal = this.bulkConfirmModalRef.createComponent(factory).instance; + const childComponent = this.modal.show(BulkConfirmComponent, this.bulkConfirmModalRef); + + childComponent.providerId = this.providerId; + childComponent.users = this.getCheckedUsers(); + + this.modal.onClosed.subscribe(async () => { + await this.load(); + this.modal = null; + }); + } + + private async showBulkStatus(users: ProviderUserUserDetailsResponse[], filteredUsers: ProviderUserUserDetailsResponse[], + request: Promise>, successfullMessage: string) { + + const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent); + this.modal = this.bulkStatusModalRef.createComponent(factory).instance; + const childComponent = this.modal.show( + BulkStatusComponent, this.bulkStatusModalRef); + + childComponent.loading = true; + + // Workaround to handle closing the modal shortly after it has been opened + let close = false; + this.modal.onShown.subscribe(() => { + if (close) { + this.modal.close(); + } + }); + + this.modal.onClosed.subscribe(() => { + this.modal = null; + }); + + try { + const response = await request; + + if (this.modal) { + const keyedErrors: any = response.data.filter(r => r.error !== '').reduce((a, x) => ({ ...a, [x.id]: x.error }), {}); + const keyedFilteredUsers: any = filteredUsers.reduce((a, x) => ({ ...a, [x.id]: x }), {}); + + childComponent.users = users.map(user => { + let message = keyedErrors[user.id] ?? successfullMessage; + if (!keyedFilteredUsers.hasOwnProperty(user.id)) { + message = this.i18nService.t('bulkFilteredMessage'); + } + + return { + user: user, + error: keyedErrors.hasOwnProperty(user.id), + message: message, + }; + }); + childComponent.loading = false; + } + } catch { + close = true; + if (this.modal) { + this.modal.close(); + } + } + } +} diff --git a/bitwarden_license/src/app/providers/manage/user-add-edit.component.html b/bitwarden_license/src/app/providers/manage/user-add-edit.component.html new file mode 100644 index 0000000000..7e8e014ebb --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/user-add-edit.component.html @@ -0,0 +1,71 @@ + diff --git a/bitwarden_license/src/app/providers/manage/user-add-edit.component.ts b/bitwarden_license/src/app/providers/manage/user-add-edit.component.ts new file mode 100644 index 0000000000..e70ffd16a3 --- /dev/null +++ b/bitwarden_license/src/app/providers/manage/user-add-edit.component.ts @@ -0,0 +1,104 @@ +import { + Component, + EventEmitter, + Input, + OnInit, + Output, +} from '@angular/core'; + +import { ToasterService } from 'angular2-toaster'; + +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; + +import { ProviderUserInviteRequest } from 'jslib-common/models/request/provider/providerUserInviteRequest'; + +import { PermissionsApi } from 'jslib-common/models/api/permissionsApi'; + +import { ProviderUserType } from 'jslib-common/enums/providerUserType'; +import { ProviderUserUpdateRequest } from 'jslib-common/models/request/provider/providerUserUpdateRequest'; + +@Component({ + selector: 'provider-user-add-edit', + templateUrl: 'user-add-edit.component.html', +}) +export class UserAddEditComponent implements OnInit { + @Input() name: string; + @Input() providerUserId: string; + @Input() providerId: string; + @Output() onSavedUser = new EventEmitter(); + @Output() onDeletedUser = new EventEmitter(); + + loading = true; + editMode: boolean = false; + title: string; + emails: string; + type: ProviderUserType = ProviderUserType.ServiceUser; + permissions = new PermissionsApi(); + showCustom = false; + access: 'all' | 'selected' = 'selected'; + formPromise: Promise; + deletePromise: Promise; + userType = ProviderUserType; + + constructor(private apiService: ApiService, private i18nService: I18nService, + private toasterService: ToasterService, private platformUtilsService: PlatformUtilsService) { } + + async ngOnInit() { + this.editMode = this.loading = this.providerUserId != null; + + if (this.editMode) { + this.editMode = true; + this.title = this.i18nService.t('editUser'); + try { + const user = await this.apiService.getProviderUser(this.providerId, this.providerUserId); + this.type = user.type; + } catch { } + } else { + this.title = this.i18nService.t('inviteUser'); + } + + this.loading = false; + } + + async submit() { + try { + if (this.editMode) { + const request = new ProviderUserUpdateRequest(); + request.type = this.type; + this.formPromise = this.apiService.putProviderUser(this.providerId, this.providerUserId, request); + } else { + const request = new ProviderUserInviteRequest(); + request.emails = this.emails.trim().split(/\s*,\s*/); + request.type = this.type; + this.formPromise = this.apiService.postProviderUserInvite(this.providerId, request); + } + await this.formPromise; + this.toasterService.popAsync('success', null, + this.i18nService.t(this.editMode ? 'editedUserId' : 'invitedUsers', this.name)); + this.onSavedUser.emit(); + } catch { } + } + + async delete() { + if (!this.editMode) { + return; + } + + const confirmed = await this.platformUtilsService.showDialog( + this.i18nService.t('removeUserConfirmation'), this.name, + this.i18nService.t('yes'), this.i18nService.t('no'), 'warning'); + if (!confirmed) { + return false; + } + + try { + this.deletePromise = this.apiService.deleteProviderUser(this.providerId, this.providerUserId); + await this.deletePromise; + this.toasterService.popAsync('success', null, this.i18nService.t('removedUserId', this.name)); + this.onDeletedUser.emit(); + } catch { } + } + +} diff --git a/bitwarden_license/src/app/providers/providers-layout.component.html b/bitwarden_license/src/app/providers/providers-layout.component.html new file mode 100644 index 0000000000..1cee05e77b --- /dev/null +++ b/bitwarden_license/src/app/providers/providers-layout.component.html @@ -0,0 +1,44 @@ + +
+
+
+
+ +
+ {{provider.name}} + {{'provider' | i18n}} +
+
+
+ + {{'providerIsDisabled' | i18n}} +
+
+
+ +
+
+
+
+ +
+ diff --git a/bitwarden_license/src/app/providers/providers-layout.component.ts b/bitwarden_license/src/app/providers/providers-layout.component.ts new file mode 100644 index 0000000000..ac63e5dd55 --- /dev/null +++ b/bitwarden_license/src/app/providers/providers-layout.component.ts @@ -0,0 +1,47 @@ +import { + Component, + NgZone, +} from '@angular/core'; + +import { ActivatedRoute } from '@angular/router'; + +import { UserService } from 'jslib-common/abstractions/user.service'; + +import { Provider } from 'jslib-common/models/domain/provider'; + +@Component({ + selector: 'providers-layout', + templateUrl: 'providers-layout.component.html', +}) +export class ProvidersLayoutComponent { + + provider: Provider; + private providerId: string; + + constructor(private route: ActivatedRoute, private userService: UserService) { } + + ngOnInit() { + document.body.classList.remove('layout_frontend'); + this.route.params.subscribe(async params => { + this.providerId = params.providerId; + await this.load(); + }); + } + + async load() { + this.provider = await this.userService.getProvider(this.providerId); + } + + get showMenuBar() { + return true; // TODO: Replace with permissions + } + + get manageRoute(): string { + switch (true) { + case this.provider.canManageUsers: + return 'manage/people'; + case this.provider.canAccessEventLogs: + return 'manage/events'; + } + } +} diff --git a/bitwarden_license/src/app/providers/providers-routing.module.ts b/bitwarden_license/src/app/providers/providers-routing.module.ts new file mode 100644 index 0000000000..f6c4c6d637 --- /dev/null +++ b/bitwarden_license/src/app/providers/providers-routing.module.ts @@ -0,0 +1,117 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; + +import { AuthGuardService } from 'jslib-angular/services/auth-guard.service'; +import { Permissions } from 'jslib-common/enums/permissions'; + +import { AddOrganizationComponent } from './clients/add-organization.component'; +import { ClientsComponent } from './clients/clients.component'; +import { CreateOrganizationComponent } from './clients/create-organization.component'; +import { AcceptProviderComponent } from './manage/accept-provider.component'; +import { EventsComponent } from './manage/events.component'; +import { ManageComponent } from './manage/manage.component'; +import { PeopleComponent } from './manage/people.component'; +import { ProvidersLayoutComponent } from './providers-layout.component'; +import { SettingsComponent } from './settings/settings.component'; +import { SetupProviderComponent } from './setup/setup-provider.component'; +import { SetupComponent } from './setup/setup.component'; + +import { FrontendLayoutComponent } from 'src/app/layouts/frontend-layout.component'; + +import { ProviderGuardService } from './services/provider-guard.service'; +import { ProviderTypeGuardService } from './services/provider-type-guard.service'; +import { AccountComponent } from './settings/account.component'; + +const routes: Routes = [ + { + path: '', + component: FrontendLayoutComponent, + children: [ + { + path: 'setup-provider', + component: SetupProviderComponent, + data: { titleId: 'setupProvider' }, + }, + { + path: 'accept-provider', + component: AcceptProviderComponent, + data: { titleId: 'acceptProvider' }, + }, + ], + }, + { + path: '', + canActivate: [AuthGuardService], + children: [ + { + path: 'setup', + component: SetupComponent, + }, + { + path: ':providerId', + component: ProvidersLayoutComponent, + canActivate: [ProviderGuardService], + children: [ + { path: '', pathMatch: 'full', redirectTo: 'clients' }, + { path: 'clients/create', component: CreateOrganizationComponent }, + { path: 'clients', component: ClientsComponent, data: { titleId: 'clients' } }, + { + path: 'manage', + component: ManageComponent, + children: [ + { + path: '', + pathMatch: 'full', + redirectTo: 'people', + }, + { + path: 'people', + component: PeopleComponent, + canActivate: [ProviderTypeGuardService], + data: { + titleId: 'people', + permissions: [Permissions.ManageUsers], + }, + }, + { + path: 'events', + component: EventsComponent, + canActivate: [ProviderTypeGuardService], + data: { + titleId: 'eventLogs', + permissions: [Permissions.AccessEventLogs], + }, + }, + ], + }, + { + path: 'settings', + component: SettingsComponent, + children: [ + { + path: '', + pathMatch: 'full', + redirectTo: 'account', + }, + { + path: 'account', + component: AccountComponent, + canActivate: [ProviderTypeGuardService], + data: { + titleId: 'myProvider', + permissions: [Permissions.ManageProvider], + }, + }, + ], + }, + ], + }, + ], + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ProvidersRoutingModule { } diff --git a/bitwarden_license/src/app/providers/providers.module.ts b/bitwarden_license/src/app/providers/providers.module.ts new file mode 100644 index 0000000000..df69031810 --- /dev/null +++ b/bitwarden_license/src/app/providers/providers.module.ts @@ -0,0 +1,62 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; + +import { ProviderGuardService } from './services/provider-guard.service'; +import { ProviderTypeGuardService } from './services/provider-type-guard.service'; +import { ProviderService } from './services/provider.service'; + +import { ProvidersLayoutComponent } from './providers-layout.component'; +import { ProvidersRoutingModule } from './providers-routing.module'; + +import { AddOrganizationComponent } from './clients/add-organization.component'; +import { ClientsComponent } from './clients/clients.component'; +import { CreateOrganizationComponent } from './clients/create-organization.component'; + +import { AcceptProviderComponent } from './manage/accept-provider.component'; +import { BulkConfirmComponent } from './manage/bulk/bulk-confirm.component'; +import { BulkRemoveComponent } from './manage/bulk/bulk-remove.component'; +import { EventsComponent } from './manage/events.component'; +import { ManageComponent } from './manage/manage.component'; +import { PeopleComponent } from './manage/people.component'; +import { UserAddEditComponent } from './manage/user-add-edit.component'; + +import { AccountComponent } from './settings/account.component'; +import { SettingsComponent } from './settings/settings.component'; + +import { SetupProviderComponent } from './setup/setup-provider.component'; +import { SetupComponent } from './setup/setup.component'; + +import { OssModule } from 'src/app/oss.module'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + OssModule, + ProvidersRoutingModule, + ], + declarations: [ + AcceptProviderComponent, + AccountComponent, + AddOrganizationComponent, + BulkConfirmComponent, + BulkRemoveComponent, + ClientsComponent, + CreateOrganizationComponent, + EventsComponent, + ManageComponent, + PeopleComponent, + ProvidersLayoutComponent, + SettingsComponent, + SetupComponent, + SetupProviderComponent, + UserAddEditComponent, + ], + providers: [ + ProviderService, + ProviderGuardService, + ProviderTypeGuardService, + ], +}) +export class ProvidersModule {} diff --git a/bitwarden_license/src/app/providers/services/provider-guard.service.ts b/bitwarden_license/src/app/providers/services/provider-guard.service.ts new file mode 100644 index 0000000000..5f1c5fc47d --- /dev/null +++ b/bitwarden_license/src/app/providers/services/provider-guard.service.ts @@ -0,0 +1,32 @@ +import { Injectable } from '@angular/core'; +import { + ActivatedRouteSnapshot, + CanActivate, + Router, +} from '@angular/router'; + +import { ToasterService } from 'angular2-toaster'; + +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; + +@Injectable() +export class ProviderGuardService implements CanActivate { + constructor(private userService: UserService, private router: Router, + private toasterService: ToasterService, private i18nService: I18nService) { } + + async canActivate(route: ActivatedRouteSnapshot) { + const provider = await this.userService.getProvider(route.params.providerId); + if (provider == null) { + this.router.navigate(['/']); + return false; + } + if (!provider.isProviderAdmin && !provider.enabled) { + this.toasterService.popAsync('error', null, this.i18nService.t('providerIsDisabled')); + this.router.navigate(['/']); + return false; + } + + return true; + } +} diff --git a/bitwarden_license/src/app/providers/services/provider-type-guard.service.ts b/bitwarden_license/src/app/providers/services/provider-type-guard.service.ts new file mode 100644 index 0000000000..c2f9c3e4c3 --- /dev/null +++ b/bitwarden_license/src/app/providers/services/provider-type-guard.service.ts @@ -0,0 +1,31 @@ +import { Injectable } from '@angular/core'; +import { + ActivatedRouteSnapshot, + CanActivate, + Router, +} from '@angular/router'; + +import { UserService } from 'jslib-common/abstractions/user.service'; + +import { Permissions } from 'jslib-common/enums/permissions'; + +@Injectable() +export class ProviderTypeGuardService implements CanActivate { + constructor(private userService: UserService, private router: Router) { } + + async canActivate(route: ActivatedRouteSnapshot) { + const provider = await this.userService.getProvider(route.params.providerId); + const permissions = route.data == null ? null : route.data.permissions as Permissions[]; + + if ( + (permissions.indexOf(Permissions.AccessEventLogs) !== -1 && provider.canAccessEventLogs) || + (permissions.indexOf(Permissions.ManageProvider) !== -1 && provider.isProviderAdmin) || + (permissions.indexOf(Permissions.ManageUsers) !== -1 && provider.canManageUsers) + ) { + return true; + } + + this.router.navigate(['/providers', provider.id]); + return false; + } +} diff --git a/bitwarden_license/src/app/providers/services/provider.service.ts b/bitwarden_license/src/app/providers/services/provider.service.ts new file mode 100644 index 0000000000..2f60fffdc3 --- /dev/null +++ b/bitwarden_license/src/app/providers/services/provider.service.ts @@ -0,0 +1,32 @@ +import { Injectable } from '@angular/core'; + +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; + +import { ProviderAddOrganizationRequest } from 'jslib-common/models/request/provider/providerAddOrganizationRequest'; + +@Injectable() +export class ProviderService { + constructor(private cryptoService: CryptoService, private syncService: SyncService, private apiService: ApiService) {} + + async addOrganizationToProvider(providerId: string, organizationId: string) { + const orgKey = await this.cryptoService.getOrgKey(organizationId); + const providerKey = await this.cryptoService.getProviderKey(providerId); + + const encryptedOrgKey = await this.cryptoService.encrypt(orgKey.key, providerKey); + + const request = new ProviderAddOrganizationRequest(); + request.organizationId = organizationId; + request.key = encryptedOrgKey.encryptedString; + + const response = await this.apiService.postProviderAddOrganization(providerId, request); + await this.syncService.fullSync(true); + return response; + } + + async detachOrganizastion(providerId: string, organizationId: string): Promise { + await this.apiService.deleteProviderOrganization(providerId, organizationId); + await this.syncService.fullSync(true); + } +} diff --git a/bitwarden_license/src/app/providers/settings/account.component.html b/bitwarden_license/src/app/providers/settings/account.component.html new file mode 100644 index 0000000000..70aa5c6e3a --- /dev/null +++ b/bitwarden_license/src/app/providers/settings/account.component.html @@ -0,0 +1,35 @@ +
+

{{'myProvider' | i18n}}

+
+
+ + {{'loading' | i18n}} +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+ +
diff --git a/bitwarden_license/src/app/providers/settings/account.component.ts b/bitwarden_license/src/app/providers/settings/account.component.ts new file mode 100644 index 0000000000..7e26eed4fd --- /dev/null +++ b/bitwarden_license/src/app/providers/settings/account.component.ts @@ -0,0 +1,62 @@ +import { Component } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { ToasterService } from 'angular2-toaster'; + +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { LogService } from 'jslib-common/abstractions/log.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; + +import { ProviderUpdateRequest } from 'jslib-common/models/request/provider/providerUpdateRequest'; + +import { ProviderResponse } from 'jslib-common/models/response/provider/providerResponse'; + +@Component({ + selector: 'provider-account', + templateUrl: 'account.component.html', +}) +export class AccountComponent { + selfHosted = false; + loading = true; + provider: ProviderResponse; + formPromise: Promise; + taxFormPromise: Promise; + + private providerId: string; + + constructor(private apiService: ApiService, private i18nService: I18nService, + private toasterService: ToasterService, private route: ActivatedRoute, + private syncService: SyncService, private platformUtilsService: PlatformUtilsService, + private logService: LogService) { } + + async ngOnInit() { + this.selfHosted = this.platformUtilsService.isSelfHost(); + this.route.parent.parent.params.subscribe(async params => { + this.providerId = params.providerId; + try { + this.provider = await this.apiService.getProvider(this.providerId); + } catch (e) { + this.logService.error(`Handled exception: ${e}`); + } + }); + this.loading = false; + } + + async submit() { + try { + const request = new ProviderUpdateRequest(); + request.name = this.provider.name; + request.businessName = this.provider.businessName; + request.billingEmail = this.provider.billingEmail; + + this.formPromise = this.apiService.putProvider(this.providerId, request).then(() => { + return this.syncService.fullSync(true); + }); + await this.formPromise; + this.toasterService.popAsync('success', null, this.i18nService.t('providerUpdated')); + } catch (e) { + this.logService.error(`Handled exception: ${e}`); + } + } +} diff --git a/bitwarden_license/src/app/providers/settings/settings.component.html b/bitwarden_license/src/app/providers/settings/settings.component.html new file mode 100644 index 0000000000..552f4fc0da --- /dev/null +++ b/bitwarden_license/src/app/providers/settings/settings.component.html @@ -0,0 +1,17 @@ +
+
+
+
+
{{'settings' | i18n}}
+
+ + {{'myProvider' | i18n}} + +
+
+
+
+ +
+
+
diff --git a/bitwarden_license/src/app/providers/settings/settings.component.ts b/bitwarden_license/src/app/providers/settings/settings.component.ts new file mode 100644 index 0000000000..0b8f2820ed --- /dev/null +++ b/bitwarden_license/src/app/providers/settings/settings.component.ts @@ -0,0 +1,20 @@ +import { Component } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; + +@Component({ + selector: 'provider-settings', + templateUrl: 'settings.component.html', +}) +export class SettingsComponent { + constructor(private route: ActivatedRoute, private userService: UserService, + private platformUtilsService: PlatformUtilsService) { } + + ngOnInit() { + this.route.parent.params.subscribe(async params => { + const provider = await this.userService.getProvider(params.providerId); + }); + } +} diff --git a/bitwarden_license/src/app/providers/setup/setup-provider.component.html b/bitwarden_license/src/app/providers/setup/setup-provider.component.html new file mode 100644 index 0000000000..00280e9ed6 --- /dev/null +++ b/bitwarden_license/src/app/providers/setup/setup-provider.component.html @@ -0,0 +1,31 @@ +
+
+ +

+ + {{'loading' | i18n}} +

+
+
+
+
+
+

{{'setupProvider' | i18n}}

+
+
+

{{'setupProviderLoginDesc' | i18n}}

+
+
+ + {{'logIn' | i18n}} + + + {{'createAccount' | i18n}} + +
+
+
+
+
+
diff --git a/bitwarden_license/src/app/providers/setup/setup-provider.component.ts b/bitwarden_license/src/app/providers/setup/setup-provider.component.ts new file mode 100644 index 0000000000..e1ea5670a5 --- /dev/null +++ b/bitwarden_license/src/app/providers/setup/setup-provider.component.ts @@ -0,0 +1,22 @@ +import { Component } from '@angular/core'; + +import { BaseAcceptComponent } from 'src/app/common/base.accept.component'; + +@Component({ + selector: 'app-setup-provider', + templateUrl: 'setup-provider.component.html', +}) +export class SetupProviderComponent extends BaseAcceptComponent { + + failedShortMessage = 'inviteAcceptFailedShort'; + failedMessage = 'inviteAcceptFailed'; + + requiredParameters = ['providerId', 'email', 'token']; + + async authedHandler(qParams: any) { + this.router.navigate(['/providers/setup'], {queryParams: qParams}); + } + + // tslint:disable-next-line + async unauthedHandler(qParams: any) {} +} diff --git a/bitwarden_license/src/app/providers/setup/setup.component.html b/bitwarden_license/src/app/providers/setup/setup.component.html new file mode 100644 index 0000000000..1f62512ced --- /dev/null +++ b/bitwarden_license/src/app/providers/setup/setup.component.html @@ -0,0 +1,38 @@ + +
+
+

{{'setupProvider' | i18n}}

+
+

{{'setupProviderDesc' | i18n}}

+ +
+

{{'generalInformation' | i18n}}

+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ +
+ + +
+
+
+ diff --git a/bitwarden_license/src/app/providers/setup/setup.component.ts b/bitwarden_license/src/app/providers/setup/setup.component.ts new file mode 100644 index 0000000000..b3c68c0b25 --- /dev/null +++ b/bitwarden_license/src/app/providers/setup/setup.component.ts @@ -0,0 +1,96 @@ +import { + Component, + OnInit, +} from '@angular/core'; +import { + ActivatedRoute, + Router, +} from '@angular/router'; +import { + Toast, + ToasterService, +} from 'angular2-toaster'; + +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; + +import { ValidationService } from 'jslib-angular/services/validation.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { ProviderSetupRequest } from 'jslib-common/models/request/provider/providerSetupRequest'; + +@Component({ + selector: 'provider-setup', + templateUrl: 'setup.component.html', +}) +export class SetupComponent implements OnInit { + loading = true; + authed = false; + email: string; + formPromise: Promise; + + providerId: string; + token: string; + name: string; + billingEmail: string; + businessName: string; + + constructor(private router: Router, private toasterService: ToasterService, + private i18nService: I18nService, private route: ActivatedRoute, + private cryptoService: CryptoService, private apiService: ApiService, + private syncService: SyncService, private validationService: ValidationService) { } + + ngOnInit() { + document.body.classList.remove('layout_frontend'); + let fired = false; + this.route.queryParams.subscribe(async qParams => { + if (fired) { + return; + } + fired = true; + const error = qParams.providerId == null || qParams.email == null || qParams.token == null; + + if (error) { + const toast: Toast = { + type: 'error', + title: null, + body: this.i18nService.t('emergencyInviteAcceptFailed'), + timeout: 10000, + }; + this.toasterService.popAsync(toast); + this.router.navigate(['/']); + } else { + this.providerId = qParams.providerId; + this.token = qParams.token; + } + }); + } + + async submit() { + this.formPromise = this.doSubmit(); + await this.formPromise; + this.formPromise = null; + } + + async doSubmit() { + try { + const shareKey = await this.cryptoService.makeShareKey(); + const key = shareKey[0].encryptedString; + + const request = new ProviderSetupRequest(); + request.name = this.name; + request.billingEmail = this.billingEmail; + request.businessName = this.businessName; + request.token = this.token; + request.key = key; + + const provider = await this.apiService.postProviderSetup(this.providerId, request); + this.toasterService.popAsync('success', this.i18nService.t('providerSetup')); + await this.syncService.fullSync(true); + + this.router.navigate(['/providers', provider.id]); + } catch (e) { + this.validationService.showError(e); + } + } +} diff --git a/bitwarden_license/webpack.config.js b/bitwarden_license/webpack.config.js index e2aa15890a..44dfe325b4 100644 --- a/bitwarden_license/webpack.config.js +++ b/bitwarden_license/webpack.config.js @@ -1,5 +1,12 @@ +const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin; + const webpackConfig = require('../webpack.config'); webpackConfig.entry['app/main'] = './bitwarden_license/src/app/main.ts'; +webpackConfig.plugins[webpackConfig.plugins.length -1] = new AngularCompilerPlugin({ + tsConfigPath: 'tsconfig.json', + entryModule: 'bitwarden_license/src/app/app.module#AppModule', + sourceMap: true, +}); module.exports = webpackConfig; diff --git a/package.json b/package.json index 8a19397479..b262e49658 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ "dist:selfhost:oss": "npm run build:selfhost:prod:oss && gulp postdist", "deploy": "npm run dist && gh-pages -d build", "deploy:dev": "npm run dist && gh-pages -d build -r git@github.com:kspearrin/bitwarden-web-dev.git", - "lint": "tslint 'src/**/*.ts' || true", - "lint:fix": "tslint 'src/**/*.ts' --fix" + "lint": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' || true", + "lint:fix": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' --fix" }, "devDependencies": { "@angular/compiler-cli": "^11.2.11", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8512425ada..1066149beb 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -6,8 +6,8 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; +import { OssRoutingModule } from './oss-routing.module'; import { OssModule } from './oss.module'; import { ServicesModule } from './services/services.module'; @@ -20,7 +20,7 @@ import { ServicesModule } from './services/services.module'; ToasterModule.forRoot(), InfiniteScrollModule, DragDropModule, - AppRoutingModule, + OssRoutingModule, ], bootstrap: [AppComponent], }) diff --git a/src/app/common/base.events.component.ts b/src/app/common/base.events.component.ts new file mode 100644 index 0000000000..9b86a6853c --- /dev/null +++ b/src/app/common/base.events.component.ts @@ -0,0 +1,157 @@ +import { Directive } from '@angular/core'; +import { ToasterService } from 'angular2-toaster'; + +import { ExportService } from 'jslib-common/abstractions/export.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; + +import { EventView } from 'jslib-common/models/view/eventView'; + +import { ListResponse } from 'jslib-common/models/response'; +import { EventResponse } from 'jslib-common/models/response/eventResponse'; + +import { LogService } from 'jslib-common/abstractions'; +import { EventService } from 'src/app/services/event.service'; + +@Directive() +export abstract class BaseEventsComponent { + loading = true; + loaded = false; + events: EventView[]; + start: string; + end: string; + dirtyDates: boolean = true; + continuationToken: string; + refreshPromise: Promise; + exportPromise: Promise; + morePromise: Promise; + + abstract readonly exportFileName: string; + + constructor(protected eventService: EventService, protected i18nService: I18nService, + protected toasterService: ToasterService, protected exportService: ExportService, + protected platformUtilsService: PlatformUtilsService, protected logService: LogService) { + const defaultDates = this.eventService.getDefaultDateFilters(); + this.start = defaultDates[0]; + this.end = defaultDates[1]; + } + + async exportEvents() { + if (this.appApiPromiseUnfulfilled() || this.dirtyDates) { + return; + } + + this.loading = true; + + const dates = this.parseDates(); + if (dates == null) { + return; + } + + try { + this.exportPromise = this.export(dates[0], dates[1]); + + await this.exportPromise; + } catch (e) { + this.logService.error(`Handled exception: ${e}`); + } + + this.exportPromise = null; + this.loading = false; + } + + async loadEvents(clearExisting: boolean) { + if (this.appApiPromiseUnfulfilled()) { + return; + } + + const dates = this.parseDates(); + if (dates == null) { + return; + } + + this.loading = true; + let events: EventView[] = []; + try { + const promise = this.loadAndParseEvents(dates[0], dates[1], clearExisting ? null : this.continuationToken); + if (clearExisting) { + this.refreshPromise = promise; + } else { + this.morePromise = promise; + } + const result = await promise; + this.continuationToken = result.continuationToken; + events = result.events; + } catch (e) { + this.logService.error(`Handled exception: ${e}`); + } + + if (!clearExisting && this.events != null && this.events.length > 0) { + this.events = this.events.concat(events); + } else { + this.events = events; + } + + this.dirtyDates = false; + this.loading = false; + this.morePromise = null; + this.refreshPromise = null; + } + + protected abstract requestEvents(startDate: string, endDate: string, continuationToken: string): Promise>; + protected abstract getUserName(r: EventResponse, userId: string): { name: string, email: string }; + + protected async loadAndParseEvents(startDate: string, endDate: string, continuationToken: string) { + const response = await this.requestEvents(startDate, endDate, continuationToken); + + const events = await Promise.all(response.data.map(async r => { + const userId = r.actingUserId == null ? r.userId : r.actingUserId; + const eventInfo = await this.eventService.getEventInfo(r); + const user = this.getUserName(r, userId); + return new EventView({ + message: eventInfo.message, + humanReadableMessage: eventInfo.humanReadableMessage, + appIcon: eventInfo.appIcon, + appName: eventInfo.appName, + userId: userId, + userName: user != null ? user.name : this.i18nService.t('unknown'), + userEmail: user != null ? user.email : '', + date: r.date, + ip: r.ipAddress, + type: r.type, + }); + })); + return { continuationToken: response.continuationToken, events: events }; + } + + protected parseDates() { + let dates: string[] = null; + try { + dates = this.eventService.formatDateFilters(this.start, this.end); + } catch (e) { + this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'), + this.i18nService.t('invalidDateRange')); + return null; + } + return dates; + } + + protected appApiPromiseUnfulfilled() { + return this.refreshPromise != null || this.morePromise != null || this.exportPromise != null; + } + + private async export(start: string, end: string) { + let continuationToken = this.continuationToken; + let events = [].concat(this.events); + + while (continuationToken != null) { + const result = await this.loadAndParseEvents(start, end, continuationToken); + continuationToken = result.continuationToken; + events = events.concat(result.events); + } + + const data = await this.exportService.getEventExport(events); + const fileName = this.exportService.getFileName(this.exportFileName, 'csv'); + this.platformUtilsService.saveFile(window, data, { type: 'text/plain' }, fileName); + } +} diff --git a/src/app/common/base.people.component.ts b/src/app/common/base.people.component.ts new file mode 100644 index 0000000000..0fe943d2f2 --- /dev/null +++ b/src/app/common/base.people.component.ts @@ -0,0 +1,314 @@ +import { + ComponentFactoryResolver, + Directive, + ViewChild, + ViewContainerRef +} from '@angular/core'; +import { ToasterService } from 'angular2-toaster'; + +import { ValidationService } from 'jslib-angular/services/validation.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { LogService } from 'jslib-common/abstractions/log.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; + +import { ConstantsService } from 'jslib-common/services/constants.service'; + +import { SearchPipe } from 'jslib-angular/pipes/search.pipe'; +import { UserNamePipe } from 'jslib-angular/pipes/user-name.pipe'; + +import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; +import { OrganizationUserType } from 'jslib-common/enums/organizationUserType'; +import { ProviderUserStatusType } from 'jslib-common/enums/providerUserStatusType'; +import { ProviderUserType } from 'jslib-common/enums/providerUserType'; + +import { ListResponse } from 'jslib-common/models/response/listResponse'; +import { OrganizationUserUserDetailsResponse } from 'jslib-common/models/response/organizationUserResponse'; +import { ProviderUserUserDetailsResponse } from 'jslib-common/models/response/provider/providerUserResponse'; + +import { Utils } from 'jslib-common/misc/utils'; + +import { ModalComponent } from '../modal.component'; +import { UserConfirmComponent } from '../organizations/manage/user-confirm.component'; + +type StatusType = OrganizationUserStatusType | ProviderUserStatusType; + +const MaxCheckedCount = 500; + +@Directive() +export abstract class BasePeopleComponent { + + @ViewChild('confirmTemplate', { read: ViewContainerRef, static: true }) confirmModalRef: ViewContainerRef; + + get allCount() { + return this.allUsers != null ? this.allUsers.length : 0; + } + + get invitedCount() { + return this.statusMap.has(this.userStatusType.Invited) ? + this.statusMap.get(this.userStatusType.Invited).length : 0; + } + + get acceptedCount() { + return this.statusMap.has(this.userStatusType.Accepted) ? + this.statusMap.get(this.userStatusType.Accepted).length : 0; + } + + get confirmedCount() { + return this.statusMap.has(this.userStatusType.Confirmed) ? + this.statusMap.get(this.userStatusType.Confirmed).length : 0; + } + + get showConfirmUsers(): boolean { + return this.allUsers != null && this.statusMap != null && this.allUsers.length > 1 && + this.confirmedCount > 0 && this.confirmedCount < 3 && this.acceptedCount > 0; + } + + get showBulkConfirmUsers(): boolean { + return this.acceptedCount > 0; + } + + abstract userType: typeof OrganizationUserType | typeof ProviderUserType; + abstract userStatusType: typeof OrganizationUserStatusType | typeof ProviderUserStatusType; + + loading = true; + statusMap = new Map(); + status: StatusType; + users: UserType[] = []; + pagedUsers: UserType[] = []; + searchText: string; + actionPromise: Promise; + + protected allUsers: UserType[] = []; + + protected didScroll = false; + protected pageSize = 100; + protected modal: ModalComponent = null; + + private pagedUsersCount = 0; + + constructor(protected apiService: ApiService, private searchService: SearchService, + protected i18nService: I18nService, private platformUtilsService: PlatformUtilsService, + protected toasterService: ToasterService, protected cryptoService: CryptoService, + private storageService: StorageService, protected validationService: ValidationService, + protected componentFactoryResolver: ComponentFactoryResolver, private logService: LogService, + private searchPipe: SearchPipe, protected userNamePipe: UserNamePipe) { } + + abstract edit(user: UserType): void; + abstract getUsers(): Promise>; + abstract deleteUser(id: string): Promise; + abstract reinviteUser(id: string): Promise; + abstract confirmUser(user: UserType, publicKey: Uint8Array): Promise; + + async load() { + const response = await this.getUsers(); + this.statusMap.clear(); + this.allUsers = response.data != null && response.data.length > 0 ? response.data : []; + this.allUsers.sort(Utils.getSortFunction(this.i18nService, 'email')); + this.allUsers.forEach(u => { + if (!this.statusMap.has(u.status)) { + this.statusMap.set(u.status, [u]); + } else { + this.statusMap.get(u.status).push(u); + } + }); + this.filter(this.status); + this.loading = false; + } + + filter(status: StatusType) { + this.status = status; + if (this.status != null) { + this.users = this.statusMap.get(this.status); + } else { + this.users = this.allUsers; + } + // Reset checkbox selecton + this.selectAll(false); + this.resetPaging(); + } + + loadMore() { + if (!this.users || this.users.length <= this.pageSize) { + return; + } + const pagedLength = this.pagedUsers.length; + let pagedSize = this.pageSize; + if (pagedLength === 0 && this.pagedUsersCount > this.pageSize) { + pagedSize = this.pagedUsersCount; + } + if (this.users.length > pagedLength) { + this.pagedUsers = this.pagedUsers.concat(this.users.slice(pagedLength, pagedLength + pagedSize)); + } + this.pagedUsersCount = this.pagedUsers.length; + this.didScroll = this.pagedUsers.length > this.pageSize; + } + + checkUser(user: OrganizationUserUserDetailsResponse, select?: boolean) { + (user as any).checked = select == null ? !(user as any).checked : select; + } + + selectAll(select: boolean) { + if (select) { + this.selectAll(false); + } + + const filteredUsers = this.searchPipe.transform(this.users, this.searchText, 'name', 'email', 'id'); + + const selectCount = select && filteredUsers.length > MaxCheckedCount + ? MaxCheckedCount + : filteredUsers.length; + for (let i = 0; i < selectCount; i++) { + this.checkUser(filteredUsers[i], select); + } + } + + async resetPaging() { + this.pagedUsers = []; + this.loadMore(); + } + + invite() { + this.edit(null); + } + + async remove(user: UserType) { + const confirmed = await this.platformUtilsService.showDialog( + this.i18nService.t('removeUserConfirmation'), this.userNamePipe.transform(user), + this.i18nService.t('yes'), this.i18nService.t('no'), 'warning'); + + if (!confirmed) { + return false; + } + + this.actionPromise = this.deleteUser(user.id); + try { + await this.actionPromise; + this.toasterService.popAsync('success', null, this.i18nService.t('removedUserId', this.userNamePipe.transform(user))); + this.removeUser(user); + } catch (e) { + this.validationService.showError(e); + } + this.actionPromise = null; + } + + async reinvite(user: UserType) { + if (this.actionPromise != null) { + return; + } + + this.actionPromise = this.reinviteUser(user.id); + try { + await this.actionPromise; + this.toasterService.popAsync('success', null, this.i18nService.t('hasBeenReinvited', this.userNamePipe.transform(user))); + } catch (e) { + this.validationService.showError(e); + } + this.actionPromise = null; + } + + async confirm(user: UserType) { + function updateUser(self: BasePeopleComponent) { + user.status = self.userStatusType.Confirmed; + const mapIndex = self.statusMap.get(self.userStatusType.Accepted).indexOf(user); + if (mapIndex > -1) { + self.statusMap.get(self.userStatusType.Accepted).splice(mapIndex, 1); + self.statusMap.get(self.userStatusType.Confirmed).push(user); + } + } + + const confirmUser = async (publicKey: Uint8Array) => { + try { + this.actionPromise = this.confirmUser(user, publicKey); + await this.actionPromise; + updateUser(this); + this.toasterService.popAsync('success', null, this.i18nService.t('hasBeenConfirmed', this.userNamePipe.transform(user))); + } catch (e) { + this.validationService.showError(e); + throw e; + } finally { + this.actionPromise = null; + } + }; + + if (this.actionPromise != null) { + return; + } + + try { + const publicKeyResponse = await this.apiService.getUserPublicKey(user.userId); + const publicKey = Utils.fromB64ToArray(publicKeyResponse.publicKey); + + const autoConfirm = await this.storageService.get(ConstantsService.autoConfirmFingerprints); + if (autoConfirm == null || !autoConfirm) { + if (this.modal != null) { + this.modal.close(); + } + + const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent); + this.modal = this.confirmModalRef.createComponent(factory).instance; + const childComponent = this.modal.show( + UserConfirmComponent, this.confirmModalRef); + + childComponent.name = this.userNamePipe.transform(user); + childComponent.userId = user != null ? user.userId : null; + childComponent.publicKey = publicKey; + childComponent.onConfirmedUser.subscribe(async () => { + try { + await confirmUser(publicKey); + this.modal.close(); + } catch (e) { + this.logService.error(`Handled exception: ${e}`); + } + }); + + this.modal.onClosed.subscribe(() => { + this.modal = null; + }); + return; + } + + try { + const fingerprint = await this.cryptoService.getFingerprint(user.userId, publicKey.buffer); + this.logService.info(`User's fingerprint: ${fingerprint.join('-')}`); + } catch { } + await confirmUser(publicKey); + } catch (e) { + this.logService.error(`Handled exception: ${e}`); + } + } + + isSearching() { + return this.searchService.isSearchable(this.searchText); + } + + isPaging() { + const searching = this.isSearching(); + if (searching && this.didScroll) { + this.resetPaging(); + } + return !searching && this.users && this.users.length > this.pageSize; + } + + protected getCheckedUsers() { + return this.users.filter(u => (u as any).checked); + } + + protected removeUser(user: UserType) { + let index = this.users.indexOf(user); + if (index > -1) { + this.users.splice(index, 1); + this.resetPaging(); + } + if (this.statusMap.has(user.status)) { + index = this.statusMap.get(user.status).indexOf(user); + if (index > -1) { + this.statusMap.get(user.status).splice(index, 1); + } + } + } + +} \ No newline at end of file diff --git a/src/app/layouts/organization-layout.component.html b/src/app/layouts/organization-layout.component.html index 93f18d5d97..324e02e1cc 100644 --- a/src/app/layouts/organization-layout.component.html +++ b/src/app/layouts/organization-layout.component.html @@ -14,6 +14,12 @@ {{'organizationIsDisabled' | i18n}} +
+
+ + {{'accessingUsingProvider' | i18n : organization.providerName}} +
+
  • diff --git a/src/app/organizations/manage/bulk/bulk-confirm.component.ts b/src/app/organizations/manage/bulk/bulk-confirm.component.ts index f567e865fc..5dab0d48b3 100644 --- a/src/app/organizations/manage/bulk/bulk-confirm.component.ts +++ b/src/app/organizations/manage/bulk/bulk-confirm.component.ts @@ -11,11 +11,10 @@ import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { OrganizationUserBulkConfirmRequest } from 'jslib-common/models/request/organizationUserBulkConfirmRequest'; import { OrganizationUserBulkRequest } from 'jslib-common/models/request/organizationUserBulkRequest'; -import { OrganizationUserUserDetailsResponse } from 'jslib-common/models/response/organizationUserResponse'; - import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; import { Utils } from 'jslib-common/misc/utils'; +import { BulkUserDetails } from './bulk-status.component'; @Component({ selector: 'app-bulk-confirm', @@ -24,10 +23,10 @@ import { Utils } from 'jslib-common/misc/utils'; export class BulkConfirmComponent implements OnInit { @Input() organizationId: string; - @Input() users: OrganizationUserUserDetailsResponse[]; + @Input() users: BulkUserDetails[]; - excludedUsers: OrganizationUserUserDetailsResponse[]; - filteredUsers: OrganizationUserUserDetailsResponse[]; + excludedUsers: BulkUserDetails[]; + filteredUsers: BulkUserDetails[]; publicKeys: Map = new Map(); fingerprints: Map = new Map(); statuses: Map = new Map(); @@ -36,19 +35,18 @@ export class BulkConfirmComponent implements OnInit { done: boolean = false; error: string; - constructor(private cryptoService: CryptoService, private apiService: ApiService, + constructor(protected cryptoService: CryptoService, protected apiService: ApiService, private i18nService: I18nService) { } async ngOnInit() { - this.excludedUsers = this.users.filter(user => user.status !== OrganizationUserStatusType.Accepted); - this.filteredUsers = this.users.filter(user => user.status === OrganizationUserStatusType.Accepted); + this.excludedUsers = this.users.filter(u => !this.isAccepted(u)); + this.filteredUsers = this.users.filter(u => this.isAccepted(u)); if (this.filteredUsers.length <= 0) { this.done = true; } - const request = new OrganizationUserBulkRequest(this.filteredUsers.map(user => user.id)); - const response = await this.apiService.postOrganizationUsersPublicKey(this.organizationId, request); + const response = await this.getPublicKeys(); for (const entry of response.data) { const publicKey = Utils.fromB64ToArray(entry.key); @@ -65,21 +63,20 @@ export class BulkConfirmComponent implements OnInit { async submit() { this.loading = true; try { - const orgKey = await this.cryptoService.getOrgKey(this.organizationId); + const key = await this.getCryptoKey(); const userIdsWithKeys: any[] = []; for (const user of this.filteredUsers) { const publicKey = this.publicKeys.get(user.id); if (publicKey == null) { continue; } - const key = await this.cryptoService.rsaEncrypt(orgKey.key, publicKey.buffer); + const encryptedKey = await this.cryptoService.rsaEncrypt(key.key, publicKey.buffer); userIdsWithKeys.push({ id: user.id, - key: key.encryptedString, + key: encryptedKey.encryptedString, }); } - const request = new OrganizationUserBulkConfirmRequest(userIdsWithKeys); - const response = await this.apiService.postOrganizationUserBulkConfirm(this.organizationId, request); + const response = await this.postConfirmRequest(userIdsWithKeys); response.data.forEach(entry => { const error = entry.error !== '' ? entry.error : this.i18nService.t('bulkConfirmMessage'); @@ -92,4 +89,22 @@ export class BulkConfirmComponent implements OnInit { } this.loading = false; } + + protected isAccepted(user: BulkUserDetails) { + return user.status === OrganizationUserStatusType.Accepted; + } + + protected async getPublicKeys() { + const request = new OrganizationUserBulkRequest(this.filteredUsers.map(user => user.id)); + return await this.apiService.postOrganizationUsersPublicKey(this.organizationId, request); + } + + protected getCryptoKey() { + return this.cryptoService.getOrgKey(this.organizationId); + } + + protected async postConfirmRequest(userIdsWithKeys: any[]) { + const request = new OrganizationUserBulkConfirmRequest(userIdsWithKeys); + return await this.apiService.postOrganizationUserBulkConfirm(this.organizationId, request); + } } diff --git a/src/app/organizations/manage/bulk/bulk-remove.component.html b/src/app/organizations/manage/bulk/bulk-remove.component.html index 48a0d56e0e..53186fabbe 100644 --- a/src/app/organizations/manage/bulk/bulk-remove.component.html +++ b/src/app/organizations/manage/bulk/bulk-remove.component.html @@ -10,17 +10,13 @@
    -
    - - {{'loading' | i18n}} -
    {{'noSelectedUsersApplicable' | i18n}} {{error}} - + {{'removeUsersWarning' | i18n}} @@ -42,7 +38,7 @@ - + diff --git a/src/app/organizations/manage/bulk/bulk-remove.component.ts b/src/app/organizations/manage/bulk/bulk-remove.component.ts index 8b59aee638..7f06df3116 100644 --- a/src/app/organizations/manage/bulk/bulk-remove.component.ts +++ b/src/app/organizations/manage/bulk/bulk-remove.component.ts @@ -7,7 +7,7 @@ import { ApiService } from 'jslib-common/abstractions/api.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { OrganizationUserBulkRequest } from 'jslib-common/models/request/organizationUserBulkRequest'; -import { OrganizationUserUserDetailsResponse } from 'jslib-common/models/response/organizationUserResponse'; +import { BulkUserDetails } from './bulk-status.component'; @Component({ selector: 'app-bulk-remove', @@ -16,7 +16,7 @@ import { OrganizationUserUserDetailsResponse } from 'jslib-common/models/respons export class BulkRemoveComponent { @Input() organizationId: string; - @Input() users: OrganizationUserUserDetailsResponse[]; + @Input() users: BulkUserDetails[]; statuses: Map = new Map(); @@ -24,13 +24,12 @@ export class BulkRemoveComponent { done: boolean = false; error: string; - constructor(private apiService: ApiService, private i18nService: I18nService) { } + constructor(protected apiService: ApiService, protected i18nService: I18nService) { } async submit() { this.loading = true; try { - const request = new OrganizationUserBulkRequest(this.users.map(user => user.id)); - const response = await this.apiService.deleteManyOrganizationUsers(this.organizationId, request); + const response = await this.deleteUsers(); response.data.forEach(entry => { const error = entry.error !== '' ? entry.error : this.i18nService.t('bulkRemovedMessage'); @@ -43,4 +42,9 @@ export class BulkRemoveComponent { this.loading = false; } + + protected async deleteUsers() { + const request = new OrganizationUserBulkRequest(this.users.map(user => user.id)); + return await this.apiService.deleteManyOrganizationUsers(this.organizationId, request); + } } diff --git a/src/app/organizations/manage/bulk/bulk-status.component.ts b/src/app/organizations/manage/bulk/bulk-status.component.ts index f9a17b61dd..96e6e2810b 100644 --- a/src/app/organizations/manage/bulk/bulk-status.component.ts +++ b/src/app/organizations/manage/bulk/bulk-status.component.ts @@ -1,9 +1,16 @@ import { Component } from '@angular/core'; +import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; +import { ProviderUserStatusType } from 'jslib-common/enums/providerUserStatusType'; -import { OrganizationUserUserDetailsResponse } from 'jslib-common/models/response/organizationUserResponse'; +export interface BulkUserDetails { + id: string; + name: string; + email: string; + status: OrganizationUserStatusType | ProviderUserStatusType; +} type BulkStatusEntry = { - user: OrganizationUserUserDetailsResponse, + user: BulkUserDetails, error: boolean, message: string, }; diff --git a/src/app/organizations/manage/entity-events.component.ts b/src/app/organizations/manage/entity-events.component.ts index 05087931b5..dcd3c79b9a 100644 --- a/src/app/organizations/manage/entity-events.component.ts +++ b/src/app/organizations/manage/entity-events.component.ts @@ -25,6 +25,7 @@ export class EntityEventsComponent implements OnInit { @Input() entity: 'user' | 'cipher'; @Input() entityId: string; @Input() organizationId: string; + @Input() providerId: string; @Input() showUser = false; loading = true; @@ -81,7 +82,10 @@ export class EntityEventsComponent implements OnInit { let response: ListResponse; try { let promise: Promise; - if (this.entity === 'user') { + if (this.entity === 'user' && this.providerId) { + promise = this.apiService.getEventsProviderUser(this.providerId, this.entityId, + dates[0], dates[1], clearExisting ? null : this.continuationToken); + } else if (this.entity === 'user') { promise = this.apiService.getEventsOrganizationUser(this.organizationId, this.entityId, dates[0], dates[1], clearExisting ? null : this.continuationToken); } else { diff --git a/src/app/organizations/manage/events.component.ts b/src/app/organizations/manage/events.component.ts index 7b0c34a62a..2d81b9e5f4 100644 --- a/src/app/organizations/manage/events.component.ts +++ b/src/app/organizations/manage/events.component.ts @@ -3,7 +3,6 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; - import { ToasterService } from 'angular2-toaster'; import { UserNamePipe } from 'jslib-angular/pipes/user-name.pipe'; @@ -11,49 +10,44 @@ import { UserNamePipe } from 'jslib-angular/pipes/user-name.pipe'; import { ApiService } from 'jslib-common/abstractions/api.service'; import { ExportService } from 'jslib-common/abstractions/export.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { LogService } from 'jslib-common/abstractions/log.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { UserService } from 'jslib-common/abstractions/user.service'; -import { EventView } from 'jslib-common/models/view/eventView'; +import { Organization } from 'jslib-common/models/domain/organization'; +import { EventResponse } from 'jslib-common/models/response/eventResponse'; import { EventService } from '../../services/event.service'; +import { BaseEventsComponent } from '../../common/base.events.component'; + @Component({ selector: 'app-org-events', templateUrl: 'events.component.html', }) -export class EventsComponent implements OnInit { - loading = true; - loaded = false; +export class EventsComponent extends BaseEventsComponent implements OnInit { + exportFileName: string = 'org-events'; organizationId: string; - events: EventView[]; - start: string; - end: string; - dirtyDates: boolean = true; - continuationToken: string; - refreshPromise: Promise; - exportPromise: Promise; - morePromise: Promise; + organization: Organization; private orgUsersUserIdMap = new Map(); - private orgUsersIdMap = new Map(); - constructor(private apiService: ApiService, private route: ActivatedRoute, private eventService: EventService, - private i18nService: I18nService, private toasterService: ToasterService, private userService: UserService, - private exportService: ExportService, private platformUtilsService: PlatformUtilsService, - private router: Router, private userNamePipe: UserNamePipe) { } + constructor(private apiService: ApiService, private route: ActivatedRoute, eventService: EventService, + i18nService: I18nService, toasterService: ToasterService, private userService: UserService, + exportService: ExportService, platformUtilsService: PlatformUtilsService, private router: Router, + logService: LogService, private userNamePipe: UserNamePipe) { + super(eventService, i18nService, toasterService, exportService, platformUtilsService, logService); + } async ngOnInit() { this.route.parent.parent.params.subscribe(async params => { this.organizationId = params.organizationId; - const organization = await this.userService.getOrganization(this.organizationId); - if (organization == null || !organization.useEvents) { + this.organization = await this.userService.getOrganization(this.organizationId); + if (this.organization == null || !this.organization.useEvents) { this.router.navigate(['/organizations', this.organizationId]); return; } - const defaultDates = this.eventService.getDefaultDateFilters(); - this.start = defaultDates[0]; - this.end = defaultDates[1]; + await this.load(); }); } @@ -62,124 +56,40 @@ export class EventsComponent implements OnInit { const response = await this.apiService.getOrganizationUsers(this.organizationId); response.data.forEach(u => { const name = this.userNamePipe.transform(u); - this.orgUsersIdMap.set(u.id, { name: name, email: u.email }); this.orgUsersUserIdMap.set(u.userId, { name: name, email: u.email }); }); + + if (this.organization.providerId != null && (await this.userService.getProvider(this.organization.providerId)) != null) { + const providerUsersResponse = await this.apiService.getProviderUsers(this.organization.providerId); + providerUsersResponse.data.forEach(u => { + const name = this.userNamePipe.transform(u); + this.orgUsersUserIdMap.set(u.userId, { name: `${name} (${this.organization.providerName})`, email: u.email }); + }); + } + await this.loadEvents(true); this.loaded = true; } - async exportEvents() { - if (this.appApiPromiseUnfulfilled() || this.dirtyDates) { - return; - } - - this.loading = true; - - const dates = this.parseDates(); - if (dates == null) { - return; - } - - try { - this.exportPromise = this.export(dates[0], dates[1]); - - await this.exportPromise; - } catch { } - - this.exportPromise = null; - this.loading = false; + protected requestEvents(startDate: string, endDate: string, continuationToken: string) { + return this.apiService.getEventsOrganization(this.organizationId, startDate, endDate, continuationToken); } - async loadEvents(clearExisting: boolean) { - if (this.appApiPromiseUnfulfilled()) { - return; - } - - const dates = this.parseDates(); - if (dates == null) { - return; - } - - this.loading = true; - let events: EventView[] = []; - try { - const promise = this.loadAndParseEvents(dates[0], dates[1], clearExisting ? null : this.continuationToken); - if (clearExisting) { - this.refreshPromise = promise; - } else { - this.morePromise = promise; - } - const result = await promise; - this.continuationToken = result.continuationToken; - events = result.events; - } catch { } - - if (!clearExisting && this.events != null && this.events.length > 0) { - this.events = this.events.concat(events); - } else { - this.events = events; - } - - this.dirtyDates = false; - this.loading = false; - this.morePromise = null; - this.refreshPromise = null; - } - - private async export(start: string, end: string) { - let continuationToken = this.continuationToken; - let events = [].concat(this.events); - - while (continuationToken != null) { - const result = await this.loadAndParseEvents(start, end, continuationToken); - continuationToken = result.continuationToken; - events = events.concat(result.events); - } - - const data = await this.exportService.getEventExport(events); - const fileName = this.exportService.getFileName('org-events', 'csv'); - this.platformUtilsService.saveFile(window, data, { type: 'text/plain' }, fileName); - } - - private async loadAndParseEvents(startDate: string, endDate: string, continuationToken: string) { - const response = await this.apiService.getEventsOrganization(this.organizationId, startDate, endDate, - continuationToken); - - const events = await Promise.all(response.data.map(async r => { - const userId = r.actingUserId == null ? r.userId : r.actingUserId; - const eventInfo = await this.eventService.getEventInfo(r); - const user = userId != null && this.orgUsersUserIdMap.has(userId) ? - this.orgUsersUserIdMap.get(userId) : null; - return new EventView({ - message: eventInfo.message, - humanReadableMessage: eventInfo.humanReadableMessage, - appIcon: eventInfo.appIcon, - appName: eventInfo.appName, - userId: userId, - userName: user != null ? user.name : this.i18nService.t('unknown'), - userEmail: user != null ? user.email : '', - date: r.date, - ip: r.ipAddress, - type: r.type, - }); - })); - return { continuationToken: response.continuationToken, events: events }; - } - - private parseDates() { - let dates: string[] = null; - try { - dates = this.eventService.formatDateFilters(this.start, this.end); - } catch (e) { - this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'), - this.i18nService.t('invalidDateRange')); + protected getUserName(r: EventResponse, userId: string) { + if (userId == null) { return null; } - return dates; - } - private appApiPromiseUnfulfilled() { - return this.refreshPromise != null || this.morePromise != null || this.exportPromise != null; + if (this.orgUsersUserIdMap.has(userId)) { + return this.orgUsersUserIdMap.get(userId); + } + + if (r.providerId != null && r.providerId === this.organization.providerId) { + return { + 'name': this.organization.providerName, + }; + } + + return null; } } diff --git a/src/app/organizations/manage/people.component.html b/src/app/organizations/manage/people.component.html index 3afabc06d1..167b3a44f5 100644 --- a/src/app/organizations/manage/people.component.html +++ b/src/app/organizations/manage/people.component.html @@ -8,14 +8,14 @@ {{allCount}} @@ -86,9 +86,9 @@
    {{u.email}} {{'invited' | i18n}} + *ngIf="u.status === userStatusType.Invited">{{'invited' | i18n}} {{'accepted' | i18n}} + *ngIf="u.status === userStatusType.Accepted">{{'accepted' | i18n}} {{u.name}} @@ -102,11 +102,11 @@ - {{'owner' | i18n}} - {{'admin' | i18n}} - {{'manager' | i18n}} - {{'user' | i18n}} - {{'custom' | i18n}} + {{'owner' | i18n}} + {{'admin' | i18n}} + {{'manager' | i18n}} + {{'user' | i18n}} + {{'custom' | i18n}}
    @@ -117,12 +117,12 @@
    + *ngIf="u.status === userStatusType.Invited"> {{'resendInvitation' | i18n}} + *ngIf="u.status === userStatusType.Accepted"> {{'confirm' | i18n}} @@ -131,7 +131,7 @@ {{'groups' | i18n}} + *ngIf="accessEvents && u.status === userStatusType.Confirmed"> {{'eventLogs' | i18n}} diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts index 71af2995cf..f62ebb7487 100644 --- a/src/app/organizations/manage/people.component.ts +++ b/src/app/organizations/manage/people.component.ts @@ -14,11 +14,11 @@ import { import { ToasterService } from 'angular2-toaster'; import { ValidationService } from 'jslib-angular/services/validation.service'; -import { ConstantsService } from 'jslib-common/services/constants.service'; import { ApiService } from 'jslib-common/abstractions/api.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { LogService } from 'jslib-common/abstractions/log.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service'; import { SearchService } from 'jslib-common/abstractions/search.service'; @@ -37,12 +37,12 @@ import { OrganizationUserUserDetailsResponse } from 'jslib-common/models/respons import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; import { OrganizationUserType } from 'jslib-common/enums/organizationUserType'; import { PolicyType } from 'jslib-common/enums/policyType'; +import { ProviderUserType } from 'jslib-common/enums/providerUserType'; import { SearchPipe } from 'jslib-angular/pipes/search.pipe'; import { UserNamePipe } from 'jslib-angular/pipes/user-name.pipe'; -import { Utils } from 'jslib-common/misc/utils'; - +import { BasePeopleComponent } from '../../common/base.people.component'; import { ModalComponent } from '../../modal.component'; import { BulkConfirmComponent } from './bulk/bulk-confirm.component'; import { BulkRemoveComponent } from './bulk/bulk-remove.component'; @@ -50,16 +50,13 @@ import { BulkStatusComponent } from './bulk/bulk-status.component'; import { EntityEventsComponent } from './entity-events.component'; import { ResetPasswordComponent } from './reset-password.component'; import { UserAddEditComponent } from './user-add-edit.component'; -import { UserConfirmComponent } from './user-confirm.component'; import { UserGroupsComponent } from './user-groups.component'; -const MaxCheckedCount = 500; - @Component({ selector: 'app-org-people', templateUrl: 'people.component.html', }) -export class PeopleComponent implements OnInit { +export class PeopleComponent extends BasePeopleComponent implements OnInit { @ViewChild('addEdit', { read: ViewContainerRef, static: true }) addEditModalRef: ViewContainerRef; @ViewChild('groupsTemplate', { read: ViewContainerRef, static: true }) groupsModalRef: ViewContainerRef; @ViewChild('eventsTemplate', { read: ViewContainerRef, static: true }) eventsModalRef: ViewContainerRef; @@ -69,16 +66,11 @@ export class PeopleComponent implements OnInit { @ViewChild('bulkConfirmTemplate', { read: ViewContainerRef, static: true }) bulkConfirmModalRef: ViewContainerRef; @ViewChild('bulkRemoveTemplate', { read: ViewContainerRef, static: true }) bulkRemoveModalRef: ViewContainerRef; - loading = true; + userType = ProviderUserType; + userStatusType = OrganizationUserStatusType; + organizationId: string; - users: OrganizationUserUserDetailsResponse[]; - pagedUsers: OrganizationUserUserDetailsResponse[]; - searchText: string; status: OrganizationUserStatusType = null; - statusMap = new Map(); - organizationUserType = OrganizationUserType; - organizationUserStatusType = OrganizationUserStatusType; - actionPromise: Promise; accessEvents = false; accessGroups = false; canResetPassword = false; // User permission (admin/custom) @@ -87,20 +79,16 @@ export class PeopleComponent implements OnInit { orgResetPasswordPolicyEnabled = false; callingUserType: OrganizationUserType = null; - protected didScroll = false; - protected pageSize = 100; - - private pagedUsersCount = 0; - private modal: ModalComponent = null; - private allUsers: OrganizationUserUserDetailsResponse[]; - - constructor(private apiService: ApiService, private route: ActivatedRoute, - private i18nService: I18nService, private componentFactoryResolver: ComponentFactoryResolver, - private platformUtilsService: PlatformUtilsService, private toasterService: ToasterService, - private cryptoService: CryptoService, private userService: UserService, private router: Router, - private storageService: StorageService, private searchService: SearchService, - private validationService: ValidationService, private policyService: PolicyService, - private searchPipe: SearchPipe, private userNamePipe: UserNamePipe, private syncService: SyncService) { } + constructor(apiService: ApiService, private route: ActivatedRoute, + i18nService: I18nService, componentFactoryResolver: ComponentFactoryResolver, + platformUtilsService: PlatformUtilsService, toasterService: ToasterService, + cryptoService: CryptoService, private userService: UserService, private router: Router, + storageService: StorageService, searchService: SearchService, + validationService: ValidationService, private policyService: PolicyService, + logService: LogService, searchPipe: SearchPipe, userNamePipe: UserNamePipe, private syncService: SyncService) { + super(apiService, searchService, i18nService, platformUtilsService, toasterService, cryptoService, + storageService, validationService, componentFactoryResolver, logService, searchPipe, userNamePipe); + } async ngOnInit() { this.route.parent.parent.params.subscribe(async params => { @@ -149,21 +137,29 @@ export class PeopleComponent implements OnInit { } async load() { - const response = await this.apiService.getOrganizationUsers(this.organizationId); - this.statusMap.clear(); - this.allUsers = response.data != null && response.data.length > 0 ? response.data : []; - this.allUsers.sort(Utils.getSortFunction(this.i18nService, 'email')); - this.allUsers.forEach(u => { - if (!this.statusMap.has(u.status)) { - this.statusMap.set(u.status, [u]); - } else { - this.statusMap.get(u.status).push(u); - } - }); - this.filter(this.status); const policies = await this.policyService.getAll(PolicyType.ResetPassword); this.orgResetPasswordPolicyEnabled = policies.some(p => p.organizationId === this.organizationId && p.enabled); - this.loading = false; + super.load(); + } + + getUsers(): Promise> { + return this.apiService.getOrganizationUsers(this.organizationId); + } + + deleteUser(id: string): Promise { + return this.apiService.deleteOrganizationUser(this.organizationId, id); + } + + reinviteUser(id: string): Promise { + return this.apiService.postOrganizationUserReinvite(this.organizationId, id); + } + + async confirmUser(user: OrganizationUserUserDetailsResponse, publicKey: Uint8Array): Promise { + const orgKey = await this.cryptoService.getOrgKey(this.organizationId); + const key = await this.cryptoService.rsaEncrypt(orgKey.key, publicKey.buffer); + const request = new OrganizationUserConfirmRequest(); + request.key = key.encryptedString; + await this.apiService.postOrganizationUserConfirm(this.organizationId, user.id, request); } allowResetPassword(orgUser: OrganizationUserUserDetailsResponse): boolean { @@ -193,62 +189,6 @@ export class PeopleComponent implements OnInit { return this.orgUseResetPassword && orgUser.resetPasswordEnrolled && this.orgResetPasswordPolicyEnabled; } - filter(status: OrganizationUserStatusType) { - this.status = status; - if (this.status != null) { - this.users = this.statusMap.get(this.status); - } else { - this.users = this.allUsers; - } - // Reset checkbox selecton - this.selectAll(false); - this.resetPaging(); - } - - loadMore() { - if (!this.users || this.users.length <= this.pageSize) { - return; - } - const pagedLength = this.pagedUsers.length; - let pagedSize = this.pageSize; - if (pagedLength === 0 && this.pagedUsersCount > this.pageSize) { - pagedSize = this.pagedUsersCount; - } - if (this.users.length > pagedLength) { - this.pagedUsers = this.pagedUsers.concat(this.users.slice(pagedLength, pagedLength + pagedSize)); - } - this.pagedUsersCount = this.pagedUsers.length; - this.didScroll = this.pagedUsers.length > this.pageSize; - } - - get allCount() { - return this.allUsers != null ? this.allUsers.length : 0; - } - - get invitedCount() { - return this.statusMap.has(OrganizationUserStatusType.Invited) ? - this.statusMap.get(OrganizationUserStatusType.Invited).length : 0; - } - - get acceptedCount() { - return this.statusMap.has(OrganizationUserStatusType.Accepted) ? - this.statusMap.get(OrganizationUserStatusType.Accepted).length : 0; - } - - get confirmedCount() { - return this.statusMap.has(OrganizationUserStatusType.Confirmed) ? - this.statusMap.get(OrganizationUserStatusType.Confirmed).length : 0; - } - - get showConfirmUsers(): boolean { - return this.allUsers != null && this.statusMap != null && this.allUsers.length > 1 && - this.confirmedCount > 0 && this.confirmedCount < 3 && this.acceptedCount > 0; - } - - get showBulkConfirmUsers(): boolean { - return this.acceptedCount > 0; - } - edit(user: OrganizationUserUserDetailsResponse) { if (this.modal != null) { this.modal.close(); @@ -276,10 +216,6 @@ export class PeopleComponent implements OnInit { }); } - invite() { - this.edit(null); - } - groups(user: OrganizationUserUserDetailsResponse) { if (this.modal != null) { this.modal.close(); @@ -302,40 +238,6 @@ export class PeopleComponent implements OnInit { }); } - async remove(user: OrganizationUserUserDetailsResponse) { - const confirmed = await this.platformUtilsService.showDialog( - this.i18nService.t('removeUserConfirmation'), this.userNamePipe.transform(user), - this.i18nService.t('yes'), this.i18nService.t('no'), 'warning'); - if (!confirmed) { - return false; - } - - this.actionPromise = this.apiService.deleteOrganizationUser(this.organizationId, user.id); - try { - await this.actionPromise; - this.toasterService.popAsync('success', null, this.i18nService.t('removedUserId', this.userNamePipe.transform(user))); - this.removeUser(user); - } catch (e) { - this.validationService.showError(e); - } - this.actionPromise = null; - } - - async reinvite(user: OrganizationUserUserDetailsResponse) { - if (this.actionPromise != null) { - return; - } - - this.actionPromise = this.apiService.postOrganizationUserReinvite(this.organizationId, user.id); - try { - await this.actionPromise; - this.toasterService.popAsync('success', null, this.i18nService.t('hasBeenReinvited', this.userNamePipe.transform(user))); - } catch (e) { - this.validationService.showError(e); - } - this.actionPromise = null; - } - async bulkRemove() { if (this.actionPromise != null) { return; @@ -405,80 +307,6 @@ export class PeopleComponent implements OnInit { }); } - async confirm(user: OrganizationUserUserDetailsResponse) { - function updateUser(self: PeopleComponent) { - user.status = OrganizationUserStatusType.Confirmed; - const mapIndex = self.statusMap.get(OrganizationUserStatusType.Accepted).indexOf(user); - if (mapIndex > -1) { - self.statusMap.get(OrganizationUserStatusType.Accepted).splice(mapIndex, 1); - self.statusMap.get(OrganizationUserStatusType.Confirmed).push(user); - } - } - - const confirmUser = async (publicKey: Uint8Array) => { - try { - this.actionPromise = this.doConfirmation(user, publicKey); - await this.actionPromise; - updateUser(this); - this.toasterService.popAsync('success', null, this.i18nService.t('hasBeenConfirmed', this.userNamePipe.transform(user))); - } catch (e) { - this.validationService.showError(e); - throw e; - } finally { - this.actionPromise = null; - } - }; - - if (this.actionPromise != null) { - return; - } - - const autoConfirm = await this.storageService.get(ConstantsService.autoConfirmFingerprints); - if (autoConfirm == null || !autoConfirm) { - if (this.modal != null) { - this.modal.close(); - } - - const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent); - this.modal = this.confirmModalRef.createComponent(factory).instance; - const childComponent = this.modal.show( - UserConfirmComponent, this.confirmModalRef); - - childComponent.name = this.userNamePipe.transform(user); - childComponent.organizationId = this.organizationId; - childComponent.organizationUserId = user != null ? user.id : null; - childComponent.userId = user != null ? user.userId : null; - childComponent.onConfirmedUser.subscribe(async (publicKey: Uint8Array) => { - try { - await confirmUser(publicKey); - this.modal.close(); - } catch (e) { - // tslint:disable-next-line - console.error('Handled exception:', e); - } - }); - - this.modal.onClosed.subscribe(() => { - this.modal = null; - }); - return; - } - - try { - const publicKeyResponse = await this.apiService.getUserPublicKey(user.userId); - const publicKey = Utils.fromB64ToArray(publicKeyResponse.publicKey); - try { - // tslint:disable-next-line - console.log('User\'s fingerprint: ' + - (await this.cryptoService.getFingerprint(user.userId, publicKey.buffer)).join('-')); - } catch { } - await confirmUser(publicKey); - } catch (e) { - // tslint:disable-next-line - console.error('Handled exception:', e); - } - } - async events(user: OrganizationUserUserDetailsResponse) { if (this.modal != null) { this.modal.close(); @@ -500,23 +328,6 @@ export class PeopleComponent implements OnInit { }); } - async resetPaging() { - this.pagedUsers = []; - this.loadMore(); - } - - isSearching() { - return this.searchService.isSearchable(this.searchText); - } - - isPaging() { - const searching = this.isSearching(); - if (searching && this.didScroll) { - this.resetPaging(); - } - return !searching && this.users && this.users.length > this.pageSize; - } - async resetPassword(user: OrganizationUserUserDetailsResponse) { if (this.modal != null) { this.modal.close(); @@ -542,25 +353,6 @@ export class PeopleComponent implements OnInit { }); } - checkUser(user: OrganizationUserUserDetailsResponse, select?: boolean) { - (user as any).checked = select == null ? !(user as any).checked : select; - } - - selectAll(select: boolean) { - if (select) { - this.selectAll(false); - } - - const filteredUsers = this.searchPipe.transform(this.users, this.searchText, 'name', 'email', 'id'); - - const selectCount = select && filteredUsers.length > MaxCheckedCount - ? MaxCheckedCount - : filteredUsers.length; - for (let i = 0; i < selectCount; i++) { - this.checkUser(filteredUsers[i], select); - } - } - private async showBulkStatus(users: OrganizationUserUserDetailsResponse[], filteredUsers: OrganizationUserUserDetailsResponse[], request: Promise>, successfullMessage: string) { @@ -611,42 +403,4 @@ export class PeopleComponent implements OnInit { } } } - - private async doConfirmation(user: OrganizationUserUserDetailsResponse, publicKey: Uint8Array) { - const orgKey = await this.cryptoService.getOrgKey(this.organizationId); - const key = await this.cryptoService.rsaEncrypt(orgKey.key, publicKey.buffer); - const request = new OrganizationUserConfirmRequest(); - request.key = key.encryptedString; - await this.apiService.postOrganizationUserConfirm(this.organizationId, user.id, request); - } - - private removeUser(user: OrganizationUserUserDetailsResponse) { - let index = this.users.indexOf(user); - if (index > -1) { - this.users.splice(index, 1); - this.resetPaging(); - } - if (this.statusMap.has(OrganizationUserStatusType.Accepted)) { - index = this.statusMap.get(OrganizationUserStatusType.Accepted).indexOf(user); - if (index > -1) { - this.statusMap.get(OrganizationUserStatusType.Accepted).splice(index, 1); - } - } - if (this.statusMap.has(OrganizationUserStatusType.Invited)) { - index = this.statusMap.get(OrganizationUserStatusType.Invited).indexOf(user); - if (index > -1) { - this.statusMap.get(OrganizationUserStatusType.Invited).splice(index, 1); - } - } - if (this.statusMap.has(OrganizationUserStatusType.Confirmed)) { - index = this.statusMap.get(OrganizationUserStatusType.Confirmed).indexOf(user); - if (index > -1) { - this.statusMap.get(OrganizationUserStatusType.Confirmed).splice(index, 1); - } - } - } - - private getCheckedUsers() { - return this.users.filter(u => (u as any).checked); - } } diff --git a/src/app/organizations/manage/user-confirm.component.ts b/src/app/organizations/manage/user-confirm.component.ts index f55f8aaeea..872bd37644 100644 --- a/src/app/organizations/manage/user-confirm.component.ts +++ b/src/app/organizations/manage/user-confirm.component.ts @@ -8,12 +8,9 @@ import { import { ConstantsService } from 'jslib-common/services/constants.service'; -import { ApiService } from 'jslib-common/abstractions/api.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service'; import { StorageService } from 'jslib-common/abstractions/storage.service'; -import { Utils } from 'jslib-common/misc/utils'; - @Component({ selector: 'app-user-confirm', templateUrl: 'user-confirm.component.html', @@ -21,24 +18,18 @@ import { Utils } from 'jslib-common/misc/utils'; export class UserConfirmComponent implements OnInit { @Input() name: string; @Input() userId: string; - @Input() organizationUserId: string; - @Input() organizationId: string; + @Input() publicKey: Uint8Array; @Output() onConfirmedUser = new EventEmitter(); dontAskAgain = false; loading = true; fingerprint: string; - private publicKey: Uint8Array = null; - - constructor(private apiService: ApiService, private cryptoService: CryptoService, - private storageService: StorageService) { } + constructor(private cryptoService: CryptoService, private storageService: StorageService) { } async ngOnInit() { try { - const publicKeyResponse = await this.apiService.getUserPublicKey(this.userId); - if (publicKeyResponse != null) { - this.publicKey = Utils.fromB64ToArray(publicKeyResponse.publicKey); + if (this.publicKey != null) { const fingerprint = await this.cryptoService.getFingerprint(this.userId, this.publicKey.buffer); if (fingerprint != null) { this.fingerprint = fingerprint.join('-'); @@ -57,6 +48,6 @@ export class UserConfirmComponent implements OnInit { await this.storageService.save(ConstantsService.autoConfirmFingerprints, true); } - this.onConfirmedUser.emit(this.publicKey); + this.onConfirmedUser.emit(); } } diff --git a/src/app/organizations/settings/organization-subscription.component.html b/src/app/organizations/settings/organization-subscription.component.html index 6128f74833..0db263f8b6 100644 --- a/src/app/organizations/settings/organization-subscription.component.html +++ b/src/app/organizations/settings/organization-subscription.component.html @@ -11,6 +11,7 @@ {{'loading' | i18n}} + {{'subscriptionCanceled' | i18n}} @@ -150,5 +151,12 @@ (onCanceled)="closeStorage(false)" *ngIf="showAdjustStorage">
    + + +
    +

    {{'provider' | i18n}}

    +
    + {{'yourProviderIs' | i18n : userOrg.providerName}} +     diff --git a/src/app/organizations/settings/organization-subscription.component.ts b/src/app/organizations/settings/organization-subscription.component.ts index 5ac864b32a..216c1d91d8 100644 --- a/src/app/organizations/settings/organization-subscription.component.ts +++ b/src/app/organizations/settings/organization-subscription.component.ts @@ -3,9 +3,9 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; - import { ToasterService } from 'angular2-toaster'; +import { Organization } from 'jslib-common/models/domain/organization'; import { OrganizationSubscriptionResponse } from 'jslib-common/models/response/organizationSubscriptionResponse'; import { ApiService } from 'jslib-common/abstractions/api.service'; @@ -13,6 +13,7 @@ import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions'; import { PlanType } from 'jslib-common/enums/planType'; @Component({ @@ -33,12 +34,15 @@ export class OrganizationSubscriptionComponent implements OnInit { sub: OrganizationSubscriptionResponse; selfHosted = false; + userOrg: Organization; + cancelPromise: Promise; reinstatePromise: Promise; constructor(private apiService: ApiService, private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, private toasterService: ToasterService, - private messagingService: MessagingService, private route: ActivatedRoute) { + private messagingService: MessagingService, private route: ActivatedRoute, + private userService: UserService) { this.selfHosted = platformUtilsService.isSelfHost(); } @@ -54,7 +58,9 @@ export class OrganizationSubscriptionComponent implements OnInit { if (this.loading) { return; } + this.loading = true; + this.userOrg = await this.userService.getOrganization(this.organizationId); this.sub = await this.apiService.getOrganizationSubscription(this.organizationId); this.loading = false; } diff --git a/src/app/app-routing.module.ts b/src/app/oss-routing.module.ts similarity index 99% rename from src/app/app-routing.module.ts rename to src/app/oss-routing.module.ts index bee8416fc1..eb712de2cd 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/oss-routing.module.ts @@ -438,4 +438,4 @@ const routes: Routes = [ })], exports: [RouterModule], }) -export class AppRoutingModule { } +export class OssRoutingModule { } diff --git a/src/app/oss.module.ts b/src/app/oss.module.ts index 0dc54c8b2e..26c2025895 100644 --- a/src/app/oss.module.ts +++ b/src/app/oss.module.ts @@ -171,6 +171,8 @@ import { GroupingsComponent } from './vault/groupings.component'; import { ShareComponent } from './vault/share.component'; import { VaultComponent } from './vault/vault.component'; +import { ProvidersComponent } from './providers/providers.component'; + import { CalloutComponent } from 'jslib-angular/components/callout.component'; import { IconComponent } from 'jslib-angular/components/icon.component'; @@ -433,6 +435,22 @@ registerLocaleData(localeZhTw, 'zh-TW'); VerifyEmailTokenComponent, VerifyRecoverDeleteComponent, WeakPasswordsReportComponent, + ProvidersComponent, + ], + exports: [ + A11yTitleDirective, + AvatarComponent, + CalloutComponent, + ApiActionDirective, + StopClickDirective, + StopPropDirective, + I18nPipe, + SearchPipe, + UserNamePipe, + ModalComponent, + NavbarComponent, + FooterComponent, + OrganizationPlansComponent, ], providers: [DatePipe, SearchPipe, UserNamePipe], bootstrap: [], diff --git a/src/app/providers/providers.component.html b/src/app/providers/providers.component.html new file mode 100644 index 0000000000..6ff84f4c8c --- /dev/null +++ b/src/app/providers/providers.component.html @@ -0,0 +1,20 @@ + +

    + + {{'loading' | i18n}} +

    + + + +     diff --git a/src/app/providers/providers.component.ts b/src/app/providers/providers.component.ts new file mode 100644 index 0000000000..18c8b2a68b --- /dev/null +++ b/src/app/providers/providers.component.ts @@ -0,0 +1,36 @@ +import { + Component, + OnInit, +} from '@angular/core'; + +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; + +import { Provider } from 'jslib-common/models/domain/provider'; + +import { Utils } from 'jslib-common/misc/utils'; + +@Component({ + selector: 'app-providers', + templateUrl: 'providers.component.html', +}) +export class ProvidersComponent implements OnInit { + providers: Provider[]; + loaded: boolean = false; + actionPromise: Promise; + + constructor(private userService: UserService, private i18nService: I18nService, private syncService: SyncService) { } + + async ngOnInit() { + await this.syncService.fullSync(false); + await this.load(); + } + + async load() { + const providers = await this.userService.getAllProviders(); + providers.sort(Utils.getSortFunction(this.i18nService, 'name')); + this.providers = providers; + this.loaded = true; + } +} diff --git a/src/app/services/event.service.ts b/src/app/services/event.service.ts index 2ee4fc103c..07a0b97b33 100644 --- a/src/app/services/event.service.ts +++ b/src/app/services/event.service.ts @@ -228,7 +228,23 @@ export class EventService { humanReadableMsg = this.i18nService.t('modifiedPolicyId', p1); break; - + // Provider users: + case EventType.ProviderUser_Invited: + msg = this.i18nService.t('invitedUserId', this.formatProviderUserId(ev)); + humanReadableMsg = this.i18nService.t('invitedUserId', this.getShortId(ev.providerUserId)); + break; + case EventType.ProviderUser_Confirmed: + msg = this.i18nService.t('confirmedUserId', this.formatProviderUserId(ev)); + humanReadableMsg = this.i18nService.t('confirmedUserId', this.getShortId(ev.providerUserId)); + break; + case EventType.ProviderUser_Updated: + msg = this.i18nService.t('editedUserId', this.formatProviderUserId(ev)); + humanReadableMsg = this.i18nService.t('editedUserId', this.getShortId(ev.providerUserId)); + break; + case EventType.ProviderUser_Removed: + msg = this.i18nService.t('removedUserId', this.formatProviderUserId(ev)); + humanReadableMsg = this.i18nService.t('removedUserId', this.getShortId(ev.providerUserId)); + break; default: break; } @@ -318,6 +334,14 @@ export class EventService { return a.outerHTML; } + private formatProviderUserId(ev: EventResponse) { + const shortId = this.getShortId(ev.providerUserId); + const a = this.makeAnchor(shortId); + a.setAttribute('href', '#/providers/' + ev.providerId + '/manage/people?search=' + shortId + + '&viewEvents=' + ev.providerUserId); + return a.outerHTML; + } + private formatPolicyId(ev: EventResponse) { const shortId = this.getShortId(ev.policyId); const a = this.makeAnchor(shortId); diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index 231edc5154..3b6231a2d6 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -54,6 +54,7 @@ import { UserService } from 'jslib-common/services/user.service'; import { VaultTimeoutService } from 'jslib-common/services/vaultTimeout.service'; import { WebCryptoFunctionService } from 'jslib-common/services/webCryptoFunction.service'; +import { LogService } from 'jslib-common/abstractions'; import { ApiService as ApiServiceAbstraction } from 'jslib-common/abstractions/api.service'; import { AuditService as AuditServiceAbstraction } from 'jslib-common/abstractions/audit.service'; import { AuthService as AuthServiceAbstraction } from 'jslib-common/abstractions/auth.service'; @@ -223,6 +224,7 @@ export function initFactory(): Function { { provide: PolicyServiceAbstraction, useValue: policyService }, { provide: SendServiceAbstraction, useValue: sendService }, { provide: PasswordRepromptServiceAbstraction, useValue: passwordRepromptService }, + { provide: LogService, useValue: consoleLogService }, { provide: APP_INITIALIZER, useFactory: initFactory, diff --git a/src/app/settings/organization-plans.component.ts b/src/app/settings/organization-plans.component.ts index be163b8beb..2c17c9cc23 100644 --- a/src/app/settings/organization-plans.component.ts +++ b/src/app/settings/organization-plans.component.ts @@ -10,8 +10,6 @@ import { Router } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { PaymentMethodType } from 'jslib-common/enums/paymentMethodType'; - import { ApiService } from 'jslib-common/abstractions/api.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service'; @@ -23,8 +21,12 @@ import { UserService } from 'jslib-common/abstractions/user.service'; import { PaymentComponent } from './payment.component'; import { TaxInfoComponent } from './tax-info.component'; +import { EncString } from 'jslib-common/models/domain/encString'; +import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; + import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; import { OrganizationUserType } from 'jslib-common/enums/organizationUserType'; +import { PaymentMethodType } from 'jslib-common/enums/paymentMethodType'; import { PlanType } from 'jslib-common/enums/planType'; import { PolicyType } from 'jslib-common/enums/policyType'; import { ProductType } from 'jslib-common/enums/productType'; @@ -33,7 +35,6 @@ import { OrganizationCreateRequest } from 'jslib-common/models/request/organizat import { OrganizationKeysRequest } from 'jslib-common/models/request/organizationKeysRequest'; import { OrganizationUpgradeRequest } from 'jslib-common/models/request/organizationUpgradeRequest'; -import { EncString } from 'jslib-common/models/domain'; import { PlanResponse } from 'jslib-common/models/response/planResponse'; @Component({ @@ -49,6 +50,7 @@ export class OrganizationPlansComponent implements OnInit { @Input() showCancel = false; @Input() product: ProductType = ProductType.Free; @Input() plan: PlanType = PlanType.Free; + @Input() providerId: string; @Output() onSuccess = new EventEmitter(); @Output() onCanceled = new EventEmitter(); @@ -237,7 +239,7 @@ export class OrganizationPlansComponent implements OnInit { if (this.selfHosted) { orgId = await this.createSelfHosted(key, collectionCt, orgKeys); } else { - orgId = await this.createCloudHosted(key, collectionCt, orgKeys); + orgId = await this.createCloudHosted(key, collectionCt, orgKeys, shareKey[1]); } this.toasterService.popAsync('success', this.i18nService.t('organizationCreated'), this.i18nService.t('organizationReadyToGo')); @@ -296,7 +298,7 @@ export class OrganizationPlansComponent implements OnInit { return this.organizationId; } - private async createCloudHosted(key: string, collectionCt: string, orgKeys: [string, EncString]) { + private async createCloudHosted(key: string, collectionCt: string, orgKeys: [string, EncString], orgKey: SymmetricCryptoKey) { const request = new OrganizationCreateRequest(); request.key = key; request.collectionName = collectionCt; @@ -327,8 +329,14 @@ export class OrganizationPlansComponent implements OnInit { request.billingAddressState = this.taxComponent.taxInfo.state; } } - const response = await this.apiService.postOrganization(request); - return response.id; + + if (this.providerId) { + const providerKey = await this.cryptoService.getProviderKey(this.providerId); + request.key = (await this.cryptoService.encrypt(orgKey.key, providerKey)).encryptedString; + return (await this.apiService.postProviderCreateOrganization(this.providerId, request)).id; + } else { + return (await this.apiService.postOrganization(request)).id; + } } private async createSelfHosted(key: string, collectionCt: string, orgKeys: [string, EncString]) { diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html index 9b8818f606..4ed97a6aae 100644 --- a/src/app/vault/vault.component.html +++ b/src/app/vault/vault.component.html @@ -85,6 +85,18 @@
    +
    +
    + {{'providers' | i18n}} + + + +
    +
    + +
    +
    diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts index 41216eadff..c60d293abf 100644 --- a/src/app/vault/vault.component.ts +++ b/src/app/vault/vault.component.ts @@ -64,6 +64,7 @@ export class VaultComponent implements OnInit, OnDestroy { showBrowserOutdated = false; showUpdateKey = false; showPremiumCallout = false; + showProviders = false; deleted: boolean = false; trashCleanupWarning: string = null; @@ -92,6 +93,8 @@ export class VaultComponent implements OnInit, OnDestroy { this.showPremiumCallout = !this.showVerifyEmail && !canAccessPremium && !this.platformUtilsService.isSelfHost(); + this.showProviders = (await this.userService.getAllProviders()).length > 0; + await Promise.all([ this.groupingsComponent.load(), this.organizationsComponent.load(), diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index d502ea9393..adcad3a6f8 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -4017,5 +4017,123 @@ }, "resetPasswordManageUsers": { "message": "Manage Users must also be enabled with the Manage Password Reset permission" + }, + "setupProvider": { + "message": "Setup Provider" + }, + "setupProviderLoginDesc": { + "message": "You've been invited to setup a new provider. To continue, you need to log in or create a new Bitwarden account." + }, + "setupProviderDesc": { + "message": "You have been invited to create a Provider, please enter the details below to complete the setup. Contact customer support if you have any questions." + }, + "providerName": { + "message": "Provider Name" + }, + "providerSetup": { + "message": "The provider has been setup." + }, + "clients": { + "message": "Clients" + }, + "providerAdmin": { + "message": "Provider Admin" + }, + "providerAdminDesc": { + "message": "The highest access user that can manage all aspects of your provider, and client organizations." + }, + "serviceUser": { + "message": "Service User" + }, + "serviceUserDesc": { + "message": "Service users can access and manage all client organizations." + }, + "providerInviteUserDesc": { + "message": "Invite a new user to your provider by entering their Bitwarden account email address below. If they do not have a Bitwarden account already, they will be prompted to create a new account." + }, + "joinProvider": { + "message": "Join Provider" + }, + "joinProviderDesc": { + "message": "You've been invited to join the provider listed above. To accept the invitation, you need to log in or create a new Bitwarden account." + }, + "providerInviteAcceptFailed": { + "message": "Unable to accept invitation. Ask a provider admin to send a new invitation." + }, + "providerInviteAcceptedDesc": { + "message": "You can access this provider once an administrator confirms your membership. We'll send you an email when that happens." + }, + "providerUsersNeedConfirmed": { + "message": "You have users that have accepted their invitation, but still need to be confirmed. Users will not have access to the provider until they are confirmed." + }, + "provider": { + "message": "Provider" + }, + "newClientOrganization": { + "message": "New client organization" + }, + "newClientOrganizationDesc": { + "message": "Organizations allow you to share parts of your vault with others as well as manage related users for a specific entity such as a family, small team, or large company." + }, + "addExistingOrganization": { + "message": "Add existing organization" + }, + "myProvider": { + "message": "My Provider" + }, + "addOrganizationConfirmation": { + "message": "Are you sure you want to add $ORGANIZATION$ as a client to $PROVIDER$?", + "placeholders": { + "organization": { + "content": "$1", + "example": "My Org Name" + }, + "provider": { + "content": "$2", + "example": "My Provider Name" + } + } + }, + "organizationJoinedProvider": { + "message": "Organization was successfully added to the provider" + }, + "accessingUsingProvider": { + "message": "Accessing organization using provider $PROVIDER$", + "placeholders": { + "provider": { + "content": "$1", + "example": "My Provider Name" + } + } + }, + "providerIsDisabled": { + "message": "Provider is disabled." + }, + "providerUpdated": { + "message": "Provider updated" + }, + "yourProviderIs": { + "message": "Your provider is $PROVIDER$. They have administrative and billing privileges for your organization.", + "placeholders": { + "provider": { + "content": "$1", + "example": "My Provider Name" + } + } + }, + "detachedOrganization": { + "message": "The organization $ORGANIZATION$ has been detached from your provider.", + "placeholders": { + "organization": { + "content": "$1", + "example": "My Org Name" + } + } + }, + "detachOrganizationConfirmation": { + "message": "Are you sure you want to detach this organization? The organization will continue to exist but will no longer be managed by the provider." + }, + "add": { + "message": "Add" } } diff --git a/tsconfig.json b/tsconfig.json index 452496e309..16f8f67b45 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,6 +22,9 @@ ], "jslib-angular/*": [ "jslib/angular/src/*" + ], + "src/*": [ + "src/*" ] } },