Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update invite_info protocol to support multiple greeters during a user invite #9394

Merged
merged 11 commits into from
Jan 27, 2025
Merged
2 changes: 1 addition & 1 deletion .github/workflows/ci-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
TESTBED_SERVER: http://localhost:6777
services:
parsec-testbed-server:
image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.2.4-a.0.dev.20104.7da2559
image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.2.5-a.0.dev.20111.317cb00
ports:
- 6777:6777
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# https://github.com/Scille/parsec-cloud/pkgs/container/parsec-cloud%2Fparsec-testbed-server
services:
parsec-testbed-server:
image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.2.4-a.0.dev.20104.7da2559
image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.2.5-a.0.dev.20111.317cb00
ports:
- 6777:6777
steps:
Expand Down
41 changes: 41 additions & 0 deletions bindings/electron/src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ export enum RealmRole {
Reader = 'RealmRoleReader',
}

export enum UserOnlineStatus {
Offline = 'UserOnlineStatusOffline',
Online = 'UserOnlineStatusOnline',
Unknown = 'UserOnlineStatusUnknown',
}

export enum UserProfile {
Admin = 'UserProfileAdmin',
Outsider = 'UserProfileOutsider',
Expand Down Expand Up @@ -267,6 +273,7 @@ export interface ShamirRecoveryRecipient {
humanHandle: HumanHandle
revokedOn: number | null
shares: number
onlineStatus: UserOnlineStatus
}


Expand Down Expand Up @@ -400,6 +407,7 @@ export interface AnyClaimRetrievedInfoShamirRecovery {
handle: number
claimer_user_id: string
claimer_human_handle: HumanHandle
invitation_created_by: InviteInfoInvitationCreatedBy
shamir_recovery_created_on: number
recipients: Array<ShamirRecoveryRecipient>
threshold: number
Expand Down Expand Up @@ -1610,19 +1618,51 @@ export type ImportRecoveryDeviceError =
| ImportRecoveryDeviceErrorTimestampOutOfBallpark


// InviteInfoInvitationCreatedBy
export interface InviteInfoInvitationCreatedByExternalService {
tag: "ExternalService"
service_label: string
}
export interface InviteInfoInvitationCreatedByUser {
tag: "User"
user_id: string
human_handle: HumanHandle
}
export type InviteInfoInvitationCreatedBy =
| InviteInfoInvitationCreatedByExternalService
| InviteInfoInvitationCreatedByUser


// InviteListInvitationCreatedBy
export interface InviteListInvitationCreatedByExternalService {
tag: "ExternalService"
service_label: string
}
export interface InviteListInvitationCreatedByUser {
tag: "User"
user_id: string
human_handle: HumanHandle
}
export type InviteListInvitationCreatedBy =
| InviteListInvitationCreatedByExternalService
| InviteListInvitationCreatedByUser


// InviteListItem
export interface InviteListItemDevice {
tag: "Device"
addr: string
token: string
created_on: number
created_by: InviteListInvitationCreatedBy
status: InvitationStatus
}
export interface InviteListItemShamirRecovery {
tag: "ShamirRecovery"
addr: string
token: string
created_on: number
created_by: InviteListInvitationCreatedBy
claimer_user_id: string
shamir_recovery_created_on: number
status: InvitationStatus
Expand All @@ -1632,6 +1672,7 @@ export interface InviteListItemUser {
addr: string
token: string
created_on: number
created_by: InviteListInvitationCreatedBy
claimer_email: string
status: InvitationStatus
}
Expand Down
Loading
Loading