refactor!: use more steps for invites

proto/rpc.proto

@@ -3,27 +3,30 @@ syntax = "proto3";
 import "keys.proto";
 
 message Invite {
-  // Project info that is displayed to the user receiving the invite
-  message ProjectInfo {
-    optional string name = 1;
-  }
-  bytes projectKey = 1;
-  EncryptionKeys encryptionKeys = 2;
-  optional ProjectInfo projectInfo = 3;
-  string roleName = 4;
+  bytes inviteId = 1;
+  string projectPublicId = 2;
+  string projectName = 3;
+  optional string roleName = 4;
   optional string roleDescription = 5;
   string invitorName = 6;
 }
+
 message InviteResponse {
   enum Decision {
     REJECT = 0;
     ACCEPT = 1;
     ALREADY = 2;
   }
-  bytes projectKey = 1;
+  bytes inviteId = 1;
   Decision decision = 2;
 }
 
+message ProjectJoinDetails {
+  bytes inviteId = 1;
+  bytes projectKey = 2;
+  EncryptionKeys encryptionKeys = 3;
+}
+
 message DeviceInfo {
   enum DeviceType {
     mobile = 0;

src/generated/rpc.d.ts

@@ -2,19 +2,15 @@
 import _m0 from "protobufjs/minimal.js";
 import { EncryptionKeys } from "./keys.js";
 export interface Invite {
-    projectKey: Buffer;
-    encryptionKeys: EncryptionKeys | undefined;
-    projectInfo?: Invite_ProjectInfo | undefined;
-    roleName: string;
+    inviteId: Buffer;
+    projectPublicId: string;
+    projectName: string;
+    roleName?: string | undefined;
     roleDescription?: string | undefined;
     invitorName: string;
 }
-/** Project info that is displayed to the user receiving the invite */
-export interface Invite_ProjectInfo {
-    name?: string | undefined;
-}
 export interface InviteResponse {
-    projectKey: Buffer;
+    inviteId: Buffer;
     decision: InviteResponse_Decision;
 }
 export declare const InviteResponse_Decision: {
@@ -26,6 +22,11 @@ export declare const InviteResponse_Decision: {
 export type InviteResponse_Decision = typeof InviteResponse_Decision[keyof typeof InviteResponse_Decision];
 export declare function inviteResponse_DecisionFromJSON(object: any): InviteResponse_Decision;
 export declare function inviteResponse_DecisionToNumber(object: InviteResponse_Decision): number;
+export interface ProjectJoinDetails {
+    inviteId: Buffer;
+    projectKey: Buffer;
+    encryptionKeys: EncryptionKeys | undefined;
+}
 export interface DeviceInfo {
     name: string;
     deviceType?: DeviceInfo_DeviceType | undefined;
@@ -43,6 +44,59 @@ export declare const Invite: {
     encode(message: Invite, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number): Invite;
     create<I extends {
+        inviteId?: Buffer;
+        projectPublicId?: string;
+        projectName?: string;
+        roleName?: string | undefined;
+        roleDescription?: string | undefined;
+        invitorName?: string;
+    } & {
+        inviteId?: Buffer;
+        projectPublicId?: string;
+        projectName?: string;
+        roleName?: string | undefined;
+        roleDescription?: string | undefined;
+        invitorName?: string;
+    } & { [K in Exclude<keyof I, keyof Invite>]: never; }>(base?: I): Invite;
+    fromPartial<I_1 extends {
+        inviteId?: Buffer;
+        projectPublicId?: string;
+        projectName?: string;
+        roleName?: string | undefined;
+        roleDescription?: string | undefined;
+        invitorName?: string;
+    } & {
+        inviteId?: Buffer;
+        projectPublicId?: string;
+        projectName?: string;
+        roleName?: string | undefined;
+        roleDescription?: string | undefined;
+        invitorName?: string;
+    } & { [K_1 in Exclude<keyof I_1, keyof Invite>]: never; }>(object: I_1): Invite;
+};
+export declare const InviteResponse: {
+    encode(message: InviteResponse, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number): InviteResponse;
+    create<I extends {
+        inviteId?: Buffer;
+        decision?: InviteResponse_Decision;
+    } & {
+        inviteId?: Buffer;
+        decision?: InviteResponse_Decision;
+    } & { [K in Exclude<keyof I, keyof InviteResponse>]: never; }>(base?: I): InviteResponse;
+    fromPartial<I_1 extends {
+        inviteId?: Buffer;
+        decision?: InviteResponse_Decision;
+    } & {
+        inviteId?: Buffer;
+        decision?: InviteResponse_Decision;
+    } & { [K_1 in Exclude<keyof I_1, keyof InviteResponse>]: never; }>(object: I_1): InviteResponse;
+};
+export declare const ProjectJoinDetails: {
+    encode(message: ProjectJoinDetails, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number): ProjectJoinDetails;
+    create<I extends {
+        inviteId?: Buffer;
         projectKey?: Buffer;
         encryptionKeys?: {
             auth?: Buffer;
@@ -51,13 +105,8 @@ export declare const Invite: {
             blobIndex?: Buffer;
             blob?: Buffer;
         };
-        projectInfo?: {
-            name?: string | undefined;
-        };
-        roleName?: string;
-        roleDescription?: string | undefined;
-        invitorName?: string;
     } & {
+        inviteId?: Buffer;
         projectKey?: Buffer;
         encryptionKeys?: {
             auth?: Buffer;
@@ -72,16 +121,9 @@ export declare const Invite: {
             blobIndex?: Buffer;
             blob?: Buffer;
         } & { [K in Exclude<keyof I["encryptionKeys"], keyof EncryptionKeys>]: never; };
-        projectInfo?: {
-            name?: string | undefined;
-        } & {
-            name?: string | undefined;
-        } & { [K_1 in Exclude<keyof I["projectInfo"], "name">]: never; };
-        roleName?: string;
-        roleDescription?: string | undefined;
-        invitorName?: string;
-    } & { [K_2 in Exclude<keyof I, keyof Invite>]: never; }>(base?: I): Invite;
+    } & { [K_1 in Exclude<keyof I, keyof ProjectJoinDetails>]: never; }>(base?: I): ProjectJoinDetails;
     fromPartial<I_1 extends {
+        inviteId?: Buffer;
         projectKey?: Buffer;
         encryptionKeys?: {
             auth?: Buffer;
@@ -90,13 +132,8 @@ export declare const Invite: {
             blobIndex?: Buffer;
             blob?: Buffer;
         };
-        projectInfo?: {
-            name?: string | undefined;
-        };
-        roleName?: string;
-        roleDescription?: string | undefined;
-        invitorName?: string;
     } & {
+        inviteId?: Buffer;
         projectKey?: Buffer;
         encryptionKeys?: {
             auth?: Buffer;
@@ -110,48 +147,8 @@ export declare const Invite: {
             config?: Buffer;
             blobIndex?: Buffer;
             blob?: Buffer;
-        } & { [K_3 in Exclude<keyof I_1["encryptionKeys"], keyof EncryptionKeys>]: never; };
-        projectInfo?: {
-            name?: string | undefined;
-        } & {
-            name?: string | undefined;
-        } & { [K_4 in Exclude<keyof I_1["projectInfo"], "name">]: never; };
-        roleName?: string;
-        roleDescription?: string | undefined;
-        invitorName?: string;
-    } & { [K_5 in Exclude<keyof I_1, keyof Invite>]: never; }>(object: I_1): Invite;
-};
-export declare const Invite_ProjectInfo: {
-    encode(message: Invite_ProjectInfo, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number): Invite_ProjectInfo;
-    create<I extends {
-        name?: string | undefined;
-    } & {
-        name?: string | undefined;
-    } & { [K in Exclude<keyof I, "name">]: never; }>(base?: I): Invite_ProjectInfo;
-    fromPartial<I_1 extends {
-        name?: string | undefined;
-    } & {
-        name?: string | undefined;
-    } & { [K_1 in Exclude<keyof I_1, "name">]: never; }>(object: I_1): Invite_ProjectInfo;
-};
-export declare const InviteResponse: {
-    encode(message: InviteResponse, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number): InviteResponse;
-    create<I extends {
-        projectKey?: Buffer;
-        decision?: InviteResponse_Decision;
-    } & {
-        projectKey?: Buffer;
-        decision?: InviteResponse_Decision;
-    } & { [K in Exclude<keyof I, keyof InviteResponse>]: never; }>(base?: I): InviteResponse;
-    fromPartial<I_1 extends {
-        projectKey?: Buffer;
-        decision?: InviteResponse_Decision;
-    } & {
-        projectKey?: Buffer;
-        decision?: InviteResponse_Decision;
-    } & { [K_1 in Exclude<keyof I_1, keyof InviteResponse>]: never; }>(object: I_1): InviteResponse;
+        } & { [K_2 in Exclude<keyof I_1["encryptionKeys"], keyof EncryptionKeys>]: never; };
+    } & { [K_3 in Exclude<keyof I_1, keyof ProjectJoinDetails>]: never; }>(object: I_1): ProjectJoinDetails;
 };
 export declare const DeviceInfo: {
     encode(message: DeviceInfo, writer?: _m0.Writer): _m0.Writer;