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

[Shamir port] Implement greeting procedure #8995

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.1-a.0.dev.20053.312b36d
image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.2.1-a.0.dev.20066.5832712
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.1-a.0.dev.20053.312b36d
image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.2.1-a.0.dev.20066.5832712
ports:
- 6777:6777
steps:
Expand Down
45 changes: 25 additions & 20 deletions bindings/electron/src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,25 @@ export type ActiveUsersLimit =
| ActiveUsersLimitNoLimit


// AnyClaimRetrievedInfo
export interface AnyClaimRetrievedInfoDevice {
tag: "Device"
handle: number
greeter_user_id: string
greeter_human_handle: HumanHandle
}
export interface AnyClaimRetrievedInfoUser {
tag: "User"
handle: number
claimer_email: string
greeter_user_id: string
greeter_human_handle: HumanHandle
}
export type AnyClaimRetrievedInfo =
| AnyClaimRetrievedInfoDevice
| AnyClaimRetrievedInfoUser


// ArchiveDeviceError
export interface ArchiveDeviceErrorInternal {
tag: "Internal"
Expand Down Expand Up @@ -481,11 +500,16 @@ export interface ClaimerRetrieveInfoErrorOffline {
tag: "Offline"
error: string
}
export interface ClaimerRetrieveInfoErrorOrganizationExpired {
tag: "OrganizationExpired"
error: string
}
export type ClaimerRetrieveInfoError =
| ClaimerRetrieveInfoErrorAlreadyUsed
| ClaimerRetrieveInfoErrorInternal
| ClaimerRetrieveInfoErrorNotFound
| ClaimerRetrieveInfoErrorOffline
| ClaimerRetrieveInfoErrorOrganizationExpired


// ClientAcceptTosError
Expand Down Expand Up @@ -1533,25 +1557,6 @@ export type TestbedError =
| TestbedErrorInternal


// UserOrDeviceClaimInitialInfo
export interface UserOrDeviceClaimInitialInfoDevice {
tag: "Device"
handle: number
greeter_user_id: string
greeter_human_handle: HumanHandle
}
export interface UserOrDeviceClaimInitialInfoUser {
tag: "User"
handle: number
claimer_email: string
greeter_user_id: string
greeter_human_handle: HumanHandle
}
export type UserOrDeviceClaimInitialInfo =
| UserOrDeviceClaimInitialInfoDevice
| UserOrDeviceClaimInitialInfoUser


// WaitForDeviceAvailableError
export interface WaitForDeviceAvailableErrorInternal {
tag: "Internal"
Expand Down Expand Up @@ -2612,7 +2617,7 @@ export function claimerRetrieveInfo(
config: ClientConfig,
on_event_callback: (handle: number, event: ClientEvent) => void,
addr: string
): Promise<Result<UserOrDeviceClaimInitialInfo, ClaimerRetrieveInfoError>>
): Promise<Result<AnyClaimRetrievedInfo, ClaimerRetrieveInfoError>>
export function claimerUserFinalizeSaveLocalDevice(
handle: number,
save_strategy: DeviceSaveStrategy
Expand Down
Loading
Loading