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.

Sign up for GitHub

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

Optional Terms Of Services APIs and libparsec support #8471

Merged
merged 7 commits into from
Oct 4, 2024
Merged

Optional Terms Of Services APIs and libparsec support #8471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7166ded
Re-build server bindings when protocol schema has changed
touilleMan Sep 25, 2024
75370e9
Add support for dict in bindings
touilleMan Sep 25, 2024
cefa4aa
Add family field to ProtocolRequest with ProtocolFamily enum
touilleMan Sep 27, 2024
e6480c4
Add Terms Of Service APIs in server & libparsec
touilleMan Sep 25, 2024
9082e5e
Re-generate electron&web bindings
touilleMan Sep 25, 2024
ece19f7
Re-generate Python bindings typings
touilleMan Sep 25, 2024
fc618f5
Bump testbed server docker image to 3.0.3-a.0.dev.20000.fa2c652
touilleMan Oct 4, 2024
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
View file
Open in desktop
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.0.0-rc.1.dev.19984.b40f8b9
image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.0.3-a.0.dev.20000.fa2c652
ports:
- 6777:6777
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-web.yml
View file
Open in desktop
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.0.0-rc.1.dev.19984.b40f8b9
image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.0.3-a.0.dev.20000.fa2c652
ports:
- 6777:6777
steps:
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 60 additions & 0 deletions bindings/electron/src/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,12 @@ export interface StartedWorkspaceInfo {
}


export interface Tos {
perLocaleUrls: Map<string, string>
updatedOn: number
}


export interface UserClaimFinalizeInfo {
handle: number
}
Expand Down Expand Up @@ -454,6 +460,30 @@ export type ClaimerRetrieveInfoError =
| ClaimerRetrieveInfoErrorOffline


// ClientAcceptTosError
export interface ClientAcceptTosErrorInternal {
tag: "Internal"
error: string
}
export interface ClientAcceptTosErrorNoTos {
tag: "NoTos"
error: string
}
export interface ClientAcceptTosErrorOffline {
tag: "Offline"
error: string
}
export interface ClientAcceptTosErrorTosMismatch {
tag: "TosMismatch"
error: string
}
export type ClientAcceptTosError =
| ClientAcceptTosErrorInternal
| ClientAcceptTosErrorNoTos
| ClientAcceptTosErrorOffline
| ClientAcceptTosErrorTosMismatch


// ClientCancelInvitationError
export interface ClientCancelInvitationErrorAlreadyDeleted {
tag: "AlreadyDeleted"
Expand Down Expand Up @@ -529,6 +559,9 @@ export interface ClientEventInvitationChanged {
token: string
status: InvitationStatus
}
export interface ClientEventMustAcceptTos {
tag: "MustAcceptTos"
}
export interface ClientEventOffline {
tag: "Offline"
}
Expand Down Expand Up @@ -595,6 +628,7 @@ export type ClientEvent =
| ClientEventExpiredOrganization
| ClientEventIncompatibleServer
| ClientEventInvitationChanged
| ClientEventMustAcceptTos
| ClientEventOffline
| ClientEventOnline
| ClientEventPing
Expand All @@ -611,6 +645,25 @@ export type ClientEvent =
| ClientEventWorkspacesSelfListChanged


// ClientGetTosError
export interface ClientGetTosErrorInternal {
tag: "Internal"
error: string
}
export interface ClientGetTosErrorNoTos {
tag: "NoTos"
error: string
}
export interface ClientGetTosErrorOffline {
tag: "Offline"
error: string
}
export type ClientGetTosError =
| ClientGetTosErrorInternal
| ClientGetTosErrorNoTos
| ClientGetTosErrorOffline


// ClientGetUserDeviceError
export interface ClientGetUserDeviceErrorInternal {
tag: "Internal"
Expand Down Expand Up @@ -2116,6 +2169,10 @@ export function claimerUserInitialDoWaitPeer(
canceller: number,
handle: number
): Promise<Result<UserClaimInProgress1Info, ClaimInProgressError>>
export function clientAcceptTos(
client: number,
tos_updated_on: number
): Promise<Result<null, ClientAcceptTosError>>
export function clientCancelInvitation(
client: number,
token: string
Expand All @@ -2129,6 +2186,9 @@ export function clientCreateWorkspace(
client: number,
name: string
): Promise<Result<string, ClientCreateWorkspaceError>>
export function clientGetTos(
client: number
): Promise<Result<Tos, ClientGetTosError>>
export function clientGetUserDevice(
client: number,
device: string
Expand Down
Loading
Loading