mirror of
https://github.com/bitwarden/browser
synced 2026-02-07 04:03:29 +00:00
[Account Recovery][PM-18721] update property name/type
This commit is contained in:
@@ -13,6 +13,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
|
||||
import { getUserId } from "@bitwarden/common/auth/services/account.service";
|
||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
||||
import { OrganizationId } from "@bitwarden/common/types/guid";
|
||||
import {
|
||||
ButtonModule,
|
||||
CalloutModule,
|
||||
@@ -45,12 +46,12 @@ export type AccountRecoveryDialogData = {
|
||||
/**
|
||||
* The `organizationUserId` for the user
|
||||
*/
|
||||
id: string;
|
||||
organizationUserId: string;
|
||||
|
||||
/**
|
||||
* The organization's `organizationId`
|
||||
*/
|
||||
organizationId: string;
|
||||
organizationId: OrganizationId;
|
||||
};
|
||||
|
||||
export const AccountRecoveryDialogResultTypes = {
|
||||
@@ -133,7 +134,7 @@ export class AccountRecoveryDialogComponent implements OnInit {
|
||||
await this.resetPasswordService.resetMasterPassword(
|
||||
passwordInputResult.newPassword,
|
||||
this.dialogData.email,
|
||||
this.dialogData.id,
|
||||
this.dialogData.organizationUserId,
|
||||
this.dialogData.organizationId,
|
||||
);
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
|
||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
||||
import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
|
||||
import { OrganizationId } from "@bitwarden/common/types/guid";
|
||||
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
|
||||
import { DialogService, SimpleDialogOptions, ToastService } from "@bitwarden/components";
|
||||
import { KeyService } from "@bitwarden/key-management";
|
||||
@@ -751,8 +752,8 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
|
||||
data: {
|
||||
name: this.userNamePipe.transform(user),
|
||||
email: user != null ? user.email : null,
|
||||
organizationId: this.organization.id,
|
||||
id: user != null ? user.id : null,
|
||||
organizationId: this.organization.id as OrganizationId,
|
||||
organizationUserId: user != null ? user.id : null,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user