[DO NOT MERGE] DMLS proof-of-concept

src/components/views/dialogs/CreateRoomDialog.tsx

@@ -48,6 +48,7 @@ interface IState {
     joinRule: JoinRule;
     isPublic: boolean;
     isEncrypted: boolean;
+    useMls: boolean;
     name: string;
     topic: string;
     alias: string;
@@ -77,6 +78,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         this.state = {
             isPublic: this.props.defaultPublic || false,
             isEncrypted: this.props.defaultEncrypted ?? privateShouldBeEncrypted(),
+            useMls: false,
             joinRule,
             name: this.props.defaultName || "",
             topic: "",
@@ -107,6 +109,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         } else {
             // If we cannot change encryption we pass `true` for safety, the server should automatically do this for us.
             opts.encryption = this.state.canChangeEncryption ? this.state.isEncrypted : true;
+            opts.useMls = this.state.useMls;
         }
 
         if (this.state.topic) {
@@ -188,6 +191,10 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         this.setState({ isEncrypted });
     };
 
+    private onUseMlsChange = (useMls: boolean): void => {
+        this.setState({ useMls });
+    };
+
     private onAliasChange = (alias: string): void => {
         this.setState({ alias });
     };
@@ -311,6 +318,19 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                 </React.Fragment>
             );
         }
+        let mlsSection: JSX.Element;
+        if (this.state.isEncrypted) {
+            mlsSection = (
+                <React.Fragment>
+                    <LabelledToggleSwitch
+                        label="Use MLS"
+                        onChange={this.onUseMlsChange}
+                        value={this.state.useMls}
+                    />
+                    <p>Experimental! Don't do it!</p>
+                </React.Fragment>
+            );
+        }
 
         let federateLabel = _t(
             "You might enable this if the room will only be used for collaborating with internal " +
@@ -374,6 +394,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                             <summary className="mx_CreateRoomDialog_details_summary">
                                 {this.state.detailsOpen ? _t("Hide advanced") : _t("Show advanced")}
                             </summary>
+                            {mlsSection}
                             <LabelledToggleSwitch
                                 label={_t("Block anyone not part of %(serverName)s from ever joining this room.", {
                                     serverName: MatrixClientPeg.getHomeserverName(),

src/createRoom.ts

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import { MatrixClient, ClientEvent } from "matrix-js-sdk/src/client";
+import { MLS_ALGORITHM } from "matrix-js-sdk/src/crypto/algorithms/dmls";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { EventType, RoomCreateTypeField, RoomType } from "matrix-js-sdk/src/@types/event";
 import { ICreateRoomOpts } from "matrix-js-sdk/src/@types/requests";
@@ -66,6 +67,7 @@ export interface IOpts {
     // contextually only makes sense if parentSpace is specified, if true then will be added to parentSpace as suggested
     suggested?: boolean;
     joinRule?: JoinRule;
+    useMls?: boolean;
 }
 
 const DEFAULT_EVENT_POWER_LEVELS = {
@@ -208,7 +210,7 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
             type: "m.room.encryption",
             state_key: "",
             content: {
-                algorithm: "m.megolm.v1.aes-sha2",
+                algorithm: opts.useMls ? MLS_ALGORITHM.name : "m.megolm.v1.aes-sha2",
             },
         });
     }
@@ -315,6 +317,14 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
 
             if (opts.dmUserId) await Rooms.setDMRoom(roomId, opts.dmUserId);
         })
+        .then(async () => {
+            if (opts.encryption && opts.useMls) {
+                return await client.crypto.mlsProvider.createGroup(
+                    await room,
+                    createOpts.invite || [],
+                );
+            }
+        })
         .then(() => {
             if (opts.parentSpace) {
                 return SpaceStore.instance.addRoomToSpace(