feat(spaces): add consent-based member invitations (#6232)
This commit is contained in:
parent
45c3a79b12
commit
05f882e43a
68 changed files with 4234 additions and 506 deletions
12
CONTEXT.md
12
CONTEXT.md
|
|
@ -19,3 +19,15 @@ _Avoid_: Memo ID, content ID
|
|||
**Memo reaction**:
|
||||
A response attached to exactly one memo. Reactions are not a generic mechanism for targeting other kinds of content.
|
||||
_Avoid_: Content reaction, generic reaction, reaction target
|
||||
|
||||
**Space**:
|
||||
An instance-scoped collaboration boundary for accepted members and memo placement. It is not a tenant, folder, or application-wide authorization role.
|
||||
_Avoid_: Tenant, workspace, group
|
||||
|
||||
**Space invitation**:
|
||||
A pending offer for an existing active Memos user to join a Space with a specified Space role. It grants no membership or Space access until that user accepts it.
|
||||
_Avoid_: Pending membership, direct add
|
||||
|
||||
**Space membership**:
|
||||
An accepted relationship between an active Memos user and a Space, carrying either the `ADMIN` or `USER` Space role.
|
||||
_Avoid_: Invitation, application role
|
||||
|
|
|
|||
|
|
@ -15,13 +15,14 @@ Every memo remains an author-owned, independent resource. Placement, audience, a
|
|||
## Goals
|
||||
|
||||
- Let an active user create or join multiple Spaces.
|
||||
- Give each Space direct `ADMIN` and `USER` memberships.
|
||||
- Give each Space accepted `ADMIN` and `USER` memberships.
|
||||
- Let a Space `ADMIN` invite an existing active Memos user with a selected role, while requiring that user to accept before becoming a member.
|
||||
- Let members contribute and browse memos in a shared Space context.
|
||||
- Let every memo, including a comment, be Unassigned or assigned to exactly one Space while retaining its own author, audience, and lifecycle.
|
||||
- Add a Space-members-only memo audience.
|
||||
- Preserve existing memo identities, relations, data, and non-Space workflows.
|
||||
- Keep existing memos Unassigned; do not create a default Space.
|
||||
- Provide a complete backend workflow for Space creation, membership, memo placement, and Space browsing.
|
||||
- Provide a complete backend workflow for Space creation, invitations, membership, memo placement, and Space browsing.
|
||||
|
||||
## Non-goals
|
||||
|
||||
|
|
@ -32,7 +33,7 @@ Every memo remains an author-owned, independent resource. Placement, audience, a
|
|||
- Thread ownership, inherited placement or audience, or relation-based cascading deletion.
|
||||
- Mutable or re-parentable `COMMENT` relations.
|
||||
- Space archival or restoration.
|
||||
- Invitations, guests, open enrollment, federation, or public Space discovery.
|
||||
- Guests, email or external-user invitations, open enrollment, federation, or public Space discovery.
|
||||
- A generated default Space.
|
||||
- UI/UX design or a redesign of global surfaces.
|
||||
|
||||
|
|
@ -48,7 +49,7 @@ Research completed on 2026-08-22 compared the agreed boundary with Discourse Cat
|
|||
|
||||
The research supports four choices:
|
||||
|
||||
- Make Space one first-class resource with direct membership and roles.
|
||||
- Make Space one first-class resource with explicit membership and roles, gated by invitee acceptance.
|
||||
- Keep placement, audience, authorship, and distribution independent.
|
||||
- Represent Unassigned as a real absence of placement.
|
||||
- Eventually make Spaces visible in normal browsing and creation flows, while deferring UI/UX here.
|
||||
|
|
@ -67,7 +68,8 @@ These sources establish product mechanics, not demand or prevalence. This resear
|
|||
- Audience is a single choice: Author, Instance, Space, or Public. These are named domains, not ordered access levels.
|
||||
- A comment is an independent memo connected to a context memo by one immutable `COMMENT` relation created atomically with it. The relation grants no ownership, inheritance, or lifecycle authority.
|
||||
- A reaction belongs to one memo and has no independent audience.
|
||||
- A Space membership connects one active registered user to one Space with role `ADMIN` or `USER`. The creator becomes the first `ADMIN`; there is no permanent owner.
|
||||
- A Space invitation is a pending offer to one existing active registered user with a selected `ADMIN` or `USER` role. It grants no Space access before that user accepts it.
|
||||
- A Space membership is an accepted relationship between one active registered user and one Space with role `ADMIN` or `USER`. The creator becomes the first `ADMIN`; there is no permanent owner.
|
||||
- Application `ADMIN` is a control-plane role and is not an implicit Space member or memo reader.
|
||||
|
||||
### Read access and distribution
|
||||
|
|
@ -104,7 +106,9 @@ Reading and participation are separate. A caller may read an assigned `PUBLIC` o
|
|||
| Create a Space | Any active registered user; creation atomically adds the first `ADMIN`. |
|
||||
| View Space metadata, members, or feed | Active Space membership. |
|
||||
| Update Space metadata | Space `ADMIN`. |
|
||||
| Add or remove another member, or change a role | Space `ADMIN`; the Space must always retain an active `ADMIN`. |
|
||||
| Invite an existing active user, choose their role, list invitations, or revoke one | Space `ADMIN`. |
|
||||
| Accept or decline an invitation | Exactly the invited user. |
|
||||
| Remove another member or change an accepted member's role | Space `ADMIN`; the Space must always retain an active `ADMIN`. |
|
||||
| Leave a Space | The member; leaving must preserve an active `ADMIN`. |
|
||||
| Create or assign a memo in a Space | The author is an active member of the target Space. |
|
||||
| Comment on or react to an assigned memo | The caller can read the memo and is an active member of its Space. The new comment is authorized independently as a new memo. |
|
||||
|
|
@ -115,6 +119,8 @@ Reading and participation are separate. A caller may read an assigned `PUBLIC` o
|
|||
|
||||
Any membership change or user archival that would leave a Space without an active `ADMIN` is rejected.
|
||||
|
||||
An invitation is never treated as membership. Apart from the read-only Space summary carried by the invitation itself, a pending `ADMIN` invitation grants no Space metadata, feed, memo, participation, or governance access and does not count toward the last-active-`ADMIN` invariant. Accept preserves the role selected when the invitation was created. Decline and administrator revocation remove the pending offer; either outcome permits a later invitation for the same Space-user pair.
|
||||
|
||||
Only the memo author changes placement, using the existing memo update API to assign, move, or withdraw it. Assigning a memo does not change its audience. Changing placement and audience may be one atomic update. Moving a `SPACE` memo requires both `space` and `visibility` in the update mask, with visibility set to `SPACE`, to confirm the new member audience. Withdrawing one requires a non-Space audience in the same update.
|
||||
|
||||
Creating a share for a `SPACE` memo is rejected. Changing a memo with active shares to `SPACE` is rejected until those shares are revoked.
|
||||
|
|
@ -127,26 +133,30 @@ Deleting one memo deletes that memo, its owned resources, and relations having i
|
|||
|
||||
Hard-deleting a Space atomically deletes the Space, its memberships, every directly assigned memo, those memos' owned database resources, and relations having a deleted endpoint. It does not follow relations into other Spaces or Unassigned memos, and it does not delete inbox records. The deleting `ADMIN` receives no content inventory for memos they cannot read. External attachment objects use the existing post-commit cleanup path; this feature adds no cleanup queue or dispatcher.
|
||||
|
||||
General account erasure remains deferred. As a fail-closed guard, user hard deletion fails while the user has any Space membership, and `force` does not bypass this rule. Account deletion removes only inbox rows whose sender or receiver is that user; deleting the user's memos does not remove other inbox rows that reference them.
|
||||
General account erasure remains deferred. As a fail-closed guard, user hard deletion fails while the user has any active Space membership, and `force` does not bypass this rule. Pending invitations do not block deletion and are removed in the account-deletion transaction. Account deletion removes only inbox rows whose sender or receiver is that user; deleting the user's memos does not remove other inbox rows that reference them.
|
||||
|
||||
### Persistence and migration
|
||||
|
||||
```text
|
||||
space(id, uid, title, description)
|
||||
space_member(space_id, user_id, role ADMIN | USER)
|
||||
space_member(space_id, user_id, status INVITED | ACTIVE, role ADMIN | USER)
|
||||
memo(..., space_id NULL means Unassigned, visibility encodes audience)
|
||||
memo_relation(memo_id, related_memo_id, type COMMENT | REFERENCE)
|
||||
```
|
||||
|
||||
The Space-user pair is unique. The initial version does not record Space or membership timestamps; they can be added when a concrete audit or ordering requirement exists. A nullable `memo.space_id` directly enforces zero-or-one placement; an association table is unnecessary. Existing `memo_relation` rows remain the source of truth for comments.
|
||||
The Space-user pair is unique and represents one current relationship slot. `INVITED` is exposed as a Space Invitation; `ACTIVE` is exposed as a Space Membership. Accept atomically changes the current row from `INVITED` to `ACTIVE`; decline and revoke delete only `INVITED` rows. There is deliberately no invitation-generation UID, so a request for the same Space-user pair always refers to its current pending invitation.
|
||||
|
||||
The change ships in migration `0.31` for SQLite, MySQL, and PostgreSQL, with equivalent fresh-install schemas. Existing memos keep their UID, author, visibility, relations, permalink, and become Unassigned. Comment rows and comment visibility are not rewritten. SQLite rebuilds `memo` only to add `space_id` and extend its visibility constraint.
|
||||
`status` is required and has no default or database `CHECK`; Store logic writes and recognizes `INVITED` and `ACTIVE`, while unknown values fail closed in authorization queries. The existing role constraint remains unchanged. The initial version does not record inviter, invitation, Space, or membership timestamps; they can be added when a concrete attribution, expiration, audit, or ordering requirement exists. A nullable `memo.space_id` directly enforces zero-or-one placement; an association table is unnecessary. Existing `memo_relation` rows remain the source of truth for comments.
|
||||
|
||||
Space creation, membership changes, placement and audience changes, comment creation, memo deletion, and Space deletion use ordinary transactions where partial application would corrupt directly affected data. Space deletion directly removes assigned memos and their owned rows in the same style as existing user deletion, then uses the existing best-effort attachment storage cleanup after commit. The initial version does not introduce explicit row-lock protocols, transaction retries, a cleanup queue, or a global concurrency framework.
|
||||
The change ships in migration `0.31` for SQLite, MySQL, and PostgreSQL, with equivalent fresh-install schemas. Existing membership rows are backfilled to `ACTIVE`. Existing memos keep their UID, author, visibility, relations, permalink, and become Unassigned. Comment rows and comment visibility are not rewritten. SQLite rebuilds the affected tables where its `ALTER TABLE` support requires it.
|
||||
|
||||
Space creation, invitation transitions, membership changes, placement and audience changes, comment creation, memo deletion, and Space deletion use ordinary transactions where partial application would corrupt directly affected data. On MySQL and PostgreSQL, operations that create or activate a Space relationship serialize with user deletion on the target user row, and invitation creation serializes with Space deletion on the Space row. This prevents a concurrent delete from leaving an orphaned active membership or invitation. Space deletion directly removes assigned memos and their owned rows in the same style as existing user deletion, then uses the existing best-effort attachment storage cleanup after commit. The initial version does not introduce general transaction retries, a cleanup queue, or a global concurrency framework.
|
||||
|
||||
### API shape
|
||||
|
||||
A dedicated Space service provides create, list, get, update, and hard-delete operations plus member CRUD. Listing Spaces returns only Spaces in which the caller has active membership; no application-wide Space listing or archive API is added. An authenticated non-member receives `NotFound` for Space metadata, members, and feed requests.
|
||||
A dedicated Space service provides create, list, get, update, and hard-delete operations, active-member read/update/delete operations, and a distinct Space Invitation resource. Invitation operations cover create, list by Space, list received by user, get, revoke, accept, and decline. There is no operation that directly creates an active membership. A received invitation includes a read-only Space summary so the invitee can understand the offer without receiving membership-based `GetSpace` access.
|
||||
|
||||
Listing Spaces returns only Spaces in which the caller has active membership; no application-wide Space listing or archive API is added. An authenticated non-member, including a pending invitee, receives `NotFound` for Space metadata, members, and feed requests.
|
||||
|
||||
Memo responses gain an optional Space resource name, and `Visibility` adds `SPACE = 4` without renumbering existing values. The domain-to-v1 mapping is Author to `PRIVATE`, Instance to `PROTECTED`, Public to `PUBLIC`, and Space to `SPACE`. `VISIBILITY_UNSPECIFIED` remains an input sentinel: create treats it as `PRIVATE`, an explicit visibility update rejects it, and responses never return it. Visibility values are named domains and must not be compared numerically. The global default memo visibility setting continues to accept only `PRIVATE`, `PROTECTED`, and `PUBLIC`, because it cannot identify a Space.
|
||||
|
||||
|
|
@ -160,7 +170,7 @@ MCP memo operations reuse the same memo policy; Space management is not exposed
|
|||
|
||||
Before `SPACE` can be stored, one shared, memo-local, fail-closed policy must cover point reads, lists and counts, files, reactions, relations, notifications, email, webhooks, shares, search, statistics, public feeds, and MCP. Child resources resolve the memo they directly belong to. Application `ADMIN` receives no implicit bypass.
|
||||
|
||||
Unknown visibility denies access. A missing or invalid placement denies `SPACE` reads and placement-dependent operations. Other audiences continue to govern ordinary reads, but an invalid Space identity is omitted. Inactive users and invalid memberships deny any access that depends on them. Database list and count authorization is applied before pagination:
|
||||
Unknown visibility denies access. A missing or invalid placement denies `SPACE` reads and placement-dependent operations. Other audiences continue to govern ordinary reads, but an invalid Space identity is omitted. Inactive users, pending invitations, unknown relationship states, and invalid membership roles deny any access that depends on them. Every membership authorization requires `status = ACTIVE` and role `ADMIN` or `USER`. Where the database supports row locks, relationship creation and activation serialize against user deletion, and invitation creation serializes against Space deletion. Database list and count authorization is applied before pagination:
|
||||
|
||||
```text
|
||||
PRIVATE + active authenticated author
|
||||
|
|
@ -169,9 +179,9 @@ OR PUBLIC permitted for caller
|
|||
OR SPACE + active membership in memo.space_id
|
||||
```
|
||||
|
||||
CEL filters may only narrow this predicate. Space membership is checked per request or through immediately invalidated cache state. Write paths validate membership and placement as part of their ordinary operation. Missing or unreadable notification subjects and relation endpoints fail closed without leaking partial metadata. Strong serialization between concurrent membership, placement, and Space-deletion operations is deferred.
|
||||
CEL filters may only narrow this predicate. Space membership is checked per request or through immediately invalidated cache state. Write paths validate membership and placement as part of their ordinary operation. Missing or unreadable notification subjects and relation endpoints fail closed without leaking partial metadata. Broader serialization between concurrent membership, placement, and memo mutations remains deferred.
|
||||
|
||||
Live refresh is an authenticated, subject-free cache-invalidation channel. Successful memo, reaction, Space, and membership mutations broadcast only `{"type":"memo.changed"}` to connected clients. The event carries no resource name, audience, actor, or membership data; clients invalidate memo-backed caches and refetch through ordinary authorization. SSE does not materialize recipient sets or perform memo-level authorization.
|
||||
Live refresh is an authenticated, subject-free cache-invalidation channel. Successful memo, reaction, Space, invitation, and membership mutations broadcast only `{"type":"memo.changed"}` to connected clients. The event carries no resource name, audience, actor, invitation, or membership data; clients invalidate memo-backed caches and refetch through ordinary authorization. SSE does not materialize recipient sets or perform memo-level authorization.
|
||||
|
||||
Notifications are authorized when presented. Email and user webhook payloads are authorized before entering the existing asynchronous queue; the initial version does not cancel a prepared delivery when access changes while it is queued. A comment webhook requires both the comment and its context memo to be readable by the webhook owner when the event is prepared. A deleted-memo webhook is built only from an author-readable pre-delete snapshot.
|
||||
|
||||
|
|
@ -191,10 +201,12 @@ Files for `PRIVATE`, `PROTECTED`, and `SPACE` memos use `private, no-store`; pub
|
|||
| Move or delete a member's memos when membership ends | Rejected; historical contributions remain until an author lifecycle action or Space deletion. |
|
||||
| Give a Space `ADMIN` a separate operation to evict or otherwise mutate one memo | Rejected; placement belongs to the memo author's lifecycle, while Space governance is limited to Space metadata, membership, and aggregate hard deletion. |
|
||||
| Give application `ADMIN` implicit Space or memo access | Rejected; moderation and recovery require separate control-plane design. |
|
||||
| Let a Space `ADMIN` directly create an active membership | Rejected; only the invited user can turn a pending offer into membership. |
|
||||
| Add a separate invitation table now | Rejected for this iteration because the relationship state fits the unique Space-user slot and the design intentionally omits history, expiration, and delivery credentials. Revisit when those requirements appear. |
|
||||
| Rename v1 `visibility` to `audience`, or expose both fields | Rejected; the domain term is Audience, while one legacy v1 field remains the compatibility representation. |
|
||||
|
||||
## Deferred design
|
||||
|
||||
UI/UX is explicitly out of scope, including navigation, editor controls, membership screens, warnings, and confirmation flows.
|
||||
|
||||
Invitations, open enrollment, account erasure beyond the membership guard, notification retention policy, application-admin moderation and recovery, audit history, soft deletion, restoration, retryable external-object cleanup, delivery-time cancellation of queued email/webhooks, concurrent mutation hardening, and asynchronous deletion of very large Spaces remain deferred. Later work must preserve independent memo authorization, non-propagating relations, and explicit Space aggregate deletion unless this design is revisited.
|
||||
Email and external-user invitations, invitation expiration, inviter attribution, invitation history, open enrollment, account erasure beyond the membership guard, notification delivery and retention policy, application-admin moderation and recovery, audit history, soft deletion, restoration, retryable external-object cleanup, delivery-time cancellation of queued email/webhooks, broader concurrent-mutation hardening, and asynchronous deletion of very large Spaces remain deferred. Later work must preserve invitee consent, independent memo authorization, non-propagating relations, and explicit Space aggregate deletion unless this design is revisited.
|
||||
|
|
|
|||
|
|
@ -51,13 +51,55 @@ service SpaceService {
|
|||
option (google.api.method_signature) = "name";
|
||||
}
|
||||
|
||||
// CreateSpaceMember directly adds an existing active user to a space.
|
||||
rpc CreateSpaceMember(CreateSpaceMemberRequest) returns (SpaceMember) {
|
||||
// CreateSpaceInvitation invites an existing active user to a space.
|
||||
rpc CreateSpaceInvitation(CreateSpaceInvitationRequest) returns (SpaceInvitation) {
|
||||
option (google.api.http) = {
|
||||
post: "/api/v1/{parent=spaces/*}/members"
|
||||
body: "space_member"
|
||||
post: "/api/v1/{parent=spaces/*}/invitations"
|
||||
body: "space_invitation"
|
||||
};
|
||||
option (google.api.method_signature) = "parent,space_member";
|
||||
option (google.api.method_signature) = "parent,space_invitation";
|
||||
}
|
||||
|
||||
// ListSpaceInvitations lists the pending invitations for a space.
|
||||
rpc ListSpaceInvitations(ListSpaceInvitationsRequest) returns (ListSpaceInvitationsResponse) {
|
||||
option (google.api.http) = {get: "/api/v1/{parent=spaces/*}/invitations"};
|
||||
option (google.api.method_signature) = "parent";
|
||||
}
|
||||
|
||||
// ListUserSpaceInvitations lists the authenticated user's pending space invitations.
|
||||
rpc ListUserSpaceInvitations(ListUserSpaceInvitationsRequest) returns (ListUserSpaceInvitationsResponse) {
|
||||
option (google.api.http) = {get: "/api/v1/{parent=users/*}/spaceInvitations"};
|
||||
option (google.api.method_signature) = "parent";
|
||||
}
|
||||
|
||||
// GetSpaceInvitation gets one pending invitation.
|
||||
rpc GetSpaceInvitation(GetSpaceInvitationRequest) returns (SpaceInvitation) {
|
||||
option (google.api.http) = {get: "/api/v1/{name=spaces/*/invitations/*}"};
|
||||
option (google.api.method_signature) = "name";
|
||||
}
|
||||
|
||||
// DeleteSpaceInvitation revokes a pending invitation.
|
||||
rpc DeleteSpaceInvitation(DeleteSpaceInvitationRequest) returns (google.protobuf.Empty) {
|
||||
option (google.api.http) = {delete: "/api/v1/{name=spaces/*/invitations/*}"};
|
||||
option (google.api.method_signature) = "name";
|
||||
}
|
||||
|
||||
// AcceptSpaceInvitation accepts a pending invitation and creates a membership.
|
||||
rpc AcceptSpaceInvitation(AcceptSpaceInvitationRequest) returns (SpaceMember) {
|
||||
option (google.api.http) = {
|
||||
post: "/api/v1/{name=spaces/*/invitations/*}:accept"
|
||||
body: "*"
|
||||
};
|
||||
option (google.api.method_signature) = "name";
|
||||
}
|
||||
|
||||
// DeclineSpaceInvitation declines a pending invitation.
|
||||
rpc DeclineSpaceInvitation(DeclineSpaceInvitationRequest) returns (google.protobuf.Empty) {
|
||||
option (google.api.http) = {
|
||||
post: "/api/v1/{name=spaces/*/invitations/*}:decline"
|
||||
body: "*"
|
||||
};
|
||||
option (google.api.method_signature) = "name";
|
||||
}
|
||||
|
||||
// ListSpaceMembers lists the members of a space.
|
||||
|
|
@ -138,6 +180,33 @@ message SpaceMember {
|
|||
Role role = 3 [(google.api.field_behavior) = REQUIRED];
|
||||
}
|
||||
|
||||
// SpaceInvitation is a pending invitation for an existing user to join a space.
|
||||
message SpaceInvitation {
|
||||
option (google.api.resource) = {
|
||||
type: "memos.api.v1/SpaceInvitation"
|
||||
pattern: "spaces/{space}/invitations/{invitation}"
|
||||
name_field: "name"
|
||||
singular: "spaceInvitation"
|
||||
plural: "spaceInvitations"
|
||||
};
|
||||
|
||||
// The resource name. Format: spaces/{space}/invitations/{username}.
|
||||
string name = 1 [(google.api.field_behavior) = IDENTIFIER];
|
||||
|
||||
// Required. The invited user. Format: users/{username}.
|
||||
string invitee = 2 [
|
||||
(google.api.field_behavior) = REQUIRED,
|
||||
(google.api.resource_reference) = {type: "memos.api.v1/User"}
|
||||
];
|
||||
|
||||
// Required. The role the user will receive after accepting the invitation.
|
||||
SpaceMember.Role role = 3 [(google.api.field_behavior) = REQUIRED];
|
||||
|
||||
// Output only. The Space the user is invited to. This lets an invitee
|
||||
// understand the invitation without granting membership-based GetSpace access.
|
||||
Space space = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
|
||||
}
|
||||
|
||||
message CreateSpaceRequest {
|
||||
// Required. The space to create.
|
||||
Space space = 1 [(google.api.field_behavior) = REQUIRED];
|
||||
|
|
@ -183,15 +252,85 @@ message DeleteSpaceRequest {
|
|||
];
|
||||
}
|
||||
|
||||
message CreateSpaceMemberRequest {
|
||||
message CreateSpaceInvitationRequest {
|
||||
// Required. The parent space. Format: spaces/{space}.
|
||||
string parent = 1 [
|
||||
(google.api.field_behavior) = REQUIRED,
|
||||
(google.api.resource_reference) = {child_type: "memos.api.v1/SpaceMember"}
|
||||
(google.api.resource_reference) = {child_type: "memos.api.v1/SpaceInvitation"}
|
||||
];
|
||||
|
||||
// Required. The membership to create.
|
||||
SpaceMember space_member = 2 [(google.api.field_behavior) = REQUIRED];
|
||||
// Required. The invitation to create.
|
||||
SpaceInvitation space_invitation = 2 [(google.api.field_behavior) = REQUIRED];
|
||||
}
|
||||
|
||||
message ListSpaceInvitationsRequest {
|
||||
// Required. The parent space. Format: spaces/{space}.
|
||||
string parent = 1 [
|
||||
(google.api.field_behavior) = REQUIRED,
|
||||
(google.api.resource_reference) = {child_type: "memos.api.v1/SpaceInvitation"}
|
||||
];
|
||||
|
||||
// Optional. The maximum number of invitations to return.
|
||||
int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
|
||||
|
||||
// Optional. A token from a previous ListSpaceInvitations response.
|
||||
string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
|
||||
}
|
||||
|
||||
message ListSpaceInvitationsResponse {
|
||||
repeated SpaceInvitation space_invitations = 1;
|
||||
string next_page_token = 2;
|
||||
}
|
||||
|
||||
message ListUserSpaceInvitationsRequest {
|
||||
// Required. The authenticated user. Format: users/{username}.
|
||||
string parent = 1 [
|
||||
(google.api.field_behavior) = REQUIRED,
|
||||
(google.api.resource_reference) = {type: "memos.api.v1/User"}
|
||||
];
|
||||
|
||||
// Optional. The maximum number of invitations to return.
|
||||
int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
|
||||
|
||||
// Optional. A token from a previous ListUserSpaceInvitations response.
|
||||
string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
|
||||
}
|
||||
|
||||
message ListUserSpaceInvitationsResponse {
|
||||
repeated SpaceInvitation space_invitations = 1;
|
||||
string next_page_token = 2;
|
||||
}
|
||||
|
||||
message GetSpaceInvitationRequest {
|
||||
// Required. Format: spaces/{space}/invitations/{username}.
|
||||
string name = 1 [
|
||||
(google.api.field_behavior) = REQUIRED,
|
||||
(google.api.resource_reference) = {type: "memos.api.v1/SpaceInvitation"}
|
||||
];
|
||||
}
|
||||
|
||||
message DeleteSpaceInvitationRequest {
|
||||
// Required. Format: spaces/{space}/invitations/{username}.
|
||||
string name = 1 [
|
||||
(google.api.field_behavior) = REQUIRED,
|
||||
(google.api.resource_reference) = {type: "memos.api.v1/SpaceInvitation"}
|
||||
];
|
||||
}
|
||||
|
||||
message AcceptSpaceInvitationRequest {
|
||||
// Required. Format: spaces/{space}/invitations/{username}.
|
||||
string name = 1 [
|
||||
(google.api.field_behavior) = REQUIRED,
|
||||
(google.api.resource_reference) = {type: "memos.api.v1/SpaceInvitation"}
|
||||
];
|
||||
}
|
||||
|
||||
message DeclineSpaceInvitationRequest {
|
||||
// Required. Format: spaces/{space}/invitations/{username}.
|
||||
string name = 1 [
|
||||
(google.api.field_behavior) = REQUIRED,
|
||||
(google.api.resource_reference) = {type: "memos.api.v1/SpaceInvitation"}
|
||||
];
|
||||
}
|
||||
|
||||
message ListSpaceMembersRequest {
|
||||
|
|
|
|||
|
|
@ -47,9 +47,27 @@ const (
|
|||
// SpaceServiceDeleteSpaceProcedure is the fully-qualified name of the SpaceService's DeleteSpace
|
||||
// RPC.
|
||||
SpaceServiceDeleteSpaceProcedure = "/memos.api.v1.SpaceService/DeleteSpace"
|
||||
// SpaceServiceCreateSpaceMemberProcedure is the fully-qualified name of the SpaceService's
|
||||
// CreateSpaceMember RPC.
|
||||
SpaceServiceCreateSpaceMemberProcedure = "/memos.api.v1.SpaceService/CreateSpaceMember"
|
||||
// SpaceServiceCreateSpaceInvitationProcedure is the fully-qualified name of the SpaceService's
|
||||
// CreateSpaceInvitation RPC.
|
||||
SpaceServiceCreateSpaceInvitationProcedure = "/memos.api.v1.SpaceService/CreateSpaceInvitation"
|
||||
// SpaceServiceListSpaceInvitationsProcedure is the fully-qualified name of the SpaceService's
|
||||
// ListSpaceInvitations RPC.
|
||||
SpaceServiceListSpaceInvitationsProcedure = "/memos.api.v1.SpaceService/ListSpaceInvitations"
|
||||
// SpaceServiceListUserSpaceInvitationsProcedure is the fully-qualified name of the SpaceService's
|
||||
// ListUserSpaceInvitations RPC.
|
||||
SpaceServiceListUserSpaceInvitationsProcedure = "/memos.api.v1.SpaceService/ListUserSpaceInvitations"
|
||||
// SpaceServiceGetSpaceInvitationProcedure is the fully-qualified name of the SpaceService's
|
||||
// GetSpaceInvitation RPC.
|
||||
SpaceServiceGetSpaceInvitationProcedure = "/memos.api.v1.SpaceService/GetSpaceInvitation"
|
||||
// SpaceServiceDeleteSpaceInvitationProcedure is the fully-qualified name of the SpaceService's
|
||||
// DeleteSpaceInvitation RPC.
|
||||
SpaceServiceDeleteSpaceInvitationProcedure = "/memos.api.v1.SpaceService/DeleteSpaceInvitation"
|
||||
// SpaceServiceAcceptSpaceInvitationProcedure is the fully-qualified name of the SpaceService's
|
||||
// AcceptSpaceInvitation RPC.
|
||||
SpaceServiceAcceptSpaceInvitationProcedure = "/memos.api.v1.SpaceService/AcceptSpaceInvitation"
|
||||
// SpaceServiceDeclineSpaceInvitationProcedure is the fully-qualified name of the SpaceService's
|
||||
// DeclineSpaceInvitation RPC.
|
||||
SpaceServiceDeclineSpaceInvitationProcedure = "/memos.api.v1.SpaceService/DeclineSpaceInvitation"
|
||||
// SpaceServiceListSpaceMembersProcedure is the fully-qualified name of the SpaceService's
|
||||
// ListSpaceMembers RPC.
|
||||
SpaceServiceListSpaceMembersProcedure = "/memos.api.v1.SpaceService/ListSpaceMembers"
|
||||
|
|
@ -78,8 +96,20 @@ type SpaceServiceClient interface {
|
|||
// DeleteSpace permanently deletes a space and every memo currently placed
|
||||
// in it. It never follows memo relations to other memos.
|
||||
DeleteSpace(context.Context, *connect.Request[v1.DeleteSpaceRequest]) (*connect.Response[emptypb.Empty], error)
|
||||
// CreateSpaceMember directly adds an existing active user to a space.
|
||||
CreateSpaceMember(context.Context, *connect.Request[v1.CreateSpaceMemberRequest]) (*connect.Response[v1.SpaceMember], error)
|
||||
// CreateSpaceInvitation invites an existing active user to a space.
|
||||
CreateSpaceInvitation(context.Context, *connect.Request[v1.CreateSpaceInvitationRequest]) (*connect.Response[v1.SpaceInvitation], error)
|
||||
// ListSpaceInvitations lists the pending invitations for a space.
|
||||
ListSpaceInvitations(context.Context, *connect.Request[v1.ListSpaceInvitationsRequest]) (*connect.Response[v1.ListSpaceInvitationsResponse], error)
|
||||
// ListUserSpaceInvitations lists the authenticated user's pending space invitations.
|
||||
ListUserSpaceInvitations(context.Context, *connect.Request[v1.ListUserSpaceInvitationsRequest]) (*connect.Response[v1.ListUserSpaceInvitationsResponse], error)
|
||||
// GetSpaceInvitation gets one pending invitation.
|
||||
GetSpaceInvitation(context.Context, *connect.Request[v1.GetSpaceInvitationRequest]) (*connect.Response[v1.SpaceInvitation], error)
|
||||
// DeleteSpaceInvitation revokes a pending invitation.
|
||||
DeleteSpaceInvitation(context.Context, *connect.Request[v1.DeleteSpaceInvitationRequest]) (*connect.Response[emptypb.Empty], error)
|
||||
// AcceptSpaceInvitation accepts a pending invitation and creates a membership.
|
||||
AcceptSpaceInvitation(context.Context, *connect.Request[v1.AcceptSpaceInvitationRequest]) (*connect.Response[v1.SpaceMember], error)
|
||||
// DeclineSpaceInvitation declines a pending invitation.
|
||||
DeclineSpaceInvitation(context.Context, *connect.Request[v1.DeclineSpaceInvitationRequest]) (*connect.Response[emptypb.Empty], error)
|
||||
// ListSpaceMembers lists the members of a space.
|
||||
ListSpaceMembers(context.Context, *connect.Request[v1.ListSpaceMembersRequest]) (*connect.Response[v1.ListSpaceMembersResponse], error)
|
||||
// GetSpaceMember gets one membership in a space.
|
||||
|
|
@ -132,10 +162,46 @@ func NewSpaceServiceClient(httpClient connect.HTTPClient, baseURL string, opts .
|
|||
connect.WithSchema(spaceServiceMethods.ByName("DeleteSpace")),
|
||||
connect.WithClientOptions(opts...),
|
||||
),
|
||||
createSpaceMember: connect.NewClient[v1.CreateSpaceMemberRequest, v1.SpaceMember](
|
||||
createSpaceInvitation: connect.NewClient[v1.CreateSpaceInvitationRequest, v1.SpaceInvitation](
|
||||
httpClient,
|
||||
baseURL+SpaceServiceCreateSpaceMemberProcedure,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("CreateSpaceMember")),
|
||||
baseURL+SpaceServiceCreateSpaceInvitationProcedure,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("CreateSpaceInvitation")),
|
||||
connect.WithClientOptions(opts...),
|
||||
),
|
||||
listSpaceInvitations: connect.NewClient[v1.ListSpaceInvitationsRequest, v1.ListSpaceInvitationsResponse](
|
||||
httpClient,
|
||||
baseURL+SpaceServiceListSpaceInvitationsProcedure,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("ListSpaceInvitations")),
|
||||
connect.WithClientOptions(opts...),
|
||||
),
|
||||
listUserSpaceInvitations: connect.NewClient[v1.ListUserSpaceInvitationsRequest, v1.ListUserSpaceInvitationsResponse](
|
||||
httpClient,
|
||||
baseURL+SpaceServiceListUserSpaceInvitationsProcedure,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("ListUserSpaceInvitations")),
|
||||
connect.WithClientOptions(opts...),
|
||||
),
|
||||
getSpaceInvitation: connect.NewClient[v1.GetSpaceInvitationRequest, v1.SpaceInvitation](
|
||||
httpClient,
|
||||
baseURL+SpaceServiceGetSpaceInvitationProcedure,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("GetSpaceInvitation")),
|
||||
connect.WithClientOptions(opts...),
|
||||
),
|
||||
deleteSpaceInvitation: connect.NewClient[v1.DeleteSpaceInvitationRequest, emptypb.Empty](
|
||||
httpClient,
|
||||
baseURL+SpaceServiceDeleteSpaceInvitationProcedure,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("DeleteSpaceInvitation")),
|
||||
connect.WithClientOptions(opts...),
|
||||
),
|
||||
acceptSpaceInvitation: connect.NewClient[v1.AcceptSpaceInvitationRequest, v1.SpaceMember](
|
||||
httpClient,
|
||||
baseURL+SpaceServiceAcceptSpaceInvitationProcedure,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("AcceptSpaceInvitation")),
|
||||
connect.WithClientOptions(opts...),
|
||||
),
|
||||
declineSpaceInvitation: connect.NewClient[v1.DeclineSpaceInvitationRequest, emptypb.Empty](
|
||||
httpClient,
|
||||
baseURL+SpaceServiceDeclineSpaceInvitationProcedure,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("DeclineSpaceInvitation")),
|
||||
connect.WithClientOptions(opts...),
|
||||
),
|
||||
listSpaceMembers: connect.NewClient[v1.ListSpaceMembersRequest, v1.ListSpaceMembersResponse](
|
||||
|
|
@ -167,16 +233,22 @@ func NewSpaceServiceClient(httpClient connect.HTTPClient, baseURL string, opts .
|
|||
|
||||
// spaceServiceClient implements SpaceServiceClient.
|
||||
type spaceServiceClient struct {
|
||||
createSpace *connect.Client[v1.CreateSpaceRequest, v1.Space]
|
||||
listSpaces *connect.Client[v1.ListSpacesRequest, v1.ListSpacesResponse]
|
||||
getSpace *connect.Client[v1.GetSpaceRequest, v1.Space]
|
||||
updateSpace *connect.Client[v1.UpdateSpaceRequest, v1.Space]
|
||||
deleteSpace *connect.Client[v1.DeleteSpaceRequest, emptypb.Empty]
|
||||
createSpaceMember *connect.Client[v1.CreateSpaceMemberRequest, v1.SpaceMember]
|
||||
listSpaceMembers *connect.Client[v1.ListSpaceMembersRequest, v1.ListSpaceMembersResponse]
|
||||
getSpaceMember *connect.Client[v1.GetSpaceMemberRequest, v1.SpaceMember]
|
||||
updateSpaceMember *connect.Client[v1.UpdateSpaceMemberRequest, v1.SpaceMember]
|
||||
deleteSpaceMember *connect.Client[v1.DeleteSpaceMemberRequest, emptypb.Empty]
|
||||
createSpace *connect.Client[v1.CreateSpaceRequest, v1.Space]
|
||||
listSpaces *connect.Client[v1.ListSpacesRequest, v1.ListSpacesResponse]
|
||||
getSpace *connect.Client[v1.GetSpaceRequest, v1.Space]
|
||||
updateSpace *connect.Client[v1.UpdateSpaceRequest, v1.Space]
|
||||
deleteSpace *connect.Client[v1.DeleteSpaceRequest, emptypb.Empty]
|
||||
createSpaceInvitation *connect.Client[v1.CreateSpaceInvitationRequest, v1.SpaceInvitation]
|
||||
listSpaceInvitations *connect.Client[v1.ListSpaceInvitationsRequest, v1.ListSpaceInvitationsResponse]
|
||||
listUserSpaceInvitations *connect.Client[v1.ListUserSpaceInvitationsRequest, v1.ListUserSpaceInvitationsResponse]
|
||||
getSpaceInvitation *connect.Client[v1.GetSpaceInvitationRequest, v1.SpaceInvitation]
|
||||
deleteSpaceInvitation *connect.Client[v1.DeleteSpaceInvitationRequest, emptypb.Empty]
|
||||
acceptSpaceInvitation *connect.Client[v1.AcceptSpaceInvitationRequest, v1.SpaceMember]
|
||||
declineSpaceInvitation *connect.Client[v1.DeclineSpaceInvitationRequest, emptypb.Empty]
|
||||
listSpaceMembers *connect.Client[v1.ListSpaceMembersRequest, v1.ListSpaceMembersResponse]
|
||||
getSpaceMember *connect.Client[v1.GetSpaceMemberRequest, v1.SpaceMember]
|
||||
updateSpaceMember *connect.Client[v1.UpdateSpaceMemberRequest, v1.SpaceMember]
|
||||
deleteSpaceMember *connect.Client[v1.DeleteSpaceMemberRequest, emptypb.Empty]
|
||||
}
|
||||
|
||||
// CreateSpace calls memos.api.v1.SpaceService.CreateSpace.
|
||||
|
|
@ -204,9 +276,39 @@ func (c *spaceServiceClient) DeleteSpace(ctx context.Context, req *connect.Reque
|
|||
return c.deleteSpace.CallUnary(ctx, req)
|
||||
}
|
||||
|
||||
// CreateSpaceMember calls memos.api.v1.SpaceService.CreateSpaceMember.
|
||||
func (c *spaceServiceClient) CreateSpaceMember(ctx context.Context, req *connect.Request[v1.CreateSpaceMemberRequest]) (*connect.Response[v1.SpaceMember], error) {
|
||||
return c.createSpaceMember.CallUnary(ctx, req)
|
||||
// CreateSpaceInvitation calls memos.api.v1.SpaceService.CreateSpaceInvitation.
|
||||
func (c *spaceServiceClient) CreateSpaceInvitation(ctx context.Context, req *connect.Request[v1.CreateSpaceInvitationRequest]) (*connect.Response[v1.SpaceInvitation], error) {
|
||||
return c.createSpaceInvitation.CallUnary(ctx, req)
|
||||
}
|
||||
|
||||
// ListSpaceInvitations calls memos.api.v1.SpaceService.ListSpaceInvitations.
|
||||
func (c *spaceServiceClient) ListSpaceInvitations(ctx context.Context, req *connect.Request[v1.ListSpaceInvitationsRequest]) (*connect.Response[v1.ListSpaceInvitationsResponse], error) {
|
||||
return c.listSpaceInvitations.CallUnary(ctx, req)
|
||||
}
|
||||
|
||||
// ListUserSpaceInvitations calls memos.api.v1.SpaceService.ListUserSpaceInvitations.
|
||||
func (c *spaceServiceClient) ListUserSpaceInvitations(ctx context.Context, req *connect.Request[v1.ListUserSpaceInvitationsRequest]) (*connect.Response[v1.ListUserSpaceInvitationsResponse], error) {
|
||||
return c.listUserSpaceInvitations.CallUnary(ctx, req)
|
||||
}
|
||||
|
||||
// GetSpaceInvitation calls memos.api.v1.SpaceService.GetSpaceInvitation.
|
||||
func (c *spaceServiceClient) GetSpaceInvitation(ctx context.Context, req *connect.Request[v1.GetSpaceInvitationRequest]) (*connect.Response[v1.SpaceInvitation], error) {
|
||||
return c.getSpaceInvitation.CallUnary(ctx, req)
|
||||
}
|
||||
|
||||
// DeleteSpaceInvitation calls memos.api.v1.SpaceService.DeleteSpaceInvitation.
|
||||
func (c *spaceServiceClient) DeleteSpaceInvitation(ctx context.Context, req *connect.Request[v1.DeleteSpaceInvitationRequest]) (*connect.Response[emptypb.Empty], error) {
|
||||
return c.deleteSpaceInvitation.CallUnary(ctx, req)
|
||||
}
|
||||
|
||||
// AcceptSpaceInvitation calls memos.api.v1.SpaceService.AcceptSpaceInvitation.
|
||||
func (c *spaceServiceClient) AcceptSpaceInvitation(ctx context.Context, req *connect.Request[v1.AcceptSpaceInvitationRequest]) (*connect.Response[v1.SpaceMember], error) {
|
||||
return c.acceptSpaceInvitation.CallUnary(ctx, req)
|
||||
}
|
||||
|
||||
// DeclineSpaceInvitation calls memos.api.v1.SpaceService.DeclineSpaceInvitation.
|
||||
func (c *spaceServiceClient) DeclineSpaceInvitation(ctx context.Context, req *connect.Request[v1.DeclineSpaceInvitationRequest]) (*connect.Response[emptypb.Empty], error) {
|
||||
return c.declineSpaceInvitation.CallUnary(ctx, req)
|
||||
}
|
||||
|
||||
// ListSpaceMembers calls memos.api.v1.SpaceService.ListSpaceMembers.
|
||||
|
|
@ -243,8 +345,20 @@ type SpaceServiceHandler interface {
|
|||
// DeleteSpace permanently deletes a space and every memo currently placed
|
||||
// in it. It never follows memo relations to other memos.
|
||||
DeleteSpace(context.Context, *connect.Request[v1.DeleteSpaceRequest]) (*connect.Response[emptypb.Empty], error)
|
||||
// CreateSpaceMember directly adds an existing active user to a space.
|
||||
CreateSpaceMember(context.Context, *connect.Request[v1.CreateSpaceMemberRequest]) (*connect.Response[v1.SpaceMember], error)
|
||||
// CreateSpaceInvitation invites an existing active user to a space.
|
||||
CreateSpaceInvitation(context.Context, *connect.Request[v1.CreateSpaceInvitationRequest]) (*connect.Response[v1.SpaceInvitation], error)
|
||||
// ListSpaceInvitations lists the pending invitations for a space.
|
||||
ListSpaceInvitations(context.Context, *connect.Request[v1.ListSpaceInvitationsRequest]) (*connect.Response[v1.ListSpaceInvitationsResponse], error)
|
||||
// ListUserSpaceInvitations lists the authenticated user's pending space invitations.
|
||||
ListUserSpaceInvitations(context.Context, *connect.Request[v1.ListUserSpaceInvitationsRequest]) (*connect.Response[v1.ListUserSpaceInvitationsResponse], error)
|
||||
// GetSpaceInvitation gets one pending invitation.
|
||||
GetSpaceInvitation(context.Context, *connect.Request[v1.GetSpaceInvitationRequest]) (*connect.Response[v1.SpaceInvitation], error)
|
||||
// DeleteSpaceInvitation revokes a pending invitation.
|
||||
DeleteSpaceInvitation(context.Context, *connect.Request[v1.DeleteSpaceInvitationRequest]) (*connect.Response[emptypb.Empty], error)
|
||||
// AcceptSpaceInvitation accepts a pending invitation and creates a membership.
|
||||
AcceptSpaceInvitation(context.Context, *connect.Request[v1.AcceptSpaceInvitationRequest]) (*connect.Response[v1.SpaceMember], error)
|
||||
// DeclineSpaceInvitation declines a pending invitation.
|
||||
DeclineSpaceInvitation(context.Context, *connect.Request[v1.DeclineSpaceInvitationRequest]) (*connect.Response[emptypb.Empty], error)
|
||||
// ListSpaceMembers lists the members of a space.
|
||||
ListSpaceMembers(context.Context, *connect.Request[v1.ListSpaceMembersRequest]) (*connect.Response[v1.ListSpaceMembersResponse], error)
|
||||
// GetSpaceMember gets one membership in a space.
|
||||
|
|
@ -293,10 +407,46 @@ func NewSpaceServiceHandler(svc SpaceServiceHandler, opts ...connect.HandlerOpti
|
|||
connect.WithSchema(spaceServiceMethods.ByName("DeleteSpace")),
|
||||
connect.WithHandlerOptions(opts...),
|
||||
)
|
||||
spaceServiceCreateSpaceMemberHandler := connect.NewUnaryHandler(
|
||||
SpaceServiceCreateSpaceMemberProcedure,
|
||||
svc.CreateSpaceMember,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("CreateSpaceMember")),
|
||||
spaceServiceCreateSpaceInvitationHandler := connect.NewUnaryHandler(
|
||||
SpaceServiceCreateSpaceInvitationProcedure,
|
||||
svc.CreateSpaceInvitation,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("CreateSpaceInvitation")),
|
||||
connect.WithHandlerOptions(opts...),
|
||||
)
|
||||
spaceServiceListSpaceInvitationsHandler := connect.NewUnaryHandler(
|
||||
SpaceServiceListSpaceInvitationsProcedure,
|
||||
svc.ListSpaceInvitations,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("ListSpaceInvitations")),
|
||||
connect.WithHandlerOptions(opts...),
|
||||
)
|
||||
spaceServiceListUserSpaceInvitationsHandler := connect.NewUnaryHandler(
|
||||
SpaceServiceListUserSpaceInvitationsProcedure,
|
||||
svc.ListUserSpaceInvitations,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("ListUserSpaceInvitations")),
|
||||
connect.WithHandlerOptions(opts...),
|
||||
)
|
||||
spaceServiceGetSpaceInvitationHandler := connect.NewUnaryHandler(
|
||||
SpaceServiceGetSpaceInvitationProcedure,
|
||||
svc.GetSpaceInvitation,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("GetSpaceInvitation")),
|
||||
connect.WithHandlerOptions(opts...),
|
||||
)
|
||||
spaceServiceDeleteSpaceInvitationHandler := connect.NewUnaryHandler(
|
||||
SpaceServiceDeleteSpaceInvitationProcedure,
|
||||
svc.DeleteSpaceInvitation,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("DeleteSpaceInvitation")),
|
||||
connect.WithHandlerOptions(opts...),
|
||||
)
|
||||
spaceServiceAcceptSpaceInvitationHandler := connect.NewUnaryHandler(
|
||||
SpaceServiceAcceptSpaceInvitationProcedure,
|
||||
svc.AcceptSpaceInvitation,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("AcceptSpaceInvitation")),
|
||||
connect.WithHandlerOptions(opts...),
|
||||
)
|
||||
spaceServiceDeclineSpaceInvitationHandler := connect.NewUnaryHandler(
|
||||
SpaceServiceDeclineSpaceInvitationProcedure,
|
||||
svc.DeclineSpaceInvitation,
|
||||
connect.WithSchema(spaceServiceMethods.ByName("DeclineSpaceInvitation")),
|
||||
connect.WithHandlerOptions(opts...),
|
||||
)
|
||||
spaceServiceListSpaceMembersHandler := connect.NewUnaryHandler(
|
||||
|
|
@ -335,8 +485,20 @@ func NewSpaceServiceHandler(svc SpaceServiceHandler, opts ...connect.HandlerOpti
|
|||
spaceServiceUpdateSpaceHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceDeleteSpaceProcedure:
|
||||
spaceServiceDeleteSpaceHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceCreateSpaceMemberProcedure:
|
||||
spaceServiceCreateSpaceMemberHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceCreateSpaceInvitationProcedure:
|
||||
spaceServiceCreateSpaceInvitationHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceListSpaceInvitationsProcedure:
|
||||
spaceServiceListSpaceInvitationsHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceListUserSpaceInvitationsProcedure:
|
||||
spaceServiceListUserSpaceInvitationsHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceGetSpaceInvitationProcedure:
|
||||
spaceServiceGetSpaceInvitationHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceDeleteSpaceInvitationProcedure:
|
||||
spaceServiceDeleteSpaceInvitationHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceAcceptSpaceInvitationProcedure:
|
||||
spaceServiceAcceptSpaceInvitationHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceDeclineSpaceInvitationProcedure:
|
||||
spaceServiceDeclineSpaceInvitationHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceListSpaceMembersProcedure:
|
||||
spaceServiceListSpaceMembersHandler.ServeHTTP(w, r)
|
||||
case SpaceServiceGetSpaceMemberProcedure:
|
||||
|
|
@ -374,8 +536,32 @@ func (UnimplementedSpaceServiceHandler) DeleteSpace(context.Context, *connect.Re
|
|||
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.SpaceService.DeleteSpace is not implemented"))
|
||||
}
|
||||
|
||||
func (UnimplementedSpaceServiceHandler) CreateSpaceMember(context.Context, *connect.Request[v1.CreateSpaceMemberRequest]) (*connect.Response[v1.SpaceMember], error) {
|
||||
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.SpaceService.CreateSpaceMember is not implemented"))
|
||||
func (UnimplementedSpaceServiceHandler) CreateSpaceInvitation(context.Context, *connect.Request[v1.CreateSpaceInvitationRequest]) (*connect.Response[v1.SpaceInvitation], error) {
|
||||
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.SpaceService.CreateSpaceInvitation is not implemented"))
|
||||
}
|
||||
|
||||
func (UnimplementedSpaceServiceHandler) ListSpaceInvitations(context.Context, *connect.Request[v1.ListSpaceInvitationsRequest]) (*connect.Response[v1.ListSpaceInvitationsResponse], error) {
|
||||
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.SpaceService.ListSpaceInvitations is not implemented"))
|
||||
}
|
||||
|
||||
func (UnimplementedSpaceServiceHandler) ListUserSpaceInvitations(context.Context, *connect.Request[v1.ListUserSpaceInvitationsRequest]) (*connect.Response[v1.ListUserSpaceInvitationsResponse], error) {
|
||||
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.SpaceService.ListUserSpaceInvitations is not implemented"))
|
||||
}
|
||||
|
||||
func (UnimplementedSpaceServiceHandler) GetSpaceInvitation(context.Context, *connect.Request[v1.GetSpaceInvitationRequest]) (*connect.Response[v1.SpaceInvitation], error) {
|
||||
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.SpaceService.GetSpaceInvitation is not implemented"))
|
||||
}
|
||||
|
||||
func (UnimplementedSpaceServiceHandler) DeleteSpaceInvitation(context.Context, *connect.Request[v1.DeleteSpaceInvitationRequest]) (*connect.Response[emptypb.Empty], error) {
|
||||
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.SpaceService.DeleteSpaceInvitation is not implemented"))
|
||||
}
|
||||
|
||||
func (UnimplementedSpaceServiceHandler) AcceptSpaceInvitation(context.Context, *connect.Request[v1.AcceptSpaceInvitationRequest]) (*connect.Response[v1.SpaceMember], error) {
|
||||
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.SpaceService.AcceptSpaceInvitation is not implemented"))
|
||||
}
|
||||
|
||||
func (UnimplementedSpaceServiceHandler) DeclineSpaceInvitation(context.Context, *connect.Request[v1.DeclineSpaceInvitationRequest]) (*connect.Response[emptypb.Empty], error) {
|
||||
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("memos.api.v1.SpaceService.DeclineSpaceInvitation is not implemented"))
|
||||
}
|
||||
|
||||
func (UnimplementedSpaceServiceHandler) ListSpaceMembers(context.Context, *connect.Request[v1.ListSpaceMembersRequest]) (*connect.Response[v1.ListSpaceMembersResponse], error) {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -270,13 +270,13 @@ func local_request_SpaceService_DeleteSpace_0(ctx context.Context, marshaler run
|
|||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func request_SpaceService_CreateSpaceMember_0(ctx context.Context, marshaler runtime.Marshaler, client SpaceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
func request_SpaceService_CreateSpaceInvitation_0(ctx context.Context, marshaler runtime.Marshaler, client SpaceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq CreateSpaceMemberRequest
|
||||
protoReq CreateSpaceInvitationRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.SpaceMember); err != nil && !errors.Is(err, io.EOF) {
|
||||
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.SpaceInvitation); err != nil && !errors.Is(err, io.EOF) {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
val, ok := pathParams["parent"]
|
||||
|
|
@ -290,17 +290,17 @@ func request_SpaceService_CreateSpaceMember_0(ctx context.Context, marshaler run
|
|||
if req.Body != nil {
|
||||
_, _ = io.Copy(io.Discard, req.Body)
|
||||
}
|
||||
msg, err := client.CreateSpaceMember(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
|
||||
msg, err := client.CreateSpaceInvitation(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func local_request_SpaceService_CreateSpaceMember_0(ctx context.Context, marshaler runtime.Marshaler, server SpaceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
func local_request_SpaceService_CreateSpaceInvitation_0(ctx context.Context, marshaler runtime.Marshaler, server SpaceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq CreateSpaceMemberRequest
|
||||
protoReq CreateSpaceInvitationRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.SpaceMember); err != nil && !errors.Is(err, io.EOF) {
|
||||
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.SpaceInvitation); err != nil && !errors.Is(err, io.EOF) {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
val, ok := pathParams["parent"]
|
||||
|
|
@ -311,7 +311,281 @@ func local_request_SpaceService_CreateSpaceMember_0(ctx context.Context, marshal
|
|||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)
|
||||
}
|
||||
msg, err := server.CreateSpaceMember(ctx, &protoReq)
|
||||
msg, err := server.CreateSpaceInvitation(ctx, &protoReq)
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
var filter_SpaceService_ListSpaceInvitations_0 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
|
||||
|
||||
func request_SpaceService_ListSpaceInvitations_0(ctx context.Context, marshaler runtime.Marshaler, client SpaceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq ListSpaceInvitationsRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
val, ok := pathParams["parent"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")
|
||||
}
|
||||
protoReq.Parent, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)
|
||||
}
|
||||
if err := req.ParseForm(); err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_SpaceService_ListSpaceInvitations_0); err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
if req.Body != nil {
|
||||
_, _ = io.Copy(io.Discard, req.Body)
|
||||
}
|
||||
msg, err := client.ListSpaceInvitations(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func local_request_SpaceService_ListSpaceInvitations_0(ctx context.Context, marshaler runtime.Marshaler, server SpaceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq ListSpaceInvitationsRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
val, ok := pathParams["parent"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")
|
||||
}
|
||||
protoReq.Parent, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)
|
||||
}
|
||||
if err := req.ParseForm(); err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_SpaceService_ListSpaceInvitations_0); err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
msg, err := server.ListSpaceInvitations(ctx, &protoReq)
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
var filter_SpaceService_ListUserSpaceInvitations_0 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
|
||||
|
||||
func request_SpaceService_ListUserSpaceInvitations_0(ctx context.Context, marshaler runtime.Marshaler, client SpaceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq ListUserSpaceInvitationsRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
val, ok := pathParams["parent"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")
|
||||
}
|
||||
protoReq.Parent, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)
|
||||
}
|
||||
if err := req.ParseForm(); err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_SpaceService_ListUserSpaceInvitations_0); err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
if req.Body != nil {
|
||||
_, _ = io.Copy(io.Discard, req.Body)
|
||||
}
|
||||
msg, err := client.ListUserSpaceInvitations(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func local_request_SpaceService_ListUserSpaceInvitations_0(ctx context.Context, marshaler runtime.Marshaler, server SpaceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq ListUserSpaceInvitationsRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
val, ok := pathParams["parent"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")
|
||||
}
|
||||
protoReq.Parent, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)
|
||||
}
|
||||
if err := req.ParseForm(); err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_SpaceService_ListUserSpaceInvitations_0); err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
msg, err := server.ListUserSpaceInvitations(ctx, &protoReq)
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func request_SpaceService_GetSpaceInvitation_0(ctx context.Context, marshaler runtime.Marshaler, client SpaceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq GetSpaceInvitationRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
val, ok := pathParams["name"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
|
||||
}
|
||||
protoReq.Name, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
|
||||
}
|
||||
if req.Body != nil {
|
||||
_, _ = io.Copy(io.Discard, req.Body)
|
||||
}
|
||||
msg, err := client.GetSpaceInvitation(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func local_request_SpaceService_GetSpaceInvitation_0(ctx context.Context, marshaler runtime.Marshaler, server SpaceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq GetSpaceInvitationRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
val, ok := pathParams["name"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
|
||||
}
|
||||
protoReq.Name, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
|
||||
}
|
||||
msg, err := server.GetSpaceInvitation(ctx, &protoReq)
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func request_SpaceService_DeleteSpaceInvitation_0(ctx context.Context, marshaler runtime.Marshaler, client SpaceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq DeleteSpaceInvitationRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
val, ok := pathParams["name"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
|
||||
}
|
||||
protoReq.Name, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
|
||||
}
|
||||
if req.Body != nil {
|
||||
_, _ = io.Copy(io.Discard, req.Body)
|
||||
}
|
||||
msg, err := client.DeleteSpaceInvitation(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func local_request_SpaceService_DeleteSpaceInvitation_0(ctx context.Context, marshaler runtime.Marshaler, server SpaceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq DeleteSpaceInvitationRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
val, ok := pathParams["name"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
|
||||
}
|
||||
protoReq.Name, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
|
||||
}
|
||||
msg, err := server.DeleteSpaceInvitation(ctx, &protoReq)
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func request_SpaceService_AcceptSpaceInvitation_0(ctx context.Context, marshaler runtime.Marshaler, client SpaceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq AcceptSpaceInvitationRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
val, ok := pathParams["name"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
|
||||
}
|
||||
protoReq.Name, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
|
||||
}
|
||||
if req.Body != nil {
|
||||
_, _ = io.Copy(io.Discard, req.Body)
|
||||
}
|
||||
msg, err := client.AcceptSpaceInvitation(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func local_request_SpaceService_AcceptSpaceInvitation_0(ctx context.Context, marshaler runtime.Marshaler, server SpaceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq AcceptSpaceInvitationRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
val, ok := pathParams["name"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
|
||||
}
|
||||
protoReq.Name, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
|
||||
}
|
||||
msg, err := server.AcceptSpaceInvitation(ctx, &protoReq)
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func request_SpaceService_DeclineSpaceInvitation_0(ctx context.Context, marshaler runtime.Marshaler, client SpaceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq DeclineSpaceInvitationRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
val, ok := pathParams["name"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
|
||||
}
|
||||
protoReq.Name, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
|
||||
}
|
||||
if req.Body != nil {
|
||||
_, _ = io.Copy(io.Discard, req.Body)
|
||||
}
|
||||
msg, err := client.DeclineSpaceInvitation(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func local_request_SpaceService_DeclineSpaceInvitation_0(ctx context.Context, marshaler runtime.Marshaler, server SpaceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq DeclineSpaceInvitationRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
val, ok := pathParams["name"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
|
||||
}
|
||||
protoReq.Name, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
|
||||
}
|
||||
msg, err := server.DeclineSpaceInvitation(ctx, &protoReq)
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
|
|
@ -633,25 +907,145 @@ func RegisterSpaceServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
|
|||
}
|
||||
forward_SpaceService_DeleteSpace_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodPost, pattern_SpaceService_CreateSpaceMember_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
mux.Handle(http.MethodPost, pattern_SpaceService_CreateSpaceInvitation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
var stream runtime.ServerTransportStream
|
||||
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.SpaceService/CreateSpaceMember", runtime.WithHTTPPathPattern("/api/v1/{parent=spaces/*}/members"))
|
||||
annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.SpaceService/CreateSpaceInvitation", runtime.WithHTTPPathPattern("/api/v1/{parent=spaces/*}/invitations"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := local_request_SpaceService_CreateSpaceMember_0(annotatedContext, inboundMarshaler, server, req, pathParams)
|
||||
resp, md, err := local_request_SpaceService_CreateSpaceInvitation_0(annotatedContext, inboundMarshaler, server, req, pathParams)
|
||||
md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_CreateSpaceMember_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
forward_SpaceService_CreateSpaceInvitation_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodGet, pattern_SpaceService_ListSpaceInvitations_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
var stream runtime.ServerTransportStream
|
||||
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.SpaceService/ListSpaceInvitations", runtime.WithHTTPPathPattern("/api/v1/{parent=spaces/*}/invitations"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := local_request_SpaceService_ListSpaceInvitations_0(annotatedContext, inboundMarshaler, server, req, pathParams)
|
||||
md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_ListSpaceInvitations_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodGet, pattern_SpaceService_ListUserSpaceInvitations_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
var stream runtime.ServerTransportStream
|
||||
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.SpaceService/ListUserSpaceInvitations", runtime.WithHTTPPathPattern("/api/v1/{parent=users/*}/spaceInvitations"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := local_request_SpaceService_ListUserSpaceInvitations_0(annotatedContext, inboundMarshaler, server, req, pathParams)
|
||||
md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_ListUserSpaceInvitations_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodGet, pattern_SpaceService_GetSpaceInvitation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
var stream runtime.ServerTransportStream
|
||||
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.SpaceService/GetSpaceInvitation", runtime.WithHTTPPathPattern("/api/v1/{name=spaces/*/invitations/*}"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := local_request_SpaceService_GetSpaceInvitation_0(annotatedContext, inboundMarshaler, server, req, pathParams)
|
||||
md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_GetSpaceInvitation_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodDelete, pattern_SpaceService_DeleteSpaceInvitation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
var stream runtime.ServerTransportStream
|
||||
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.SpaceService/DeleteSpaceInvitation", runtime.WithHTTPPathPattern("/api/v1/{name=spaces/*/invitations/*}"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := local_request_SpaceService_DeleteSpaceInvitation_0(annotatedContext, inboundMarshaler, server, req, pathParams)
|
||||
md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_DeleteSpaceInvitation_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodPost, pattern_SpaceService_AcceptSpaceInvitation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
var stream runtime.ServerTransportStream
|
||||
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.SpaceService/AcceptSpaceInvitation", runtime.WithHTTPPathPattern("/api/v1/{name=spaces/*/invitations/*}:accept"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := local_request_SpaceService_AcceptSpaceInvitation_0(annotatedContext, inboundMarshaler, server, req, pathParams)
|
||||
md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_AcceptSpaceInvitation_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodPost, pattern_SpaceService_DeclineSpaceInvitation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
var stream runtime.ServerTransportStream
|
||||
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.SpaceService/DeclineSpaceInvitation", runtime.WithHTTPPathPattern("/api/v1/{name=spaces/*/invitations/*}:decline"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := local_request_SpaceService_DeclineSpaceInvitation_0(annotatedContext, inboundMarshaler, server, req, pathParams)
|
||||
md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_DeclineSpaceInvitation_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodGet, pattern_SpaceService_ListSpaceMembers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
|
|
@ -858,22 +1252,124 @@ func RegisterSpaceServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
|
|||
}
|
||||
forward_SpaceService_DeleteSpace_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodPost, pattern_SpaceService_CreateSpaceMember_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
mux.Handle(http.MethodPost, pattern_SpaceService_CreateSpaceInvitation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.SpaceService/CreateSpaceMember", runtime.WithHTTPPathPattern("/api/v1/{parent=spaces/*}/members"))
|
||||
annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.SpaceService/CreateSpaceInvitation", runtime.WithHTTPPathPattern("/api/v1/{parent=spaces/*}/invitations"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := request_SpaceService_CreateSpaceMember_0(annotatedContext, inboundMarshaler, client, req, pathParams)
|
||||
resp, md, err := request_SpaceService_CreateSpaceInvitation_0(annotatedContext, inboundMarshaler, client, req, pathParams)
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_CreateSpaceMember_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
forward_SpaceService_CreateSpaceInvitation_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodGet, pattern_SpaceService_ListSpaceInvitations_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.SpaceService/ListSpaceInvitations", runtime.WithHTTPPathPattern("/api/v1/{parent=spaces/*}/invitations"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := request_SpaceService_ListSpaceInvitations_0(annotatedContext, inboundMarshaler, client, req, pathParams)
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_ListSpaceInvitations_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodGet, pattern_SpaceService_ListUserSpaceInvitations_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.SpaceService/ListUserSpaceInvitations", runtime.WithHTTPPathPattern("/api/v1/{parent=users/*}/spaceInvitations"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := request_SpaceService_ListUserSpaceInvitations_0(annotatedContext, inboundMarshaler, client, req, pathParams)
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_ListUserSpaceInvitations_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodGet, pattern_SpaceService_GetSpaceInvitation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.SpaceService/GetSpaceInvitation", runtime.WithHTTPPathPattern("/api/v1/{name=spaces/*/invitations/*}"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := request_SpaceService_GetSpaceInvitation_0(annotatedContext, inboundMarshaler, client, req, pathParams)
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_GetSpaceInvitation_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodDelete, pattern_SpaceService_DeleteSpaceInvitation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.SpaceService/DeleteSpaceInvitation", runtime.WithHTTPPathPattern("/api/v1/{name=spaces/*/invitations/*}"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := request_SpaceService_DeleteSpaceInvitation_0(annotatedContext, inboundMarshaler, client, req, pathParams)
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_DeleteSpaceInvitation_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodPost, pattern_SpaceService_AcceptSpaceInvitation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.SpaceService/AcceptSpaceInvitation", runtime.WithHTTPPathPattern("/api/v1/{name=spaces/*/invitations/*}:accept"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := request_SpaceService_AcceptSpaceInvitation_0(annotatedContext, inboundMarshaler, client, req, pathParams)
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_AcceptSpaceInvitation_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodPost, pattern_SpaceService_DeclineSpaceInvitation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.SpaceService/DeclineSpaceInvitation", runtime.WithHTTPPathPattern("/api/v1/{name=spaces/*/invitations/*}:decline"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := request_SpaceService_DeclineSpaceInvitation_0(annotatedContext, inboundMarshaler, client, req, pathParams)
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_SpaceService_DeclineSpaceInvitation_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodGet, pattern_SpaceService_ListSpaceMembers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
|
|
@ -947,27 +1443,39 @@ func RegisterSpaceServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
|
|||
}
|
||||
|
||||
var (
|
||||
pattern_SpaceService_CreateSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "spaces"}, ""))
|
||||
pattern_SpaceService_ListSpaces_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "spaces"}, ""))
|
||||
pattern_SpaceService_GetSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3}, []string{"api", "v1", "spaces", "name"}, ""))
|
||||
pattern_SpaceService_UpdateSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3}, []string{"api", "v1", "spaces", "space.name"}, ""))
|
||||
pattern_SpaceService_DeleteSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3}, []string{"api", "v1", "spaces", "name"}, ""))
|
||||
pattern_SpaceService_CreateSpaceMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v1", "spaces", "parent", "members"}, ""))
|
||||
pattern_SpaceService_ListSpaceMembers_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v1", "spaces", "parent", "members"}, ""))
|
||||
pattern_SpaceService_GetSpaceMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "spaces", "members", "name"}, ""))
|
||||
pattern_SpaceService_UpdateSpaceMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "spaces", "members", "space_member.name"}, ""))
|
||||
pattern_SpaceService_DeleteSpaceMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "spaces", "members", "name"}, ""))
|
||||
pattern_SpaceService_CreateSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "spaces"}, ""))
|
||||
pattern_SpaceService_ListSpaces_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "spaces"}, ""))
|
||||
pattern_SpaceService_GetSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3}, []string{"api", "v1", "spaces", "name"}, ""))
|
||||
pattern_SpaceService_UpdateSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3}, []string{"api", "v1", "spaces", "space.name"}, ""))
|
||||
pattern_SpaceService_DeleteSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3}, []string{"api", "v1", "spaces", "name"}, ""))
|
||||
pattern_SpaceService_CreateSpaceInvitation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v1", "spaces", "parent", "invitations"}, ""))
|
||||
pattern_SpaceService_ListSpaceInvitations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v1", "spaces", "parent", "invitations"}, ""))
|
||||
pattern_SpaceService_ListUserSpaceInvitations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v1", "users", "parent", "spaceInvitations"}, ""))
|
||||
pattern_SpaceService_GetSpaceInvitation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "spaces", "invitations", "name"}, ""))
|
||||
pattern_SpaceService_DeleteSpaceInvitation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "spaces", "invitations", "name"}, ""))
|
||||
pattern_SpaceService_AcceptSpaceInvitation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "spaces", "invitations", "name"}, "accept"))
|
||||
pattern_SpaceService_DeclineSpaceInvitation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "spaces", "invitations", "name"}, "decline"))
|
||||
pattern_SpaceService_ListSpaceMembers_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v1", "spaces", "parent", "members"}, ""))
|
||||
pattern_SpaceService_GetSpaceMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "spaces", "members", "name"}, ""))
|
||||
pattern_SpaceService_UpdateSpaceMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "spaces", "members", "space_member.name"}, ""))
|
||||
pattern_SpaceService_DeleteSpaceMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 2, 3, 1, 0, 4, 4, 5, 4}, []string{"api", "v1", "spaces", "members", "name"}, ""))
|
||||
)
|
||||
|
||||
var (
|
||||
forward_SpaceService_CreateSpace_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_ListSpaces_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_GetSpace_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_UpdateSpace_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_DeleteSpace_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_CreateSpaceMember_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_ListSpaceMembers_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_GetSpaceMember_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_UpdateSpaceMember_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_DeleteSpaceMember_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_CreateSpace_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_ListSpaces_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_GetSpace_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_UpdateSpace_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_DeleteSpace_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_CreateSpaceInvitation_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_ListSpaceInvitations_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_ListUserSpaceInvitations_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_GetSpaceInvitation_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_DeleteSpaceInvitation_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_AcceptSpaceInvitation_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_DeclineSpaceInvitation_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_ListSpaceMembers_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_GetSpaceMember_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_UpdateSpaceMember_0 = runtime.ForwardResponseMessage
|
||||
forward_SpaceService_DeleteSpaceMember_0 = runtime.ForwardResponseMessage
|
||||
)
|
||||
|
|
|
|||
|
|
@ -20,16 +20,22 @@ import (
|
|||
const _ = grpc.SupportPackageIsVersion9
|
||||
|
||||
const (
|
||||
SpaceService_CreateSpace_FullMethodName = "/memos.api.v1.SpaceService/CreateSpace"
|
||||
SpaceService_ListSpaces_FullMethodName = "/memos.api.v1.SpaceService/ListSpaces"
|
||||
SpaceService_GetSpace_FullMethodName = "/memos.api.v1.SpaceService/GetSpace"
|
||||
SpaceService_UpdateSpace_FullMethodName = "/memos.api.v1.SpaceService/UpdateSpace"
|
||||
SpaceService_DeleteSpace_FullMethodName = "/memos.api.v1.SpaceService/DeleteSpace"
|
||||
SpaceService_CreateSpaceMember_FullMethodName = "/memos.api.v1.SpaceService/CreateSpaceMember"
|
||||
SpaceService_ListSpaceMembers_FullMethodName = "/memos.api.v1.SpaceService/ListSpaceMembers"
|
||||
SpaceService_GetSpaceMember_FullMethodName = "/memos.api.v1.SpaceService/GetSpaceMember"
|
||||
SpaceService_UpdateSpaceMember_FullMethodName = "/memos.api.v1.SpaceService/UpdateSpaceMember"
|
||||
SpaceService_DeleteSpaceMember_FullMethodName = "/memos.api.v1.SpaceService/DeleteSpaceMember"
|
||||
SpaceService_CreateSpace_FullMethodName = "/memos.api.v1.SpaceService/CreateSpace"
|
||||
SpaceService_ListSpaces_FullMethodName = "/memos.api.v1.SpaceService/ListSpaces"
|
||||
SpaceService_GetSpace_FullMethodName = "/memos.api.v1.SpaceService/GetSpace"
|
||||
SpaceService_UpdateSpace_FullMethodName = "/memos.api.v1.SpaceService/UpdateSpace"
|
||||
SpaceService_DeleteSpace_FullMethodName = "/memos.api.v1.SpaceService/DeleteSpace"
|
||||
SpaceService_CreateSpaceInvitation_FullMethodName = "/memos.api.v1.SpaceService/CreateSpaceInvitation"
|
||||
SpaceService_ListSpaceInvitations_FullMethodName = "/memos.api.v1.SpaceService/ListSpaceInvitations"
|
||||
SpaceService_ListUserSpaceInvitations_FullMethodName = "/memos.api.v1.SpaceService/ListUserSpaceInvitations"
|
||||
SpaceService_GetSpaceInvitation_FullMethodName = "/memos.api.v1.SpaceService/GetSpaceInvitation"
|
||||
SpaceService_DeleteSpaceInvitation_FullMethodName = "/memos.api.v1.SpaceService/DeleteSpaceInvitation"
|
||||
SpaceService_AcceptSpaceInvitation_FullMethodName = "/memos.api.v1.SpaceService/AcceptSpaceInvitation"
|
||||
SpaceService_DeclineSpaceInvitation_FullMethodName = "/memos.api.v1.SpaceService/DeclineSpaceInvitation"
|
||||
SpaceService_ListSpaceMembers_FullMethodName = "/memos.api.v1.SpaceService/ListSpaceMembers"
|
||||
SpaceService_GetSpaceMember_FullMethodName = "/memos.api.v1.SpaceService/GetSpaceMember"
|
||||
SpaceService_UpdateSpaceMember_FullMethodName = "/memos.api.v1.SpaceService/UpdateSpaceMember"
|
||||
SpaceService_DeleteSpaceMember_FullMethodName = "/memos.api.v1.SpaceService/DeleteSpaceMember"
|
||||
)
|
||||
|
||||
// SpaceServiceClient is the client API for SpaceService service.
|
||||
|
|
@ -50,8 +56,20 @@ type SpaceServiceClient interface {
|
|||
// DeleteSpace permanently deletes a space and every memo currently placed
|
||||
// in it. It never follows memo relations to other memos.
|
||||
DeleteSpace(ctx context.Context, in *DeleteSpaceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
|
||||
// CreateSpaceMember directly adds an existing active user to a space.
|
||||
CreateSpaceMember(ctx context.Context, in *CreateSpaceMemberRequest, opts ...grpc.CallOption) (*SpaceMember, error)
|
||||
// CreateSpaceInvitation invites an existing active user to a space.
|
||||
CreateSpaceInvitation(ctx context.Context, in *CreateSpaceInvitationRequest, opts ...grpc.CallOption) (*SpaceInvitation, error)
|
||||
// ListSpaceInvitations lists the pending invitations for a space.
|
||||
ListSpaceInvitations(ctx context.Context, in *ListSpaceInvitationsRequest, opts ...grpc.CallOption) (*ListSpaceInvitationsResponse, error)
|
||||
// ListUserSpaceInvitations lists the authenticated user's pending space invitations.
|
||||
ListUserSpaceInvitations(ctx context.Context, in *ListUserSpaceInvitationsRequest, opts ...grpc.CallOption) (*ListUserSpaceInvitationsResponse, error)
|
||||
// GetSpaceInvitation gets one pending invitation.
|
||||
GetSpaceInvitation(ctx context.Context, in *GetSpaceInvitationRequest, opts ...grpc.CallOption) (*SpaceInvitation, error)
|
||||
// DeleteSpaceInvitation revokes a pending invitation.
|
||||
DeleteSpaceInvitation(ctx context.Context, in *DeleteSpaceInvitationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
|
||||
// AcceptSpaceInvitation accepts a pending invitation and creates a membership.
|
||||
AcceptSpaceInvitation(ctx context.Context, in *AcceptSpaceInvitationRequest, opts ...grpc.CallOption) (*SpaceMember, error)
|
||||
// DeclineSpaceInvitation declines a pending invitation.
|
||||
DeclineSpaceInvitation(ctx context.Context, in *DeclineSpaceInvitationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
|
||||
// ListSpaceMembers lists the members of a space.
|
||||
ListSpaceMembers(ctx context.Context, in *ListSpaceMembersRequest, opts ...grpc.CallOption) (*ListSpaceMembersResponse, error)
|
||||
// GetSpaceMember gets one membership in a space.
|
||||
|
|
@ -121,10 +139,70 @@ func (c *spaceServiceClient) DeleteSpace(ctx context.Context, in *DeleteSpaceReq
|
|||
return out, nil
|
||||
}
|
||||
|
||||
func (c *spaceServiceClient) CreateSpaceMember(ctx context.Context, in *CreateSpaceMemberRequest, opts ...grpc.CallOption) (*SpaceMember, error) {
|
||||
func (c *spaceServiceClient) CreateSpaceInvitation(ctx context.Context, in *CreateSpaceInvitationRequest, opts ...grpc.CallOption) (*SpaceInvitation, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(SpaceInvitation)
|
||||
err := c.cc.Invoke(ctx, SpaceService_CreateSpaceInvitation_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *spaceServiceClient) ListSpaceInvitations(ctx context.Context, in *ListSpaceInvitationsRequest, opts ...grpc.CallOption) (*ListSpaceInvitationsResponse, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(ListSpaceInvitationsResponse)
|
||||
err := c.cc.Invoke(ctx, SpaceService_ListSpaceInvitations_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *spaceServiceClient) ListUserSpaceInvitations(ctx context.Context, in *ListUserSpaceInvitationsRequest, opts ...grpc.CallOption) (*ListUserSpaceInvitationsResponse, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(ListUserSpaceInvitationsResponse)
|
||||
err := c.cc.Invoke(ctx, SpaceService_ListUserSpaceInvitations_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *spaceServiceClient) GetSpaceInvitation(ctx context.Context, in *GetSpaceInvitationRequest, opts ...grpc.CallOption) (*SpaceInvitation, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(SpaceInvitation)
|
||||
err := c.cc.Invoke(ctx, SpaceService_GetSpaceInvitation_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *spaceServiceClient) DeleteSpaceInvitation(ctx context.Context, in *DeleteSpaceInvitationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(emptypb.Empty)
|
||||
err := c.cc.Invoke(ctx, SpaceService_DeleteSpaceInvitation_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *spaceServiceClient) AcceptSpaceInvitation(ctx context.Context, in *AcceptSpaceInvitationRequest, opts ...grpc.CallOption) (*SpaceMember, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(SpaceMember)
|
||||
err := c.cc.Invoke(ctx, SpaceService_CreateSpaceMember_FullMethodName, in, out, cOpts...)
|
||||
err := c.cc.Invoke(ctx, SpaceService_AcceptSpaceInvitation_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *spaceServiceClient) DeclineSpaceInvitation(ctx context.Context, in *DeclineSpaceInvitationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(emptypb.Empty)
|
||||
err := c.cc.Invoke(ctx, SpaceService_DeclineSpaceInvitation_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -189,8 +267,20 @@ type SpaceServiceServer interface {
|
|||
// DeleteSpace permanently deletes a space and every memo currently placed
|
||||
// in it. It never follows memo relations to other memos.
|
||||
DeleteSpace(context.Context, *DeleteSpaceRequest) (*emptypb.Empty, error)
|
||||
// CreateSpaceMember directly adds an existing active user to a space.
|
||||
CreateSpaceMember(context.Context, *CreateSpaceMemberRequest) (*SpaceMember, error)
|
||||
// CreateSpaceInvitation invites an existing active user to a space.
|
||||
CreateSpaceInvitation(context.Context, *CreateSpaceInvitationRequest) (*SpaceInvitation, error)
|
||||
// ListSpaceInvitations lists the pending invitations for a space.
|
||||
ListSpaceInvitations(context.Context, *ListSpaceInvitationsRequest) (*ListSpaceInvitationsResponse, error)
|
||||
// ListUserSpaceInvitations lists the authenticated user's pending space invitations.
|
||||
ListUserSpaceInvitations(context.Context, *ListUserSpaceInvitationsRequest) (*ListUserSpaceInvitationsResponse, error)
|
||||
// GetSpaceInvitation gets one pending invitation.
|
||||
GetSpaceInvitation(context.Context, *GetSpaceInvitationRequest) (*SpaceInvitation, error)
|
||||
// DeleteSpaceInvitation revokes a pending invitation.
|
||||
DeleteSpaceInvitation(context.Context, *DeleteSpaceInvitationRequest) (*emptypb.Empty, error)
|
||||
// AcceptSpaceInvitation accepts a pending invitation and creates a membership.
|
||||
AcceptSpaceInvitation(context.Context, *AcceptSpaceInvitationRequest) (*SpaceMember, error)
|
||||
// DeclineSpaceInvitation declines a pending invitation.
|
||||
DeclineSpaceInvitation(context.Context, *DeclineSpaceInvitationRequest) (*emptypb.Empty, error)
|
||||
// ListSpaceMembers lists the members of a space.
|
||||
ListSpaceMembers(context.Context, *ListSpaceMembersRequest) (*ListSpaceMembersResponse, error)
|
||||
// GetSpaceMember gets one membership in a space.
|
||||
|
|
@ -225,8 +315,26 @@ func (UnimplementedSpaceServiceServer) UpdateSpace(context.Context, *UpdateSpace
|
|||
func (UnimplementedSpaceServiceServer) DeleteSpace(context.Context, *DeleteSpaceRequest) (*emptypb.Empty, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method DeleteSpace not implemented")
|
||||
}
|
||||
func (UnimplementedSpaceServiceServer) CreateSpaceMember(context.Context, *CreateSpaceMemberRequest) (*SpaceMember, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method CreateSpaceMember not implemented")
|
||||
func (UnimplementedSpaceServiceServer) CreateSpaceInvitation(context.Context, *CreateSpaceInvitationRequest) (*SpaceInvitation, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method CreateSpaceInvitation not implemented")
|
||||
}
|
||||
func (UnimplementedSpaceServiceServer) ListSpaceInvitations(context.Context, *ListSpaceInvitationsRequest) (*ListSpaceInvitationsResponse, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method ListSpaceInvitations not implemented")
|
||||
}
|
||||
func (UnimplementedSpaceServiceServer) ListUserSpaceInvitations(context.Context, *ListUserSpaceInvitationsRequest) (*ListUserSpaceInvitationsResponse, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method ListUserSpaceInvitations not implemented")
|
||||
}
|
||||
func (UnimplementedSpaceServiceServer) GetSpaceInvitation(context.Context, *GetSpaceInvitationRequest) (*SpaceInvitation, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method GetSpaceInvitation not implemented")
|
||||
}
|
||||
func (UnimplementedSpaceServiceServer) DeleteSpaceInvitation(context.Context, *DeleteSpaceInvitationRequest) (*emptypb.Empty, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method DeleteSpaceInvitation not implemented")
|
||||
}
|
||||
func (UnimplementedSpaceServiceServer) AcceptSpaceInvitation(context.Context, *AcceptSpaceInvitationRequest) (*SpaceMember, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method AcceptSpaceInvitation not implemented")
|
||||
}
|
||||
func (UnimplementedSpaceServiceServer) DeclineSpaceInvitation(context.Context, *DeclineSpaceInvitationRequest) (*emptypb.Empty, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method DeclineSpaceInvitation not implemented")
|
||||
}
|
||||
func (UnimplementedSpaceServiceServer) ListSpaceMembers(context.Context, *ListSpaceMembersRequest) (*ListSpaceMembersResponse, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method ListSpaceMembers not implemented")
|
||||
|
|
@ -351,20 +459,128 @@ func _SpaceService_DeleteSpace_Handler(srv interface{}, ctx context.Context, dec
|
|||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _SpaceService_CreateSpaceMember_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(CreateSpaceMemberRequest)
|
||||
func _SpaceService_CreateSpaceInvitation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(CreateSpaceInvitationRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(SpaceServiceServer).CreateSpaceMember(ctx, in)
|
||||
return srv.(SpaceServiceServer).CreateSpaceInvitation(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: SpaceService_CreateSpaceMember_FullMethodName,
|
||||
FullMethod: SpaceService_CreateSpaceInvitation_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(SpaceServiceServer).CreateSpaceMember(ctx, req.(*CreateSpaceMemberRequest))
|
||||
return srv.(SpaceServiceServer).CreateSpaceInvitation(ctx, req.(*CreateSpaceInvitationRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _SpaceService_ListSpaceInvitations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(ListSpaceInvitationsRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(SpaceServiceServer).ListSpaceInvitations(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: SpaceService_ListSpaceInvitations_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(SpaceServiceServer).ListSpaceInvitations(ctx, req.(*ListSpaceInvitationsRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _SpaceService_ListUserSpaceInvitations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(ListUserSpaceInvitationsRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(SpaceServiceServer).ListUserSpaceInvitations(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: SpaceService_ListUserSpaceInvitations_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(SpaceServiceServer).ListUserSpaceInvitations(ctx, req.(*ListUserSpaceInvitationsRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _SpaceService_GetSpaceInvitation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(GetSpaceInvitationRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(SpaceServiceServer).GetSpaceInvitation(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: SpaceService_GetSpaceInvitation_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(SpaceServiceServer).GetSpaceInvitation(ctx, req.(*GetSpaceInvitationRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _SpaceService_DeleteSpaceInvitation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(DeleteSpaceInvitationRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(SpaceServiceServer).DeleteSpaceInvitation(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: SpaceService_DeleteSpaceInvitation_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(SpaceServiceServer).DeleteSpaceInvitation(ctx, req.(*DeleteSpaceInvitationRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _SpaceService_AcceptSpaceInvitation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(AcceptSpaceInvitationRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(SpaceServiceServer).AcceptSpaceInvitation(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: SpaceService_AcceptSpaceInvitation_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(SpaceServiceServer).AcceptSpaceInvitation(ctx, req.(*AcceptSpaceInvitationRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _SpaceService_DeclineSpaceInvitation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(DeclineSpaceInvitationRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(SpaceServiceServer).DeclineSpaceInvitation(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: SpaceService_DeclineSpaceInvitation_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(SpaceServiceServer).DeclineSpaceInvitation(ctx, req.(*DeclineSpaceInvitationRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
|
@ -469,8 +685,32 @@ var SpaceService_ServiceDesc = grpc.ServiceDesc{
|
|||
Handler: _SpaceService_DeleteSpace_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "CreateSpaceMember",
|
||||
Handler: _SpaceService_CreateSpaceMember_Handler,
|
||||
MethodName: "CreateSpaceInvitation",
|
||||
Handler: _SpaceService_CreateSpaceInvitation_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "ListSpaceInvitations",
|
||||
Handler: _SpaceService_ListSpaceInvitations_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "ListUserSpaceInvitations",
|
||||
Handler: _SpaceService_ListUserSpaceInvitations_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "GetSpaceInvitation",
|
||||
Handler: _SpaceService_GetSpaceInvitation_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "DeleteSpaceInvitation",
|
||||
Handler: _SpaceService_DeleteSpaceInvitation_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "AcceptSpaceInvitation",
|
||||
Handler: _SpaceService_AcceptSpaceInvitation_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "DeclineSpaceInvitation",
|
||||
Handler: _SpaceService_DeclineSpaceInvitation_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "ListSpaceMembers",
|
||||
|
|
|
|||
|
|
@ -1455,6 +1455,207 @@ paths:
|
|||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
/api/v1/spaces/{space}/invitations:
|
||||
get:
|
||||
tags:
|
||||
- SpaceService
|
||||
description: ListSpaceInvitations lists the pending invitations for a space.
|
||||
operationId: SpaceService_ListSpaceInvitations
|
||||
parameters:
|
||||
- name: space
|
||||
in: path
|
||||
description: The space id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
- name: pageSize
|
||||
in: query
|
||||
description: Optional. The maximum number of invitations to return.
|
||||
schema:
|
||||
type: integer
|
||||
format: int32
|
||||
- name: pageToken
|
||||
in: query
|
||||
description: Optional. A token from a previous ListSpaceInvitations response.
|
||||
schema:
|
||||
type: string
|
||||
responses:
|
||||
"200":
|
||||
description: OK
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/ListSpaceInvitationsResponse'
|
||||
default:
|
||||
description: Default error response
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
post:
|
||||
tags:
|
||||
- SpaceService
|
||||
description: CreateSpaceInvitation invites an existing active user to a space.
|
||||
operationId: SpaceService_CreateSpaceInvitation
|
||||
parameters:
|
||||
- name: space
|
||||
in: path
|
||||
description: The space id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
requestBody:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/SpaceInvitation'
|
||||
required: true
|
||||
responses:
|
||||
"200":
|
||||
description: OK
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/SpaceInvitation'
|
||||
default:
|
||||
description: Default error response
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
/api/v1/spaces/{space}/invitations/{invitation}:
|
||||
get:
|
||||
tags:
|
||||
- SpaceService
|
||||
description: GetSpaceInvitation gets one pending invitation.
|
||||
operationId: SpaceService_GetSpaceInvitation
|
||||
parameters:
|
||||
- name: space
|
||||
in: path
|
||||
description: The space id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
- name: invitation
|
||||
in: path
|
||||
description: The invitation id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
responses:
|
||||
"200":
|
||||
description: OK
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/SpaceInvitation'
|
||||
default:
|
||||
description: Default error response
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
delete:
|
||||
tags:
|
||||
- SpaceService
|
||||
description: DeleteSpaceInvitation revokes a pending invitation.
|
||||
operationId: SpaceService_DeleteSpaceInvitation
|
||||
parameters:
|
||||
- name: space
|
||||
in: path
|
||||
description: The space id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
- name: invitation
|
||||
in: path
|
||||
description: The invitation id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
responses:
|
||||
"200":
|
||||
description: OK
|
||||
content: {}
|
||||
default:
|
||||
description: Default error response
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
/api/v1/spaces/{space}/invitations/{invitation}:accept:
|
||||
post:
|
||||
tags:
|
||||
- SpaceService
|
||||
description: AcceptSpaceInvitation accepts a pending invitation and creates a membership.
|
||||
operationId: SpaceService_AcceptSpaceInvitation
|
||||
parameters:
|
||||
- name: space
|
||||
in: path
|
||||
description: The space id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
- name: invitation
|
||||
in: path
|
||||
description: The invitation id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
requestBody:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/AcceptSpaceInvitationRequest'
|
||||
required: true
|
||||
responses:
|
||||
"200":
|
||||
description: OK
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/SpaceMember'
|
||||
default:
|
||||
description: Default error response
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
/api/v1/spaces/{space}/invitations/{invitation}:decline:
|
||||
post:
|
||||
tags:
|
||||
- SpaceService
|
||||
description: DeclineSpaceInvitation declines a pending invitation.
|
||||
operationId: SpaceService_DeclineSpaceInvitation
|
||||
parameters:
|
||||
- name: space
|
||||
in: path
|
||||
description: The space id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
- name: invitation
|
||||
in: path
|
||||
description: The invitation id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
requestBody:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/DeclineSpaceInvitationRequest'
|
||||
required: true
|
||||
responses:
|
||||
"200":
|
||||
description: OK
|
||||
content: {}
|
||||
default:
|
||||
description: Default error response
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
/api/v1/spaces/{space}/members:
|
||||
get:
|
||||
tags:
|
||||
|
|
@ -1492,37 +1693,6 @@ paths:
|
|||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
post:
|
||||
tags:
|
||||
- SpaceService
|
||||
description: CreateSpaceMember directly adds an existing active user to a space.
|
||||
operationId: SpaceService_CreateSpaceMember
|
||||
parameters:
|
||||
- name: space
|
||||
in: path
|
||||
description: The space id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
requestBody:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/SpaceMember'
|
||||
required: true
|
||||
responses:
|
||||
"200":
|
||||
description: OK
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/SpaceMember'
|
||||
default:
|
||||
description: Default error response
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
/api/v1/spaces/{space}/members/{member}:
|
||||
get:
|
||||
tags:
|
||||
|
|
@ -2275,6 +2445,43 @@ paths:
|
|||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
/api/v1/users/{user}/spaceInvitations:
|
||||
get:
|
||||
tags:
|
||||
- SpaceService
|
||||
description: ListUserSpaceInvitations lists the authenticated user's pending space invitations.
|
||||
operationId: SpaceService_ListUserSpaceInvitations
|
||||
parameters:
|
||||
- name: user
|
||||
in: path
|
||||
description: The user id.
|
||||
required: true
|
||||
schema:
|
||||
type: string
|
||||
- name: pageSize
|
||||
in: query
|
||||
description: Optional. The maximum number of invitations to return.
|
||||
schema:
|
||||
type: integer
|
||||
format: int32
|
||||
- name: pageToken
|
||||
in: query
|
||||
description: Optional. A token from a previous ListUserSpaceInvitations response.
|
||||
schema:
|
||||
type: string
|
||||
responses:
|
||||
"200":
|
||||
description: OK
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/ListUserSpaceInvitationsResponse'
|
||||
default:
|
||||
description: Default error response
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/Status'
|
||||
/api/v1/users/{user}/views:
|
||||
get:
|
||||
tags:
|
||||
|
|
@ -2704,6 +2911,14 @@ paths:
|
|||
$ref: '#/components/schemas/Status'
|
||||
components:
|
||||
schemas:
|
||||
AcceptSpaceInvitationRequest:
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
properties:
|
||||
name:
|
||||
type: string
|
||||
description: 'Required. Format: spaces/{space}/invitations/{username}.'
|
||||
Attachment:
|
||||
required:
|
||||
- filename
|
||||
|
|
@ -3025,6 +3240,14 @@ components:
|
|||
description: |-
|
||||
The actual token value - only returned on creation.
|
||||
This is the only time the token value will be visible.
|
||||
DeclineSpaceInvitationRequest:
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
properties:
|
||||
name:
|
||||
type: string
|
||||
description: 'Required. Format: spaces/{space}/invitations/{username}.'
|
||||
FieldMapping:
|
||||
type: object
|
||||
properties:
|
||||
|
|
@ -3555,6 +3778,15 @@ components:
|
|||
nextPageToken:
|
||||
type: string
|
||||
description: A token for the next page of results.
|
||||
ListSpaceInvitationsResponse:
|
||||
type: object
|
||||
properties:
|
||||
spaceInvitations:
|
||||
type: array
|
||||
items:
|
||||
$ref: '#/components/schemas/SpaceInvitation'
|
||||
nextPageToken:
|
||||
type: string
|
||||
ListSpaceMembersResponse:
|
||||
type: object
|
||||
properties:
|
||||
|
|
@ -3596,6 +3828,15 @@ components:
|
|||
A token that can be sent as `page_token` to retrieve the next page.
|
||||
If this field is omitted, there are no subsequent pages.
|
||||
description: Response message for ListUserSettings method.
|
||||
ListUserSpaceInvitationsResponse:
|
||||
type: object
|
||||
properties:
|
||||
spaceInvitations:
|
||||
type: array
|
||||
items:
|
||||
$ref: '#/components/schemas/SpaceInvitation'
|
||||
nextPageToken:
|
||||
type: string
|
||||
ListUserWebhooksResponse:
|
||||
type: object
|
||||
properties:
|
||||
|
|
@ -4136,6 +4377,34 @@ components:
|
|||
type: string
|
||||
description: Optional. A description of the space.
|
||||
description: Space is a collaboration boundary for placed memos.
|
||||
SpaceInvitation:
|
||||
required:
|
||||
- invitee
|
||||
- role
|
||||
type: object
|
||||
properties:
|
||||
name:
|
||||
type: string
|
||||
description: 'The resource name. Format: spaces/{space}/invitations/{username}.'
|
||||
invitee:
|
||||
type: string
|
||||
description: 'Required. The invited user. Format: users/{username}.'
|
||||
role:
|
||||
enum:
|
||||
- ROLE_UNSPECIFIED
|
||||
- ADMIN
|
||||
- USER
|
||||
type: string
|
||||
description: Required. The role the user will receive after accepting the invitation.
|
||||
format: enum
|
||||
space:
|
||||
readOnly: true
|
||||
allOf:
|
||||
- $ref: '#/components/schemas/Space'
|
||||
description: |-
|
||||
Output only. The Space the user is invited to. This lets an invitee
|
||||
understand the invitation without granting membership-based GetSpace access.
|
||||
description: SpaceInvitation is a pending invitation for an existing user to join a space.
|
||||
SpaceMember:
|
||||
required:
|
||||
- user
|
||||
|
|
|
|||
|
|
@ -68,7 +68,13 @@ func TestProtectedMethodsRequireAuth(t *testing.T) {
|
|||
"/memos.api.v1.SpaceService/GetSpace",
|
||||
"/memos.api.v1.SpaceService/UpdateSpace",
|
||||
"/memos.api.v1.SpaceService/DeleteSpace",
|
||||
"/memos.api.v1.SpaceService/CreateSpaceMember",
|
||||
"/memos.api.v1.SpaceService/CreateSpaceInvitation",
|
||||
"/memos.api.v1.SpaceService/ListSpaceInvitations",
|
||||
"/memos.api.v1.SpaceService/ListUserSpaceInvitations",
|
||||
"/memos.api.v1.SpaceService/GetSpaceInvitation",
|
||||
"/memos.api.v1.SpaceService/DeleteSpaceInvitation",
|
||||
"/memos.api.v1.SpaceService/AcceptSpaceInvitation",
|
||||
"/memos.api.v1.SpaceService/DeclineSpaceInvitation",
|
||||
"/memos.api.v1.SpaceService/ListSpaceMembers",
|
||||
"/memos.api.v1.SpaceService/GetSpaceMember",
|
||||
"/memos.api.v1.SpaceService/UpdateSpaceMember",
|
||||
|
|
|
|||
|
|
@ -505,8 +505,56 @@ func (s *ConnectServiceHandler) DeleteSpace(ctx context.Context, req *connect.Re
|
|||
return connect.NewResponse(resp), nil
|
||||
}
|
||||
|
||||
func (s *ConnectServiceHandler) CreateSpaceMember(ctx context.Context, req *connect.Request[v1pb.CreateSpaceMemberRequest]) (*connect.Response[v1pb.SpaceMember], error) {
|
||||
resp, err := s.APIV1Service.CreateSpaceMember(ctx, req.Msg)
|
||||
func (s *ConnectServiceHandler) CreateSpaceInvitation(ctx context.Context, req *connect.Request[v1pb.CreateSpaceInvitationRequest]) (*connect.Response[v1pb.SpaceInvitation], error) {
|
||||
resp, err := s.APIV1Service.CreateSpaceInvitation(ctx, req.Msg)
|
||||
if err != nil {
|
||||
return nil, convertGRPCError(err)
|
||||
}
|
||||
return connect.NewResponse(resp), nil
|
||||
}
|
||||
|
||||
func (s *ConnectServiceHandler) ListSpaceInvitations(ctx context.Context, req *connect.Request[v1pb.ListSpaceInvitationsRequest]) (*connect.Response[v1pb.ListSpaceInvitationsResponse], error) {
|
||||
resp, err := s.APIV1Service.ListSpaceInvitations(ctx, req.Msg)
|
||||
if err != nil {
|
||||
return nil, convertGRPCError(err)
|
||||
}
|
||||
return connect.NewResponse(resp), nil
|
||||
}
|
||||
|
||||
func (s *ConnectServiceHandler) ListUserSpaceInvitations(ctx context.Context, req *connect.Request[v1pb.ListUserSpaceInvitationsRequest]) (*connect.Response[v1pb.ListUserSpaceInvitationsResponse], error) {
|
||||
resp, err := s.APIV1Service.ListUserSpaceInvitations(ctx, req.Msg)
|
||||
if err != nil {
|
||||
return nil, convertGRPCError(err)
|
||||
}
|
||||
return connect.NewResponse(resp), nil
|
||||
}
|
||||
|
||||
func (s *ConnectServiceHandler) GetSpaceInvitation(ctx context.Context, req *connect.Request[v1pb.GetSpaceInvitationRequest]) (*connect.Response[v1pb.SpaceInvitation], error) {
|
||||
resp, err := s.APIV1Service.GetSpaceInvitation(ctx, req.Msg)
|
||||
if err != nil {
|
||||
return nil, convertGRPCError(err)
|
||||
}
|
||||
return connect.NewResponse(resp), nil
|
||||
}
|
||||
|
||||
func (s *ConnectServiceHandler) DeleteSpaceInvitation(ctx context.Context, req *connect.Request[v1pb.DeleteSpaceInvitationRequest]) (*connect.Response[emptypb.Empty], error) {
|
||||
resp, err := s.APIV1Service.DeleteSpaceInvitation(ctx, req.Msg)
|
||||
if err != nil {
|
||||
return nil, convertGRPCError(err)
|
||||
}
|
||||
return connect.NewResponse(resp), nil
|
||||
}
|
||||
|
||||
func (s *ConnectServiceHandler) AcceptSpaceInvitation(ctx context.Context, req *connect.Request[v1pb.AcceptSpaceInvitationRequest]) (*connect.Response[v1pb.SpaceMember], error) {
|
||||
resp, err := s.APIV1Service.AcceptSpaceInvitation(ctx, req.Msg)
|
||||
if err != nil {
|
||||
return nil, convertGRPCError(err)
|
||||
}
|
||||
return connect.NewResponse(resp), nil
|
||||
}
|
||||
|
||||
func (s *ConnectServiceHandler) DeclineSpaceInvitation(ctx context.Context, req *connect.Request[v1pb.DeclineSpaceInvitationRequest]) (*connect.Response[emptypb.Empty], error) {
|
||||
resp, err := s.APIV1Service.DeclineSpaceInvitation(ctx, req.Msg)
|
||||
if err != nil {
|
||||
return nil, convertGRPCError(err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,14 +32,7 @@ func TestDeleteMemoWebhooksRespectCurrentReadAccess(t *testing.T) {
|
|||
Space: &v1pb.Space{Title: "Delete webhook space"},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = service.CreateSpaceMember(ownerCtx, &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: space.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{
|
||||
User: BuildUserName(successor.Username),
|
||||
Role: v1pb.SpaceMember_ADMIN,
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
inviteAndAcceptSpaceTestUser(ctx, t, service, owner, successor, space, v1pb.SpaceMember_ADMIN)
|
||||
|
||||
assignedSpace := space.Name
|
||||
hiddenMemo, err := service.CreateMemo(ownerCtx, &v1pb.CreateMemoRequest{
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ const (
|
|||
WebhookNamePrefix = "webhooks/"
|
||||
SpaceNamePrefix = "spaces/"
|
||||
SpaceMemberNamePrefix = "members/"
|
||||
SpaceInvitationNamePrefix = "invitations/"
|
||||
)
|
||||
|
||||
// GetNameParentTokens returns the tokens from a resource name.
|
||||
|
|
@ -113,6 +114,16 @@ func ExtractSpaceMemberTokensFromName(name string) (string, string, error) {
|
|||
return tokens[0], tokens[1], nil
|
||||
}
|
||||
|
||||
// ExtractSpaceInvitationTokensFromName returns the Space UID and invitee
|
||||
// username from a SpaceInvitation resource name.
|
||||
func ExtractSpaceInvitationTokensFromName(name string) (string, string, error) {
|
||||
tokens, err := GetNameParentTokens(name, SpaceNamePrefix, SpaceInvitationNamePrefix)
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
return tokens[0], tokens[1], nil
|
||||
}
|
||||
|
||||
// ExtractAttachmentUIDFromName returns the attachment UID from a resource name.
|
||||
func ExtractAttachmentUIDFromName(name string) (string, error) {
|
||||
tokens, err := GetNameParentTokens(name, AttachmentNamePrefix)
|
||||
|
|
|
|||
|
|
@ -67,3 +67,18 @@ func TestExtractSpaceMemberTokensFromName(t *testing.T) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestExtractSpaceInvitationTokensFromName(t *testing.T) {
|
||||
spaceUID, username, err := ExtractSpaceInvitationTokensFromName("spaces/team-notes/invitations/alice")
|
||||
if err != nil {
|
||||
t.Fatalf("ExtractSpaceInvitationTokensFromName() returned error: %v", err)
|
||||
}
|
||||
if spaceUID != "team-notes" || username != "alice" {
|
||||
t.Fatalf("ExtractSpaceInvitationTokensFromName() = (%q, %q)", spaceUID, username)
|
||||
}
|
||||
for _, name := range []string{"spaces/team-notes/invitations", "spaces//invitations/alice", "spaces/team-notes/members/alice"} {
|
||||
if _, _, err := ExtractSpaceInvitationTokensFromName(name); err == nil {
|
||||
t.Errorf("ExtractSpaceInvitationTokensFromName(%q) succeeded, want error", name)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,7 +69,9 @@ func mapSpaceMutationError(err error, operation string) error {
|
|||
case errors.Is(err, store.ErrSpaceAlreadyExists):
|
||||
return status.Error(codes.AlreadyExists, "space already exists")
|
||||
case errors.Is(err, store.ErrSpaceMemberAlreadyExists):
|
||||
return status.Error(codes.AlreadyExists, "space member already exists")
|
||||
return status.Error(codes.AlreadyExists, "space membership or invitation already exists")
|
||||
case errors.Is(err, store.ErrSpaceInvitationNotFound):
|
||||
return status.Error(codes.NotFound, "space invitation not found")
|
||||
case errors.Is(err, store.ErrSpaceNotFound), errors.Is(err, store.ErrSpaceMemberNotFound):
|
||||
return status.Error(codes.NotFound, "space or membership not found")
|
||||
case errors.Is(err, sql.ErrNoRows):
|
||||
|
|
@ -239,14 +241,15 @@ func (s *APIV1Service) DeleteSpace(ctx context.Context, request *v1pb.DeleteSpac
|
|||
return &emptypb.Empty{}, nil
|
||||
}
|
||||
|
||||
// CreateSpaceMember directly adds an active user to a Space.
|
||||
func (s *APIV1Service) CreateSpaceMember(ctx context.Context, request *v1pb.CreateSpaceMemberRequest) (*v1pb.SpaceMember, error) {
|
||||
// CreateSpaceInvitation creates a pending invitation without granting any
|
||||
// Space access to the invitee.
|
||||
func (s *APIV1Service) CreateSpaceInvitation(ctx context.Context, request *v1pb.CreateSpaceInvitationRequest) (*v1pb.SpaceInvitation, error) {
|
||||
currentUser, err := s.requireCurrentSpaceUser(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if request.GetSpaceMember() == nil {
|
||||
return nil, status.Error(codes.InvalidArgument, "space member is required")
|
||||
if request.GetSpaceInvitation() == nil {
|
||||
return nil, status.Error(codes.InvalidArgument, "space invitation is required")
|
||||
}
|
||||
space, callerMembership, err := s.resolveMemberSpace(ctx, request.Parent, currentUser)
|
||||
if err != nil {
|
||||
|
|
@ -255,38 +258,293 @@ func (s *APIV1Service) CreateSpaceMember(ctx context.Context, request *v1pb.Crea
|
|||
if err := requireSpaceAdministrator(callerMembership); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
targetUsername, err := parseUsernameFromName(request.SpaceMember.User)
|
||||
targetUsername, err := parseUsernameFromName(request.SpaceInvitation.Invitee)
|
||||
if err != nil {
|
||||
return nil, status.Errorf(codes.InvalidArgument, "invalid member user: %v", err)
|
||||
return nil, status.Errorf(codes.InvalidArgument, "invalid invitation invitee: %v", err)
|
||||
}
|
||||
targetUser, err := s.Store.GetUser(ctx, &store.FindUser{Username: &targetUsername})
|
||||
if err != nil {
|
||||
return nil, status.Errorf(codes.Internal, "failed to get member user: %v", err)
|
||||
return nil, status.Errorf(codes.Internal, "failed to get invitation invitee: %v", err)
|
||||
}
|
||||
if targetUser == nil {
|
||||
return nil, status.Error(codes.NotFound, "user not found")
|
||||
}
|
||||
if targetUser.RowStatus != store.Normal {
|
||||
return nil, status.Error(codes.FailedPrecondition, "only active users can be added to a space")
|
||||
return nil, status.Error(codes.FailedPrecondition, "only active users can be invited to a space")
|
||||
}
|
||||
role, ok := convertSpaceMemberRoleToStore(request.SpaceMember.Role)
|
||||
role, ok := convertSpaceMemberRoleToStore(request.SpaceInvitation.Role)
|
||||
if !ok {
|
||||
return nil, status.Error(codes.InvalidArgument, "space member role must be ADMIN or USER")
|
||||
return nil, status.Error(codes.InvalidArgument, "space invitation role must be ADMIN or USER")
|
||||
}
|
||||
expectedName := buildSpaceMemberName(space.UID, targetUser.Username)
|
||||
if request.SpaceMember.Name != "" && request.SpaceMember.Name != expectedName {
|
||||
return nil, status.Error(codes.InvalidArgument, "space member name does not match parent and user")
|
||||
expectedName := buildSpaceInvitationName(space.UID, targetUser.Username)
|
||||
if request.SpaceInvitation.Name != "" && request.SpaceInvitation.Name != expectedName {
|
||||
return nil, status.Error(codes.InvalidArgument, "space invitation name does not match parent and invitee")
|
||||
}
|
||||
created, err := s.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
created, err := s.Store.CreateSpaceInvitation(ctx, &store.SpaceInvitation{
|
||||
SpaceID: space.ID,
|
||||
UserID: targetUser.ID,
|
||||
Role: role,
|
||||
}, currentUser.ID)
|
||||
if err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to create space member")
|
||||
return nil, mapSpaceMutationError(err, "failed to create space invitation")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
return convertSpaceMemberFromStore(space, targetUser, created), nil
|
||||
return convertSpaceInvitationFromStore(space, targetUser, created), nil
|
||||
}
|
||||
|
||||
// ListSpaceInvitations lists pending invitations after requiring an active
|
||||
// Space administrator.
|
||||
func (s *APIV1Service) ListSpaceInvitations(ctx context.Context, request *v1pb.ListSpaceInvitationsRequest) (*v1pb.ListSpaceInvitationsResponse, error) {
|
||||
currentUser, err := s.requireCurrentSpaceUser(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
space, callerMembership, err := s.resolveMemberSpace(ctx, request.Parent, currentUser)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := requireSpaceAdministrator(callerMembership); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
limit, offset, err := listSpacePage(request.PageSize, request.PageToken)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
limitPlusOne := limit + 1
|
||||
invitations, err := s.Store.ListSpaceInvitations(ctx, &store.FindSpaceInvitation{
|
||||
SpaceID: &space.ID,
|
||||
ViewerUserID: ¤tUser.ID,
|
||||
Limit: &limitPlusOne,
|
||||
Offset: &offset,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, status.Errorf(codes.Internal, "failed to list space invitations: %v", err)
|
||||
}
|
||||
nextPageToken := ""
|
||||
if len(invitations) == limitPlusOne {
|
||||
invitations = invitations[:limit]
|
||||
nextPageToken, err = getPageToken(limit, offset+limit)
|
||||
if err != nil {
|
||||
return nil, status.Errorf(codes.Internal, "failed to create next page token: %v", err)
|
||||
}
|
||||
}
|
||||
response := &v1pb.ListSpaceInvitationsResponse{
|
||||
SpaceInvitations: make([]*v1pb.SpaceInvitation, 0, len(invitations)),
|
||||
NextPageToken: nextPageToken,
|
||||
}
|
||||
if len(invitations) == 0 {
|
||||
return response, nil
|
||||
}
|
||||
userIDs := make([]int32, 0, len(invitations))
|
||||
for _, invitation := range invitations {
|
||||
userIDs = append(userIDs, invitation.UserID)
|
||||
}
|
||||
users, err := s.Store.ListUsers(ctx, &store.FindUser{IDList: userIDs})
|
||||
if err != nil {
|
||||
return nil, status.Errorf(codes.Internal, "failed to resolve invitation invitees: %v", err)
|
||||
}
|
||||
usersByID := make(map[int32]*store.User, len(users))
|
||||
for _, user := range users {
|
||||
usersByID[user.ID] = user
|
||||
}
|
||||
for _, invitation := range invitations {
|
||||
user := usersByID[invitation.UserID]
|
||||
if user == nil || convertSpaceMemberRoleFromStore(invitation.Role) == v1pb.SpaceMember_ROLE_UNSPECIFIED {
|
||||
continue
|
||||
}
|
||||
response.SpaceInvitations = append(response.SpaceInvitations, convertSpaceInvitationFromStore(space, user, invitation))
|
||||
}
|
||||
return response, nil
|
||||
}
|
||||
|
||||
// ListUserSpaceInvitations lists the authenticated user's received pending
|
||||
// invitations. A user cannot enumerate another user's invitations.
|
||||
func (s *APIV1Service) ListUserSpaceInvitations(ctx context.Context, request *v1pb.ListUserSpaceInvitationsRequest) (*v1pb.ListUserSpaceInvitationsResponse, error) {
|
||||
currentUser, err := s.requireCurrentSpaceUser(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
username, err := parseUsernameFromName(request.Parent)
|
||||
if err != nil {
|
||||
return nil, status.Errorf(codes.InvalidArgument, "invalid user parent: %v", err)
|
||||
}
|
||||
if username != currentUser.Username {
|
||||
return nil, status.Error(codes.PermissionDenied, "users may only list their own space invitations")
|
||||
}
|
||||
limit, offset, err := listSpacePage(request.PageSize, request.PageToken)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
limitPlusOne := limit + 1
|
||||
invitations, err := s.Store.ListSpaceInvitations(ctx, &store.FindSpaceInvitation{
|
||||
UserID: ¤tUser.ID,
|
||||
ViewerUserID: ¤tUser.ID,
|
||||
Limit: &limitPlusOne,
|
||||
Offset: &offset,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, status.Errorf(codes.Internal, "failed to list user space invitations: %v", err)
|
||||
}
|
||||
nextPageToken := ""
|
||||
if len(invitations) == limitPlusOne {
|
||||
invitations = invitations[:limit]
|
||||
nextPageToken, err = getPageToken(limit, offset+limit)
|
||||
if err != nil {
|
||||
return nil, status.Errorf(codes.Internal, "failed to create next page token: %v", err)
|
||||
}
|
||||
}
|
||||
response := &v1pb.ListUserSpaceInvitationsResponse{
|
||||
SpaceInvitations: make([]*v1pb.SpaceInvitation, 0, len(invitations)),
|
||||
NextPageToken: nextPageToken,
|
||||
}
|
||||
if len(invitations) == 0 {
|
||||
return response, nil
|
||||
}
|
||||
spaceIDs := make([]int32, 0, len(invitations))
|
||||
for _, invitation := range invitations {
|
||||
spaceIDs = append(spaceIDs, invitation.SpaceID)
|
||||
}
|
||||
spaces, err := s.Store.ListSpaces(ctx, &store.FindSpace{IDList: spaceIDs})
|
||||
if err != nil {
|
||||
return nil, status.Errorf(codes.Internal, "failed to resolve invitation spaces: %v", err)
|
||||
}
|
||||
spacesByID := make(map[int32]*store.Space, len(spaces))
|
||||
for _, space := range spaces {
|
||||
spacesByID[space.ID] = space
|
||||
}
|
||||
for _, invitation := range invitations {
|
||||
space := spacesByID[invitation.SpaceID]
|
||||
if space == nil || convertSpaceMemberRoleFromStore(invitation.Role) == v1pb.SpaceMember_ROLE_UNSPECIFIED {
|
||||
continue
|
||||
}
|
||||
response.SpaceInvitations = append(response.SpaceInvitations, convertSpaceInvitationFromStore(space, currentUser, invitation))
|
||||
}
|
||||
return response, nil
|
||||
}
|
||||
|
||||
// resolveSpaceInvitationResource resolves an invitation and authorizes either
|
||||
// its invitee or an active administrator of its Space.
|
||||
func (s *APIV1Service) resolveSpaceInvitationResource(ctx context.Context, name string, currentUser *store.User) (*store.Space, *store.User, *store.SpaceMember, *store.SpaceInvitation, error) {
|
||||
spaceUID, username, err := ExtractSpaceInvitationTokensFromName(name)
|
||||
if err != nil {
|
||||
return nil, nil, nil, nil, status.Errorf(codes.InvalidArgument, "invalid space invitation name: %v", err)
|
||||
}
|
||||
space, err := s.Store.GetSpace(ctx, &store.FindSpace{UID: &spaceUID})
|
||||
if err != nil {
|
||||
return nil, nil, nil, nil, status.Errorf(codes.Internal, "failed to resolve invitation space: %v", err)
|
||||
}
|
||||
if space == nil {
|
||||
return nil, nil, nil, nil, status.Error(codes.NotFound, "space invitation not found")
|
||||
}
|
||||
targetUser, err := s.Store.GetUser(ctx, &store.FindUser{Username: &username})
|
||||
if err != nil {
|
||||
return nil, nil, nil, nil, status.Errorf(codes.Internal, "failed to resolve invitation invitee: %v", err)
|
||||
}
|
||||
if targetUser == nil {
|
||||
return nil, nil, nil, nil, status.Error(codes.NotFound, "space invitation not found")
|
||||
}
|
||||
callerMembership, err := s.Store.GetSpaceMember(ctx, &store.FindSpaceMember{SpaceID: &space.ID, UserID: ¤tUser.ID})
|
||||
if err != nil {
|
||||
return nil, nil, nil, nil, status.Errorf(codes.Internal, "failed to resolve caller space membership: %v", err)
|
||||
}
|
||||
isInvitee := targetUser.ID == currentUser.ID
|
||||
isAdministrator := callerMembership != nil && callerMembership.Role == store.SpaceMemberRoleAdmin
|
||||
if !isInvitee && !isAdministrator {
|
||||
return nil, nil, nil, nil, status.Error(codes.NotFound, "space invitation not found")
|
||||
}
|
||||
invitation, err := s.Store.GetSpaceInvitation(ctx, &store.FindSpaceInvitation{
|
||||
SpaceID: &space.ID,
|
||||
UserID: &targetUser.ID,
|
||||
ViewerUserID: ¤tUser.ID,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, nil, nil, nil, status.Errorf(codes.Internal, "failed to get space invitation: %v", err)
|
||||
}
|
||||
if invitation == nil || convertSpaceMemberRoleFromStore(invitation.Role) == v1pb.SpaceMember_ROLE_UNSPECIFIED {
|
||||
return nil, nil, nil, nil, status.Error(codes.NotFound, "space invitation not found")
|
||||
}
|
||||
return space, targetUser, callerMembership, invitation, nil
|
||||
}
|
||||
|
||||
// GetSpaceInvitation gets a pending invitation for its invitee or a Space
|
||||
// administrator.
|
||||
func (s *APIV1Service) GetSpaceInvitation(ctx context.Context, request *v1pb.GetSpaceInvitationRequest) (*v1pb.SpaceInvitation, error) {
|
||||
currentUser, err := s.requireCurrentSpaceUser(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
space, targetUser, _, invitation, err := s.resolveSpaceInvitationResource(ctx, request.Name, currentUser)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return convertSpaceInvitationFromStore(space, targetUser, invitation), nil
|
||||
}
|
||||
|
||||
// DeleteSpaceInvitation revokes a pending invitation. Only an active Space
|
||||
// administrator can revoke it.
|
||||
func (s *APIV1Service) DeleteSpaceInvitation(ctx context.Context, request *v1pb.DeleteSpaceInvitationRequest) (*emptypb.Empty, error) {
|
||||
currentUser, err := s.requireCurrentSpaceUser(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, targetUser, callerMembership, invitation, err := s.resolveSpaceInvitationResource(ctx, request.Name, currentUser)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := requireSpaceAdministrator(callerMembership); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := s.Store.RevokeSpaceInvitation(ctx, &store.RevokeSpaceInvitation{
|
||||
SpaceID: invitation.SpaceID,
|
||||
UserID: targetUser.ID,
|
||||
}, currentUser.ID); err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to revoke space invitation")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
return &emptypb.Empty{}, nil
|
||||
}
|
||||
|
||||
// AcceptSpaceInvitation activates the invited user's membership with the role
|
||||
// selected by the administrator who created the invitation.
|
||||
func (s *APIV1Service) AcceptSpaceInvitation(ctx context.Context, request *v1pb.AcceptSpaceInvitationRequest) (*v1pb.SpaceMember, error) {
|
||||
currentUser, err := s.requireCurrentSpaceUser(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
space, targetUser, _, invitation, err := s.resolveSpaceInvitationResource(ctx, request.Name, currentUser)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if targetUser.ID != currentUser.ID {
|
||||
return nil, status.Error(codes.PermissionDenied, "only the invitee may accept a space invitation")
|
||||
}
|
||||
member, err := s.Store.AcceptSpaceInvitation(ctx, &store.AcceptSpaceInvitation{SpaceID: invitation.SpaceID, UserID: currentUser.ID}, currentUser.ID)
|
||||
if err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to accept space invitation")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
return convertSpaceMemberFromStore(space, currentUser, member), nil
|
||||
}
|
||||
|
||||
// DeclineSpaceInvitation deletes the authenticated invitee's pending
|
||||
// invitation without ever creating a membership.
|
||||
func (s *APIV1Service) DeclineSpaceInvitation(ctx context.Context, request *v1pb.DeclineSpaceInvitationRequest) (*emptypb.Empty, error) {
|
||||
currentUser, err := s.requireCurrentSpaceUser(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, targetUser, _, invitation, err := s.resolveSpaceInvitationResource(ctx, request.Name, currentUser)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if targetUser.ID != currentUser.ID {
|
||||
return nil, status.Error(codes.PermissionDenied, "only the invitee may decline a space invitation")
|
||||
}
|
||||
if err := s.Store.DeclineSpaceInvitation(ctx, &store.DeclineSpaceInvitation{SpaceID: invitation.SpaceID, UserID: currentUser.ID}, currentUser.ID); err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to decline space invitation")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
return &emptypb.Empty{}, nil
|
||||
}
|
||||
|
||||
// ListSpaceMembers lists memberships after authorizing the caller's own
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@ func buildSpaceMemberName(spaceUID, username string) string {
|
|||
return buildSpaceName(spaceUID) + "/" + SpaceMemberNamePrefix + username
|
||||
}
|
||||
|
||||
func buildSpaceInvitationName(spaceUID, username string) string {
|
||||
return buildSpaceName(spaceUID) + "/" + SpaceInvitationNamePrefix + username
|
||||
}
|
||||
|
||||
func convertSpaceFromStore(space *store.Space) *v1pb.Space {
|
||||
if space == nil {
|
||||
return nil
|
||||
|
|
@ -56,3 +60,15 @@ func convertSpaceMemberFromStore(space *store.Space, user *store.User, member *s
|
|||
Role: convertSpaceMemberRoleFromStore(member.Role),
|
||||
}
|
||||
}
|
||||
|
||||
func convertSpaceInvitationFromStore(space *store.Space, user *store.User, invitation *store.SpaceInvitation) *v1pb.SpaceInvitation {
|
||||
if space == nil || user == nil || invitation == nil {
|
||||
return nil
|
||||
}
|
||||
return &v1pb.SpaceInvitation{
|
||||
Name: buildSpaceInvitationName(space.UID, user.Username),
|
||||
Invitee: BuildUserName(user.Username),
|
||||
Role: convertSpaceMemberRoleFromStore(invitation.Role),
|
||||
Space: convertSpaceFromStore(space),
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,27 @@ func createSpaceTestUser(ctx context.Context, t *testing.T, service *APIV1Servic
|
|||
return user
|
||||
}
|
||||
|
||||
func inviteSpaceTestUser(ctx context.Context, t *testing.T, service *APIV1Service, inviter, invitee *store.User, space *v1pb.Space, role v1pb.SpaceMember_Role) *v1pb.SpaceInvitation {
|
||||
t.Helper()
|
||||
invitation, err := service.CreateSpaceInvitation(userCtx(ctx, inviter.ID), &v1pb.CreateSpaceInvitationRequest{
|
||||
Parent: space.Name,
|
||||
SpaceInvitation: &v1pb.SpaceInvitation{
|
||||
Invitee: BuildUserName(invitee.Username),
|
||||
Role: role,
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
return invitation
|
||||
}
|
||||
|
||||
func inviteAndAcceptSpaceTestUser(ctx context.Context, t *testing.T, service *APIV1Service, inviter, invitee *store.User, space *v1pb.Space, role v1pb.SpaceMember_Role) *v1pb.SpaceMember {
|
||||
t.Helper()
|
||||
invitation := inviteSpaceTestUser(ctx, t, service, inviter, invitee, space, role)
|
||||
membership, err := service.AcceptSpaceInvitation(userCtx(ctx, invitee.ID), &v1pb.AcceptSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.NoError(t, err)
|
||||
return membership
|
||||
}
|
||||
|
||||
func TestSpaceServiceMembershipVisibilityAndGovernance(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
service := newIntegrationService(t)
|
||||
|
|
@ -62,20 +83,44 @@ func TestSpaceServiceMembershipVisibilityAndGovernance(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
require.Empty(t, adminSpaces.Spaces)
|
||||
|
||||
createdMember, err := service.CreateSpaceMember(userCtx(ctx, owner.ID), &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: space.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{
|
||||
User: BuildUserName(member.Username),
|
||||
Role: v1pb.SpaceMember_USER,
|
||||
},
|
||||
invitation, err := service.CreateSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.CreateSpaceInvitationRequest{
|
||||
Parent: space.Name,
|
||||
SpaceInvitation: &v1pb.SpaceInvitation{Invitee: BuildUserName(member.Username), Role: v1pb.SpaceMember_USER},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, "spaces/team-notes/members/space-member", createdMember.Name)
|
||||
_, err = service.CreateSpaceMember(userCtx(ctx, owner.ID), &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: space.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{User: BuildUserName(member.Username), Role: v1pb.SpaceMember_USER},
|
||||
require.Equal(t, "spaces/team-notes/invitations/space-member", invitation.Name)
|
||||
require.Equal(t, space, invitation.Space, "the invitation must identify the Space without granting membership access")
|
||||
|
||||
_, err = service.GetSpace(userCtx(ctx, member.ID), &v1pb.GetSpaceRequest{Name: space.Name})
|
||||
require.Equal(t, codes.NotFound, status.Code(err), "a pending invitation must not grant Space access")
|
||||
invitedUserSpaces, err := service.ListSpaces(userCtx(ctx, member.ID), &v1pb.ListSpacesRequest{})
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, invitedUserSpaces.Spaces)
|
||||
members, err = service.ListSpaceMembers(userCtx(ctx, owner.ID), &v1pb.ListSpaceMembersRequest{Parent: space.Name})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, members.SpaceMembers, 1, "an invitation must not appear as an active membership")
|
||||
|
||||
spaceInvitations, err := service.ListSpaceInvitations(userCtx(ctx, owner.ID), &v1pb.ListSpaceInvitationsRequest{Parent: space.Name})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, []*v1pb.SpaceInvitation{invitation}, spaceInvitations.SpaceInvitations)
|
||||
userInvitations, err := service.ListUserSpaceInvitations(userCtx(ctx, member.ID), &v1pb.ListUserSpaceInvitationsRequest{Parent: BuildUserName(member.Username)})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, []*v1pb.SpaceInvitation{invitation}, userInvitations.SpaceInvitations)
|
||||
|
||||
_, err = service.CreateSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.CreateSpaceInvitationRequest{
|
||||
Parent: space.Name,
|
||||
SpaceInvitation: &v1pb.SpaceInvitation{Invitee: BuildUserName(member.Username), Role: v1pb.SpaceMember_USER},
|
||||
})
|
||||
require.Equal(t, codes.AlreadyExists, status.Code(err))
|
||||
_, err = service.AcceptSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.AcceptSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.Equal(t, codes.PermissionDenied, status.Code(err), "an administrator cannot accept for the invitee")
|
||||
|
||||
createdMember, err := service.AcceptSpaceInvitation(userCtx(ctx, member.ID), &v1pb.AcceptSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, "spaces/team-notes/members/space-member", createdMember.Name)
|
||||
require.Equal(t, v1pb.SpaceMember_USER, createdMember.Role)
|
||||
_, err = service.GetSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.GetSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.Equal(t, codes.NotFound, status.Code(err))
|
||||
|
||||
_, err = service.GetSpace(userCtx(ctx, member.ID), &v1pb.GetSpaceRequest{Name: space.Name})
|
||||
require.NoError(t, err)
|
||||
|
|
@ -92,6 +137,73 @@ func TestSpaceServiceMembershipVisibilityAndGovernance(t *testing.T) {
|
|||
require.Equal(t, codes.FailedPrecondition, status.Code(err), "the last active ADMIN cannot be demoted")
|
||||
}
|
||||
|
||||
func TestSpaceInvitationDeclineRevokeAndSelectedRole(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
service := newIntegrationService(t)
|
||||
owner := createSpaceTestUser(ctx, t, service, "invitation-owner", store.RoleUser)
|
||||
invitee := createSpaceTestUser(ctx, t, service, "invitation-invitee", store.RoleUser)
|
||||
secondInvitee := createSpaceTestUser(ctx, t, service, "invitation-second", store.RoleUser)
|
||||
archivedInvitee := createSpaceTestUser(ctx, t, service, "invitation-archived", store.RoleUser)
|
||||
pendingThenArchived := createSpaceTestUser(ctx, t, service, "invitation-pending-archived", store.RoleUser)
|
||||
space, err := service.CreateSpace(userCtx(ctx, owner.ID), &v1pb.CreateSpaceRequest{
|
||||
SpaceId: "invitation-lifecycle",
|
||||
Space: &v1pb.Space{Title: "Invitation lifecycle"},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
invitation := inviteSpaceTestUser(ctx, t, service, owner, invitee, space, v1pb.SpaceMember_ADMIN)
|
||||
got, err := service.GetSpaceInvitation(userCtx(ctx, invitee.ID), &v1pb.GetSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, v1pb.SpaceMember_ADMIN, got.Role)
|
||||
_, err = service.DeleteSpaceInvitation(userCtx(ctx, invitee.ID), &v1pb.DeleteSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.Equal(t, codes.PermissionDenied, status.Code(err), "the invitee cannot revoke an invitation")
|
||||
|
||||
_, err = service.DeleteSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.DeleteSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.NoError(t, err)
|
||||
_, err = service.AcceptSpaceInvitation(userCtx(ctx, invitee.ID), &v1pb.AcceptSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.Equal(t, codes.NotFound, status.Code(err), "a revoked invitation cannot be accepted")
|
||||
|
||||
invitation = inviteSpaceTestUser(ctx, t, service, owner, invitee, space, v1pb.SpaceMember_ADMIN)
|
||||
_, err = service.DeclineSpaceInvitation(userCtx(ctx, invitee.ID), &v1pb.DeclineSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.NoError(t, err)
|
||||
_, err = service.GetSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.GetSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.Equal(t, codes.NotFound, status.Code(err))
|
||||
|
||||
invitation = inviteSpaceTestUser(ctx, t, service, owner, invitee, space, v1pb.SpaceMember_ADMIN)
|
||||
membership, err := service.AcceptSpaceInvitation(userCtx(ctx, invitee.ID), &v1pb.AcceptSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, v1pb.SpaceMember_ADMIN, membership.Role, "accept must preserve the role selected at invite time")
|
||||
|
||||
secondInvitation := inviteSpaceTestUser(ctx, t, service, owner, secondInvitee, space, v1pb.SpaceMember_USER)
|
||||
listed, err := service.ListSpaceInvitations(userCtx(ctx, invitee.ID), &v1pb.ListSpaceInvitationsRequest{Parent: space.Name})
|
||||
require.NoError(t, err, "any active Space administrator may manage invitations")
|
||||
require.Equal(t, []*v1pb.SpaceInvitation{secondInvitation}, listed.SpaceInvitations)
|
||||
_, err = service.AcceptSpaceInvitation(userCtx(ctx, invitee.ID), &v1pb.AcceptSpaceInvitationRequest{Name: secondInvitation.Name})
|
||||
require.Equal(t, codes.PermissionDenied, status.Code(err), "an administrator cannot accept for another user")
|
||||
_, err = service.DeleteSpaceInvitation(userCtx(ctx, invitee.ID), &v1pb.DeleteSpaceInvitationRequest{Name: secondInvitation.Name})
|
||||
require.NoError(t, err)
|
||||
|
||||
pendingArchivedInvitation := inviteSpaceTestUser(ctx, t, service, owner, pendingThenArchived, space, v1pb.SpaceMember_USER)
|
||||
archived := store.Archived
|
||||
_, err = service.Store.UpdateUser(ctx, &store.UpdateUser{ID: pendingThenArchived.ID, RowStatus: &archived})
|
||||
require.NoError(t, err, "a pending invitation is not an active membership and must not prevent archival")
|
||||
listed, err = service.ListSpaceInvitations(userCtx(ctx, owner.ID), &v1pb.ListSpaceInvitationsRequest{Parent: space.Name})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, []*v1pb.SpaceInvitation{pendingArchivedInvitation}, listed.SpaceInvitations, "administrators must retain a way to revoke invitations for archived users")
|
||||
_, err = service.AcceptSpaceInvitation(userCtx(ctx, pendingThenArchived.ID), &v1pb.AcceptSpaceInvitationRequest{Name: pendingArchivedInvitation.Name})
|
||||
require.Equal(t, codes.Unauthenticated, status.Code(err), "an archived user cannot accept an invitation")
|
||||
_, err = service.DeleteSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.DeleteSpaceInvitationRequest{Name: pendingArchivedInvitation.Name})
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = service.Store.UpdateUser(ctx, &store.UpdateUser{ID: archivedInvitee.ID, RowStatus: &archived})
|
||||
require.NoError(t, err)
|
||||
_, err = service.CreateSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.CreateSpaceInvitationRequest{
|
||||
Parent: space.Name,
|
||||
SpaceInvitation: &v1pb.SpaceInvitation{Invitee: BuildUserName(archivedInvitee.Username), Role: v1pb.SpaceMember_USER},
|
||||
})
|
||||
require.Equal(t, codes.FailedPrecondition, status.Code(err), "only NORMAL users can be invited")
|
||||
}
|
||||
|
||||
func TestSpaceServiceHardDeleteLifecycle(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
service := newIntegrationService(t)
|
||||
|
|
@ -129,11 +241,7 @@ func TestSpaceServiceHardDeleteLifecycle(t *testing.T) {
|
|||
Payload: &storepb.AttachmentPayload{},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = service.CreateSpaceMember(userCtx(ctx, owner.ID), &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: space.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{User: BuildUserName(target.Username), Role: v1pb.SpaceMember_USER},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
inviteAndAcceptSpaceTestUser(ctx, t, service, owner, target, space, v1pb.SpaceMember_USER)
|
||||
|
||||
_, err = service.UpdateSpace(userCtx(ctx, owner.ID), &v1pb.UpdateSpaceRequest{
|
||||
Space: &v1pb.Space{Name: space.Name},
|
||||
|
|
@ -167,11 +275,7 @@ func TestSpaceServiceHidesMembershipForInactiveUser(t *testing.T) {
|
|||
Space: &v1pb.Space{Title: "Inactive member space"},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = service.CreateSpaceMember(userCtx(ctx, owner.ID), &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: space.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{User: BuildUserName(member.Username), Role: v1pb.SpaceMember_USER},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
inviteAndAcceptSpaceTestUser(ctx, t, service, owner, member, space, v1pb.SpaceMember_USER)
|
||||
|
||||
// The normal archive path rejects users with memberships. Simulate an
|
||||
// inconsistent row to verify that membership reads still fail closed.
|
||||
|
|
@ -200,14 +304,7 @@ func TestUpdateSpaceMemberAcceptsGatewayInferredIdentityMask(t *testing.T) {
|
|||
Space: &v1pb.Space{Title: "Gateway Space"},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
createdMember, err := service.CreateSpaceMember(userCtx(ctx, owner.ID), &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: space.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{
|
||||
User: BuildUserName(member.Username),
|
||||
Role: v1pb.SpaceMember_USER,
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
createdMember := inviteAndAcceptSpaceTestUser(ctx, t, service, owner, member, space, v1pb.SpaceMember_USER)
|
||||
|
||||
mux := runtime.NewServeMux()
|
||||
require.NoError(t, v1pb.RegisterSpaceServiceHandlerServer(ctx, mux, service))
|
||||
|
|
@ -242,7 +339,7 @@ func TestUpdateSpaceMemberAcceptsGatewayInferredIdentityMask(t *testing.T) {
|
|||
require.Equal(t, store.SpaceMemberRoleAdmin, storedMember.Role, "a mismatched immutable user must not update the membership")
|
||||
}
|
||||
|
||||
func TestCreateSpaceMemberClassifiesTargetUserErrors(t *testing.T) {
|
||||
func TestCreateSpaceInvitationClassifiesTargetUserErrors(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
service := newIntegrationService(t)
|
||||
owner := createSpaceTestUser(ctx, t, service, "lookup-owner", store.RoleUser)
|
||||
|
|
@ -253,9 +350,9 @@ func TestCreateSpaceMemberClassifiesTargetUserErrors(t *testing.T) {
|
|||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = service.CreateSpaceMember(userCtx(ctx, owner.ID), &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: space.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{User: "invalid-user-name", Role: v1pb.SpaceMember_USER},
|
||||
_, err = service.CreateSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.CreateSpaceInvitationRequest{
|
||||
Parent: space.Name,
|
||||
SpaceInvitation: &v1pb.SpaceInvitation{Invitee: "invalid-user-name", Role: v1pb.SpaceMember_USER},
|
||||
})
|
||||
require.Equal(t, codes.InvalidArgument, status.Code(err))
|
||||
|
||||
|
|
@ -264,9 +361,9 @@ func TestCreateSpaceMemberClassifiesTargetUserErrors(t *testing.T) {
|
|||
// require the target lookup failure to remain a server error.
|
||||
_, err = service.Store.GetDriver().GetDB().ExecContext(ctx, "UPDATE user SET created_ts = ? WHERE id = ?", "not-an-integer", target.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = service.CreateSpaceMember(userCtx(ctx, owner.ID), &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: space.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{User: BuildUserName(target.Username), Role: v1pb.SpaceMember_USER},
|
||||
_, err = service.CreateSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.CreateSpaceInvitationRequest{
|
||||
Parent: space.Name,
|
||||
SpaceInvitation: &v1pb.SpaceInvitation{Invitee: BuildUserName(target.Username), Role: v1pb.SpaceMember_USER},
|
||||
})
|
||||
require.Equal(t, codes.Internal, status.Code(err))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -247,15 +247,15 @@ func TestSpaceMutationsPublishMemoChanged(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
requireMemoChanged(t, client.events)
|
||||
|
||||
membership, err := svc.CreateSpaceMember(ownerCtx, &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: space.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{
|
||||
User: BuildUserName(member.Username),
|
||||
Role: v1pb.SpaceMember_USER,
|
||||
},
|
||||
invitation, err := svc.CreateSpaceInvitation(ownerCtx, &v1pb.CreateSpaceInvitationRequest{
|
||||
Parent: space.Name,
|
||||
SpaceInvitation: &v1pb.SpaceInvitation{Invitee: BuildUserName(member.Username), Role: v1pb.SpaceMember_USER},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
requireMemoChanged(t, client.events)
|
||||
membership, err := svc.AcceptSpaceInvitation(userCtx(ctx, member.ID), &v1pb.AcceptSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.NoError(t, err)
|
||||
requireMemoChanged(t, client.events)
|
||||
|
||||
membership.Role = v1pb.SpaceMember_ADMIN
|
||||
_, err = svc.UpdateSpaceMember(ownerCtx, &v1pb.UpdateSpaceMemberRequest{
|
||||
|
|
@ -327,22 +327,8 @@ func TestMoveSpaceAudienceMemoSSEBroadcastsWithoutAudienceCalculation(t *testing
|
|||
Space: &v1pb.Space{Title: "Target"},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = svc.CreateSpaceMember(ownerCtx, &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: source.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{
|
||||
User: BuildUserName(sourceMember.Username),
|
||||
Role: v1pb.SpaceMember_USER,
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = svc.CreateSpaceMember(ownerCtx, &v1pb.CreateSpaceMemberRequest{
|
||||
Parent: target.Name,
|
||||
SpaceMember: &v1pb.SpaceMember{
|
||||
User: BuildUserName(targetMember.Username),
|
||||
Role: v1pb.SpaceMember_USER,
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
inviteAndAcceptSpaceTestUser(ctx, t, svc, owner, sourceMember, source, v1pb.SpaceMember_USER)
|
||||
inviteAndAcceptSpaceTestUser(ctx, t, svc, owner, targetMember, target, v1pb.SpaceMember_USER)
|
||||
|
||||
sourceName := source.Name
|
||||
memo, err := svc.CreateMemo(ownerCtx, &v1pb.CreateMemoRequest{Memo: &v1pb.Memo{
|
||||
|
|
|
|||
|
|
@ -404,7 +404,7 @@ func TestLinkedAttachmentMutationsRevalidateMemoSpaceMembership(t *testing.T) {
|
|||
memberCtx := ts.CreateUserContext(ctx, member.ID)
|
||||
space, err := ts.Store.CreateSpace(ctx, &store.Space{UID: "attachment-lifecycle-space", Title: "Attachment Lifecycle"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser,
|
||||
}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
|
@ -469,7 +469,7 @@ func TestLinkedAttachmentMutationsRevalidateMemoSpaceMembership(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
require.Equal(t, "updated-before-revoke.txt", storedUpdate.Filename)
|
||||
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser,
|
||||
}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
|
@ -493,7 +493,7 @@ func TestListAttachmentsSpaceFilter(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
spaceA, err := ts.Store.CreateSpace(ctx, &store.Space{UID: "attachment-api-scope-a", Title: "A"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: spaceA.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser,
|
||||
}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
|
|
|||
|
|
@ -741,14 +741,16 @@ func TestUpdateMemoPlacementAndAudienceContract(t *testing.T) {
|
|||
Space: &apiv1.Space{Title: "Placement Target"},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Service.CreateSpaceMember(sourceAdminCtx, &apiv1.CreateSpaceMemberRequest{
|
||||
invitation, err := ts.Service.CreateSpaceInvitation(sourceAdminCtx, &apiv1.CreateSpaceInvitationRequest{
|
||||
Parent: source.Name,
|
||||
SpaceMember: &apiv1.SpaceMember{
|
||||
User: "users/" + author.Username,
|
||||
Role: apiv1.SpaceMember_USER,
|
||||
SpaceInvitation: &apiv1.SpaceInvitation{
|
||||
Invitee: "users/" + author.Username,
|
||||
Role: apiv1.SpaceMember_USER,
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Service.AcceptSpaceInvitation(authorCtx, &apiv1.AcceptSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.NoError(t, err)
|
||||
|
||||
protectedMemo, err := ts.Service.CreateMemo(authorCtx, &apiv1.CreateMemoRequest{Memo: &apiv1.Memo{
|
||||
Content: "assign without audience change", Visibility: apiv1.Visibility_PROTECTED,
|
||||
|
|
@ -1088,7 +1090,7 @@ func TestAssignedMemoCommentListingUsesMemoLocalReadAccess(t *testing.T) {
|
|||
|
||||
space, err := ts.Store.CreateSpace(ctx, &store.Space{UID: "assigned-comment-space", Title: "Assigned comments"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID,
|
||||
UserID: member.ID,
|
||||
Role: store.SpaceMemberRoleAdmin,
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ func TestDeleteMemoShare_RevalidatesSpaceWriteAuthority(t *testing.T) {
|
|||
ownerCtx := ts.CreateUserContext(ctx, owner.ID)
|
||||
space, err := ts.Store.CreateSpace(ctx, &store.Space{UID: "share-space", Title: "Share Space"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin,
|
||||
}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
|
@ -95,7 +95,7 @@ func TestDeleteMemoShare_RevalidatesSpaceWriteAuthority(t *testing.T) {
|
|||
require.Equal(t, codes.PermissionDenied, status.Code(err))
|
||||
requireSharePresent(ctx, t, ts, shareToken)
|
||||
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID, UserID: owner.ID, Role: store.SpaceMemberRoleUser,
|
||||
}, admin.ID)
|
||||
require.NoError(t, err)
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ func TestUpsertMemoReactionRevalidatesSpaceParticipation(t *testing.T) {
|
|||
|
||||
space, err := ts.Store.CreateSpace(ctx, &store.Space{UID: "reaction-space", Title: "Reaction Space"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID,
|
||||
UserID: member.ID,
|
||||
Role: store.SpaceMemberRoleUser,
|
||||
|
|
@ -156,7 +156,7 @@ func TestUpsertMemoReactionRevalidatesSpaceParticipation(t *testing.T) {
|
|||
})
|
||||
require.Equal(t, codes.PermissionDenied, status.Code(err))
|
||||
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID,
|
||||
UserID: member.ID,
|
||||
Role: store.SpaceMemberRoleUser,
|
||||
|
|
@ -192,7 +192,7 @@ func TestAssignedMemoReactionsFollowMemoReadAccess(t *testing.T) {
|
|||
|
||||
space, err := ts.Store.CreateSpace(ctx, &store.Space{UID: "assigned-reaction-space", Title: "Assigned reactions"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID,
|
||||
UserID: member.ID,
|
||||
Role: store.SpaceMemberRoleAdmin,
|
||||
|
|
|
|||
|
|
@ -104,6 +104,20 @@ func (ts *TestService) CreateRegularUser(ctx context.Context, username string) (
|
|||
})
|
||||
}
|
||||
|
||||
// InviteAndAcceptSpaceMember is a test fixture helper that exercises the invitation
|
||||
// lifecycle instead of bypassing invitee consent.
|
||||
func (ts *TestService) InviteAndAcceptSpaceMember(ctx context.Context, create *store.SpaceMember, actorUserID int32) (*store.SpaceMember, error) {
|
||||
invitation, err := ts.Store.CreateSpaceInvitation(ctx, &store.SpaceInvitation{
|
||||
SpaceID: create.SpaceID,
|
||||
UserID: create.UserID,
|
||||
Role: create.Role,
|
||||
}, actorUserID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return ts.Store.AcceptSpaceInvitation(ctx, &store.AcceptSpaceInvitation{SpaceID: invitation.SpaceID, UserID: invitation.UserID}, invitation.UserID)
|
||||
}
|
||||
|
||||
// CreateUserContext creates a context with the given user's ID for authentication.
|
||||
func (*TestService) CreateUserContext(ctx context.Context, userID int32) context.Context {
|
||||
// Use the context key from the auth package
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ func TestAssignedPublicMemoCommentNotifiesReadableRemovedAuthor(t *testing.T) {
|
|||
commenterCtx := ts.CreateUserContext(ctx, commenter.ID)
|
||||
space, err := ts.Store.CreateSpace(ctx, &store.Space{UID: "removed-owner-comments", Title: "Removed owner comments"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID,
|
||||
UserID: commenter.ID,
|
||||
Role: store.SpaceMemberRoleAdmin,
|
||||
|
|
@ -171,7 +171,7 @@ func TestAssignedPublicMemoCommentNotifiesReadableRemovedAuthor(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
require.Len(t, response.Notifications, 1)
|
||||
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID,
|
||||
UserID: owner.ID,
|
||||
Role: store.SpaceMemberRoleUser,
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ func TestUserStatsUseMemoLocalAccess(t *testing.T) {
|
|||
Title: "Stats access",
|
||||
}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: space.ID,
|
||||
UserID: member.ID,
|
||||
Role: store.SpaceMemberRoleUser,
|
||||
|
|
@ -379,7 +379,7 @@ func TestUserStatsSpaceFilter(t *testing.T) {
|
|||
|
||||
spaceA, err := ts.Store.CreateSpace(ctx, &store.Space{UID: "stats-scope-a", Title: "A"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.Store.CreateSpaceMember(ctx, &store.SpaceMember{
|
||||
_, err = ts.InviteAndAcceptSpaceMember(ctx, &store.SpaceMember{
|
||||
SpaceID: spaceA.ID,
|
||||
UserID: member.ID,
|
||||
Role: store.SpaceMemberRoleUser,
|
||||
|
|
|
|||
|
|
@ -109,7 +109,8 @@ func validateMySQLMemoSpaceMember(ctx context.Context, tx *sql.Tx, spaceID, user
|
|||
}
|
||||
var exists bool
|
||||
err := tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM space_member sm JOIN user u ON u.id = sm.user_id
|
||||
WHERE sm.space_id = ? AND sm.user_id = ? AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')`, spaceID, userID).Scan(&exists)
|
||||
WHERE sm.space_id = ? AND sm.user_id = ? AND sm.status = 'ACTIVE'
|
||||
AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')`, spaceID, userID).Scan(&exists)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ func mysqlMemoAccessPredicate(access *store.MemoAccessScope, memoAlias, memberAl
|
|||
authenticatedClauses = append(authenticatedClauses, memoAlias+".`visibility` = 'PROTECTED'")
|
||||
}
|
||||
*args = append(*args, *access.UserID)
|
||||
authenticatedClauses = append(authenticatedClauses, "("+memoAlias+".`visibility` = 'SPACE' AND EXISTS (SELECT 1 FROM `space_member` AS "+memberAlias+" WHERE "+memberAlias+".`space_id` = "+memoAlias+".`space_id` AND "+memberAlias+".`user_id` = ? AND "+memberAlias+".`role` IN ('ADMIN', 'USER')))")
|
||||
authenticatedClauses = append(authenticatedClauses, "("+memoAlias+".`visibility` = 'SPACE' AND EXISTS (SELECT 1 FROM `space_member` AS "+memberAlias+" WHERE "+memberAlias+".`space_id` = "+memoAlias+".`space_id` AND "+memberAlias+".`user_id` = ? AND "+memberAlias+".`status` = 'ACTIVE' AND "+memberAlias+".`role` IN ('ADMIN', 'USER')))")
|
||||
|
||||
clauses = append(clauses, "(EXISTS (SELECT 1 FROM `user` AS `access_user` WHERE `access_user`.`id` = ? AND `access_user`.`row_status` = 'NORMAL') AND ("+strings.Join(authenticatedClauses, " OR ")+"))")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ func validateMySQLReactionWritePolicy(ctx context.Context, tx *sql.Tx, reaction
|
|||
func mysqlSpaceMemberActive(ctx context.Context, tx *sql.Tx, spaceID, userID int32) (bool, error) {
|
||||
var role store.SpaceMemberRole
|
||||
err := tx.QueryRowContext(ctx, `SELECT role FROM space_member
|
||||
WHERE space_id = ? AND user_id = ? AND role IN ('ADMIN', 'USER')`, spaceID, userID).Scan(&role)
|
||||
WHERE space_id = ? AND user_id = ? AND status = 'ACTIVE' AND role IN ('ADMIN', 'USER')`, spaceID, userID).Scan(&role)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return false, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,9 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
return nil, errors.Wrap(err, "failed to start space create transaction")
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := requireMySQLActiveUser(ctx, tx, creatorID); err != nil {
|
||||
// Lock the creator through the membership insert so a concurrent hard
|
||||
// delete either happens before creation or observes the new membership.
|
||||
if err := lockMySQLActiveUser(ctx, tx, creatorID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
fields := []string{"uid", "title", "description"}
|
||||
|
|
@ -36,7 +38,7 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
return nil, err
|
||||
}
|
||||
spaceID := int32(rawID)
|
||||
if _, err := tx.ExecContext(ctx, "INSERT INTO space_member (space_id, user_id, role) VALUES (?, ?, ?)", spaceID, creatorID, store.SpaceMemberRoleAdmin); err != nil {
|
||||
if _, err := tx.ExecContext(ctx, "INSERT INTO space_member (space_id, user_id, status, role) VALUES (?, ?, ?, ?)", spaceID, creatorID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to create initial space admin")
|
||||
}
|
||||
space, err := getMySQLSpace(ctx, tx, spaceID)
|
||||
|
|
@ -54,11 +56,19 @@ func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Sp
|
|||
if find.ID != nil {
|
||||
where, args = append(where, "space.id = ?"), append(args, *find.ID)
|
||||
}
|
||||
if len(find.IDList) > 0 {
|
||||
placeholders := make([]string, 0, len(find.IDList))
|
||||
for _, id := range find.IDList {
|
||||
placeholders = append(placeholders, "?")
|
||||
args = append(args, id)
|
||||
}
|
||||
where = append(where, "space.id IN ("+strings.Join(placeholders, ", ")+")")
|
||||
}
|
||||
if find.UID != nil {
|
||||
where, args = append(where, "space.uid = ?"), append(args, *find.UID)
|
||||
}
|
||||
if find.MemberUserID != nil {
|
||||
where, args = append(where, "EXISTS (SELECT 1 FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = space.id AND sm.user_id = ? AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')"), append(args, *find.MemberUserID)
|
||||
where, args = append(where, "EXISTS (SELECT 1 FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = space.id AND sm.user_id = ? AND sm.status = 'ACTIVE' AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')"), append(args, *find.MemberUserID)
|
||||
}
|
||||
query := `SELECT space.id, space.uid, space.title, space.description
|
||||
FROM space WHERE ` + strings.Join(where, " AND ") + ` ORDER BY space.id DESC`
|
||||
|
|
@ -112,36 +122,41 @@ func (d *DB) UpdateSpace(ctx context.Context, update *store.UpdateSpace, actorUs
|
|||
return space, nil
|
||||
}
|
||||
|
||||
func (d *DB) CreateSpaceMember(ctx context.Context, create *store.SpaceMember, actorUserID int32) (*store.SpaceMember, error) {
|
||||
func (d *DB) CreateSpaceInvitation(ctx context.Context, create *store.SpaceInvitation, actorUserID int32) (*store.SpaceInvitation, error) {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := requireMySQLActiveUsers(ctx, tx, actorUserID, create.UserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := authorizeMySQLSpaceAdmin(ctx, tx, create.SpaceID, actorUserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, "INSERT INTO space_member (space_id, user_id, role) VALUES (?, ?, ?)", create.SpaceID, create.UserID, create.Role); err != nil {
|
||||
// Relationship creation always locks its parents in Space-then-User order.
|
||||
if err := lockMySQLSpace(ctx, tx, create.SpaceID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := lockMySQLActiveUser(ctx, tx, create.UserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, "INSERT INTO space_member (space_id, user_id, status, role) VALUES (?, ?, ?, ?)", create.SpaceID, create.UserID, store.SpaceMemberStatusInvited, create.Role); err != nil {
|
||||
if isMySQLUniqueViolation(err) {
|
||||
return nil, store.ErrSpaceMemberAlreadyExists
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
member, err := getMySQLSpaceMember(ctx, tx, create.SpaceID, create.UserID)
|
||||
invitation, err := getMySQLSpaceInvitation(ctx, tx, create.SpaceID, create.UserID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return member, nil
|
||||
return invitation, nil
|
||||
}
|
||||
|
||||
func (d *DB) ListSpaceMembers(ctx context.Context, find *store.FindSpaceMember) ([]*store.SpaceMember, error) {
|
||||
where, args := []string{
|
||||
"space_member.status = 'ACTIVE'",
|
||||
"space_member.role IN ('ADMIN', 'USER')",
|
||||
"EXISTS (SELECT 1 FROM space member_space WHERE member_space.id = space_member.space_id)",
|
||||
"EXISTS (SELECT 1 FROM user member_user WHERE member_user.id = space_member.user_id AND member_user.row_status = 'NORMAL')",
|
||||
|
|
@ -153,7 +168,7 @@ func (d *DB) ListSpaceMembers(ctx context.Context, find *store.FindSpaceMember)
|
|||
where, args = append(where, "user_id = ?"), append(args, *find.UserID)
|
||||
}
|
||||
if find.ViewerUserID != nil {
|
||||
where, args = append(where, "EXISTS (SELECT 1 FROM space_member viewer JOIN user viewer_user ON viewer_user.id = viewer.user_id WHERE viewer.space_id = space_member.space_id AND viewer.user_id = ? AND viewer.role IN ('ADMIN', 'USER') AND viewer_user.row_status = 'NORMAL')"), append(args, *find.ViewerUserID)
|
||||
where, args = append(where, "EXISTS (SELECT 1 FROM space_member viewer JOIN user viewer_user ON viewer_user.id = viewer.user_id WHERE viewer.space_id = space_member.space_id AND viewer.user_id = ? AND viewer.status = 'ACTIVE' AND viewer.role IN ('ADMIN', 'USER') AND viewer_user.row_status = 'NORMAL')"), append(args, *find.ViewerUserID)
|
||||
}
|
||||
query := `SELECT space_id, user_id, role FROM space_member
|
||||
WHERE ` + strings.Join(where, " AND ") + ` ORDER BY user_id ASC`
|
||||
|
|
@ -174,16 +189,146 @@ func (d *DB) ListSpaceMembers(ctx context.Context, find *store.FindSpaceMember)
|
|||
return members, rows.Err()
|
||||
}
|
||||
|
||||
func (d *DB) ListSpaceInvitations(ctx context.Context, find *store.FindSpaceInvitation) ([]*store.SpaceInvitation, error) {
|
||||
where, args := []string{
|
||||
"space_member.status = 'INVITED'",
|
||||
"space_member.role IN ('ADMIN', 'USER')",
|
||||
"EXISTS (SELECT 1 FROM space invitation_space WHERE invitation_space.id = space_member.space_id)",
|
||||
"EXISTS (SELECT 1 FROM user invitee WHERE invitee.id = space_member.user_id)",
|
||||
}, []any{}
|
||||
if find.SpaceID != nil {
|
||||
where, args = append(where, "space_member.space_id = ?"), append(args, *find.SpaceID)
|
||||
}
|
||||
if find.UserID != nil {
|
||||
where, args = append(where, "space_member.user_id = ?"), append(args, *find.UserID)
|
||||
}
|
||||
if find.ViewerUserID != nil {
|
||||
where, args = append(where, `(
|
||||
(space_member.user_id = ? AND EXISTS (SELECT 1 FROM user viewer_user WHERE viewer_user.id = ? AND viewer_user.row_status = 'NORMAL'))
|
||||
OR EXISTS (
|
||||
SELECT 1 FROM space_member viewer
|
||||
JOIN user viewer_user ON viewer_user.id = viewer.user_id
|
||||
WHERE viewer.space_id = space_member.space_id
|
||||
AND viewer.user_id = ?
|
||||
AND viewer.status = 'ACTIVE'
|
||||
AND viewer.role = 'ADMIN'
|
||||
AND viewer_user.row_status = 'NORMAL'
|
||||
)
|
||||
)`), append(args, *find.ViewerUserID, *find.ViewerUserID, *find.ViewerUserID)
|
||||
}
|
||||
query := `SELECT space_id, user_id, role FROM space_member
|
||||
WHERE ` + strings.Join(where, " AND ") + ` ORDER BY space_id DESC, user_id ASC`
|
||||
query = appendMySQLLimit(query, find.Limit, find.Offset)
|
||||
rows, err := d.db.QueryContext(ctx, query, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
invitations := []*store.SpaceInvitation{}
|
||||
for rows.Next() {
|
||||
invitation := &store.SpaceInvitation{}
|
||||
if err := rows.Scan(&invitation.SpaceID, &invitation.UserID, &invitation.Role); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
invitations = append(invitations, invitation)
|
||||
}
|
||||
return invitations, rows.Err()
|
||||
}
|
||||
|
||||
func (d *DB) AcceptSpaceInvitation(ctx context.Context, accept *store.AcceptSpaceInvitation, actorUserID int32) (*store.SpaceMember, error) {
|
||||
if accept.UserID != actorUserID {
|
||||
return nil, store.ErrSpacePermissionDenied
|
||||
}
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
// Keep the invitee alive until the relationship becomes ACTIVE.
|
||||
if err := lockMySQLActiveUser(ctx, tx, accept.UserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result, err := tx.ExecContext(ctx, `UPDATE space_member SET status = ?
|
||||
WHERE space_id = ? AND user_id = ? AND status = ? AND role IN ('ADMIN', 'USER')`, store.SpaceMemberStatusActive, accept.SpaceID, accept.UserID, store.SpaceMemberStatusInvited)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
updated, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if updated == 0 {
|
||||
return nil, store.ErrSpaceInvitationNotFound
|
||||
}
|
||||
member, err := getMySQLSpaceMember(ctx, tx, accept.SpaceID, accept.UserID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return member, nil
|
||||
}
|
||||
|
||||
func (d *DB) DeclineSpaceInvitation(ctx context.Context, decline *store.DeclineSpaceInvitation, actorUserID int32) error {
|
||||
if decline.UserID != actorUserID {
|
||||
return store.ErrSpacePermissionDenied
|
||||
}
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := requireMySQLActiveUser(ctx, tx, decline.UserID); err != nil {
|
||||
return err
|
||||
}
|
||||
result, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = ? AND user_id = ? AND status = ?", decline.SpaceID, decline.UserID, store.SpaceMemberStatusInvited)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
deleted, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if deleted == 0 {
|
||||
return store.ErrSpaceInvitationNotFound
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
func (d *DB) RevokeSpaceInvitation(ctx context.Context, revoke *store.RevokeSpaceInvitation, actorUserID int32) error {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := authorizeMySQLSpaceAdmin(ctx, tx, revoke.SpaceID, actorUserID); err != nil {
|
||||
return err
|
||||
}
|
||||
result, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = ? AND user_id = ? AND status = ?", revoke.SpaceID, revoke.UserID, store.SpaceMemberStatusInvited)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
deleted, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if deleted == 0 {
|
||||
return store.ErrSpaceInvitationNotFound
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
func (d *DB) UpdateSpaceMember(ctx context.Context, update *store.UpdateSpaceMember, actorUserID int32) (*store.SpaceMember, error) {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := requireMySQLActiveUsers(ctx, tx, actorUserID, update.UserID); err != nil {
|
||||
if err := authorizeMySQLSpaceAdmin(ctx, tx, update.SpaceID, actorUserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := authorizeMySQLSpaceAdmin(ctx, tx, update.SpaceID, actorUserID); err != nil {
|
||||
if err := requireMySQLActiveUser(ctx, tx, update.UserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
current, err := getMySQLSpaceMember(ctx, tx, update.SpaceID, update.UserID)
|
||||
|
|
@ -195,7 +340,7 @@ func (d *DB) UpdateSpaceMember(ctx context.Context, update *store.UpdateSpaceMem
|
|||
}
|
||||
if current.Role == store.SpaceMemberRoleAdmin && update.Role != nil && *update.Role != store.SpaceMemberRoleAdmin {
|
||||
var count int
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.role = ? AND u.row_status = 'NORMAL'", update.SpaceID, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.status = ? AND sm.role = ? AND u.row_status = 'NORMAL'", update.SpaceID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if count <= 1 {
|
||||
|
|
@ -206,8 +351,8 @@ func (d *DB) UpdateSpaceMember(ctx context.Context, update *store.UpdateSpaceMem
|
|||
if update.Role != nil {
|
||||
sets, args = append(sets, "role = ?"), append(args, *update.Role)
|
||||
}
|
||||
args = append(args, update.SpaceID, update.UserID)
|
||||
if _, err := tx.ExecContext(ctx, "UPDATE space_member SET "+strings.Join(sets, ", ")+" WHERE space_id = ? AND user_id = ?", args...); err != nil {
|
||||
args = append(args, update.SpaceID, update.UserID, store.SpaceMemberStatusActive)
|
||||
if _, err := tx.ExecContext(ctx, "UPDATE space_member SET "+strings.Join(sets, ", ")+" WHERE space_id = ? AND user_id = ? AND status = ?", args...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
member, err := getMySQLSpaceMember(ctx, tx, update.SpaceID, update.UserID)
|
||||
|
|
@ -242,7 +387,7 @@ func (d *DB) DeleteSpaceMember(ctx context.Context, delete *store.DeleteSpaceMem
|
|||
}
|
||||
if actorUserID != delete.UserID {
|
||||
var role store.SpaceMemberRole
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = ? AND user_id = ?", delete.SpaceID, actorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = ? AND user_id = ? AND status = ?", delete.SpaceID, actorUserID, store.SpaceMemberStatusActive).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpacePermissionDenied
|
||||
} else if err != nil {
|
||||
return err
|
||||
|
|
@ -259,14 +404,14 @@ func (d *DB) DeleteSpaceMember(ctx context.Context, delete *store.DeleteSpaceMem
|
|||
}
|
||||
if member.Role == store.SpaceMemberRoleAdmin && userStatuses[delete.UserID] == store.Normal {
|
||||
var count int
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.role = ? AND u.row_status = 'NORMAL'", delete.SpaceID, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.status = ? AND sm.role = ? AND u.row_status = 'NORMAL'", delete.SpaceID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
return err
|
||||
}
|
||||
if count <= 1 {
|
||||
return store.ErrLastSpaceAdmin
|
||||
}
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = ? AND user_id = ?", delete.SpaceID, delete.UserID); err != nil {
|
||||
if _, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = ? AND user_id = ? AND status = ?", delete.SpaceID, delete.UserID, store.SpaceMemberStatusActive); err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.Commit()
|
||||
|
|
@ -285,10 +430,16 @@ func getMySQLSpace(ctx context.Context, tx *sql.Tx, id int32) (*store.Space, err
|
|||
|
||||
func getMySQLSpaceMember(ctx context.Context, tx *sql.Tx, spaceID, userID int32) (*store.SpaceMember, error) {
|
||||
member := &store.SpaceMember{}
|
||||
err := tx.QueryRowContext(ctx, `SELECT space_id, user_id, role FROM space_member WHERE space_id = ? AND user_id = ?`, spaceID, userID).Scan(&member.SpaceID, &member.UserID, &member.Role)
|
||||
err := tx.QueryRowContext(ctx, `SELECT space_id, user_id, role FROM space_member WHERE space_id = ? AND user_id = ? AND status = ?`, spaceID, userID, store.SpaceMemberStatusActive).Scan(&member.SpaceID, &member.UserID, &member.Role)
|
||||
return member, err
|
||||
}
|
||||
|
||||
func getMySQLSpaceInvitation(ctx context.Context, tx *sql.Tx, spaceID, userID int32) (*store.SpaceInvitation, error) {
|
||||
invitation := &store.SpaceInvitation{}
|
||||
err := tx.QueryRowContext(ctx, `SELECT space_id, user_id, role FROM space_member WHERE space_id = ? AND user_id = ? AND status = ?`, spaceID, userID, store.SpaceMemberStatusInvited).Scan(&invitation.SpaceID, &invitation.UserID, &invitation.Role)
|
||||
return invitation, err
|
||||
}
|
||||
|
||||
func authorizeMySQLSpaceAdmin(ctx context.Context, tx *sql.Tx, spaceID, actorUserID int32) error {
|
||||
var existingSpaceID int32
|
||||
if err := tx.QueryRowContext(ctx, "SELECT id FROM space WHERE id = ?", spaceID).Scan(&existingSpaceID); err != nil {
|
||||
|
|
@ -298,7 +449,7 @@ func authorizeMySQLSpaceAdmin(ctx context.Context, tx *sql.Tx, spaceID, actorUse
|
|||
return err
|
||||
}
|
||||
var role store.SpaceMemberRole
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = ? AND user_id = ?", spaceID, actorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT sm.role FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.user_id = ? AND sm.status = ? AND u.row_status = 'NORMAL'", spaceID, actorUserID, store.SpaceMemberStatusActive).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpacePermissionDenied
|
||||
} else if err != nil {
|
||||
return err
|
||||
|
|
@ -312,6 +463,28 @@ func requireMySQLActiveUser(ctx context.Context, tx *sql.Tx, userID int32) error
|
|||
return requireMySQLActiveUsers(ctx, tx, userID)
|
||||
}
|
||||
|
||||
func lockMySQLActiveUser(ctx context.Context, tx *sql.Tx, userID int32) error {
|
||||
var status store.RowStatus
|
||||
if err := tx.QueryRowContext(ctx, "SELECT row_status FROM user WHERE id = ? FOR UPDATE", userID).Scan(&status); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpaceMemberNotActive
|
||||
} else if err != nil {
|
||||
return err
|
||||
} else if status != store.Normal {
|
||||
return store.ErrSpaceMemberNotActive
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func lockMySQLSpace(ctx context.Context, tx *sql.Tx, spaceID int32) error {
|
||||
var storedSpaceID int32
|
||||
if err := tx.QueryRowContext(ctx, "SELECT id FROM space WHERE id = ? FOR UPDATE", spaceID).Scan(&storedSpaceID); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpaceNotFound
|
||||
} else if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func requireMySQLActiveUsers(ctx context.Context, tx *sql.Tx, userIDs ...int32) error {
|
||||
statuses, err := readMySQLUserStatuses(ctx, tx, userIDs...)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -56,14 +56,15 @@ func requireMySQLSpaceDeleteAdmin(ctx context.Context, tx *sql.Tx, delete *store
|
|||
return store.ErrSpacePermissionDenied
|
||||
}
|
||||
var spaceID int32
|
||||
if err := tx.QueryRowContext(ctx, "SELECT id FROM space WHERE id = ?", delete.ID).Scan(&spaceID); err != nil {
|
||||
// Invitation creation takes the same lock before inserting its relationship.
|
||||
if err := tx.QueryRowContext(ctx, "SELECT id FROM space WHERE id = ? FOR UPDATE", delete.ID).Scan(&spaceID); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpaceNotFound
|
||||
}
|
||||
return err
|
||||
}
|
||||
var role store.SpaceMemberRole
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = ? AND user_id = ?", delete.ID, delete.ActorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = ? AND user_id = ? AND status = 'ACTIVE'", delete.ID, delete.ActorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpacePermissionDenied
|
||||
} else if err != nil {
|
||||
return errors.Wrap(err, "failed to read space administrator membership")
|
||||
|
|
|
|||
|
|
@ -105,11 +105,11 @@ func validateMySQLUserArchive(ctx context.Context, tx *sql.Tx, userID int32) err
|
|||
if err := tx.QueryRowContext(ctx, `SELECT EXISTS(
|
||||
SELECT 1 FROM space_member target
|
||||
JOIN space s ON s.id = target.space_id
|
||||
WHERE target.user_id = ? AND target.role = 'ADMIN'
|
||||
WHERE target.user_id = ? AND target.status = 'ACTIVE' AND target.role = 'ADMIN'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM space_member other JOIN user u ON u.id = other.user_id
|
||||
WHERE other.space_id = target.space_id AND other.user_id <> ?
|
||||
AND other.role = 'ADMIN' AND u.row_status = 'NORMAL'
|
||||
AND other.status = 'ACTIVE' AND other.role = 'ADMIN' AND u.row_status = 'NORMAL'
|
||||
))`, userID, userID).Scan(&wouldLoseAdmin); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,18 +30,23 @@ func (d *DB) DeleteUser(ctx context.Context, delete *store.DeleteUser) (*store.D
|
|||
_ = tx.Rollback()
|
||||
}()
|
||||
var userID int32
|
||||
if err := tx.QueryRowContext(ctx, "SELECT id FROM user WHERE id = ?", delete.ID).Scan(&userID); errors.Is(err, sql.ErrNoRows) {
|
||||
// Relationship creation locks this same parent row before inserting or
|
||||
// activating a membership, preventing either transaction from leaving an orphan.
|
||||
if err := tx.QueryRowContext(ctx, "SELECT id FROM user WHERE id = ? FOR UPDATE", delete.ID).Scan(&userID); errors.Is(err, sql.ErrNoRows) {
|
||||
return &store.DeleteUserResult{}, nil
|
||||
} else if err != nil {
|
||||
return nil, errors.Wrap(err, "failed to read user")
|
||||
}
|
||||
var membershipCount int
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member WHERE user_id = ?", delete.ID).Scan(&membershipCount); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member WHERE user_id = ? AND status <> 'INVITED'", delete.ID).Scan(&membershipCount); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to check user space memberships")
|
||||
}
|
||||
if membershipCount != 0 {
|
||||
return nil, store.ErrUserHasSpaceMembership
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE user_id = ? AND status = 'INVITED'", delete.ID); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to delete user space invitations")
|
||||
}
|
||||
|
||||
targets, err := collectDeleteUserTargets(ctx, tx, delete.ID)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -86,7 +86,8 @@ func validatePostgresMemoSpaceMember(ctx context.Context, tx *sql.Tx, spaceID, u
|
|||
err := tx.QueryRowContext(ctx, `SELECT
|
||||
EXISTS(SELECT 1 FROM space WHERE id = $1),
|
||||
EXISTS(SELECT 1 FROM space_member sm JOIN "user" u ON u.id = sm.user_id
|
||||
WHERE sm.space_id = $1 AND sm.user_id = $2 AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')`,
|
||||
WHERE sm.space_id = $1 AND sm.user_id = $2 AND sm.status = 'ACTIVE'
|
||||
AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')`,
|
||||
spaceID, userID).Scan(&spaceExists, &memberActive)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ func postgresMemoAccessPredicate(access *store.MemoAccessScope, memoAlias, membe
|
|||
}
|
||||
memberHolder := placeholder(len(*args) + 1)
|
||||
*args = append(*args, *access.UserID)
|
||||
authenticatedClauses = append(authenticatedClauses, "("+memoAlias+".visibility = 'SPACE' AND EXISTS (SELECT 1 FROM space_member AS "+memberAlias+" WHERE "+memberAlias+".space_id = "+memoAlias+".space_id AND "+memberAlias+".user_id = "+memberHolder+" AND "+memberAlias+".role IN ('ADMIN', 'USER')))")
|
||||
authenticatedClauses = append(authenticatedClauses, "("+memoAlias+".visibility = 'SPACE' AND EXISTS (SELECT 1 FROM space_member AS "+memberAlias+" WHERE "+memberAlias+".space_id = "+memoAlias+".space_id AND "+memberAlias+".user_id = "+memberHolder+" AND "+memberAlias+".status = 'ACTIVE' AND "+memberAlias+".role IN ('ADMIN', 'USER')))")
|
||||
|
||||
clauses = append(clauses, `(EXISTS (SELECT 1 FROM "user" AS access_user WHERE access_user.id = `+activeHolder+` AND access_user.row_status = 'NORMAL') AND (`+strings.Join(authenticatedClauses, " OR ")+`))`)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,8 @@ func readPostgresMemoParticipation(ctx context.Context, tx *sql.Tx, memoID, acto
|
|||
if snapshot.ContextSpaceID != nil {
|
||||
if err := tx.QueryRowContext(ctx, `SELECT
|
||||
EXISTS(SELECT 1 FROM space WHERE id = $1),
|
||||
EXISTS(SELECT 1 FROM space_member WHERE space_id = $1 AND user_id = $2 AND role IN ('ADMIN', 'USER'))`,
|
||||
EXISTS(SELECT 1 FROM space_member WHERE space_id = $1 AND user_id = $2
|
||||
AND status = 'ACTIVE' AND role IN ('ADMIN', 'USER'))`,
|
||||
*snapshot.ContextSpaceID, actorUserID).Scan(&snapshot.ContextSpaceExists, &snapshot.ContextMemberActive); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,7 +79,8 @@ func readPostgresMemoSpaceState(ctx context.Context, tx *sql.Tx, spaceID, actorU
|
|||
var spaceExists, memberActive bool
|
||||
if err := tx.QueryRowContext(ctx, `SELECT
|
||||
EXISTS(SELECT 1 FROM space WHERE id = $1),
|
||||
EXISTS(SELECT 1 FROM space_member WHERE space_id = $1 AND user_id = $2 AND role IN ('ADMIN', 'USER'))`,
|
||||
EXISTS(SELECT 1 FROM space_member WHERE space_id = $1 AND user_id = $2
|
||||
AND status = 'ACTIVE' AND role IN ('ADMIN', 'USER'))`,
|
||||
spaceID, actorUserID).Scan(&spaceExists, &memberActive); err != nil {
|
||||
return false, false, err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,9 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
return nil, err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := requirePostgresActiveUser(ctx, tx, creatorID); err != nil {
|
||||
// Lock the creator through the membership insert so a concurrent hard
|
||||
// delete either happens before creation or observes the new membership.
|
||||
if err := lockPostgresActiveUser(ctx, tx, creatorID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
fields := []string{"uid", "title", "description"}
|
||||
|
|
@ -31,7 +33,7 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
}
|
||||
return nil, err
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, "INSERT INTO space_member (space_id, user_id, role) VALUES ($1, $2, $3)", space.ID, creatorID, store.SpaceMemberRoleAdmin); err != nil {
|
||||
if _, err := tx.ExecContext(ctx, "INSERT INTO space_member (space_id, user_id, status, role) VALUES ($1, $2, $3, $4)", space.ID, creatorID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
|
|
@ -49,11 +51,19 @@ func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Sp
|
|||
if find.ID != nil {
|
||||
add("space.id = %s", *find.ID)
|
||||
}
|
||||
if len(find.IDList) > 0 {
|
||||
holders := make([]string, 0, len(find.IDList))
|
||||
for _, id := range find.IDList {
|
||||
args = append(args, id)
|
||||
holders = append(holders, placeholder(len(args)))
|
||||
}
|
||||
where = append(where, "space.id IN ("+strings.Join(holders, ", ")+")")
|
||||
}
|
||||
if find.UID != nil {
|
||||
add("space.uid = %s", *find.UID)
|
||||
}
|
||||
if find.MemberUserID != nil {
|
||||
add(`EXISTS (SELECT 1 FROM space_member sm JOIN "user" u ON u.id = sm.user_id WHERE sm.space_id = space.id AND sm.user_id = %s AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')`, *find.MemberUserID)
|
||||
add(`EXISTS (SELECT 1 FROM space_member sm JOIN "user" u ON u.id = sm.user_id WHERE sm.space_id = space.id AND sm.user_id = %s AND sm.status = 'ACTIVE' AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')`, *find.MemberUserID)
|
||||
}
|
||||
query := `SELECT space.id, space.uid, space.title, space.description
|
||||
FROM space WHERE ` + strings.Join(where, " AND ") + ` ORDER BY space.id DESC`
|
||||
|
|
@ -109,21 +119,25 @@ func (d *DB) UpdateSpace(ctx context.Context, update *store.UpdateSpace, actorUs
|
|||
return space, nil
|
||||
}
|
||||
|
||||
func (d *DB) CreateSpaceMember(ctx context.Context, create *store.SpaceMember, actorUserID int32) (*store.SpaceMember, error) {
|
||||
func (d *DB) CreateSpaceInvitation(ctx context.Context, create *store.SpaceInvitation, actorUserID int32) (*store.SpaceInvitation, error) {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := requirePostgresActiveUsers(ctx, tx, actorUserID, create.UserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := authorizePostgresSpaceAdmin(ctx, tx, create.SpaceID, actorUserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
member := &store.SpaceMember{}
|
||||
err = tx.QueryRowContext(ctx, `INSERT INTO space_member (space_id, user_id, role) VALUES ($1, $2, $3)
|
||||
RETURNING space_id, user_id, role`, create.SpaceID, create.UserID, create.Role).Scan(&member.SpaceID, &member.UserID, &member.Role)
|
||||
// Relationship creation always locks its parents in Space-then-User order.
|
||||
if err := lockPostgresSpace(ctx, tx, create.SpaceID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := lockPostgresActiveUser(ctx, tx, create.UserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
invitation := &store.SpaceInvitation{}
|
||||
err = tx.QueryRowContext(ctx, `INSERT INTO space_member (space_id, user_id, status, role) VALUES ($1, $2, $3, $4)
|
||||
RETURNING space_id, user_id, role`, create.SpaceID, create.UserID, store.SpaceMemberStatusInvited, create.Role).Scan(&invitation.SpaceID, &invitation.UserID, &invitation.Role)
|
||||
if err != nil {
|
||||
if isPostgresUniqueViolation(err) {
|
||||
return nil, store.ErrSpaceMemberAlreadyExists
|
||||
|
|
@ -133,11 +147,12 @@ func (d *DB) CreateSpaceMember(ctx context.Context, create *store.SpaceMember, a
|
|||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return member, nil
|
||||
return invitation, nil
|
||||
}
|
||||
|
||||
func (d *DB) ListSpaceMembers(ctx context.Context, find *store.FindSpaceMember) ([]*store.SpaceMember, error) {
|
||||
where, args := []string{
|
||||
"space_member.status = 'ACTIVE'",
|
||||
"space_member.role IN ('ADMIN', 'USER')",
|
||||
"EXISTS (SELECT 1 FROM space member_space WHERE member_space.id = space_member.space_id)",
|
||||
`EXISTS (SELECT 1 FROM "user" member_user WHERE member_user.id = space_member.user_id AND member_user.row_status = 'NORMAL')`,
|
||||
|
|
@ -153,7 +168,7 @@ func (d *DB) ListSpaceMembers(ctx context.Context, find *store.FindSpaceMember)
|
|||
add("user_id = %s", *find.UserID)
|
||||
}
|
||||
if find.ViewerUserID != nil {
|
||||
add(`EXISTS (SELECT 1 FROM space_member viewer JOIN "user" viewer_user ON viewer_user.id = viewer.user_id WHERE viewer.space_id = space_member.space_id AND viewer.user_id = %s AND viewer.role IN ('ADMIN', 'USER') AND viewer_user.row_status = 'NORMAL')`, *find.ViewerUserID)
|
||||
add(`EXISTS (SELECT 1 FROM space_member viewer JOIN "user" viewer_user ON viewer_user.id = viewer.user_id WHERE viewer.space_id = space_member.space_id AND viewer.user_id = %s AND viewer.status = 'ACTIVE' AND viewer.role IN ('ADMIN', 'USER') AND viewer_user.row_status = 'NORMAL')`, *find.ViewerUserID)
|
||||
}
|
||||
query := `SELECT space_id, user_id, role FROM space_member WHERE ` + strings.Join(where, " AND ") + ` ORDER BY user_id ASC`
|
||||
query = appendPostgresLimit(query, find.Limit, find.Offset)
|
||||
|
|
@ -173,16 +188,146 @@ func (d *DB) ListSpaceMembers(ctx context.Context, find *store.FindSpaceMember)
|
|||
return members, rows.Err()
|
||||
}
|
||||
|
||||
func (d *DB) ListSpaceInvitations(ctx context.Context, find *store.FindSpaceInvitation) ([]*store.SpaceInvitation, error) {
|
||||
where, args := []string{
|
||||
"space_member.status = 'INVITED'",
|
||||
"space_member.role IN ('ADMIN', 'USER')",
|
||||
"EXISTS (SELECT 1 FROM space invitation_space WHERE invitation_space.id = space_member.space_id)",
|
||||
`EXISTS (SELECT 1 FROM "user" invitee WHERE invitee.id = space_member.user_id)`,
|
||||
}, []any{}
|
||||
add := func(condition string, value any) {
|
||||
args = append(args, value)
|
||||
where = append(where, fmt.Sprintf(condition, placeholder(len(args))))
|
||||
}
|
||||
if find.SpaceID != nil {
|
||||
add("space_member.space_id = %s", *find.SpaceID)
|
||||
}
|
||||
if find.UserID != nil {
|
||||
add("space_member.user_id = %s", *find.UserID)
|
||||
}
|
||||
if find.ViewerUserID != nil {
|
||||
args = append(args, *find.ViewerUserID)
|
||||
viewerPlaceholder := placeholder(len(args))
|
||||
where = append(where, fmt.Sprintf(`(
|
||||
(space_member.user_id = %[1]s AND EXISTS (SELECT 1 FROM "user" viewer_user WHERE viewer_user.id = %[1]s AND viewer_user.row_status = 'NORMAL'))
|
||||
OR EXISTS (
|
||||
SELECT 1 FROM space_member viewer
|
||||
JOIN "user" viewer_user ON viewer_user.id = viewer.user_id
|
||||
WHERE viewer.space_id = space_member.space_id
|
||||
AND viewer.user_id = %[1]s
|
||||
AND viewer.status = 'ACTIVE'
|
||||
AND viewer.role = 'ADMIN'
|
||||
AND viewer_user.row_status = 'NORMAL'
|
||||
)
|
||||
)`, viewerPlaceholder))
|
||||
}
|
||||
query := `SELECT space_id, user_id, role FROM space_member
|
||||
WHERE ` + strings.Join(where, " AND ") + ` ORDER BY space_id DESC, user_id ASC`
|
||||
query = appendPostgresLimit(query, find.Limit, find.Offset)
|
||||
rows, err := d.db.QueryContext(ctx, query, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
invitations := []*store.SpaceInvitation{}
|
||||
for rows.Next() {
|
||||
invitation := &store.SpaceInvitation{}
|
||||
if err := rows.Scan(&invitation.SpaceID, &invitation.UserID, &invitation.Role); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
invitations = append(invitations, invitation)
|
||||
}
|
||||
return invitations, rows.Err()
|
||||
}
|
||||
|
||||
func (d *DB) AcceptSpaceInvitation(ctx context.Context, accept *store.AcceptSpaceInvitation, actorUserID int32) (*store.SpaceMember, error) {
|
||||
if accept.UserID != actorUserID {
|
||||
return nil, store.ErrSpacePermissionDenied
|
||||
}
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
// Keep the invitee alive until the relationship becomes ACTIVE.
|
||||
if err := lockPostgresActiveUser(ctx, tx, accept.UserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
member := &store.SpaceMember{}
|
||||
query := `UPDATE space_member SET status = $1
|
||||
WHERE space_id = $2 AND user_id = $3 AND status = $4 AND role IN ('ADMIN', 'USER')
|
||||
RETURNING space_id, user_id, role`
|
||||
if err := tx.QueryRowContext(ctx, query, store.SpaceMemberStatusActive, accept.SpaceID, accept.UserID, store.SpaceMemberStatusInvited).Scan(&member.SpaceID, &member.UserID, &member.Role); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, store.ErrSpaceInvitationNotFound
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return member, nil
|
||||
}
|
||||
|
||||
func (d *DB) DeclineSpaceInvitation(ctx context.Context, decline *store.DeclineSpaceInvitation, actorUserID int32) error {
|
||||
if decline.UserID != actorUserID {
|
||||
return store.ErrSpacePermissionDenied
|
||||
}
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := requirePostgresActiveUser(ctx, tx, decline.UserID); err != nil {
|
||||
return err
|
||||
}
|
||||
result, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = $1 AND user_id = $2 AND status = $3", decline.SpaceID, decline.UserID, store.SpaceMemberStatusInvited)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
deleted, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if deleted == 0 {
|
||||
return store.ErrSpaceInvitationNotFound
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
func (d *DB) RevokeSpaceInvitation(ctx context.Context, revoke *store.RevokeSpaceInvitation, actorUserID int32) error {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := authorizePostgresSpaceAdmin(ctx, tx, revoke.SpaceID, actorUserID); err != nil {
|
||||
return err
|
||||
}
|
||||
result, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = $1 AND user_id = $2 AND status = $3", revoke.SpaceID, revoke.UserID, store.SpaceMemberStatusInvited)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
deleted, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if deleted == 0 {
|
||||
return store.ErrSpaceInvitationNotFound
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
func (d *DB) UpdateSpaceMember(ctx context.Context, update *store.UpdateSpaceMember, actorUserID int32) (*store.SpaceMember, error) {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := requirePostgresActiveUsers(ctx, tx, actorUserID, update.UserID); err != nil {
|
||||
if err := authorizePostgresSpaceAdmin(ctx, tx, update.SpaceID, actorUserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := authorizePostgresSpaceAdmin(ctx, tx, update.SpaceID, actorUserID); err != nil {
|
||||
if err := requirePostgresActiveUser(ctx, tx, update.UserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
current, err := getPostgresSpaceMember(ctx, tx, update.SpaceID, update.UserID)
|
||||
|
|
@ -194,7 +339,7 @@ func (d *DB) UpdateSpaceMember(ctx context.Context, update *store.UpdateSpaceMem
|
|||
}
|
||||
if current.Role == store.SpaceMemberRoleAdmin && update.Role != nil && *update.Role != store.SpaceMemberRoleAdmin {
|
||||
var count int
|
||||
if err := tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM space_member sm JOIN "user" u ON u.id = sm.user_id WHERE sm.space_id = $1 AND sm.role = $2 AND u.row_status = 'NORMAL'`, update.SpaceID, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM space_member sm JOIN "user" u ON u.id = sm.user_id WHERE sm.space_id = $1 AND sm.status = $2 AND sm.role = $3 AND u.row_status = 'NORMAL'`, update.SpaceID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if count <= 1 {
|
||||
|
|
@ -209,9 +354,9 @@ func (d *DB) UpdateSpaceMember(ctx context.Context, update *store.UpdateSpaceMem
|
|||
if update.Role != nil {
|
||||
add("role", *update.Role)
|
||||
}
|
||||
args = append(args, update.SpaceID, update.UserID)
|
||||
args = append(args, update.SpaceID, update.UserID, store.SpaceMemberStatusActive)
|
||||
member := &store.SpaceMember{}
|
||||
query := "UPDATE space_member SET " + strings.Join(sets, ", ") + " WHERE space_id = " + placeholder(len(args)-1) + " AND user_id = " + placeholder(len(args)) + " RETURNING space_id, user_id, role"
|
||||
query := "UPDATE space_member SET " + strings.Join(sets, ", ") + " WHERE space_id = " + placeholder(len(args)-2) + " AND user_id = " + placeholder(len(args)-1) + " AND status = " + placeholder(len(args)) + " RETURNING space_id, user_id, role"
|
||||
if err := tx.QueryRowContext(ctx, query, args...).Scan(&member.SpaceID, &member.UserID, &member.Role); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -243,7 +388,7 @@ func (d *DB) DeleteSpaceMember(ctx context.Context, delete *store.DeleteSpaceMem
|
|||
}
|
||||
if actorUserID != delete.UserID {
|
||||
var role store.SpaceMemberRole
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = $1 AND user_id = $2", delete.SpaceID, actorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = $1 AND user_id = $2 AND status = $3", delete.SpaceID, actorUserID, store.SpaceMemberStatusActive).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpacePermissionDenied
|
||||
} else if err != nil {
|
||||
return err
|
||||
|
|
@ -260,14 +405,14 @@ func (d *DB) DeleteSpaceMember(ctx context.Context, delete *store.DeleteSpaceMem
|
|||
}
|
||||
if member.Role == store.SpaceMemberRoleAdmin && userStatuses[delete.UserID] == store.Normal {
|
||||
var count int
|
||||
if err := tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM space_member sm JOIN "user" u ON u.id = sm.user_id WHERE sm.space_id = $1 AND sm.role = $2 AND u.row_status = 'NORMAL'`, delete.SpaceID, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM space_member sm JOIN "user" u ON u.id = sm.user_id WHERE sm.space_id = $1 AND sm.status = $2 AND sm.role = $3 AND u.row_status = 'NORMAL'`, delete.SpaceID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
return err
|
||||
}
|
||||
if count <= 1 {
|
||||
return store.ErrLastSpaceAdmin
|
||||
}
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = $1 AND user_id = $2", delete.SpaceID, delete.UserID); err != nil {
|
||||
if _, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = $1 AND user_id = $2 AND status = $3", delete.SpaceID, delete.UserID, store.SpaceMemberStatusActive); err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.Commit()
|
||||
|
|
@ -282,7 +427,7 @@ func authorizePostgresSpaceAdmin(ctx context.Context, tx *sql.Tx, spaceID, actor
|
|||
return err
|
||||
}
|
||||
var role store.SpaceMemberRole
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = $1 AND user_id = $2", spaceID, actorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
if err := tx.QueryRowContext(ctx, `SELECT sm.role FROM space_member sm JOIN "user" u ON u.id = sm.user_id WHERE sm.space_id = $1 AND sm.user_id = $2 AND sm.status = $3 AND u.row_status = 'NORMAL'`, spaceID, actorUserID, store.SpaceMemberStatusActive).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpacePermissionDenied
|
||||
} else if err != nil {
|
||||
return err
|
||||
|
|
@ -296,9 +441,31 @@ func requirePostgresActiveUser(ctx context.Context, tx *sql.Tx, userID int32) er
|
|||
return requirePostgresActiveUsers(ctx, tx, userID)
|
||||
}
|
||||
|
||||
func lockPostgresActiveUser(ctx context.Context, tx *sql.Tx, userID int32) error {
|
||||
var status store.RowStatus
|
||||
if err := tx.QueryRowContext(ctx, `SELECT row_status FROM "user" WHERE id = $1 FOR UPDATE`, userID).Scan(&status); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpaceMemberNotActive
|
||||
} else if err != nil {
|
||||
return err
|
||||
} else if status != store.Normal {
|
||||
return store.ErrSpaceMemberNotActive
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func lockPostgresSpace(ctx context.Context, tx *sql.Tx, spaceID int32) error {
|
||||
var storedSpaceID int32
|
||||
if err := tx.QueryRowContext(ctx, "SELECT id FROM space WHERE id = $1 FOR UPDATE", spaceID).Scan(&storedSpaceID); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpaceNotFound
|
||||
} else if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func getPostgresSpaceMember(ctx context.Context, tx *sql.Tx, spaceID, userID int32) (*store.SpaceMember, error) {
|
||||
member := &store.SpaceMember{}
|
||||
err := tx.QueryRowContext(ctx, `SELECT space_id, user_id, role FROM space_member WHERE space_id = $1 AND user_id = $2`, spaceID, userID).Scan(&member.SpaceID, &member.UserID, &member.Role)
|
||||
err := tx.QueryRowContext(ctx, `SELECT space_id, user_id, role FROM space_member WHERE space_id = $1 AND user_id = $2 AND status = $3`, spaceID, userID, store.SpaceMemberStatusActive).Scan(&member.SpaceID, &member.UserID, &member.Role)
|
||||
return member, err
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -57,14 +57,15 @@ func requirePostgresSpaceDeleteAdmin(ctx context.Context, tx *sql.Tx, delete *st
|
|||
return store.ErrSpacePermissionDenied
|
||||
}
|
||||
var spaceID int32
|
||||
if err := tx.QueryRowContext(ctx, "SELECT id FROM space WHERE id = $1", delete.ID).Scan(&spaceID); err != nil {
|
||||
// Invitation creation takes the same lock before inserting its relationship.
|
||||
if err := tx.QueryRowContext(ctx, "SELECT id FROM space WHERE id = $1 FOR UPDATE", delete.ID).Scan(&spaceID); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpaceNotFound
|
||||
}
|
||||
return err
|
||||
}
|
||||
var role store.SpaceMemberRole
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = $1 AND user_id = $2", delete.ID, delete.ActorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = $1 AND user_id = $2 AND status = 'ACTIVE'", delete.ID, delete.ActorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpacePermissionDenied
|
||||
} else if err != nil {
|
||||
return errors.Wrap(err, "failed to read space administrator membership")
|
||||
|
|
|
|||
|
|
@ -92,7 +92,8 @@ func validatePostgresUserArchive(ctx context.Context, tx *sql.Tx, userID int32)
|
|||
if err := tx.QueryRowContext(ctx, `SELECT EXISTS (
|
||||
SELECT 1
|
||||
FROM "user" target_user
|
||||
JOIN space_member target ON target.user_id = target_user.id AND target.role = 'ADMIN'
|
||||
JOIN space_member target ON target.user_id = target_user.id
|
||||
AND target.status = 'ACTIVE' AND target.role = 'ADMIN'
|
||||
JOIN space ON space.id = target.space_id
|
||||
WHERE target_user.id = $1
|
||||
AND target_user.row_status = 'NORMAL'
|
||||
|
|
@ -102,6 +103,7 @@ func validatePostgresUserArchive(ctx context.Context, tx *sql.Tx, userID int32)
|
|||
JOIN "user" other_user ON other_user.id = other.user_id
|
||||
WHERE other.space_id = target.space_id
|
||||
AND other.user_id <> target.user_id
|
||||
AND other.status = 'ACTIVE'
|
||||
AND other.role = 'ADMIN'
|
||||
AND other_user.row_status = 'NORMAL'
|
||||
)
|
||||
|
|
|
|||
|
|
@ -30,18 +30,23 @@ func (d *DB) DeleteUser(ctx context.Context, delete *store.DeleteUser) (*store.D
|
|||
_ = tx.Rollback()
|
||||
}()
|
||||
var userID int32
|
||||
if err := tx.QueryRowContext(ctx, `SELECT id FROM "user" WHERE id = $1`, delete.ID).Scan(&userID); errors.Is(err, sql.ErrNoRows) {
|
||||
// Relationship creation locks this same parent row before inserting or
|
||||
// activating a membership, preventing either transaction from leaving an orphan.
|
||||
if err := tx.QueryRowContext(ctx, `SELECT id FROM "user" WHERE id = $1 FOR UPDATE`, delete.ID).Scan(&userID); errors.Is(err, sql.ErrNoRows) {
|
||||
return &store.DeleteUserResult{}, nil
|
||||
} else if err != nil {
|
||||
return nil, errors.Wrap(err, "failed to read user")
|
||||
}
|
||||
var membershipCount int
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member WHERE user_id = $1", delete.ID).Scan(&membershipCount); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member WHERE user_id = $1 AND status <> 'INVITED'", delete.ID).Scan(&membershipCount); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to check user space memberships")
|
||||
}
|
||||
if membershipCount != 0 {
|
||||
return nil, store.ErrUserHasSpaceMembership
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE user_id = $1 AND status = 'INVITED'", delete.ID); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to delete user space invitations")
|
||||
}
|
||||
|
||||
targets, err := collectDeleteUserTargets(ctx, tx, delete.ID)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -94,7 +94,8 @@ func validateSQLiteMemoSpaceMember(ctx context.Context, tx dbExecutor, spaceID,
|
|||
}
|
||||
err := tx.QueryRowContext(ctx, `SELECT EXISTS(
|
||||
SELECT 1 FROM space_member sm JOIN user u ON u.id = sm.user_id
|
||||
WHERE sm.space_id = ? AND sm.user_id = ? AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')`, spaceID, userID).Scan(&exists)
|
||||
WHERE sm.space_id = ? AND sm.user_id = ? AND sm.status = 'ACTIVE'
|
||||
AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')`, spaceID, userID).Scan(&exists)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ func sqliteMemoAccessPredicate(access *store.MemoAccessScope, memoAlias, memberA
|
|||
authenticatedClauses = append(authenticatedClauses, memoAlias+".`visibility` = 'PROTECTED'")
|
||||
}
|
||||
*args = append(*args, *access.UserID)
|
||||
authenticatedClauses = append(authenticatedClauses, "("+memoAlias+".`visibility` = 'SPACE' AND EXISTS (SELECT 1 FROM `space_member` AS "+memberAlias+" WHERE "+memberAlias+".`space_id` = "+memoAlias+".`space_id` AND "+memberAlias+".`user_id` = ? AND "+memberAlias+".`role` IN ('ADMIN', 'USER')))")
|
||||
authenticatedClauses = append(authenticatedClauses, "("+memoAlias+".`visibility` = 'SPACE' AND EXISTS (SELECT 1 FROM `space_member` AS "+memberAlias+" WHERE "+memberAlias+".`space_id` = "+memoAlias+".`space_id` AND "+memberAlias+".`user_id` = ? AND "+memberAlias+".`status` = 'ACTIVE' AND "+memberAlias+".`role` IN ('ADMIN', 'USER')))")
|
||||
|
||||
clauses = append(clauses, "(EXISTS (SELECT 1 FROM `user` AS `access_user` WHERE `access_user`.`id` = ? AND `access_user`.`row_status` = 'NORMAL') AND ("+strings.Join(authenticatedClauses, " OR ")+"))")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ func TestValidateSQLiteMemoCreatePreservesQueryErrors(t *testing.T) {
|
|||
_, err = db.Exec(`
|
||||
CREATE TABLE user (id INTEGER PRIMARY KEY, row_status TEXT NOT NULL);
|
||||
CREATE TABLE space (id INTEGER PRIMARY KEY);
|
||||
CREATE TABLE space_member (space_id INTEGER, user_id INTEGER, role TEXT);
|
||||
CREATE TABLE space_member (space_id INTEGER, user_id INTEGER, status TEXT, role TEXT);
|
||||
INSERT INTO user (id, row_status) VALUES (1, 'NORMAL'), (2, 'ARCHIVED');
|
||||
`)
|
||||
require.NoError(t, err)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ func validateSQLiteReactionWritePolicy(ctx context.Context, tx dbExecutor, react
|
|||
func sqliteSpaceMemberActive(ctx context.Context, tx dbExecutor, spaceID, userID int32) (bool, error) {
|
||||
var role store.SpaceMemberRole
|
||||
err := tx.QueryRowContext(ctx, `SELECT role FROM space_member
|
||||
WHERE space_id = ? AND user_id = ? AND role IN ('ADMIN', 'USER')`, spaceID, userID).Scan(&role)
|
||||
WHERE space_id = ? AND user_id = ? AND status = 'ACTIVE' AND role IN ('ADMIN', 'USER')`, spaceID, userID).Scan(&role)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return false, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
}
|
||||
return nil, errors.Wrap(err, "failed to create space")
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, "INSERT INTO space_member (space_id, user_id, role) VALUES (?, ?, ?)", space.ID, creatorID, store.SpaceMemberRoleAdmin); err != nil {
|
||||
if _, err := tx.ExecContext(ctx, "INSERT INTO space_member (space_id, user_id, status, role) VALUES (?, ?, ?, ?)", space.ID, creatorID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to create initial space admin")
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
|
|
@ -48,11 +48,19 @@ func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Sp
|
|||
if find.ID != nil {
|
||||
where, args = append(where, "space.id = ?"), append(args, *find.ID)
|
||||
}
|
||||
if len(find.IDList) > 0 {
|
||||
placeholders := make([]string, 0, len(find.IDList))
|
||||
for _, id := range find.IDList {
|
||||
placeholders = append(placeholders, "?")
|
||||
args = append(args, id)
|
||||
}
|
||||
where = append(where, "space.id IN ("+strings.Join(placeholders, ", ")+")")
|
||||
}
|
||||
if find.UID != nil {
|
||||
where, args = append(where, "space.uid = ?"), append(args, *find.UID)
|
||||
}
|
||||
if find.MemberUserID != nil {
|
||||
where, args = append(where, "EXISTS (SELECT 1 FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = space.id AND sm.user_id = ? AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')"), append(args, *find.MemberUserID)
|
||||
where, args = append(where, "EXISTS (SELECT 1 FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = space.id AND sm.user_id = ? AND sm.status = 'ACTIVE' AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')"), append(args, *find.MemberUserID)
|
||||
}
|
||||
query := `SELECT space.id, space.uid, space.title, space.description
|
||||
FROM space WHERE ` + strings.Join(where, " AND ") + ` ORDER BY space.id DESC`
|
||||
|
|
@ -102,7 +110,7 @@ func (d *DB) UpdateSpace(ctx context.Context, update *store.UpdateSpace, actorUs
|
|||
return space, nil
|
||||
}
|
||||
|
||||
func (d *DB) CreateSpaceMember(ctx context.Context, create *store.SpaceMember, actorUserID int32) (*store.SpaceMember, error) {
|
||||
func (d *DB) CreateSpaceInvitation(ctx context.Context, create *store.SpaceInvitation, actorUserID int32) (*store.SpaceInvitation, error) {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -114,10 +122,10 @@ func (d *DB) CreateSpaceMember(ctx context.Context, create *store.SpaceMember, a
|
|||
if err := requireSQLiteActiveUser(ctx, tx, create.UserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
query := `INSERT INTO space_member (space_id, user_id, role) VALUES (?, ?, ?)
|
||||
query := `INSERT INTO space_member (space_id, user_id, status, role) VALUES (?, ?, ?, ?)
|
||||
RETURNING space_id, user_id, role`
|
||||
member := &store.SpaceMember{}
|
||||
if err := tx.QueryRowContext(ctx, query, create.SpaceID, create.UserID, create.Role).Scan(&member.SpaceID, &member.UserID, &member.Role); err != nil {
|
||||
invitation := &store.SpaceInvitation{}
|
||||
if err := tx.QueryRowContext(ctx, query, create.SpaceID, create.UserID, store.SpaceMemberStatusInvited, create.Role).Scan(&invitation.SpaceID, &invitation.UserID, &invitation.Role); err != nil {
|
||||
if isSQLiteUniqueViolation(err) {
|
||||
return nil, store.ErrSpaceMemberAlreadyExists
|
||||
}
|
||||
|
|
@ -126,11 +134,12 @@ func (d *DB) CreateSpaceMember(ctx context.Context, create *store.SpaceMember, a
|
|||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return member, nil
|
||||
return invitation, nil
|
||||
}
|
||||
|
||||
func (d *DB) ListSpaceMembers(ctx context.Context, find *store.FindSpaceMember) ([]*store.SpaceMember, error) {
|
||||
where, args := []string{
|
||||
"space_member.status = 'ACTIVE'",
|
||||
"space_member.role IN ('ADMIN', 'USER')",
|
||||
"EXISTS (SELECT 1 FROM space member_space WHERE member_space.id = space_member.space_id)",
|
||||
"EXISTS (SELECT 1 FROM user member_user WHERE member_user.id = space_member.user_id AND member_user.row_status = 'NORMAL')",
|
||||
|
|
@ -142,7 +151,7 @@ func (d *DB) ListSpaceMembers(ctx context.Context, find *store.FindSpaceMember)
|
|||
where, args = append(where, "user_id = ?"), append(args, *find.UserID)
|
||||
}
|
||||
if find.ViewerUserID != nil {
|
||||
where, args = append(where, "EXISTS (SELECT 1 FROM space_member viewer JOIN user viewer_user ON viewer_user.id = viewer.user_id WHERE viewer.space_id = space_member.space_id AND viewer.user_id = ? AND viewer.role IN ('ADMIN', 'USER') AND viewer_user.row_status = 'NORMAL')"), append(args, *find.ViewerUserID)
|
||||
where, args = append(where, "EXISTS (SELECT 1 FROM space_member viewer JOIN user viewer_user ON viewer_user.id = viewer.user_id WHERE viewer.space_id = space_member.space_id AND viewer.user_id = ? AND viewer.status = 'ACTIVE' AND viewer.role IN ('ADMIN', 'USER') AND viewer_user.row_status = 'NORMAL')"), append(args, *find.ViewerUserID)
|
||||
}
|
||||
query := `SELECT space_id, user_id, role FROM space_member
|
||||
WHERE ` + strings.Join(where, " AND ") + ` ORDER BY user_id ASC`
|
||||
|
|
@ -163,6 +172,129 @@ func (d *DB) ListSpaceMembers(ctx context.Context, find *store.FindSpaceMember)
|
|||
return members, rows.Err()
|
||||
}
|
||||
|
||||
func (d *DB) ListSpaceInvitations(ctx context.Context, find *store.FindSpaceInvitation) ([]*store.SpaceInvitation, error) {
|
||||
where, args := []string{
|
||||
"space_member.status = 'INVITED'",
|
||||
"space_member.role IN ('ADMIN', 'USER')",
|
||||
"EXISTS (SELECT 1 FROM space invitation_space WHERE invitation_space.id = space_member.space_id)",
|
||||
"EXISTS (SELECT 1 FROM user invitee WHERE invitee.id = space_member.user_id)",
|
||||
}, []any{}
|
||||
if find.SpaceID != nil {
|
||||
where, args = append(where, "space_member.space_id = ?"), append(args, *find.SpaceID)
|
||||
}
|
||||
if find.UserID != nil {
|
||||
where, args = append(where, "space_member.user_id = ?"), append(args, *find.UserID)
|
||||
}
|
||||
if find.ViewerUserID != nil {
|
||||
where, args = append(where, `(
|
||||
(space_member.user_id = ? AND EXISTS (SELECT 1 FROM user viewer_user WHERE viewer_user.id = ? AND viewer_user.row_status = 'NORMAL'))
|
||||
OR EXISTS (
|
||||
SELECT 1 FROM space_member viewer
|
||||
JOIN user viewer_user ON viewer_user.id = viewer.user_id
|
||||
WHERE viewer.space_id = space_member.space_id
|
||||
AND viewer.user_id = ?
|
||||
AND viewer.status = 'ACTIVE'
|
||||
AND viewer.role = 'ADMIN'
|
||||
AND viewer_user.row_status = 'NORMAL'
|
||||
)
|
||||
)`), append(args, *find.ViewerUserID, *find.ViewerUserID, *find.ViewerUserID)
|
||||
}
|
||||
query := `SELECT space_id, user_id, role FROM space_member
|
||||
WHERE ` + strings.Join(where, " AND ") + ` ORDER BY space_id DESC, user_id ASC`
|
||||
query = appendSQLiteLimit(query, find.Limit, find.Offset)
|
||||
rows, err := d.db.QueryContext(ctx, query, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
invitations := []*store.SpaceInvitation{}
|
||||
for rows.Next() {
|
||||
invitation := &store.SpaceInvitation{}
|
||||
if err := rows.Scan(&invitation.SpaceID, &invitation.UserID, &invitation.Role); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
invitations = append(invitations, invitation)
|
||||
}
|
||||
return invitations, rows.Err()
|
||||
}
|
||||
|
||||
func (d *DB) AcceptSpaceInvitation(ctx context.Context, accept *store.AcceptSpaceInvitation, actorUserID int32) (*store.SpaceMember, error) {
|
||||
if accept.UserID != actorUserID {
|
||||
return nil, store.ErrSpacePermissionDenied
|
||||
}
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := requireSQLiteActiveUser(ctx, tx, accept.UserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
member := &store.SpaceMember{}
|
||||
query := `UPDATE space_member SET status = ?
|
||||
WHERE space_id = ? AND user_id = ? AND status = ? AND role IN ('ADMIN', 'USER')
|
||||
RETURNING space_id, user_id, role`
|
||||
if err := tx.QueryRowContext(ctx, query, store.SpaceMemberStatusActive, accept.SpaceID, accept.UserID, store.SpaceMemberStatusInvited).Scan(&member.SpaceID, &member.UserID, &member.Role); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, store.ErrSpaceInvitationNotFound
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return member, nil
|
||||
}
|
||||
|
||||
func (d *DB) DeclineSpaceInvitation(ctx context.Context, decline *store.DeclineSpaceInvitation, actorUserID int32) error {
|
||||
if decline.UserID != actorUserID {
|
||||
return store.ErrSpacePermissionDenied
|
||||
}
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := requireSQLiteActiveUser(ctx, tx, decline.UserID); err != nil {
|
||||
return err
|
||||
}
|
||||
result, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = ? AND user_id = ? AND status = ?", decline.SpaceID, decline.UserID, store.SpaceMemberStatusInvited)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
deleted, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if deleted == 0 {
|
||||
return store.ErrSpaceInvitationNotFound
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
func (d *DB) RevokeSpaceInvitation(ctx context.Context, revoke *store.RevokeSpaceInvitation, actorUserID int32) error {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if err := authorizeSQLiteSpaceAdmin(ctx, tx, revoke.SpaceID, actorUserID); err != nil {
|
||||
return err
|
||||
}
|
||||
result, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = ? AND user_id = ? AND status = ?", revoke.SpaceID, revoke.UserID, store.SpaceMemberStatusInvited)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
deleted, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if deleted == 0 {
|
||||
return store.ErrSpaceInvitationNotFound
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
func (d *DB) UpdateSpaceMember(ctx context.Context, update *store.UpdateSpaceMember, actorUserID int32) (*store.SpaceMember, error) {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
|
|
@ -176,7 +308,7 @@ func (d *DB) UpdateSpaceMember(ctx context.Context, update *store.UpdateSpaceMem
|
|||
return nil, err
|
||||
}
|
||||
var currentRole store.SpaceMemberRole
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = ? AND user_id = ?", update.SpaceID, update.UserID).Scan(¤tRole); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = ? AND user_id = ? AND status = ?", update.SpaceID, update.UserID, store.SpaceMemberStatusActive).Scan(¤tRole); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, store.ErrSpaceMemberNotFound
|
||||
}
|
||||
|
|
@ -184,7 +316,7 @@ func (d *DB) UpdateSpaceMember(ctx context.Context, update *store.UpdateSpaceMem
|
|||
}
|
||||
if currentRole == store.SpaceMemberRoleAdmin && update.Role != nil && *update.Role != store.SpaceMemberRoleAdmin {
|
||||
var count int
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.role = ? AND u.row_status = 'NORMAL'", update.SpaceID, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.status = ? AND sm.role = ? AND u.row_status = 'NORMAL'", update.SpaceID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if count <= 1 {
|
||||
|
|
@ -195,8 +327,8 @@ func (d *DB) UpdateSpaceMember(ctx context.Context, update *store.UpdateSpaceMem
|
|||
if update.Role != nil {
|
||||
sets, args = append(sets, "role = ?"), append(args, *update.Role)
|
||||
}
|
||||
args = append(args, update.SpaceID, update.UserID)
|
||||
query := `UPDATE space_member SET ` + strings.Join(sets, ", ") + ` WHERE space_id = ? AND user_id = ?
|
||||
args = append(args, update.SpaceID, update.UserID, store.SpaceMemberStatusActive)
|
||||
query := `UPDATE space_member SET ` + strings.Join(sets, ", ") + ` WHERE space_id = ? AND user_id = ? AND status = ?
|
||||
RETURNING space_id, user_id, role`
|
||||
member := &store.SpaceMember{}
|
||||
if err := tx.QueryRowContext(ctx, query, args...).Scan(&member.SpaceID, &member.UserID, &member.Role); err != nil {
|
||||
|
|
@ -223,7 +355,7 @@ func (d *DB) DeleteSpaceMember(ctx context.Context, delete *store.DeleteSpaceMem
|
|||
}
|
||||
if actorUserID != delete.UserID {
|
||||
var actorRole store.SpaceMemberRole
|
||||
if err := tx.QueryRowContext(ctx, "SELECT sm.role FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.user_id = ? AND u.row_status = 'NORMAL'", delete.SpaceID, actorUserID).Scan(&actorRole); errors.Is(err, sql.ErrNoRows) {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT sm.role FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.user_id = ? AND sm.status = ? AND u.row_status = 'NORMAL'", delete.SpaceID, actorUserID, store.SpaceMemberStatusActive).Scan(&actorRole); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpacePermissionDenied
|
||||
} else if err != nil {
|
||||
return err
|
||||
|
|
@ -233,7 +365,7 @@ func (d *DB) DeleteSpaceMember(ctx context.Context, delete *store.DeleteSpaceMem
|
|||
}
|
||||
var role store.SpaceMemberRole
|
||||
var targetStatus sql.NullString
|
||||
if err := tx.QueryRowContext(ctx, "SELECT sm.role, u.row_status FROM space_member sm LEFT JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.user_id = ?", delete.SpaceID, delete.UserID).Scan(&role, &targetStatus); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT sm.role, u.row_status FROM space_member sm LEFT JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.user_id = ? AND sm.status = ?", delete.SpaceID, delete.UserID, store.SpaceMemberStatusActive).Scan(&role, &targetStatus); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpaceMemberNotFound
|
||||
}
|
||||
|
|
@ -241,14 +373,14 @@ func (d *DB) DeleteSpaceMember(ctx context.Context, delete *store.DeleteSpaceMem
|
|||
}
|
||||
if role == store.SpaceMemberRoleAdmin && targetStatus.Valid && store.RowStatus(targetStatus.String) == store.Normal {
|
||||
var count int
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.role = ? AND u.row_status = 'NORMAL'", delete.SpaceID, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.status = ? AND sm.role = ? AND u.row_status = 'NORMAL'", delete.SpaceID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin).Scan(&count); err != nil {
|
||||
return err
|
||||
}
|
||||
if count <= 1 {
|
||||
return store.ErrLastSpaceAdmin
|
||||
}
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = ? AND user_id = ?", delete.SpaceID, delete.UserID); err != nil {
|
||||
if _, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE space_id = ? AND user_id = ? AND status = ?", delete.SpaceID, delete.UserID, store.SpaceMemberStatusActive); err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.Commit()
|
||||
|
|
@ -273,7 +405,7 @@ func authorizeSQLiteSpaceAdmin(ctx context.Context, tx dbExecutor, spaceID, acto
|
|||
return err
|
||||
}
|
||||
var role store.SpaceMemberRole
|
||||
if err := tx.QueryRowContext(ctx, "SELECT sm.role FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.user_id = ? AND u.row_status = 'NORMAL'", spaceID, actorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT sm.role FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = ? AND sm.user_id = ? AND sm.status = ? AND u.row_status = 'NORMAL'", spaceID, actorUserID, store.SpaceMemberStatusActive).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpacePermissionDenied
|
||||
} else if err != nil {
|
||||
return err
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ func requireSQLiteSpaceDeleteAdmin(ctx context.Context, tx dbExecutor, delete *s
|
|||
return err
|
||||
}
|
||||
var role store.SpaceMemberRole
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = ? AND user_id = ?", delete.ID, delete.ActorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT role FROM space_member WHERE space_id = ? AND user_id = ? AND status = 'ACTIVE'", delete.ID, delete.ActorUserID).Scan(&role); errors.Is(err, sql.ErrNoRows) {
|
||||
return store.ErrSpacePermissionDenied
|
||||
} else if err != nil {
|
||||
return errors.Wrap(err, "failed to read space administrator membership")
|
||||
|
|
|
|||
|
|
@ -97,10 +97,11 @@ func validateSQLiteUserArchive(ctx context.Context, tx dbExecutor, userID int32)
|
|||
var wouldLoseAdmin bool
|
||||
err := tx.QueryRowContext(ctx, `SELECT EXISTS(
|
||||
SELECT 1 FROM space_member target
|
||||
WHERE target.user_id = ? AND target.role = 'ADMIN'
|
||||
WHERE target.user_id = ? AND target.status = 'ACTIVE' AND target.role = 'ADMIN'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM space_member other JOIN user u ON u.id = other.user_id
|
||||
WHERE other.space_id = target.space_id AND other.user_id <> ? AND other.role = 'ADMIN' AND u.row_status = 'NORMAL'
|
||||
WHERE other.space_id = target.space_id AND other.user_id <> ?
|
||||
AND other.status = 'ACTIVE' AND other.role = 'ADMIN' AND u.row_status = 'NORMAL'
|
||||
))`, userID, userID).Scan(&wouldLoseAdmin)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
|||
|
|
@ -36,12 +36,15 @@ func (d *DB) DeleteUser(ctx context.Context, delete *store.DeleteUser) (*store.D
|
|||
return nil, errors.Wrap(err, "failed to read user")
|
||||
}
|
||||
var membershipCount int
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member WHERE user_id = ?", delete.ID).Scan(&membershipCount); err != nil {
|
||||
if err := tx.QueryRowContext(ctx, "SELECT COUNT(*) FROM space_member WHERE user_id = ? AND status <> 'INVITED'", delete.ID).Scan(&membershipCount); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to check user space memberships")
|
||||
}
|
||||
if membershipCount != 0 {
|
||||
return nil, store.ErrUserHasSpaceMembership
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, "DELETE FROM space_member WHERE user_id = ? AND status = 'INVITED'", delete.ID); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to delete user space invitations")
|
||||
}
|
||||
|
||||
targets, err := collectDeleteUserTargets(ctx, tx, delete.ID)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -39,10 +39,14 @@ type Driver interface {
|
|||
ListSpaces(ctx context.Context, find *FindSpace) ([]*Space, error)
|
||||
UpdateSpace(ctx context.Context, update *UpdateSpace, actorUserID int32) (*Space, error)
|
||||
DeleteSpace(ctx context.Context, delete *DeleteSpace) (*DeleteSpaceResult, error)
|
||||
CreateSpaceMember(ctx context.Context, create *SpaceMember, actorUserID int32) (*SpaceMember, error)
|
||||
ListSpaceMembers(ctx context.Context, find *FindSpaceMember) ([]*SpaceMember, error)
|
||||
UpdateSpaceMember(ctx context.Context, update *UpdateSpaceMember, actorUserID int32) (*SpaceMember, error)
|
||||
DeleteSpaceMember(ctx context.Context, delete *DeleteSpaceMember, actorUserID int32) error
|
||||
CreateSpaceInvitation(ctx context.Context, create *SpaceInvitation, actorUserID int32) (*SpaceInvitation, error)
|
||||
ListSpaceInvitations(ctx context.Context, find *FindSpaceInvitation) ([]*SpaceInvitation, error)
|
||||
AcceptSpaceInvitation(ctx context.Context, accept *AcceptSpaceInvitation, actorUserID int32) (*SpaceMember, error)
|
||||
DeclineSpaceInvitation(ctx context.Context, decline *DeclineSpaceInvitation, actorUserID int32) error
|
||||
RevokeSpaceInvitation(ctx context.Context, revoke *RevokeSpaceInvitation, actorUserID int32) error
|
||||
|
||||
// MemoRelation model related methods.
|
||||
UpsertMemoRelation(ctx context.Context, create *MemoRelation) (*MemoRelation, error)
|
||||
|
|
|
|||
8
store/migration/mysql/0.31/04__space_member_status.sql
Normal file
8
store/migration/mysql/0.31/04__space_member_status.sql
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
ALTER TABLE `space_member`
|
||||
ADD COLUMN `status` VARCHAR(256) NULL AFTER `user_id`;
|
||||
|
||||
UPDATE `space_member`
|
||||
SET `status` = 'ACTIVE';
|
||||
|
||||
ALTER TABLE `space_member`
|
||||
MODIFY COLUMN `status` VARCHAR(256) NOT NULL;
|
||||
|
|
@ -40,6 +40,7 @@ CREATE TABLE `space` (
|
|||
CREATE TABLE `space_member` (
|
||||
`space_id` INT NOT NULL,
|
||||
`user_id` INT NOT NULL,
|
||||
`status` VARCHAR(256) NOT NULL,
|
||||
`role` VARCHAR(256) NOT NULL CHECK (`role` IN ('ADMIN', 'USER')),
|
||||
PRIMARY KEY (`space_id`, `user_id`)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
ALTER TABLE space_member
|
||||
ADD COLUMN status TEXT;
|
||||
|
||||
UPDATE space_member
|
||||
SET status = 'ACTIVE';
|
||||
|
||||
ALTER TABLE space_member
|
||||
ALTER COLUMN status SET NOT NULL;
|
||||
|
|
@ -40,6 +40,7 @@ CREATE TABLE space (
|
|||
CREATE TABLE space_member (
|
||||
space_id INTEGER NOT NULL,
|
||||
user_id INTEGER NOT NULL,
|
||||
status TEXT NOT NULL,
|
||||
role TEXT NOT NULL CHECK (role IN ('ADMIN', 'USER')),
|
||||
PRIMARY KEY (space_id, user_id)
|
||||
);
|
||||
|
|
|
|||
16
store/migration/sqlite/0.31/04__space_member_status.sql
Normal file
16
store/migration/sqlite/0.31/04__space_member_status.sql
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
CREATE TABLE space_member_new (
|
||||
space_id INTEGER NOT NULL,
|
||||
user_id INTEGER NOT NULL,
|
||||
status TEXT NOT NULL,
|
||||
role TEXT NOT NULL CHECK (role IN ('ADMIN', 'USER')),
|
||||
PRIMARY KEY (space_id, user_id)
|
||||
);
|
||||
|
||||
INSERT INTO space_member_new (space_id, user_id, status, role)
|
||||
SELECT space_id, user_id, 'ACTIVE', role
|
||||
FROM space_member;
|
||||
|
||||
DROP TABLE space_member;
|
||||
ALTER TABLE space_member_new RENAME TO space_member;
|
||||
|
||||
CREATE INDEX idx_space_member_user_id ON space_member(user_id, space_id);
|
||||
|
|
@ -41,6 +41,7 @@ CREATE TABLE space (
|
|||
CREATE TABLE space_member (
|
||||
space_id INTEGER NOT NULL,
|
||||
user_id INTEGER NOT NULL,
|
||||
status TEXT NOT NULL,
|
||||
role TEXT NOT NULL CHECK (role IN ('ADMIN', 'USER')),
|
||||
PRIMARY KEY (space_id, user_id)
|
||||
);
|
||||
|
|
|
|||
135
store/space.go
135
store/space.go
|
|
@ -21,7 +21,7 @@ var ErrSpaceMemberNotActive = errors.New("space member user is not active")
|
|||
// ErrSpaceAlreadyExists indicates a duplicate immutable space ID.
|
||||
var ErrSpaceAlreadyExists = errors.New("space already exists")
|
||||
|
||||
// ErrSpaceMemberAlreadyExists indicates an existing membership.
|
||||
// ErrSpaceMemberAlreadyExists indicates an existing membership or invitation.
|
||||
var ErrSpaceMemberAlreadyExists = errors.New("space member already exists")
|
||||
|
||||
// ErrSpaceNotFound indicates a missing mutation target.
|
||||
|
|
@ -30,6 +30,24 @@ var ErrSpaceNotFound = errors.New("space not found")
|
|||
// ErrSpaceMemberNotFound indicates a missing membership mutation target.
|
||||
var ErrSpaceMemberNotFound = errors.New("space member not found")
|
||||
|
||||
// ErrSpaceInvitationNotFound indicates a missing pending invitation.
|
||||
var ErrSpaceInvitationNotFound = errors.New("space invitation not found")
|
||||
|
||||
// SpaceMemberStatus is the state of a user's relationship with a space.
|
||||
type SpaceMemberStatus string
|
||||
|
||||
const (
|
||||
// SpaceMemberStatusInvited represents an invitation that the user has not accepted.
|
||||
SpaceMemberStatusInvited SpaceMemberStatus = "INVITED"
|
||||
// SpaceMemberStatusActive represents a membership that the user has accepted.
|
||||
SpaceMemberStatusActive SpaceMemberStatus = "ACTIVE"
|
||||
)
|
||||
|
||||
// IsValid reports whether the status is recognized.
|
||||
func (s SpaceMemberStatus) IsValid() bool {
|
||||
return s == SpaceMemberStatusInvited || s == SpaceMemberStatusActive
|
||||
}
|
||||
|
||||
// SpaceMemberRole is the role of a user within a space.
|
||||
type SpaceMemberRole string
|
||||
|
||||
|
|
@ -40,9 +58,8 @@ const (
|
|||
SpaceMemberRoleUser SpaceMemberRole = "USER"
|
||||
)
|
||||
|
||||
// IsActiveMember reports whether the role grants space membership. It is the
|
||||
// single definition of membership validity: an unknown role denies the access
|
||||
// that depends on it.
|
||||
// IsActiveMember reports whether the role can grant space membership. The
|
||||
// relationship must separately be ACTIVE before the role grants access.
|
||||
func (r SpaceMemberRole) IsActiveMember() bool {
|
||||
return r == SpaceMemberRoleAdmin || r == SpaceMemberRoleUser
|
||||
}
|
||||
|
|
@ -60,6 +77,7 @@ type Space struct {
|
|||
// user has a membership and is applied before pagination.
|
||||
type FindSpace struct {
|
||||
ID *int32
|
||||
IDList []int32
|
||||
UID *string
|
||||
MemberUserID *int32
|
||||
Limit *int
|
||||
|
|
@ -113,6 +131,42 @@ type DeleteSpaceMember struct {
|
|||
UserID int32
|
||||
}
|
||||
|
||||
// SpaceInvitation is a pending offer for an existing user to join a space.
|
||||
type SpaceInvitation struct {
|
||||
SpaceID int32
|
||||
UserID int32
|
||||
Role SpaceMemberRole
|
||||
}
|
||||
|
||||
// FindSpaceInvitation selects pending invitations. ViewerUserID restricts
|
||||
// results to invitations visible to that user: their own or those in a space
|
||||
// they actively administer.
|
||||
type FindSpaceInvitation struct {
|
||||
SpaceID *int32
|
||||
UserID *int32
|
||||
ViewerUserID *int32
|
||||
Limit *int
|
||||
Offset *int
|
||||
}
|
||||
|
||||
// AcceptSpaceInvitation identifies an invitation accepted by its invitee.
|
||||
type AcceptSpaceInvitation struct {
|
||||
SpaceID int32
|
||||
UserID int32
|
||||
}
|
||||
|
||||
// DeclineSpaceInvitation identifies an invitation declined by its invitee.
|
||||
type DeclineSpaceInvitation struct {
|
||||
SpaceID int32
|
||||
UserID int32
|
||||
}
|
||||
|
||||
// RevokeSpaceInvitation identifies an invitation revoked by a space administrator.
|
||||
type RevokeSpaceInvitation struct {
|
||||
SpaceID int32
|
||||
UserID int32
|
||||
}
|
||||
|
||||
// CreateSpace creates a space and its first ADMIN membership atomically.
|
||||
func (s *Store) CreateSpace(ctx context.Context, create *Space, creatorID int32) (*Space, error) {
|
||||
if create == nil {
|
||||
|
|
@ -174,14 +228,6 @@ func (s *Store) DeleteSpace(ctx context.Context, delete *DeleteSpace) (*DeleteSp
|
|||
return result, nil
|
||||
}
|
||||
|
||||
// CreateSpaceMember creates a membership.
|
||||
func (s *Store) CreateSpaceMember(ctx context.Context, create *SpaceMember, actorUserID int32) (*SpaceMember, error) {
|
||||
if !create.Role.IsActiveMember() {
|
||||
return nil, errors.New("invalid space member role")
|
||||
}
|
||||
return s.driver.CreateSpaceMember(ctx, create, actorUserID)
|
||||
}
|
||||
|
||||
// ListSpaceMembers returns memberships matching find.
|
||||
func (s *Store) ListSpaceMembers(ctx context.Context, find *FindSpaceMember) ([]*SpaceMember, error) {
|
||||
return s.driver.ListSpaceMembers(ctx, find)
|
||||
|
|
@ -214,5 +260,70 @@ func (s *Store) UpdateSpaceMember(ctx context.Context, update *UpdateSpaceMember
|
|||
// DeleteSpaceMember deletes a membership after checking that the change keeps
|
||||
// an active ADMIN.
|
||||
func (s *Store) DeleteSpaceMember(ctx context.Context, delete *DeleteSpaceMember, actorUserID int32) error {
|
||||
if delete == nil || delete.SpaceID <= 0 || delete.UserID <= 0 || actorUserID <= 0 {
|
||||
return errors.New("space member deletion requires space, user, and actor")
|
||||
}
|
||||
return s.driver.DeleteSpaceMember(ctx, delete, actorUserID)
|
||||
}
|
||||
|
||||
// CreateSpaceInvitation creates a pending invitation. It never creates an
|
||||
// active membership; only the invitee can do that by accepting it.
|
||||
func (s *Store) CreateSpaceInvitation(ctx context.Context, create *SpaceInvitation, actorUserID int32) (*SpaceInvitation, error) {
|
||||
if create == nil || create.SpaceID <= 0 || create.UserID <= 0 || actorUserID <= 0 {
|
||||
return nil, errors.New("space invitation requires space, user, and actor")
|
||||
}
|
||||
if !create.Role.IsActiveMember() {
|
||||
return nil, errors.New("invalid space invitation role")
|
||||
}
|
||||
return s.driver.CreateSpaceInvitation(ctx, create, actorUserID)
|
||||
}
|
||||
|
||||
// ListSpaceInvitations returns pending invitations matching find.
|
||||
func (s *Store) ListSpaceInvitations(ctx context.Context, find *FindSpaceInvitation) ([]*SpaceInvitation, error) {
|
||||
return s.driver.ListSpaceInvitations(ctx, find)
|
||||
}
|
||||
|
||||
// GetSpaceInvitation returns the first matching pending invitation.
|
||||
func (s *Store) GetSpaceInvitation(ctx context.Context, find *FindSpaceInvitation) (*SpaceInvitation, error) {
|
||||
invitations, err := s.ListSpaceInvitations(ctx, find)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(invitations) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
return invitations[0], nil
|
||||
}
|
||||
|
||||
// AcceptSpaceInvitation activates a pending invitation only when the actor is
|
||||
// the invitee.
|
||||
func (s *Store) AcceptSpaceInvitation(ctx context.Context, accept *AcceptSpaceInvitation, actorUserID int32) (*SpaceMember, error) {
|
||||
if accept == nil || accept.SpaceID <= 0 || accept.UserID <= 0 || actorUserID <= 0 {
|
||||
return nil, errors.New("space invitation acceptance requires space, user, and actor")
|
||||
}
|
||||
if accept.UserID != actorUserID {
|
||||
return nil, ErrSpacePermissionDenied
|
||||
}
|
||||
return s.driver.AcceptSpaceInvitation(ctx, accept, actorUserID)
|
||||
}
|
||||
|
||||
// DeclineSpaceInvitation deletes a pending invitation only when the actor is
|
||||
// the invitee.
|
||||
func (s *Store) DeclineSpaceInvitation(ctx context.Context, decline *DeclineSpaceInvitation, actorUserID int32) error {
|
||||
if decline == nil || decline.SpaceID <= 0 || decline.UserID <= 0 || actorUserID <= 0 {
|
||||
return errors.New("space invitation decline requires space, user, and actor")
|
||||
}
|
||||
if decline.UserID != actorUserID {
|
||||
return ErrSpacePermissionDenied
|
||||
}
|
||||
return s.driver.DeclineSpaceInvitation(ctx, decline, actorUserID)
|
||||
}
|
||||
|
||||
// RevokeSpaceInvitation deletes a pending invitation after authorizing an
|
||||
// active space administrator.
|
||||
func (s *Store) RevokeSpaceInvitation(ctx context.Context, revoke *RevokeSpaceInvitation, actorUserID int32) error {
|
||||
if revoke == nil || revoke.SpaceID <= 0 || revoke.UserID <= 0 || actorUserID <= 0 {
|
||||
return errors.New("space invitation revocation requires space, user, and actor")
|
||||
}
|
||||
return s.driver.RevokeSpaceInvitation(ctx, revoke, actorUserID)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ func TestAttachmentAccessScopeFiltersBeforePagination(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "attachment-space", Title: "Attachments"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
root, err := ts.CreateMemo(ctx, &store.Memo{UID: "attachment-space-root", CreatorID: owner.ID, Content: "root", Visibility: store.SpaceAudience, SpaceID: &space.ID})
|
||||
require.NoError(t, err)
|
||||
|
|
@ -175,7 +175,7 @@ func TestAttachmentAccessScopeSpaceAudienceHasNoMemoAuthorBypass(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "attachment-author-space", Title: "Author attachment access"}, author.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin}, author.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin}, author.ID)
|
||||
require.NoError(t, err)
|
||||
memo, err := ts.CreateMemo(ctx, &store.Memo{
|
||||
UID: "attachment-author-memo", CreatorID: author.ID, Content: "members", Visibility: store.SpaceAudience, SpaceID: &space.ID,
|
||||
|
|
@ -257,7 +257,7 @@ func TestAttachmentWritePolicyRevalidatesMemoSpaceMembership(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "attachment-write-space", Title: "Attachment Writes"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
root, err := ts.CreateMemo(ctx, &store.Memo{
|
||||
|
|
@ -367,7 +367,7 @@ func TestAttachmentWritePolicyRevalidatesMemoSpaceMembership(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
require.Equal(t, currentBindingRename, stored.Filename)
|
||||
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
restoredRename := "restored-membership.txt"
|
||||
err = ts.UpdateAttachment(ctx, &store.UpdateAttachment{
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ func createAttachmentDeleteSpace(ctx context.Context, t *testing.T, ts *store.St
|
|||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "attachment-delete-" + suffix + "-space", Title: suffix}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: actor.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: actor.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
return owner, actor, space
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ func TestMemoAccessScopeSpaceAudienceHasNoAuthorBypass(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "access-author-space", Title: "Author access"}, author.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin}, author.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin}, author.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
membersMemo, err := ts.CreateMemo(ctx, &store.Memo{
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ func TestDeleteMemoWithPolicySnapshotsCurrentAudience(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "delete-snapshot-space", Title: "Delete snapshot"}, author.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin}, author.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin}, author.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
type memoExpectation struct {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ func TestMemoRelationMutationRevalidatesRelatedMemo(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: shortuuid.New(), Title: "Relations"}, spaceOwner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: actor.ID, Role: store.SpaceMemberRoleUser}, spaceOwner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: actor.ID, Role: store.SpaceMemberRoleUser}, spaceOwner.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
targetRoot, err := ts.CreateMemo(ctx, &store.Memo{
|
||||
|
|
@ -125,7 +125,7 @@ func TestMemoCommentCreationKeepsIndependentPlacementAndAudience(t *testing.T) {
|
|||
commentSpace, err := ts.CreateSpace(ctx, &store.Space{UID: shortuuid.New(), Title: "Comment"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
for _, space := range []*store.Space{contextSpace, commentSpace} {
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: actor.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: actor.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
contextMemo, err := ts.CreateMemo(ctx, &store.Memo{
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ func TestMemoWritePolicyRevalidatesMembershipAndExactMemoShares(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "memo-policy-space", Title: "Policy"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
memo, err := ts.CreateMemo(ctx, &store.Memo{UID: "memo-policy-root", CreatorID: owner.ID, Content: "memo", Visibility: store.Public, SpaceID: &space.ID})
|
||||
require.NoError(t, err)
|
||||
|
|
@ -113,7 +113,7 @@ func TestMemoWritePolicyRemovedMemberCanOnlyMoveOrWithdraw(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
source, err := ts.CreateSpace(ctx, &store.Space{UID: "memo-move-source", Title: "Source"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: source.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: source.ID, UserID: admin.ID, Role: store.SpaceMemberRoleAdmin}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
target, err := ts.CreateSpace(ctx, &store.Space{UID: "memo-move-target", Title: "Target"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
|
|
|||
|
|
@ -267,6 +267,42 @@ func TestMigrationMultiSpacesPreservesMemosAndRelations(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestMigrationSpaceMemberStatusBackfillsActive(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ts := NewTestingStore(ctx, t)
|
||||
|
||||
owner, err := createTestingHostUser(ctx, ts)
|
||||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{
|
||||
UID: "status-migration-space",
|
||||
Title: "Status migration",
|
||||
}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
db := ts.GetDriver().GetDB()
|
||||
_, err = db.ExecContext(ctx, "ALTER TABLE space_member DROP COLUMN status")
|
||||
require.NoError(t, err)
|
||||
|
||||
basicSetting, err := ts.GetInstanceBasicSetting(ctx)
|
||||
require.NoError(t, err)
|
||||
basicSetting.SchemaVersion = "0.31.4"
|
||||
_, err = ts.UpsertInstanceSetting(ctx, &storepb.InstanceSetting{
|
||||
Key: storepb.InstanceSettingKey_BASIC,
|
||||
Value: &storepb.InstanceSetting_BasicSetting{BasicSetting: basicSetting},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
require.NoError(t, ts.Migrate(ctx))
|
||||
|
||||
query := "SELECT status FROM space_member WHERE space_id = ? AND user_id = ?"
|
||||
if getDriverFromEnv() == "postgres" {
|
||||
query = "SELECT status FROM space_member WHERE space_id = $1 AND user_id = $2"
|
||||
}
|
||||
var status store.SpaceMemberStatus
|
||||
require.NoError(t, db.QueryRowContext(ctx, query, space.ID, owner.ID).Scan(&status))
|
||||
require.Equal(t, store.SpaceMemberStatusActive, status)
|
||||
}
|
||||
|
||||
// TestMigrationMultipleReRuns verifies that migration is idempotent
|
||||
// even when run multiple times in succession.
|
||||
func TestMigrationMultipleReRuns(t *testing.T) {
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ func TestReactionWritePolicySpaceParticipationIsMemoLocal(t *testing.T) {
|
|||
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "reaction-space", Title: "Reaction Space"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
spaceMemo, err := ts.CreateMemo(ctx, &store.Memo{
|
||||
UID: "reaction-space-memo", CreatorID: owner.ID, Content: "space memo", Visibility: store.SpaceAudience, SpaceID: &space.ID,
|
||||
|
|
@ -101,7 +101,7 @@ func TestReactionWritePolicySpaceParticipationIsMemoLocal(t *testing.T) {
|
|||
UID: "reaction-space-private", CreatorID: owner.ID, Content: "private", Visibility: store.Private, SpaceID: &space.ID,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.UpsertReaction(ctx, &store.Reaction{
|
||||
CreatorID: member.ID, MemoID: assignedPrivate.ID, ReactionType: "private-member", Policy: reactionWritePolicy(member.ID),
|
||||
|
|
@ -147,7 +147,7 @@ func TestDeleteReactionAtomicallyEnforcesCreatorAndParticipation(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "reaction-delete-space", Title: "Delete Reactions"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
memo, err := ts.CreateMemo(ctx, &store.Memo{
|
||||
UID: "reaction-delete-memo", CreatorID: owner.ID, Content: "memo", Visibility: store.SpaceAudience, SpaceID: &space.ID,
|
||||
|
|
@ -171,7 +171,7 @@ func TestDeleteReactionAtomicallyEnforcesCreatorAndParticipation(t *testing.T) {
|
|||
require.ErrorIs(t, err, store.ErrMemoSpaceMembershipRequired)
|
||||
requireReactionPresent(ctx, t, ts, reaction.ID)
|
||||
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, ts.DeleteReaction(ctx, &store.DeleteReaction{
|
||||
ID: &reaction.ID, MemoID: &memo.ID, ActorUserID: &member.ID, Policy: reactionWritePolicy(member.ID),
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ func TestDeleteSpaceDeletesOnlyDirectlyAssignedMemosAndOwnedResources(t *testing
|
|||
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "delete-space", Title: "Delete Space"}, admin.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, admin.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, admin.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
assigned, err := ts.CreateMemo(ctx, &store.Memo{
|
||||
|
|
|
|||
224
store/test/space_parent_lock_test.go
Normal file
224
store/test/space_parent_lock_test.go
Normal file
|
|
@ -0,0 +1,224 @@
|
|||
package test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/usememos/memos/store"
|
||||
)
|
||||
|
||||
func TestSQLiteStaleRelationshipWriteCannotOutliveDeletedParent(t *testing.T) {
|
||||
if getDriverFromEnv() != "sqlite" {
|
||||
t.Skip("this test confirms SQLite's stale-snapshot write serialization")
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
ts := NewTestingStore(ctx, t)
|
||||
t.Cleanup(func() { require.NoError(t, ts.Close()) })
|
||||
owner, err := ts.CreateUser(ctx, &store.User{Username: "sqlite-stale-owner", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
target, err := ts.CreateUser(ctx, &store.User{Username: "sqlite-stale-target", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "sqlite-stale-space", Title: "SQLite Stale Parent"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
staleTx, err := ts.GetDriver().GetDB().BeginTx(ctx, nil)
|
||||
require.NoError(t, err)
|
||||
staleTxOpen := true
|
||||
defer func() {
|
||||
if staleTxOpen {
|
||||
_ = staleTx.Rollback()
|
||||
}
|
||||
}()
|
||||
var storedUserID int32
|
||||
require.NoError(t, staleTx.QueryRowContext(ctx, "SELECT id FROM user WHERE id = ?", target.ID).Scan(&storedUserID))
|
||||
|
||||
_, err = ts.DeleteUser(ctx, &store.DeleteUser{ID: target.ID})
|
||||
require.NoError(t, err)
|
||||
_, err = staleTx.ExecContext(ctx, `INSERT INTO space_member (space_id, user_id, status, role) VALUES (?, ?, 'INVITED', 'USER')`, space.ID, target.ID)
|
||||
require.Error(t, err, "a transaction with a stale parent snapshot must not upgrade to write an orphan relationship")
|
||||
require.NoError(t, staleTx.Rollback())
|
||||
staleTxOpen = false
|
||||
|
||||
var relationshipCount int
|
||||
require.NoError(t, ts.GetDriver().GetDB().QueryRowContext(ctx,
|
||||
"SELECT COUNT(*) FROM space_member WHERE space_id = ? AND user_id = ?", space.ID, target.ID,
|
||||
).Scan(&relationshipCount))
|
||||
require.Zero(t, relationshipCount)
|
||||
}
|
||||
|
||||
func TestSpaceInvitationWaitsForConcurrentUserDelete(t *testing.T) {
|
||||
driver := getDriverFromEnv()
|
||||
if driver == "sqlite" {
|
||||
t.Skip("SQLite serializes the competing writes and rejects stale transaction upgrades")
|
||||
}
|
||||
|
||||
setupCtx := context.Background()
|
||||
ts := NewTestingStore(setupCtx, t)
|
||||
t.Cleanup(func() { require.NoError(t, ts.Close()) })
|
||||
ctx, cancel := context.WithTimeout(setupCtx, 10*time.Second)
|
||||
defer cancel()
|
||||
|
||||
owner, err := ts.CreateUser(ctx, &store.User{Username: "user-delete-lock-owner", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
target, err := ts.CreateUser(ctx, &store.User{Username: "user-delete-lock-target", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "user-delete-lock-space", Title: "User Delete Lock"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
memo, err := ts.CreateMemo(ctx, &store.Memo{UID: "user-delete-lock-memo", CreatorID: target.ID, Content: "lock", Visibility: store.Public})
|
||||
require.NoError(t, err)
|
||||
|
||||
blocker, err := ts.GetDriver().GetDB().BeginTx(ctx, nil)
|
||||
require.NoError(t, err)
|
||||
blockerOpen := true
|
||||
defer func() {
|
||||
if blockerOpen {
|
||||
_ = blocker.Rollback()
|
||||
}
|
||||
}()
|
||||
require.NoError(t, lockMemoRow(ctx, blocker, driver, memo.ID))
|
||||
|
||||
deleteDone := make(chan error, 1)
|
||||
go func() {
|
||||
_, deleteErr := ts.DeleteUser(ctx, &store.DeleteUser{ID: target.ID})
|
||||
deleteDone <- deleteErr
|
||||
}()
|
||||
waitForLockedParentRow(ctx, t, ts.GetDriver().GetDB(), driver, "user", target.ID)
|
||||
|
||||
inviteCtx, inviteCancel := context.WithTimeout(ctx, 300*time.Millisecond)
|
||||
started := time.Now()
|
||||
_, inviteErr := ts.CreateSpaceInvitation(inviteCtx, &store.SpaceInvitation{
|
||||
SpaceID: space.ID,
|
||||
UserID: target.ID,
|
||||
Role: store.SpaceMemberRoleUser,
|
||||
}, owner.ID)
|
||||
inviteCancel()
|
||||
require.Error(t, inviteErr)
|
||||
require.GreaterOrEqual(t, time.Since(started), 250*time.Millisecond, "invitation creation must wait for the deleting user's row lock")
|
||||
|
||||
require.NoError(t, blocker.Commit())
|
||||
blockerOpen = false
|
||||
select {
|
||||
case deleteErr := <-deleteDone:
|
||||
require.NoError(t, deleteErr)
|
||||
case <-ctx.Done():
|
||||
require.FailNow(t, "timed out waiting for user deletion")
|
||||
}
|
||||
|
||||
var relationshipCount int
|
||||
require.NoError(t, ts.GetDriver().GetDB().QueryRowContext(ctx, relationshipCountQuery(driver, "user_id"), target.ID).Scan(&relationshipCount))
|
||||
require.Zero(t, relationshipCount, "deleting a user must not leave a concurrent invitation behind")
|
||||
}
|
||||
|
||||
func TestSpaceInvitationWaitsForConcurrentSpaceDelete(t *testing.T) {
|
||||
driver := getDriverFromEnv()
|
||||
if driver == "sqlite" {
|
||||
t.Skip("SQLite serializes the competing writes and rejects stale transaction upgrades")
|
||||
}
|
||||
|
||||
setupCtx := context.Background()
|
||||
ts := NewTestingStore(setupCtx, t)
|
||||
t.Cleanup(func() { require.NoError(t, ts.Close()) })
|
||||
ctx, cancel := context.WithTimeout(setupCtx, 10*time.Second)
|
||||
defer cancel()
|
||||
|
||||
owner, err := ts.CreateUser(ctx, &store.User{Username: "space-delete-lock-owner", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
target, err := ts.CreateUser(ctx, &store.User{Username: "space-delete-lock-target", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "space-delete-lock-space", Title: "Space Delete Lock"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
memo, err := ts.CreateMemo(ctx, &store.Memo{
|
||||
UID: "space-delete-lock-memo", CreatorID: owner.ID, Content: "lock", Visibility: store.SpaceAudience, SpaceID: &space.ID,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
blocker, err := ts.GetDriver().GetDB().BeginTx(ctx, nil)
|
||||
require.NoError(t, err)
|
||||
blockerOpen := true
|
||||
defer func() {
|
||||
if blockerOpen {
|
||||
_ = blocker.Rollback()
|
||||
}
|
||||
}()
|
||||
require.NoError(t, lockMemoRow(ctx, blocker, driver, memo.ID))
|
||||
|
||||
deleteDone := make(chan error, 1)
|
||||
go func() {
|
||||
_, deleteErr := ts.DeleteSpace(ctx, &store.DeleteSpace{ID: space.ID, ActorUserID: owner.ID})
|
||||
deleteDone <- deleteErr
|
||||
}()
|
||||
waitForLockedParentRow(ctx, t, ts.GetDriver().GetDB(), driver, "space", space.ID)
|
||||
|
||||
inviteCtx, inviteCancel := context.WithTimeout(ctx, 300*time.Millisecond)
|
||||
started := time.Now()
|
||||
_, inviteErr := ts.CreateSpaceInvitation(inviteCtx, &store.SpaceInvitation{
|
||||
SpaceID: space.ID,
|
||||
UserID: target.ID,
|
||||
Role: store.SpaceMemberRoleUser,
|
||||
}, owner.ID)
|
||||
inviteCancel()
|
||||
require.Error(t, inviteErr)
|
||||
require.GreaterOrEqual(t, time.Since(started), 250*time.Millisecond, "invitation creation must wait for the deleting Space's row lock")
|
||||
|
||||
require.NoError(t, blocker.Commit())
|
||||
blockerOpen = false
|
||||
select {
|
||||
case deleteErr := <-deleteDone:
|
||||
require.NoError(t, deleteErr)
|
||||
case <-ctx.Done():
|
||||
require.FailNow(t, "timed out waiting for Space deletion")
|
||||
}
|
||||
|
||||
var relationshipCount int
|
||||
require.NoError(t, ts.GetDriver().GetDB().QueryRowContext(ctx, relationshipCountQuery(driver, "space_id"), space.ID).Scan(&relationshipCount))
|
||||
require.Zero(t, relationshipCount, "deleting a Space must not leave a concurrent invitation behind")
|
||||
}
|
||||
|
||||
func lockMemoRow(ctx context.Context, tx *sql.Tx, driver string, memoID int32) error {
|
||||
query := "SELECT id FROM memo WHERE id = ? FOR UPDATE"
|
||||
if driver == "postgres" {
|
||||
query = "SELECT id FROM memo WHERE id = $1 FOR UPDATE"
|
||||
}
|
||||
var storedMemoID int32
|
||||
return tx.QueryRowContext(ctx, query, memoID).Scan(&storedMemoID)
|
||||
}
|
||||
|
||||
func waitForLockedParentRow(ctx context.Context, t *testing.T, db *sql.DB, driver, table string, id int32) {
|
||||
t.Helper()
|
||||
query := "SELECT id FROM " + table + " WHERE id = ? FOR UPDATE NOWAIT"
|
||||
if driver == "postgres" {
|
||||
if table == "user" {
|
||||
table = `"user"`
|
||||
}
|
||||
query = "SELECT id FROM " + table + " WHERE id = $1 FOR UPDATE NOWAIT"
|
||||
}
|
||||
ticker := time.NewTicker(10 * time.Millisecond)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
probe, err := db.BeginTx(ctx, nil)
|
||||
require.NoError(t, err)
|
||||
var storedID int32
|
||||
err = probe.QueryRowContext(ctx, query, id).Scan(&storedID)
|
||||
_ = probe.Rollback()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
select {
|
||||
case <-ticker.C:
|
||||
case <-ctx.Done():
|
||||
require.FailNow(t, "timed out waiting for parent row lock")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func relationshipCountQuery(driver, column string) string {
|
||||
if driver == "postgres" {
|
||||
return "SELECT COUNT(*) FROM space_member WHERE " + column + " = $1"
|
||||
}
|
||||
return "SELECT COUNT(*) FROM space_member WHERE " + column + " = ?"
|
||||
}
|
||||
|
|
@ -26,10 +26,10 @@ func TestSpaceStoreMembershipGuards(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
require.Equal(t, store.SpaceMemberRoleAdmin, ownerMembership.Role)
|
||||
|
||||
created, err := ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
created, err := createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, member.ID, created.UserID)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpaceMemberAlreadyExists)
|
||||
|
||||
userRole := store.SpaceMemberRoleUser
|
||||
|
|
@ -48,6 +48,142 @@ func TestSpaceStoreMembershipGuards(t *testing.T) {
|
|||
require.Nil(t, ownerMembership)
|
||||
}
|
||||
|
||||
func TestSpaceStoreInvitationLifecycle(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ts := NewTestingStore(ctx, t)
|
||||
defer ts.Close()
|
||||
|
||||
owner, err := ts.CreateUser(ctx, &store.User{Username: "invite-owner", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
invitedAdmin, err := ts.CreateUser(ctx, &store.User{Username: "invited-admin", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
decliningUser, err := ts.CreateUser(ctx, &store.User{Username: "declining-user", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
revokedUser, err := ts.CreateUser(ctx, &store.User{Username: "revoked-user", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
outsider, err := ts.CreateUser(ctx, &store.User{Username: "invite-outsider", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "invitation-lifecycle", Title: "Invitation Lifecycle"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
adminInvitation, err := ts.CreateSpaceInvitation(ctx, &store.SpaceInvitation{
|
||||
SpaceID: space.ID,
|
||||
UserID: invitedAdmin.ID,
|
||||
Role: store.SpaceMemberRoleAdmin,
|
||||
}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, store.SpaceMemberRoleAdmin, adminInvitation.Role)
|
||||
_, err = ts.CreateSpaceInvitation(ctx, &store.SpaceInvitation{
|
||||
SpaceID: space.ID,
|
||||
UserID: invitedAdmin.ID,
|
||||
Role: store.SpaceMemberRoleAdmin,
|
||||
}, owner.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpaceMemberAlreadyExists)
|
||||
archived := store.Archived
|
||||
_, err = ts.UpdateUser(ctx, &store.UpdateUser{ID: owner.ID, RowStatus: &archived})
|
||||
require.ErrorIs(t, err, store.ErrLastSpaceAdmin, "a pending ADMIN invitation must not satisfy the last-active-admin invariant")
|
||||
|
||||
_, err = ts.CreateSpaceInvitation(ctx, &store.SpaceInvitation{
|
||||
SpaceID: space.ID,
|
||||
UserID: decliningUser.ID,
|
||||
Role: store.SpaceMemberRoleUser,
|
||||
}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceInvitation(ctx, &store.SpaceInvitation{
|
||||
SpaceID: space.ID,
|
||||
UserID: revokedUser.ID,
|
||||
Role: store.SpaceMemberRoleUser,
|
||||
}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
member, err := ts.GetSpaceMember(ctx, &store.FindSpaceMember{SpaceID: &space.ID, UserID: &invitedAdmin.ID, ViewerUserID: &owner.ID})
|
||||
require.NoError(t, err)
|
||||
require.Nil(t, member, "a pending ADMIN invitation must not be a membership")
|
||||
spaces, err := ts.ListSpaces(ctx, &store.FindSpace{MemberUserID: &invitedAdmin.ID})
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, spaces, "a pending ADMIN invitation must not grant space discovery")
|
||||
newTitle := "Unauthorized Update"
|
||||
_, err = ts.UpdateSpace(ctx, &store.UpdateSpace{ID: space.ID, Title: &newTitle}, invitedAdmin.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpacePermissionDenied)
|
||||
err = ts.RevokeSpaceInvitation(ctx, &store.RevokeSpaceInvitation{SpaceID: space.ID, UserID: revokedUser.ID}, invitedAdmin.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpacePermissionDenied)
|
||||
|
||||
visibleToInvitee, err := ts.ListSpaceInvitations(ctx, &store.FindSpaceInvitation{ViewerUserID: &invitedAdmin.ID})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, []*store.SpaceInvitation{adminInvitation}, visibleToInvitee)
|
||||
visibleToOutsider, err := ts.ListSpaceInvitations(ctx, &store.FindSpaceInvitation{ViewerUserID: &outsider.ID})
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, visibleToOutsider)
|
||||
insertUnknownStatus := "INSERT INTO space_member (space_id, user_id, status, role) VALUES (?, ?, 'UNKNOWN', 'ADMIN')"
|
||||
if getDriverFromEnv() == "postgres" {
|
||||
insertUnknownStatus = "INSERT INTO space_member (space_id, user_id, status, role) VALUES ($1, $2, 'UNKNOWN', 'ADMIN')"
|
||||
}
|
||||
_, err = ts.GetDriver().GetDB().ExecContext(ctx, insertUnknownStatus, space.ID, outsider.ID)
|
||||
require.NoError(t, err, "status validation belongs to Store logic, not a database CHECK")
|
||||
spaces, err = ts.ListSpaces(ctx, &store.FindSpace{MemberUserID: &outsider.ID})
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, spaces, "an unknown relationship status must fail closed even with an ADMIN role")
|
||||
_, err = ts.UpdateSpace(ctx, &store.UpdateSpace{ID: space.ID, Title: &newTitle}, outsider.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpacePermissionDenied)
|
||||
visibleToAdmin, err := ts.ListSpaceInvitations(ctx, &store.FindSpaceInvitation{SpaceID: &space.ID, ViewerUserID: &owner.ID})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, visibleToAdmin, 3)
|
||||
|
||||
_, err = ts.AcceptSpaceInvitation(ctx, &store.AcceptSpaceInvitation{SpaceID: space.ID, UserID: invitedAdmin.ID}, owner.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpacePermissionDenied, "an administrator cannot accept on behalf of the invitee")
|
||||
accepted, err := ts.AcceptSpaceInvitation(ctx, &store.AcceptSpaceInvitation{SpaceID: space.ID, UserID: invitedAdmin.ID}, invitedAdmin.ID)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, store.SpaceMemberRoleAdmin, accepted.Role, "accept must preserve the invited role")
|
||||
invitation, err := ts.GetSpaceInvitation(ctx, &store.FindSpaceInvitation{SpaceID: &space.ID, UserID: &invitedAdmin.ID, ViewerUserID: &invitedAdmin.ID})
|
||||
require.NoError(t, err)
|
||||
require.Nil(t, invitation)
|
||||
_, err = ts.CreateSpaceInvitation(ctx, &store.SpaceInvitation{
|
||||
SpaceID: space.ID,
|
||||
UserID: invitedAdmin.ID,
|
||||
Role: store.SpaceMemberRoleUser,
|
||||
}, owner.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpaceMemberAlreadyExists, "an active member conflicts with an invitation")
|
||||
|
||||
err = ts.DeclineSpaceInvitation(ctx, &store.DeclineSpaceInvitation{SpaceID: space.ID, UserID: decliningUser.ID}, owner.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpacePermissionDenied, "an administrator cannot decline on behalf of the invitee")
|
||||
require.NoError(t, ts.DeclineSpaceInvitation(ctx, &store.DeclineSpaceInvitation{SpaceID: space.ID, UserID: decliningUser.ID}, decliningUser.ID))
|
||||
err = ts.DeclineSpaceInvitation(ctx, &store.DeclineSpaceInvitation{SpaceID: space.ID, UserID: decliningUser.ID}, decliningUser.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpaceInvitationNotFound)
|
||||
require.NoError(t, ts.RevokeSpaceInvitation(ctx, &store.RevokeSpaceInvitation{SpaceID: space.ID, UserID: revokedUser.ID}, owner.ID))
|
||||
_, err = ts.AcceptSpaceInvitation(ctx, &store.AcceptSpaceInvitation{SpaceID: space.ID, UserID: revokedUser.ID}, revokedUser.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpaceInvitationNotFound)
|
||||
}
|
||||
|
||||
func TestDeleteUserCleansPendingSpaceInvitations(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ts := NewTestingStore(ctx, t)
|
||||
defer ts.Close()
|
||||
|
||||
owner, err := ts.CreateUser(ctx, &store.User{Username: "invitation-delete-owner", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
invitee, err := ts.CreateUser(ctx, &store.User{Username: "invitation-delete-invitee", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "invitation-delete-space", Title: "Invitation deletion"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceInvitation(ctx, &store.SpaceInvitation{
|
||||
SpaceID: space.ID,
|
||||
UserID: invitee.ID,
|
||||
Role: store.SpaceMemberRoleAdmin,
|
||||
}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = ts.DeleteUser(ctx, &store.DeleteUser{ID: invitee.ID})
|
||||
require.NoError(t, err, "a pending invitation must not block account deletion")
|
||||
|
||||
query := "SELECT COUNT(*) FROM space_member WHERE space_id = ? AND user_id = ?"
|
||||
if getDriverFromEnv() == "postgres" {
|
||||
query = "SELECT COUNT(*) FROM space_member WHERE space_id = $1 AND user_id = $2"
|
||||
}
|
||||
var count int
|
||||
require.NoError(t, ts.GetDriver().GetDB().QueryRowContext(ctx, query, space.ID, invitee.ID).Scan(&count))
|
||||
require.Zero(t, count, "account deletion must remove its pending invitation row")
|
||||
}
|
||||
|
||||
func TestSpaceStoreRequiresTitle(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ts := NewTestingStore(ctx, t)
|
||||
|
|
@ -79,6 +215,26 @@ func TestSpaceStoreRequiresTitle(t *testing.T) {
|
|||
require.Error(t, err)
|
||||
}
|
||||
|
||||
func TestListSpacesByIDList(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ts := NewTestingStore(ctx, t)
|
||||
defer ts.Close()
|
||||
|
||||
owner, err := ts.CreateUser(ctx, &store.User{Username: "space-id-list-owner", Role: store.RoleUser, PasswordHash: "hash"})
|
||||
require.NoError(t, err)
|
||||
first, err := ts.CreateSpace(ctx, &store.Space{UID: "space-id-list-first", Title: "First"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpace(ctx, &store.Space{UID: "space-id-list-second", Title: "Second"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
third, err := ts.CreateSpace(ctx, &store.Space{UID: "space-id-list-third", Title: "Third"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
spaces, err := ts.ListSpaces(ctx, &store.FindSpace{IDList: []int32{first.ID, third.ID}})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, spaces, 2)
|
||||
require.Equal(t, []int32{third.ID, first.ID}, []int32{spaces[0].ID, spaces[1].ID})
|
||||
}
|
||||
|
||||
func TestSpaceMemoAccessDoesNotFlowAcrossCommentRelation(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ts := NewTestingStore(ctx, t)
|
||||
|
|
@ -93,7 +249,7 @@ func TestSpaceMemoAccessDoesNotFlowAcrossCommentRelation(t *testing.T) {
|
|||
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "memo-space", Title: "Memo Space"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
contextMemo, err := ts.CreateMemo(ctx, &store.Memo{
|
||||
|
|
@ -147,7 +303,7 @@ func TestUserArchiveAndDeleteRequireLeavingSpaces(t *testing.T) {
|
|||
archived := store.Archived
|
||||
_, err = ts.UpdateUser(ctx, &store.UpdateUser{ID: owner.ID, RowStatus: &archived})
|
||||
require.ErrorIs(t, err, store.ErrLastSpaceAdmin)
|
||||
_, err = ts.CreateSpaceMember(ctx, &store.SpaceMember{SpaceID: space.ID, UserID: backup.ID, Role: store.SpaceMemberRoleAdmin}, owner.ID)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: backup.ID, Role: store.SpaceMemberRoleAdmin}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
_, err = ts.UpdateUser(ctx, &store.UpdateUser{ID: owner.ID, RowStatus: &archived})
|
||||
require.NoError(t, err)
|
||||
|
|
|
|||
|
|
@ -58,6 +58,22 @@ func NewTestingStoreWithDSN(_ context.Context, t *testing.T, driver, dsn string)
|
|||
return store
|
||||
}
|
||||
|
||||
// createSpaceMemberForTest keeps fixtures concise while exercising the same
|
||||
// invitation and acceptance flow used by production code.
|
||||
func createSpaceMemberForTest(ctx context.Context, testStore *store.Store, create *store.SpaceMember, actorUserID int32) (*store.SpaceMember, error) {
|
||||
if _, err := testStore.CreateSpaceInvitation(ctx, &store.SpaceInvitation{
|
||||
SpaceID: create.SpaceID,
|
||||
UserID: create.UserID,
|
||||
Role: create.Role,
|
||||
}, actorUserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return testStore.AcceptSpaceInvitation(ctx, &store.AcceptSpaceInvitation{
|
||||
SpaceID: create.SpaceID,
|
||||
UserID: create.UserID,
|
||||
}, create.UserID)
|
||||
}
|
||||
|
||||
func getUnusedPort() int {
|
||||
// Get a random unused port
|
||||
listener, err := net.Listen("tcp", "localhost:0")
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue