@dxos/shell 0.5.1-next.260c093 → 0.5.1-next.26de2f3

package/src/composites/Shell/ShellContext.tsx

@@ -153,7 +153,7 @@ export const ShellProvider = ({
     <>
       {shellRuntime && (
         <div className={mx(display === ShellDisplay.NONE ? 'hidden' : '')}>
-          <Shell runtime={shellRuntime} origin={window.location.origin} />
+          <Shell runtime={shellRuntime} />
         </div>
       )}
 

package/src/composites/Shell/memory-shell-runtime.ts

@@ -4,25 +4,40 @@
 
 import { Event } from '@dxos/async';
 import {
+  ShellLayout,
   type AppContextRequest,
+  type InvitationUrlRequest,
   type LayoutRequest,
   type PublicKey,
-  ShellLayout,
   type ShellRuntime,
 } from '@dxos/react-client';
 
 // TODO(wittjosiah): Remove?
 export class MemoryShellRuntime implements ShellRuntime {
   readonly layoutUpdate = new Event<LayoutRequest>();
+  readonly invitationUrlUpdate = new Event<InvitationUrlRequest>();
   readonly contextUpdate = new Event<AppContextRequest>();
   private _layout: ShellLayout;
   private _invitationCode?: string;
   private _spaceKey?: PublicKey;
+  private _invitationUrl: string;
+  private _deviceInvitationParam: string;
+  private _spaceInvitationParam: string;
 
-  constructor({ layout, invitationCode, spaceKey }: Partial<LayoutRequest> & Partial<AppContextRequest> = {}) {
+  constructor({
+    layout,
+    invitationCode,
+    spaceKey,
+    invitationUrl,
+    deviceInvitationParam,
+    spaceInvitationParam,
+  }: Partial<LayoutRequest> & Partial<AppContextRequest> & Partial<InvitationUrlRequest> = {}) {
     this._layout = layout ?? ShellLayout.DEFAULT;
     this._invitationCode = invitationCode;
     this._spaceKey = spaceKey;
+    this._invitationUrl = invitationUrl ?? window.location.origin;
+    this._deviceInvitationParam = deviceInvitationParam ?? 'deviceInvitationCode';
+    this._spaceInvitationParam = spaceInvitationParam ?? 'spaceInvitationCode';
   }
 
   get layout() {
@@ -37,6 +52,18 @@ export class MemoryShellRuntime implements ShellRuntime {
     return this._spaceKey;
   }
 
+  get invitationUrl() {
+    return this._invitationUrl;
+  }
+
+  get deviceInvitationParam() {
+    return this._deviceInvitationParam;
+  }
+
+  get spaceInvitationParam() {
+    return this._spaceInvitationParam;
+  }
+
   setLayout(request: LayoutRequest) {
     this._layout = request.layout;
     this._invitationCode = request.invitationCode;
@@ -44,6 +71,13 @@ export class MemoryShellRuntime implements ShellRuntime {
     this.layoutUpdate.emit(request);
   }
 
+  setInvitationUrl(request: InvitationUrlRequest) {
+    this._invitationUrl = request.invitationUrl;
+    this._deviceInvitationParam = request.deviceInvitationParam;
+    this._spaceInvitationParam = request.spaceInvitationParam;
+    this.invitationUrlUpdate.emit(request);
+  }
+
   async setAppContext(context: AppContextRequest) {
     this.contextUpdate.emit(context);
   }

package/src/composites/Shell/run-shell.tsx

@@ -41,7 +41,7 @@ export const runShell = async (config: Config = new Config()) => {
             <ClipboardProvider>
               <Tooltip.Provider>
                 <AgentHostingProvider>
-                  <Shell runtime={runtime} origin={location.origin} />
+                  <Shell runtime={runtime} />
                 </AgentHostingProvider>
               </Tooltip.Provider>
             </ClipboardProvider>

package/src/panels/JoinPanel/JoinPanel.tsx

@@ -60,7 +60,7 @@ export const JoinPanelImpl = (props: JoinPanelImplProps) => {
           <Viewport.View classNames={stepStyles} id='reset storage confirmation'>
             <ConfirmResetComponent
               send={send}
-              active={activeView === 'reset identity confirmation'}
+              active={activeView === 'reset storage confirmation'}
               onCancel={onCancelResetStorage}
               onConfirm={onConfirmResetStorage}
             />
@@ -222,7 +222,7 @@ export const JoinPanel = ({
       case joinState.matches({ choosingIdentity: 'choosingAuthMethod' }):
         return 'addition method chooser';
       case joinState.matches('resettingIdentity'):
-        return 'reset identity confirmation';
+        return 'reset storage confirmation';
       case joinState.matches({ choosingIdentity: 'creatingIdentity' }):
         return 'create identity input';
       case joinState.matches({ choosingIdentity: 'recoveringIdentity' }):

package/src/panels/SpacePanel/steps/SpaceManager.tsx

@@ -73,8 +73,8 @@ export const SpaceManager = (props: SpaceManagerProps) => {
       icon: UsersThree,
       onClick: useCallback(() => {
         const invitation = space.share?.({
-          type: Invitation.Type.INTERACTIVE,
-          authMethod: Invitation.AuthMethod.NONE,
+          type: Invitation.Type.DELEGATED,
+          authMethod: Invitation.AuthMethod.KNOWN_PUBLIC_KEY,
           multiUse: true,
           target,
         });
@@ -83,22 +83,6 @@ export const SpaceManager = (props: SpaceManagerProps) => {
         }
       }, [space]),
     },
-    // inviteNonPersistent: {
-    //   label: 'Invite one (nonpersistent)',
-    //   description: 'Only one user may join. Invitation does not resume if client is restarted.',
-    //   icon: UserPlus,
-    //   onClick: useCallback(() => {
-    //     const invitation = space.share?.({
-    //       type: Invitation.Type.INTERACTIVE,
-    //       authMethod: Invitation.AuthMethod.SHARED_SECRET,
-    //       persistent: false,
-    //       target,
-    //     });
-    //     if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {
-    //       invitation.subscribe(onInvitationEvent);
-    //     }
-    //   }, [space]),
-    // },
   };
 
   return <SpaceManagerImpl {...props} invitations={invitations} inviteActions={inviteActions} />;

package/src/steps/InvitationManager.tsx

@@ -53,6 +53,9 @@ export const InvitationManager = ({
   const showAuthCode = statusValue === 3;
   const emoji = hexToEmoji(id);
   const activeView = useMemo(() => {
+    if (multiUse) {
+      return 'showing qr';
+    }
     switch (true) {
       case statusValue === 5:
       case statusValue < 0:

package/src/translations/locales/en-US.ts

@@ -85,14 +85,14 @@ export const os = {
   'auth code message': 'Enter the following auth code on the joining device.',
   'display name input label': 'Display name',
   'display name input placeholder': 'Enter a display name',
-  'invite one label': 'Invite one',
+  'invite one label': 'Single-use invitation',
   'invite one description': 'Only one user may join.',
-  'invite one qr label': 'Single-use',
+  'invite one qr label': 'Single-use invitation',
   'invite one list item label': 'Active single-use invitation',
-  'invite many label': 'Invite many',
+  'invite many label': 'Standing invitation',
   'invite many description': 'Anyone with the link can join.',
-  'invite many qr label': 'Multiple-use',
-  'invite many list item label': 'Active multiple-use invitation',
+  'invite many qr label': 'Standing invitation',
+  'invite many list item label': 'Active standing invitation',
   'invite options label': 'Change the active invite option.',
   'reset in progress label': 'Resetting...',
   'confirm label': 'Confirm',