@fluidframework/azure-client 0.52.0 → 0.54.0-47413

package/.eslintrc.js

@@ -10,4 +10,5 @@ module.exports = {
     "parserOptions": {
         "project": ["./tsconfig.json", "./src/test/tsconfig.json"]
     },
+    "rules": {}
 }

package/dist/AzureClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AzureClient.d.ts","sourceRoot":"","sources":["../src/AzureClient.ts"],"names":[],"mappings":"AAYA,OAAO,EACH,eAAe,EAGf,eAAe,EAElB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,cAAc,CAAC;AAItB;;GAEG;AACH,eAAO,MAAM,oBAAoB,UAAU,CAAC;AAE5C;;;GAGG;AACH,qBAAa,WAAW;IAQR,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPlC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA0B;IACjE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAE3C;;;OAGG;gBAC0B,KAAK,EAAE,gBAAgB;IAepD;;;;OAIG;IACU,eAAe,CACxB,eAAe,EAAE,eAAe,GACjC,OAAO,CAAC;QAAE,SAAS,EAAE,eAAe,CAAC;QAAC,QAAQ,EAAE,sBAAsB,CAAA;KAAE,CAAC;IA2B5E;;;;;OAKG;IACU,YAAY,CACrB,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,eAAe,GACjC,OAAO,CAAC;QAAE,SAAS,EAAE,eAAe,CAAC;QAAC,QAAQ,EAAE,sBAAsB,CAAA;KAAE,CAAC;IAS5E,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,YAAY;CAgBvB"}
+{"version":3,"file":"AzureClient.d.ts","sourceRoot":"","sources":["../src/AzureClient.ts"],"names":[],"mappings":"AAaA,OAAO,EACH,eAAe,EAGf,eAAe,EAElB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAOxE;;GAEG;AACH,eAAO,MAAM,oBAAoB,UAAU,CAAC;AAE5C;;;GAGG;AACH,qBAAa,WAAW;IAQR,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPlC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA0B;IACjE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAE3C;;;OAGG;gBAC0B,KAAK,EAAE,gBAAgB;IAYpD;;;;OAIG;IACU,eAAe,CACxB,eAAe,EAAE,eAAe,GACjC,OAAO,CAAC;QACP,SAAS,EAAE,eAAe,CAAC;QAC3B,QAAQ,EAAE,sBAAsB,CAAC;KACpC,CAAC;IAmCF;;;;;OAKG;IACU,YAAY,CACrB,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,eAAe,GACjC,OAAO,CAAC;QACP,SAAS,EAAE,eAAe,CAAC;QAC3B,QAAQ,EAAE,sBAAsB,CAAC;KACpC,CAAC;IAgBF,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,YAAY;CAcvB"}

package/dist/AzureClient.js

@@ -28,7 +28,7 @@ class AzureClient {
      */
     constructor(props) {
         this.props = props;
-        this.urlResolver = new AzureUrlResolver_1.AzureUrlResolver(this.props.connection.tenantId, this.props.connection.orderer, this.props.connection.storage);
+        this.urlResolver = new AzureUrlResolver_1.AzureUrlResolver();
         // The local service implementation differs from the Azure Fluid Relay in blob
         // storage format. Azure Fluid Relay supports whole summary upload. Local currently does not.
         const enableWholeSummaryUpload = this.props.connection.tenantId !== exports.LOCAL_MODE_TENANT_ID;
@@ -46,13 +46,13 @@ class AzureClient {
             config: {},
         });
         const rootDataObject = await runtime_utils_1.requestFluidObject(container, "/");
+        const createNewRequest = AzureUrlResolver_1.createAzureCreateNewRequest(this.props.connection.orderer, this.props.connection.storage, this.props.connection.tenantId);
         const fluidContainer = new (class extends fluid_static_1.FluidContainer {
             async attach() {
                 if (this.attachState !== container_definitions_1.AttachState.Detached) {
                     throw new Error("Cannot attach container. Container is not in detached state");
                 }
-                const request = AzureUrlResolver_1.createAzureCreateNewRequest();
-                await container.attach(request);
+                await container.attach(createNewRequest);
                 const resolved = container.resolvedUrl;
                 driver_utils_1.ensureFluidResolvedUrl(resolved);
                 return resolved.id;
@@ -69,7 +69,11 @@ class AzureClient {
      */
     async getContainer(id, containerSchema) {
         const loader = this.createLoader(containerSchema);
-        const container = await loader.resolve({ url: id });
+        const url = new URL(this.props.connection.orderer);
+        url.searchParams.append("storage", encodeURIComponent(this.props.connection.storage));
+        url.searchParams.append("tenantId", encodeURIComponent(this.props.connection.tenantId));
+        url.searchParams.append("containerId", encodeURIComponent(id));
+        const container = await loader.resolve({ url: url.href });
         const rootDataObject = await runtime_utils_1.requestFluidObject(container, "/");
         const fluidContainer = new fluid_static_1.FluidContainer(container, rootDataObject);
         const services = this.getContainerServices(container);

package/dist/AzureClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"AzureClient.js","sourceRoot":"","sources":["../src/AzureClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\nimport { Container, Loader } from \"@fluidframework/container-loader\";\nimport {\n    IDocumentServiceFactory, IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\nimport { AttachState } from \"@fluidframework/container-definitions\";\nimport { RouterliciousDocumentServiceFactory } from \"@fluidframework/routerlicious-driver\";\nimport { requestFluidObject } from \"@fluidframework/runtime-utils\";\nimport { ensureFluidResolvedUrl } from \"@fluidframework/driver-utils\";\nimport {\n    ContainerSchema,\n    DOProviderContainerRuntimeFactory,\n    FluidContainer,\n    IFluidContainer,\n    RootDataObject,\n} from \"@fluidframework/fluid-static\";\n\nimport {\n    AzureClientProps,\n    AzureContainerServices,\n} from \"./interfaces\";\nimport { AzureAudience } from \"./AzureAudience\";\nimport { AzureUrlResolver, createAzureCreateNewRequest } from \"./AzureUrlResolver\";\n\n/**\n * Strongly typed id for connecting to a local Azure Fluid Relay.\n */\nexport const LOCAL_MODE_TENANT_ID = \"local\";\n\n/**\n * AzureClient provides the ability to have a Fluid object backed by the Azure Fluid Relay or,\n * when running with local tenantId, have it be backed by a local Azure Fluid Relay instance.\n */\nexport class AzureClient {\n    private readonly documentServiceFactory: IDocumentServiceFactory;\n    private readonly urlResolver: IUrlResolver;\n\n    /**\n     * Creates a new client instance using configuration parameters.\n     * @param props - Properties for initializing a new AzureClient instance\n     */\n    constructor(private readonly props: AzureClientProps) {\n        this.urlResolver = new AzureUrlResolver(\n            this.props.connection.tenantId,\n            this.props.connection.orderer,\n            this.props.connection.storage,\n        );\n        // The local service implementation differs from the Azure Fluid Relay in blob\n        // storage format. Azure Fluid Relay supports whole summary upload. Local currently does not.\n        const enableWholeSummaryUpload = this.props.connection.tenantId !== LOCAL_MODE_TENANT_ID;\n        this.documentServiceFactory = new RouterliciousDocumentServiceFactory(\n            this.props.connection.tokenProvider,\n            { enableWholeSummaryUpload },\n        );\n    }\n\n    /**\n     * Creates a new detached container instance in the Azure Fluid Relay.\n     * @param containerSchema - Container schema for the new container.\n     * @returns New detached container instance along with associated services.\n     */\n    public async createContainer(\n        containerSchema: ContainerSchema,\n    ): Promise<{ container: IFluidContainer; services: AzureContainerServices }> {\n        const loader = this.createLoader(containerSchema);\n\n        const container = await loader.createDetachedContainer({\n            package: \"no-dynamic-package\",\n            config: {},\n        });\n\n        const rootDataObject = await requestFluidObject<RootDataObject>(container, \"/\");\n\n        const fluidContainer = new (class extends FluidContainer {\n            async attach() {\n                if (this.attachState !== AttachState.Detached) {\n                    throw new Error(\"Cannot attach container. Container is not in detached state\");\n                }\n                const request = createAzureCreateNewRequest();\n                await container.attach(request);\n                const resolved = container.resolvedUrl;\n                ensureFluidResolvedUrl(resolved);\n                return resolved.id;\n            }\n        })(container, rootDataObject);\n\n        const services = this.getContainerServices(container);\n        return { container: fluidContainer, services };\n    }\n\n    /**\n     * Accesses the existing container given its unique ID in the Azure Fluid Relay.\n     * @param id - Unique ID of the container in Azure Fluid Relay.\n     * @param containerSchema - Container schema used to access data objects in the container.\n     * @returns Existing container instance along with associated services.\n     */\n    public async getContainer(\n        id: string,\n        containerSchema: ContainerSchema,\n    ): Promise<{ container: IFluidContainer; services: AzureContainerServices }> {\n        const loader = this.createLoader(containerSchema);\n        const container = await loader.resolve({ url: id });\n        const rootDataObject = await requestFluidObject<RootDataObject>(container, \"/\");\n        const fluidContainer = new FluidContainer(container, rootDataObject);\n        const services = this.getContainerServices(container);\n        return { container: fluidContainer, services };\n    }\n\n    private getContainerServices(\n        container: Container,\n    ): AzureContainerServices {\n        return {\n            audience: new AzureAudience(container),\n        };\n    }\n\n    private createLoader(\n        containerSchema: ContainerSchema,\n    ): Loader {\n        const runtimeFactory = new DOProviderContainerRuntimeFactory(\n            containerSchema,\n        );\n        const module = { fluidExport: runtimeFactory };\n        const codeLoader = { load: async () => module };\n        return new Loader({\n            urlResolver: this.urlResolver,\n            documentServiceFactory: this.documentServiceFactory,\n            codeLoader,\n            logger: this.props.logger,\n        });\n    }\n    // #endregion\n}\n"]}
+{"version":3,"file":"AzureClient.js","sourceRoot":"","sources":["../src/AzureClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\nimport { Loader } from \"@fluidframework/container-loader\";\nimport {\n    IDocumentServiceFactory,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\nimport { AttachState, IContainer } from \"@fluidframework/container-definitions\";\nimport { RouterliciousDocumentServiceFactory } from \"@fluidframework/routerlicious-driver\";\nimport { requestFluidObject } from \"@fluidframework/runtime-utils\";\nimport { ensureFluidResolvedUrl } from \"@fluidframework/driver-utils\";\nimport {\n    ContainerSchema,\n    DOProviderContainerRuntimeFactory,\n    FluidContainer,\n    IFluidContainer,\n    RootDataObject,\n} from \"@fluidframework/fluid-static\";\n\nimport { AzureClientProps, AzureContainerServices } from \"./interfaces\";\nimport { AzureAudience } from \"./AzureAudience\";\nimport {\n    AzureUrlResolver,\n    createAzureCreateNewRequest,\n} from \"./AzureUrlResolver\";\n\n/**\n * Strongly typed id for connecting to a local Azure Fluid Relay.\n */\nexport const LOCAL_MODE_TENANT_ID = \"local\";\n\n/**\n * AzureClient provides the ability to have a Fluid object backed by the Azure Fluid Relay or,\n * when running with local tenantId, have it be backed by a local Azure Fluid Relay instance.\n */\nexport class AzureClient {\n    private readonly documentServiceFactory: IDocumentServiceFactory;\n    private readonly urlResolver: IUrlResolver;\n\n    /**\n     * Creates a new client instance using configuration parameters.\n     * @param props - Properties for initializing a new AzureClient instance\n     */\n    constructor(private readonly props: AzureClientProps) {\n        this.urlResolver = new AzureUrlResolver();\n        // The local service implementation differs from the Azure Fluid Relay in blob\n        // storage format. Azure Fluid Relay supports whole summary upload. Local currently does not.\n        const enableWholeSummaryUpload =\n            this.props.connection.tenantId !== LOCAL_MODE_TENANT_ID;\n        this.documentServiceFactory = new RouterliciousDocumentServiceFactory(\n            this.props.connection.tokenProvider,\n            { enableWholeSummaryUpload },\n        );\n    }\n\n    /**\n     * Creates a new detached container instance in the Azure Fluid Relay.\n     * @param containerSchema - Container schema for the new container.\n     * @returns New detached container instance along with associated services.\n     */\n    public async createContainer(\n        containerSchema: ContainerSchema,\n    ): Promise<{\n        container: IFluidContainer;\n        services: AzureContainerServices;\n    }> {\n        const loader = this.createLoader(containerSchema);\n\n        const container = await loader.createDetachedContainer({\n            package: \"no-dynamic-package\",\n            config: {},\n        });\n\n        const rootDataObject = await requestFluidObject<RootDataObject>(\n            container,\n            \"/\",\n        );\n        const createNewRequest = createAzureCreateNewRequest(\n            this.props.connection.orderer,\n            this.props.connection.storage,\n            this.props.connection.tenantId,\n        );\n        const fluidContainer = new (class extends FluidContainer {\n            async attach() {\n                if (this.attachState !== AttachState.Detached) {\n                    throw new Error(\n                        \"Cannot attach container. Container is not in detached state\",\n                    );\n                }\n                await container.attach(createNewRequest);\n                const resolved = container.resolvedUrl;\n                ensureFluidResolvedUrl(resolved);\n                return resolved.id;\n            }\n        })(container, rootDataObject);\n\n        const services = this.getContainerServices(container);\n        return { container: fluidContainer, services };\n    }\n\n    /**\n     * Accesses the existing container given its unique ID in the Azure Fluid Relay.\n     * @param id - Unique ID of the container in Azure Fluid Relay.\n     * @param containerSchema - Container schema used to access data objects in the container.\n     * @returns Existing container instance along with associated services.\n     */\n    public async getContainer(\n        id: string,\n        containerSchema: ContainerSchema,\n    ): Promise<{\n        container: IFluidContainer;\n        services: AzureContainerServices;\n    }> {\n        const loader = this.createLoader(containerSchema);\n        const url = new URL(this.props.connection.orderer);\n        url.searchParams.append(\"storage\", encodeURIComponent(this.props.connection.storage));\n        url.searchParams.append(\"tenantId\", encodeURIComponent(this.props.connection.tenantId));\n        url.searchParams.append(\"containerId\", encodeURIComponent(id));\n        const container = await loader.resolve({ url: url.href });\n        const rootDataObject = await requestFluidObject<RootDataObject>(\n            container,\n            \"/\",\n        );\n        const fluidContainer = new FluidContainer(container, rootDataObject);\n        const services = this.getContainerServices(container);\n        return { container: fluidContainer, services };\n    }\n\n    private getContainerServices(container: IContainer): AzureContainerServices {\n        return {\n            audience: new AzureAudience(container),\n        };\n    }\n\n    private createLoader(containerSchema: ContainerSchema): Loader {\n        const runtimeFactory = new DOProviderContainerRuntimeFactory(\n            containerSchema,\n        );\n        const module = { fluidExport: runtimeFactory };\n        const codeLoader = { load: async () => module };\n        return new Loader({\n            urlResolver: this.urlResolver,\n            documentServiceFactory: this.documentServiceFactory,\n            codeLoader,\n            logger: this.props.logger,\n        });\n    }\n    // #endregion\n}\n"]}

package/dist/AzureFunctionTokenProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"AzureFunctionTokenProvider.js","sourceRoot":"","sources":["../src/AzureFunctionTokenProvider.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAGH,kDAA0B;AAG1B;;;GAGG;AACH,MAAa,0BAA0B;IACnC;;;;OAIG;IACH,YACqB,aAAqB,EACrB,IAAqE;QADrE,kBAAa,GAAb,aAAa,CAAQ;QACrB,SAAI,GAAJ,IAAI,CAAiE;IACtF,CAAC;IAEE,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAmB;QAChE,OAAO;YACH,GAAG,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;QAC/D,OAAO;YACH,GAAG,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,QAAgB,EAAE,UAA8B;;QACnE,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE;YACjD,MAAM,EAAE;gBACJ,QAAQ;gBACR,UAAU;gBACV,MAAM,QAAE,IAAI,CAAC,IAAI,0CAAE,MAAM;gBACzB,QAAQ,QAAE,IAAI,CAAC,IAAI,0CAAE,QAAQ;gBAC7B,iBAAiB,QAAE,IAAI,CAAC,IAAI,0CAAE,iBAAiB;aAClD;SACJ,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,IAAc,CAAC;IACnC,CAAC;CACJ;AAnCD,gEAmCC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ITokenProvider, ITokenResponse } from \"@fluidframework/routerlicious-driver\";\nimport axios from \"axios\";\nimport { AzureMember } from \"./interfaces\";\n\n/**\n * Token Provider implementation for connecting to an Azure Function endpoint for\n * Azure Fluid Relay token resolution.\n */\nexport class AzureFunctionTokenProvider implements ITokenProvider {\n    /**\n     * Creates a new instance using configuration parameters.\n     * @param azFunctionUrl - URL to Azure Function endpoint\n     * @param user - User object\n     */\n    constructor(\n        private readonly azFunctionUrl: string,\n        private readonly user?: Pick<AzureMember, \"userId\" | \"userName\" | \"additionalDetails\">,\n    ) { }\n\n    public async fetchOrdererToken(tenantId: string, documentId?: string): Promise<ITokenResponse> {\n        return {\n            jwt: await this.getToken(tenantId, documentId),\n        };\n    }\n\n    public async fetchStorageToken(tenantId: string, documentId: string): Promise<ITokenResponse> {\n        return {\n            jwt: await this.getToken(tenantId, documentId),\n        };\n    }\n\n    private async getToken(tenantId: string, documentId: string | undefined): Promise<string> {\n        const response = await axios.get(this.azFunctionUrl, {\n            params: {\n                tenantId,\n                documentId,\n                userId: this.user?.userId,\n                userName: this.user?.userName,\n                additionalDetails: this.user?.additionalDetails,\n            },\n        });\n        return response.data as string;\n    }\n}\n"]}
+{"version":3,"file":"AzureFunctionTokenProvider.js","sourceRoot":"","sources":["../src/AzureFunctionTokenProvider.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAGH,kDAA0B;AAG1B;;;GAGG;AACH,MAAa,0BAA0B;IACnC;;;;OAIG;IACH,YACqB,aAAqB,EACrB,IAAqE;QADrE,kBAAa,GAAb,aAAa,CAAQ;QACrB,SAAI,GAAJ,IAAI,CAAiE;IACtF,CAAC;IAEE,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAmB;QAChE,OAAO;YACH,GAAG,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;QAC/D,OAAO;YACH,GAAG,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,QAAgB,EAAE,UAAmB;;QACxD,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE;YACjD,MAAM,EAAE;gBACJ,QAAQ;gBACR,UAAU;gBACV,MAAM,QAAE,IAAI,CAAC,IAAI,0CAAE,MAAM;gBACzB,QAAQ,QAAE,IAAI,CAAC,IAAI,0CAAE,QAAQ;gBAC7B,iBAAiB,QAAE,IAAI,CAAC,IAAI,0CAAE,iBAAiB;aAClD;SACJ,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,IAAc,CAAC;IACnC,CAAC;CACJ;AAnCD,gEAmCC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ITokenProvider, ITokenResponse } from \"@fluidframework/routerlicious-driver\";\nimport axios from \"axios\";\nimport { AzureMember } from \"./interfaces\";\n\n/**\n * Token Provider implementation for connecting to an Azure Function endpoint for\n * Azure Fluid Relay token resolution.\n */\nexport class AzureFunctionTokenProvider implements ITokenProvider {\n    /**\n     * Creates a new instance using configuration parameters.\n     * @param azFunctionUrl - URL to Azure Function endpoint\n     * @param user - User object\n     */\n    constructor(\n        private readonly azFunctionUrl: string,\n        private readonly user?: Pick<AzureMember, \"userId\" | \"userName\" | \"additionalDetails\">,\n    ) { }\n\n    public async fetchOrdererToken(tenantId: string, documentId?: string): Promise<ITokenResponse> {\n        return {\n            jwt: await this.getToken(tenantId, documentId),\n        };\n    }\n\n    public async fetchStorageToken(tenantId: string, documentId: string): Promise<ITokenResponse> {\n        return {\n            jwt: await this.getToken(tenantId, documentId),\n        };\n    }\n\n    private async getToken(tenantId: string, documentId?: string): Promise<string> {\n        const response = await axios.get(this.azFunctionUrl, {\n            params: {\n                tenantId,\n                documentId,\n                userId: this.user?.userId,\n                userName: this.user?.userName,\n                additionalDetails: this.user?.additionalDetails,\n            },\n        });\n        return response.data as string;\n    }\n}\n"]}

package/dist/AzureUrlResolver.d.ts

@@ -5,12 +5,9 @@
 import { IRequest } from "@fluidframework/core-interfaces";
 import { IFluidResolvedUrl, IResolvedUrl, IUrlResolver } from "@fluidframework/driver-definitions";
 export declare class AzureUrlResolver implements IUrlResolver {
-    private readonly tenantId;
-    private readonly orderer;
-    private readonly storage;
-    constructor(tenantId: string, orderer: string, storage: string);
+    constructor();
     resolve(request: IRequest): Promise<IFluidResolvedUrl>;
     getAbsoluteUrl(resolvedUrl: IResolvedUrl, relativeUrl: string): Promise<string>;
 }
-export declare const createAzureCreateNewRequest: () => IRequest;
+export declare const createAzureCreateNewRequest: (ordererUrl: string, storageUrl: string, tenantId: string) => IRequest;
 //# sourceMappingURL=AzureUrlResolver.d.ts.map

package/dist/AzureUrlResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AzureUrlResolver.d.ts","sourceRoot":"","sources":["../src/AzureUrlResolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAEH,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACf,MAAM,oCAAoC,CAAC;AAM5C,qBAAa,gBAAiB,YAAW,YAAY;IAE7C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFP,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM;IAGvB,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkCtD,cAAc,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAM/F;AAED,eAAO,MAAM,2BAA2B,QAAO,QAO9C,CAAC"}
+{"version":3,"file":"AzureUrlResolver.d.ts","sourceRoot":"","sources":["../src/AzureUrlResolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAEH,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACf,MAAM,oCAAoC,CAAC;AAM5C,qBAAa,gBAAiB,YAAW,YAAY;;IAGpC,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAyCtD,cAAc,CACvB,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC;CAMrB;AAkCD,eAAO,MAAM,2BAA2B,eACxB,MAAM,cACN,MAAM,YACR,MAAM,KACjB,QAUF,CAAC"}

package/dist/AzureUrlResolver.js

@@ -11,37 +11,36 @@ const driver_definitions_1 = require("@fluidframework/driver-definitions");
 // InsecureTokenProvider for basic scenarios or more robust, secure providers that fulfill the
 // ITokenProvider interface
 class AzureUrlResolver {
-    constructor(tenantId, orderer, storage) {
-        this.tenantId = tenantId;
-        this.orderer = orderer;
-        this.storage = storage;
-    }
+    constructor() { }
     async resolve(request) {
+        const { ordererUrl, storageUrl, tenantId, containerId } = decodeAzureUrl(request.url);
         // determine whether the request is for creating of a new container.
         // such request has the `createNew` header set to true and doesn't have a container ID.
-        if (request.headers && request.headers[driver_definitions_1.DriverHeader.createNew] === true) {
+        if (request.headers &&
+            request.headers[driver_definitions_1.DriverHeader.createNew] === true) {
             return {
                 endpoints: {
-                    deltaStorageUrl: `${this.orderer}/deltas/${this.tenantId}/new`,
-                    ordererUrl: this.orderer,
-                    storageUrl: `${this.storage}/repos/${this.tenantId}`,
+                    deltaStorageUrl: `${ordererUrl}/deltas/${tenantId}/new`,
+                    ordererUrl,
+                    storageUrl: `${storageUrl}/repos/${tenantId}`,
                 },
                 // id is a mandatory attribute, but it's ignored by the driver for new container requests.
                 id: "",
                 // tokens attribute is redundant as all tokens are generated via ITokenProvider
                 tokens: {},
                 type: "fluid",
-                url: `${this.orderer}/${this.tenantId}/new`,
+                url: `${ordererUrl}/${tenantId}/new`,
             };
         }
-        // for an existing container we'll parse the request URL to determine the document ID.
-        const containerId = request.url.split("/")[0];
-        const documentUrl = `${this.orderer}/${this.tenantId}/${containerId}`;
+        if (containerId === undefined) {
+            throw new Error("Azure URL did not contain containerId");
+        }
+        const documentUrl = `${ordererUrl}/${tenantId}/${containerId}`;
         return Promise.resolve({
             endpoints: {
-                deltaStorageUrl: `${this.orderer}/deltas/${this.tenantId}/${containerId}`,
-                ordererUrl: this.orderer,
-                storageUrl: `${this.storage}/repos/${this.tenantId}`,
+                deltaStorageUrl: `${ordererUrl}/deltas/${tenantId}/${containerId}`,
+                ordererUrl,
+                storageUrl: `${storageUrl}/repos/${tenantId}`,
             },
             id: containerId,
             tokens: {},
@@ -57,11 +56,42 @@ class AzureUrlResolver {
     }
 }
 exports.AzureUrlResolver = AzureUrlResolver;
-const createAzureCreateNewRequest = () => ({
-    url: "",
-    headers: {
-        [driver_definitions_1.DriverHeader.createNew]: true,
-    },
-});
+function decodeAzureUrl(urlString) {
+    const url = new URL(urlString);
+    const ordererUrl = url.origin;
+    const searchParams = url.searchParams;
+    const storageUrl = searchParams.get("storage");
+    // eslint-disable-next-line no-null/no-null
+    if (storageUrl === null) {
+        throw new Error("Azure URL did not contain a storage URL");
+    }
+    const tenantId = searchParams.get("tenantId");
+    // eslint-disable-next-line no-null/no-null
+    if (tenantId === null) {
+        throw new Error("Azure URL did not contain a tenant ID");
+    }
+    const storageUrlDecoded = decodeURIComponent(storageUrl);
+    const tenantIdDecoded = decodeURIComponent(tenantId);
+    const containerId = searchParams.get("containerId");
+    // eslint-disable-next-line no-null/no-null
+    const containerIdDecoded = containerId !== null ? decodeURIComponent(containerId) : undefined;
+    return {
+        ordererUrl,
+        storageUrl: storageUrlDecoded,
+        tenantId: tenantIdDecoded,
+        containerId: containerIdDecoded,
+    };
+}
+const createAzureCreateNewRequest = (ordererUrl, storageUrl, tenantId) => {
+    const url = new URL(ordererUrl);
+    url.searchParams.append("storage", encodeURIComponent(storageUrl));
+    url.searchParams.append("tenantId", encodeURIComponent(tenantId));
+    return {
+        url: url.href,
+        headers: {
+            [driver_definitions_1.DriverHeader.createNew]: true,
+        },
+    };
+};
 exports.createAzureCreateNewRequest = createAzureCreateNewRequest;
 //# sourceMappingURL=AzureUrlResolver.js.map

package/dist/AzureUrlResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"AzureUrlResolver.js","sourceRoot":"","sources":["../src/AzureUrlResolver.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,2EAK4C;AAE5C,2FAA2F;AAC3F,sFAAsF;AACtF,8FAA8F;AAC9F,2BAA2B;AAC3B,MAAa,gBAAgB;IACzB,YACqB,QAAgB,EAChB,OAAe,EACf,OAAe;QAFf,aAAQ,GAAR,QAAQ,CAAQ;QAChB,YAAO,GAAP,OAAO,CAAQ;QACf,YAAO,GAAP,OAAO,CAAQ;IAChC,CAAC;IAEE,KAAK,CAAC,OAAO,CAAC,OAAiB;QAClC,oEAAoE;QACpE,uFAAuF;QACvF,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,iCAAY,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;YACrE,OAAO;gBACH,SAAS,EAAE;oBACP,eAAe,EAAE,GAAG,IAAI,CAAC,OAAO,WAAW,IAAI,CAAC,QAAQ,MAAM;oBAC9D,UAAU,EAAE,IAAI,CAAC,OAAO;oBACxB,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,UAAU,IAAI,CAAC,QAAQ,EAAE;iBACvD;gBACD,0FAA0F;gBAC1F,EAAE,EAAE,EAAE;gBACN,+EAA+E;gBAC/E,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,MAAM;aAC9C,CAAC;SACL;QACD,sFAAsF;QACtF,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC;QACtE,OAAO,OAAO,CAAC,OAAO,CAAC;YACnB,SAAS,EAAE;gBACP,eAAe,EAAE,GAAG,IAAI,CAAC,OAAO,WAAW,IAAI,CAAC,QAAQ,IAAI,WAAW,EAAE;gBACzE,UAAU,EAAE,IAAI,CAAC,OAAO;gBACxB,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,UAAU,IAAI,CAAC,QAAQ,EAAE;aACvD;YACD,EAAE,EAAE,WAAW;YACf,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,OAAO;YACb,GAAG,EAAE,WAAW;SACnB,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,WAAyB,EAAE,WAAmB;QACtE,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE;YAC9B,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACvC;QACD,OAAO,GAAG,WAAW,CAAC,GAAG,IAAI,WAAW,EAAE,CAAC;IAC/C,CAAC;CACJ;AA/CD,4CA+CC;AAEM,MAAM,2BAA2B,GAAG,GAAa,EAAE,CAAC,CACvD;IACI,GAAG,EAAE,EAAE;IACP,OAAO,EAAE;QACL,CAAC,iCAAY,CAAC,SAAS,CAAC,EAAE,IAAI;KACjC;CACJ,CACJ,CAAC;AAPW,QAAA,2BAA2B,+BAOtC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IRequest } from \"@fluidframework/core-interfaces\";\nimport {\n    DriverHeader,\n    IFluidResolvedUrl,\n    IResolvedUrl,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\n\n// Implementation of a URL resolver to resolve documents stored using the Azure Fluid Relay\n// based off of the orderer and storage URLs provide. The token provider here can be a\n// InsecureTokenProvider for basic scenarios or more robust, secure providers that fulfill the\n// ITokenProvider interface\nexport class AzureUrlResolver implements IUrlResolver {\n    constructor(\n        private readonly tenantId: string,\n        private readonly orderer: string,\n        private readonly storage: string,\n    ) { }\n\n    public async resolve(request: IRequest): Promise<IFluidResolvedUrl> {\n        // determine whether the request is for creating of a new container.\n        // such request has the `createNew` header set to true and doesn't have a container ID.\n        if (request.headers && request.headers[DriverHeader.createNew] === true) {\n            return {\n                endpoints: {\n                    deltaStorageUrl: `${this.orderer}/deltas/${this.tenantId}/new`,\n                    ordererUrl: this.orderer,\n                    storageUrl: `${this.storage}/repos/${this.tenantId}`,\n                },\n                // id is a mandatory attribute, but it's ignored by the driver for new container requests.\n                id: \"\",\n                // tokens attribute is redundant as all tokens are generated via ITokenProvider\n                tokens: {},\n                type: \"fluid\",\n                url: `${this.orderer}/${this.tenantId}/new`,\n            };\n        }\n        // for an existing container we'll parse the request URL to determine the document ID.\n        const containerId = request.url.split(\"/\")[0];\n        const documentUrl = `${this.orderer}/${this.tenantId}/${containerId}`;\n        return Promise.resolve({\n            endpoints: {\n                deltaStorageUrl: `${this.orderer}/deltas/${this.tenantId}/${containerId}`,\n                ordererUrl: this.orderer,\n                storageUrl: `${this.storage}/repos/${this.tenantId}`,\n            },\n            id: containerId,\n            tokens: {},\n            type: \"fluid\",\n            url: documentUrl,\n        });\n    }\n\n    public async getAbsoluteUrl(resolvedUrl: IResolvedUrl, relativeUrl: string): Promise<string> {\n        if (resolvedUrl.type !== \"fluid\") {\n            throw Error(\"Invalid Resolved Url\");\n        }\n        return `${resolvedUrl.url}/${relativeUrl}`;\n    }\n}\n\nexport const createAzureCreateNewRequest = (): IRequest => (\n    {\n        url: \"\",\n        headers: {\n            [DriverHeader.createNew]: true,\n        },\n    }\n);\n"]}
+{"version":3,"file":"AzureUrlResolver.js","sourceRoot":"","sources":["../src/AzureUrlResolver.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IRequest } from \"@fluidframework/core-interfaces\";\nimport {\n    DriverHeader,\n    IFluidResolvedUrl,\n    IResolvedUrl,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\n\n// Implementation of a URL resolver to resolve documents stored using the Azure Fluid Relay\n// based off of the orderer and storage URLs provide. The token provider here can be a\n// InsecureTokenProvider for basic scenarios or more robust, secure providers that fulfill the\n// ITokenProvider interface\nexport class AzureUrlResolver implements IUrlResolver {\n    constructor() {}\n\n    public async resolve(request: IRequest): Promise<IFluidResolvedUrl> {\n        const { ordererUrl, storageUrl, tenantId, containerId } = decodeAzureUrl(\n            request.url,\n        );\n        // determine whether the request is for creating of a new container.\n        // such request has the `createNew` header set to true and doesn't have a container ID.\n        if (\n            request.headers &&\n            request.headers[DriverHeader.createNew] === true\n        ) {\n            return {\n                endpoints: {\n                    deltaStorageUrl: `${ordererUrl}/deltas/${tenantId}/new`,\n                    ordererUrl,\n                    storageUrl: `${storageUrl}/repos/${tenantId}`,\n                },\n                // id is a mandatory attribute, but it's ignored by the driver for new container requests.\n                id: \"\",\n                // tokens attribute is redundant as all tokens are generated via ITokenProvider\n                tokens: {},\n                type: \"fluid\",\n                url: `${ordererUrl}/${tenantId}/new`,\n            };\n        }\n        if (containerId === undefined) {\n            throw new Error(\"Azure URL did not contain containerId\");\n        }\n        const documentUrl = `${ordererUrl}/${tenantId}/${containerId}`;\n        return Promise.resolve({\n            endpoints: {\n                deltaStorageUrl: `${ordererUrl}/deltas/${tenantId}/${containerId}`,\n                ordererUrl,\n                storageUrl: `${storageUrl}/repos/${tenantId}`,\n            },\n            id: containerId,\n            tokens: {},\n            type: \"fluid\",\n            url: documentUrl,\n        });\n    }\n\n    public async getAbsoluteUrl(\n        resolvedUrl: IResolvedUrl,\n        relativeUrl: string,\n    ): Promise<string> {\n        if (resolvedUrl.type !== \"fluid\") {\n            throw Error(\"Invalid Resolved Url\");\n        }\n        return `${resolvedUrl.url}/${relativeUrl}`;\n    }\n}\n\nfunction decodeAzureUrl(urlString: string): {\n    ordererUrl: string;\n    storageUrl: string;\n    tenantId: string;\n    containerId?: string,\n} {\n    const url = new URL(urlString);\n    const ordererUrl = url.origin;\n    const searchParams = url.searchParams;\n    const storageUrl = searchParams.get(\"storage\");\n    // eslint-disable-next-line no-null/no-null\n    if (storageUrl === null) {\n        throw new Error(\"Azure URL did not contain a storage URL\");\n    }\n    const tenantId = searchParams.get(\"tenantId\");\n    // eslint-disable-next-line no-null/no-null\n    if (tenantId === null) {\n        throw new Error(\"Azure URL did not contain a tenant ID\");\n    }\n    const storageUrlDecoded = decodeURIComponent(storageUrl);\n    const tenantIdDecoded = decodeURIComponent(tenantId);\n    const containerId = searchParams.get(\"containerId\");\n    // eslint-disable-next-line no-null/no-null\n    const containerIdDecoded = containerId !== null ? decodeURIComponent(containerId) : undefined;\n    return {\n        ordererUrl,\n        storageUrl: storageUrlDecoded,\n        tenantId: tenantIdDecoded,\n        containerId: containerIdDecoded,\n    };\n}\n\nexport const createAzureCreateNewRequest = (\n    ordererUrl: string,\n    storageUrl: string,\n    tenantId: string,\n): IRequest => {\n    const url = new URL(ordererUrl);\n    url.searchParams.append(\"storage\", encodeURIComponent(storageUrl));\n    url.searchParams.append(\"tenantId\", encodeURIComponent(tenantId));\n    return {\n        url: url.href,\n        headers: {\n            [DriverHeader.createNew]: true,\n        },\n    };\n};\n"]}

package/dist/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/azure-client";
-export declare const pkgVersion = "0.52.0";
+export declare const pkgVersion = "0.54.0-47413";
 //# sourceMappingURL=packageVersion.d.ts.map

package/dist/packageVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.d.ts","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,OAAO,iCAAiC,CAAC;AACtD,eAAO,MAAM,UAAU,WAAW,CAAC"}
+{"version":3,"file":"packageVersion.d.ts","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,OAAO,iCAAiC,CAAC;AACtD,eAAO,MAAM,UAAU,iBAAiB,CAAC"}

package/dist/packageVersion.js

@@ -8,5 +8,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pkgVersion = exports.pkgName = void 0;
 exports.pkgName = "@fluidframework/azure-client";
-exports.pkgVersion = "0.52.0";
+exports.pkgVersion = "0.54.0-47413";
 //# sourceMappingURL=packageVersion.js.map

package/dist/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,8BAA8B,CAAC;AACzC,QAAA,UAAU,GAAG,QAAQ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/azure-client\";\nexport const pkgVersion = \"0.52.0\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,8BAA8B,CAAC;AACzC,QAAA,UAAU,GAAG,cAAc,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/azure-client\";\nexport const pkgVersion = \"0.54.0-47413\";\n"]}

package/lib/AzureClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AzureClient.d.ts","sourceRoot":"","sources":["../src/AzureClient.ts"],"names":[],"mappings":"AAYA,OAAO,EACH,eAAe,EAGf,eAAe,EAElB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,cAAc,CAAC;AAItB;;GAEG;AACH,eAAO,MAAM,oBAAoB,UAAU,CAAC;AAE5C;;;GAGG;AACH,qBAAa,WAAW;IAQR,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPlC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA0B;IACjE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAE3C;;;OAGG;gBAC0B,KAAK,EAAE,gBAAgB;IAepD;;;;OAIG;IACU,eAAe,CACxB,eAAe,EAAE,eAAe,GACjC,OAAO,CAAC;QAAE,SAAS,EAAE,eAAe,CAAC;QAAC,QAAQ,EAAE,sBAAsB,CAAA;KAAE,CAAC;IA2B5E;;;;;OAKG;IACU,YAAY,CACrB,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,eAAe,GACjC,OAAO,CAAC;QAAE,SAAS,EAAE,eAAe,CAAC;QAAC,QAAQ,EAAE,sBAAsB,CAAA;KAAE,CAAC;IAS5E,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,YAAY;CAgBvB"}
+{"version":3,"file":"AzureClient.d.ts","sourceRoot":"","sources":["../src/AzureClient.ts"],"names":[],"mappings":"AAaA,OAAO,EACH,eAAe,EAGf,eAAe,EAElB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAOxE;;GAEG;AACH,eAAO,MAAM,oBAAoB,UAAU,CAAC;AAE5C;;;GAGG;AACH,qBAAa,WAAW;IAQR,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPlC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA0B;IACjE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAE3C;;;OAGG;gBAC0B,KAAK,EAAE,gBAAgB;IAYpD;;;;OAIG;IACU,eAAe,CACxB,eAAe,EAAE,eAAe,GACjC,OAAO,CAAC;QACP,SAAS,EAAE,eAAe,CAAC;QAC3B,QAAQ,EAAE,sBAAsB,CAAC;KACpC,CAAC;IAmCF;;;;;OAKG;IACU,YAAY,CACrB,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,eAAe,GACjC,OAAO,CAAC;QACP,SAAS,EAAE,eAAe,CAAC;QAC3B,QAAQ,EAAE,sBAAsB,CAAC;KACpC,CAAC;IAgBF,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,YAAY;CAcvB"}

package/lib/AzureClient.js

@@ -9,7 +9,7 @@ import { requestFluidObject } from "@fluidframework/runtime-utils";
 import { ensureFluidResolvedUrl } from "@fluidframework/driver-utils";
 import { DOProviderContainerRuntimeFactory, FluidContainer, } from "@fluidframework/fluid-static";
 import { AzureAudience } from "./AzureAudience";
-import { AzureUrlResolver, createAzureCreateNewRequest } from "./AzureUrlResolver";
+import { AzureUrlResolver, createAzureCreateNewRequest, } from "./AzureUrlResolver";
 /**
  * Strongly typed id for connecting to a local Azure Fluid Relay.
  */
@@ -25,7 +25,7 @@ export class AzureClient {
      */
     constructor(props) {
         this.props = props;
-        this.urlResolver = new AzureUrlResolver(this.props.connection.tenantId, this.props.connection.orderer, this.props.connection.storage);
+        this.urlResolver = new AzureUrlResolver();
         // The local service implementation differs from the Azure Fluid Relay in blob
         // storage format. Azure Fluid Relay supports whole summary upload. Local currently does not.
         const enableWholeSummaryUpload = this.props.connection.tenantId !== LOCAL_MODE_TENANT_ID;
@@ -43,13 +43,13 @@ export class AzureClient {
             config: {},
         });
         const rootDataObject = await requestFluidObject(container, "/");
+        const createNewRequest = createAzureCreateNewRequest(this.props.connection.orderer, this.props.connection.storage, this.props.connection.tenantId);
         const fluidContainer = new (class extends FluidContainer {
             async attach() {
                 if (this.attachState !== AttachState.Detached) {
                     throw new Error("Cannot attach container. Container is not in detached state");
                 }
-                const request = createAzureCreateNewRequest();
-                await container.attach(request);
+                await container.attach(createNewRequest);
                 const resolved = container.resolvedUrl;
                 ensureFluidResolvedUrl(resolved);
                 return resolved.id;
@@ -66,7 +66,11 @@ export class AzureClient {
      */
     async getContainer(id, containerSchema) {
         const loader = this.createLoader(containerSchema);
-        const container = await loader.resolve({ url: id });
+        const url = new URL(this.props.connection.orderer);
+        url.searchParams.append("storage", encodeURIComponent(this.props.connection.storage));
+        url.searchParams.append("tenantId", encodeURIComponent(this.props.connection.tenantId));
+        url.searchParams.append("containerId", encodeURIComponent(id));
+        const container = await loader.resolve({ url: url.href });
         const rootDataObject = await requestFluidObject(container, "/");
         const fluidContainer = new FluidContainer(container, rootDataObject);
         const services = this.getContainerServices(container);

package/lib/AzureClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"AzureClient.js","sourceRoot":"","sources":["../src/AzureClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\nimport { Container, Loader } from \"@fluidframework/container-loader\";\nimport {\n    IDocumentServiceFactory, IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\nimport { AttachState } from \"@fluidframework/container-definitions\";\nimport { RouterliciousDocumentServiceFactory } from \"@fluidframework/routerlicious-driver\";\nimport { requestFluidObject } from \"@fluidframework/runtime-utils\";\nimport { ensureFluidResolvedUrl } from \"@fluidframework/driver-utils\";\nimport {\n    ContainerSchema,\n    DOProviderContainerRuntimeFactory,\n    FluidContainer,\n    IFluidContainer,\n    RootDataObject,\n} from \"@fluidframework/fluid-static\";\n\nimport {\n    AzureClientProps,\n    AzureContainerServices,\n} from \"./interfaces\";\nimport { AzureAudience } from \"./AzureAudience\";\nimport { AzureUrlResolver, createAzureCreateNewRequest } from \"./AzureUrlResolver\";\n\n/**\n * Strongly typed id for connecting to a local Azure Fluid Relay.\n */\nexport const LOCAL_MODE_TENANT_ID = \"local\";\n\n/**\n * AzureClient provides the ability to have a Fluid object backed by the Azure Fluid Relay or,\n * when running with local tenantId, have it be backed by a local Azure Fluid Relay instance.\n */\nexport class AzureClient {\n    private readonly documentServiceFactory: IDocumentServiceFactory;\n    private readonly urlResolver: IUrlResolver;\n\n    /**\n     * Creates a new client instance using configuration parameters.\n     * @param props - Properties for initializing a new AzureClient instance\n     */\n    constructor(private readonly props: AzureClientProps) {\n        this.urlResolver = new AzureUrlResolver(\n            this.props.connection.tenantId,\n            this.props.connection.orderer,\n            this.props.connection.storage,\n        );\n        // The local service implementation differs from the Azure Fluid Relay in blob\n        // storage format. Azure Fluid Relay supports whole summary upload. Local currently does not.\n        const enableWholeSummaryUpload = this.props.connection.tenantId !== LOCAL_MODE_TENANT_ID;\n        this.documentServiceFactory = new RouterliciousDocumentServiceFactory(\n            this.props.connection.tokenProvider,\n            { enableWholeSummaryUpload },\n        );\n    }\n\n    /**\n     * Creates a new detached container instance in the Azure Fluid Relay.\n     * @param containerSchema - Container schema for the new container.\n     * @returns New detached container instance along with associated services.\n     */\n    public async createContainer(\n        containerSchema: ContainerSchema,\n    ): Promise<{ container: IFluidContainer; services: AzureContainerServices }> {\n        const loader = this.createLoader(containerSchema);\n\n        const container = await loader.createDetachedContainer({\n            package: \"no-dynamic-package\",\n            config: {},\n        });\n\n        const rootDataObject = await requestFluidObject<RootDataObject>(container, \"/\");\n\n        const fluidContainer = new (class extends FluidContainer {\n            async attach() {\n                if (this.attachState !== AttachState.Detached) {\n                    throw new Error(\"Cannot attach container. Container is not in detached state\");\n                }\n                const request = createAzureCreateNewRequest();\n                await container.attach(request);\n                const resolved = container.resolvedUrl;\n                ensureFluidResolvedUrl(resolved);\n                return resolved.id;\n            }\n        })(container, rootDataObject);\n\n        const services = this.getContainerServices(container);\n        return { container: fluidContainer, services };\n    }\n\n    /**\n     * Accesses the existing container given its unique ID in the Azure Fluid Relay.\n     * @param id - Unique ID of the container in Azure Fluid Relay.\n     * @param containerSchema - Container schema used to access data objects in the container.\n     * @returns Existing container instance along with associated services.\n     */\n    public async getContainer(\n        id: string,\n        containerSchema: ContainerSchema,\n    ): Promise<{ container: IFluidContainer; services: AzureContainerServices }> {\n        const loader = this.createLoader(containerSchema);\n        const container = await loader.resolve({ url: id });\n        const rootDataObject = await requestFluidObject<RootDataObject>(container, \"/\");\n        const fluidContainer = new FluidContainer(container, rootDataObject);\n        const services = this.getContainerServices(container);\n        return { container: fluidContainer, services };\n    }\n\n    private getContainerServices(\n        container: Container,\n    ): AzureContainerServices {\n        return {\n            audience: new AzureAudience(container),\n        };\n    }\n\n    private createLoader(\n        containerSchema: ContainerSchema,\n    ): Loader {\n        const runtimeFactory = new DOProviderContainerRuntimeFactory(\n            containerSchema,\n        );\n        const module = { fluidExport: runtimeFactory };\n        const codeLoader = { load: async () => module };\n        return new Loader({\n            urlResolver: this.urlResolver,\n            documentServiceFactory: this.documentServiceFactory,\n            codeLoader,\n            logger: this.props.logger,\n        });\n    }\n    // #endregion\n}\n"]}
+{"version":3,"file":"AzureClient.js","sourceRoot":"","sources":["../src/AzureClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\nimport { Loader } from \"@fluidframework/container-loader\";\nimport {\n    IDocumentServiceFactory,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\nimport { AttachState, IContainer } from \"@fluidframework/container-definitions\";\nimport { RouterliciousDocumentServiceFactory } from \"@fluidframework/routerlicious-driver\";\nimport { requestFluidObject } from \"@fluidframework/runtime-utils\";\nimport { ensureFluidResolvedUrl } from \"@fluidframework/driver-utils\";\nimport {\n    ContainerSchema,\n    DOProviderContainerRuntimeFactory,\n    FluidContainer,\n    IFluidContainer,\n    RootDataObject,\n} from \"@fluidframework/fluid-static\";\n\nimport { AzureClientProps, AzureContainerServices } from \"./interfaces\";\nimport { AzureAudience } from \"./AzureAudience\";\nimport {\n    AzureUrlResolver,\n    createAzureCreateNewRequest,\n} from \"./AzureUrlResolver\";\n\n/**\n * Strongly typed id for connecting to a local Azure Fluid Relay.\n */\nexport const LOCAL_MODE_TENANT_ID = \"local\";\n\n/**\n * AzureClient provides the ability to have a Fluid object backed by the Azure Fluid Relay or,\n * when running with local tenantId, have it be backed by a local Azure Fluid Relay instance.\n */\nexport class AzureClient {\n    private readonly documentServiceFactory: IDocumentServiceFactory;\n    private readonly urlResolver: IUrlResolver;\n\n    /**\n     * Creates a new client instance using configuration parameters.\n     * @param props - Properties for initializing a new AzureClient instance\n     */\n    constructor(private readonly props: AzureClientProps) {\n        this.urlResolver = new AzureUrlResolver();\n        // The local service implementation differs from the Azure Fluid Relay in blob\n        // storage format. Azure Fluid Relay supports whole summary upload. Local currently does not.\n        const enableWholeSummaryUpload =\n            this.props.connection.tenantId !== LOCAL_MODE_TENANT_ID;\n        this.documentServiceFactory = new RouterliciousDocumentServiceFactory(\n            this.props.connection.tokenProvider,\n            { enableWholeSummaryUpload },\n        );\n    }\n\n    /**\n     * Creates a new detached container instance in the Azure Fluid Relay.\n     * @param containerSchema - Container schema for the new container.\n     * @returns New detached container instance along with associated services.\n     */\n    public async createContainer(\n        containerSchema: ContainerSchema,\n    ): Promise<{\n        container: IFluidContainer;\n        services: AzureContainerServices;\n    }> {\n        const loader = this.createLoader(containerSchema);\n\n        const container = await loader.createDetachedContainer({\n            package: \"no-dynamic-package\",\n            config: {},\n        });\n\n        const rootDataObject = await requestFluidObject<RootDataObject>(\n            container,\n            \"/\",\n        );\n        const createNewRequest = createAzureCreateNewRequest(\n            this.props.connection.orderer,\n            this.props.connection.storage,\n            this.props.connection.tenantId,\n        );\n        const fluidContainer = new (class extends FluidContainer {\n            async attach() {\n                if (this.attachState !== AttachState.Detached) {\n                    throw new Error(\n                        \"Cannot attach container. Container is not in detached state\",\n                    );\n                }\n                await container.attach(createNewRequest);\n                const resolved = container.resolvedUrl;\n                ensureFluidResolvedUrl(resolved);\n                return resolved.id;\n            }\n        })(container, rootDataObject);\n\n        const services = this.getContainerServices(container);\n        return { container: fluidContainer, services };\n    }\n\n    /**\n     * Accesses the existing container given its unique ID in the Azure Fluid Relay.\n     * @param id - Unique ID of the container in Azure Fluid Relay.\n     * @param containerSchema - Container schema used to access data objects in the container.\n     * @returns Existing container instance along with associated services.\n     */\n    public async getContainer(\n        id: string,\n        containerSchema: ContainerSchema,\n    ): Promise<{\n        container: IFluidContainer;\n        services: AzureContainerServices;\n    }> {\n        const loader = this.createLoader(containerSchema);\n        const url = new URL(this.props.connection.orderer);\n        url.searchParams.append(\"storage\", encodeURIComponent(this.props.connection.storage));\n        url.searchParams.append(\"tenantId\", encodeURIComponent(this.props.connection.tenantId));\n        url.searchParams.append(\"containerId\", encodeURIComponent(id));\n        const container = await loader.resolve({ url: url.href });\n        const rootDataObject = await requestFluidObject<RootDataObject>(\n            container,\n            \"/\",\n        );\n        const fluidContainer = new FluidContainer(container, rootDataObject);\n        const services = this.getContainerServices(container);\n        return { container: fluidContainer, services };\n    }\n\n    private getContainerServices(container: IContainer): AzureContainerServices {\n        return {\n            audience: new AzureAudience(container),\n        };\n    }\n\n    private createLoader(containerSchema: ContainerSchema): Loader {\n        const runtimeFactory = new DOProviderContainerRuntimeFactory(\n            containerSchema,\n        );\n        const module = { fluidExport: runtimeFactory };\n        const codeLoader = { load: async () => module };\n        return new Loader({\n            urlResolver: this.urlResolver,\n            documentServiceFactory: this.documentServiceFactory,\n            codeLoader,\n            logger: this.props.logger,\n        });\n    }\n    // #endregion\n}\n"]}

package/lib/AzureFunctionTokenProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"AzureFunctionTokenProvider.js","sourceRoot":"","sources":["../src/AzureFunctionTokenProvider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B;;;GAGG;AACH,MAAM,OAAO,0BAA0B;IACnC;;;;OAIG;IACH,YACqB,aAAqB,EACrB,IAAqE;QADrE,kBAAa,GAAb,aAAa,CAAQ;QACrB,SAAI,GAAJ,IAAI,CAAiE;IACtF,CAAC;IAEE,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAmB;QAChE,OAAO;YACH,GAAG,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;QAC/D,OAAO;YACH,GAAG,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,QAAgB,EAAE,UAA8B;;QACnE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE;YACjD,MAAM,EAAE;gBACJ,QAAQ;gBACR,UAAU;gBACV,MAAM,QAAE,IAAI,CAAC,IAAI,0CAAE,MAAM;gBACzB,QAAQ,QAAE,IAAI,CAAC,IAAI,0CAAE,QAAQ;gBAC7B,iBAAiB,QAAE,IAAI,CAAC,IAAI,0CAAE,iBAAiB;aAClD;SACJ,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,IAAc,CAAC;IACnC,CAAC;CACJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ITokenProvider, ITokenResponse } from \"@fluidframework/routerlicious-driver\";\nimport axios from \"axios\";\nimport { AzureMember } from \"./interfaces\";\n\n/**\n * Token Provider implementation for connecting to an Azure Function endpoint for\n * Azure Fluid Relay token resolution.\n */\nexport class AzureFunctionTokenProvider implements ITokenProvider {\n    /**\n     * Creates a new instance using configuration parameters.\n     * @param azFunctionUrl - URL to Azure Function endpoint\n     * @param user - User object\n     */\n    constructor(\n        private readonly azFunctionUrl: string,\n        private readonly user?: Pick<AzureMember, \"userId\" | \"userName\" | \"additionalDetails\">,\n    ) { }\n\n    public async fetchOrdererToken(tenantId: string, documentId?: string): Promise<ITokenResponse> {\n        return {\n            jwt: await this.getToken(tenantId, documentId),\n        };\n    }\n\n    public async fetchStorageToken(tenantId: string, documentId: string): Promise<ITokenResponse> {\n        return {\n            jwt: await this.getToken(tenantId, documentId),\n        };\n    }\n\n    private async getToken(tenantId: string, documentId: string | undefined): Promise<string> {\n        const response = await axios.get(this.azFunctionUrl, {\n            params: {\n                tenantId,\n                documentId,\n                userId: this.user?.userId,\n                userName: this.user?.userName,\n                additionalDetails: this.user?.additionalDetails,\n            },\n        });\n        return response.data as string;\n    }\n}\n"]}
+{"version":3,"file":"AzureFunctionTokenProvider.js","sourceRoot":"","sources":["../src/AzureFunctionTokenProvider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B;;;GAGG;AACH,MAAM,OAAO,0BAA0B;IACnC;;;;OAIG;IACH,YACqB,aAAqB,EACrB,IAAqE;QADrE,kBAAa,GAAb,aAAa,CAAQ;QACrB,SAAI,GAAJ,IAAI,CAAiE;IACtF,CAAC;IAEE,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAmB;QAChE,OAAO;YACH,GAAG,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;QAC/D,OAAO;YACH,GAAG,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,QAAgB,EAAE,UAAmB;;QACxD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE;YACjD,MAAM,EAAE;gBACJ,QAAQ;gBACR,UAAU;gBACV,MAAM,QAAE,IAAI,CAAC,IAAI,0CAAE,MAAM;gBACzB,QAAQ,QAAE,IAAI,CAAC,IAAI,0CAAE,QAAQ;gBAC7B,iBAAiB,QAAE,IAAI,CAAC,IAAI,0CAAE,iBAAiB;aAClD;SACJ,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,IAAc,CAAC;IACnC,CAAC;CACJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ITokenProvider, ITokenResponse } from \"@fluidframework/routerlicious-driver\";\nimport axios from \"axios\";\nimport { AzureMember } from \"./interfaces\";\n\n/**\n * Token Provider implementation for connecting to an Azure Function endpoint for\n * Azure Fluid Relay token resolution.\n */\nexport class AzureFunctionTokenProvider implements ITokenProvider {\n    /**\n     * Creates a new instance using configuration parameters.\n     * @param azFunctionUrl - URL to Azure Function endpoint\n     * @param user - User object\n     */\n    constructor(\n        private readonly azFunctionUrl: string,\n        private readonly user?: Pick<AzureMember, \"userId\" | \"userName\" | \"additionalDetails\">,\n    ) { }\n\n    public async fetchOrdererToken(tenantId: string, documentId?: string): Promise<ITokenResponse> {\n        return {\n            jwt: await this.getToken(tenantId, documentId),\n        };\n    }\n\n    public async fetchStorageToken(tenantId: string, documentId: string): Promise<ITokenResponse> {\n        return {\n            jwt: await this.getToken(tenantId, documentId),\n        };\n    }\n\n    private async getToken(tenantId: string, documentId?: string): Promise<string> {\n        const response = await axios.get(this.azFunctionUrl, {\n            params: {\n                tenantId,\n                documentId,\n                userId: this.user?.userId,\n                userName: this.user?.userName,\n                additionalDetails: this.user?.additionalDetails,\n            },\n        });\n        return response.data as string;\n    }\n}\n"]}

package/lib/AzureUrlResolver.d.ts

@@ -5,12 +5,9 @@
 import { IRequest } from "@fluidframework/core-interfaces";
 import { IFluidResolvedUrl, IResolvedUrl, IUrlResolver } from "@fluidframework/driver-definitions";
 export declare class AzureUrlResolver implements IUrlResolver {
-    private readonly tenantId;
-    private readonly orderer;
-    private readonly storage;
-    constructor(tenantId: string, orderer: string, storage: string);
+    constructor();
     resolve(request: IRequest): Promise<IFluidResolvedUrl>;
     getAbsoluteUrl(resolvedUrl: IResolvedUrl, relativeUrl: string): Promise<string>;
 }
-export declare const createAzureCreateNewRequest: () => IRequest;
+export declare const createAzureCreateNewRequest: (ordererUrl: string, storageUrl: string, tenantId: string) => IRequest;
 //# sourceMappingURL=AzureUrlResolver.d.ts.map

package/lib/AzureUrlResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AzureUrlResolver.d.ts","sourceRoot":"","sources":["../src/AzureUrlResolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAEH,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACf,MAAM,oCAAoC,CAAC;AAM5C,qBAAa,gBAAiB,YAAW,YAAY;IAE7C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFP,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM;IAGvB,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkCtD,cAAc,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAM/F;AAED,eAAO,MAAM,2BAA2B,QAAO,QAO9C,CAAC"}
+{"version":3,"file":"AzureUrlResolver.d.ts","sourceRoot":"","sources":["../src/AzureUrlResolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAEH,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACf,MAAM,oCAAoC,CAAC;AAM5C,qBAAa,gBAAiB,YAAW,YAAY;;IAGpC,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAyCtD,cAAc,CACvB,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC;CAMrB;AAkCD,eAAO,MAAM,2BAA2B,eACxB,MAAM,cACN,MAAM,YACR,MAAM,KACjB,QAUF,CAAC"}

package/lib/AzureUrlResolver.js

@@ -8,37 +8,36 @@ import { DriverHeader, } from "@fluidframework/driver-definitions";
 // InsecureTokenProvider for basic scenarios or more robust, secure providers that fulfill the
 // ITokenProvider interface
 export class AzureUrlResolver {
-    constructor(tenantId, orderer, storage) {
-        this.tenantId = tenantId;
-        this.orderer = orderer;
-        this.storage = storage;
-    }
+    constructor() { }
     async resolve(request) {
+        const { ordererUrl, storageUrl, tenantId, containerId } = decodeAzureUrl(request.url);
         // determine whether the request is for creating of a new container.
         // such request has the `createNew` header set to true and doesn't have a container ID.
-        if (request.headers && request.headers[DriverHeader.createNew] === true) {
+        if (request.headers &&
+            request.headers[DriverHeader.createNew] === true) {
             return {
                 endpoints: {
-                    deltaStorageUrl: `${this.orderer}/deltas/${this.tenantId}/new`,
-                    ordererUrl: this.orderer,
-                    storageUrl: `${this.storage}/repos/${this.tenantId}`,
+                    deltaStorageUrl: `${ordererUrl}/deltas/${tenantId}/new`,
+                    ordererUrl,
+                    storageUrl: `${storageUrl}/repos/${tenantId}`,
                 },
                 // id is a mandatory attribute, but it's ignored by the driver for new container requests.
                 id: "",
                 // tokens attribute is redundant as all tokens are generated via ITokenProvider
                 tokens: {},
                 type: "fluid",
-                url: `${this.orderer}/${this.tenantId}/new`,
+                url: `${ordererUrl}/${tenantId}/new`,
             };
         }
-        // for an existing container we'll parse the request URL to determine the document ID.
-        const containerId = request.url.split("/")[0];
-        const documentUrl = `${this.orderer}/${this.tenantId}/${containerId}`;
+        if (containerId === undefined) {
+            throw new Error("Azure URL did not contain containerId");
+        }
+        const documentUrl = `${ordererUrl}/${tenantId}/${containerId}`;
         return Promise.resolve({
             endpoints: {
-                deltaStorageUrl: `${this.orderer}/deltas/${this.tenantId}/${containerId}`,
-                ordererUrl: this.orderer,
-                storageUrl: `${this.storage}/repos/${this.tenantId}`,
+                deltaStorageUrl: `${ordererUrl}/deltas/${tenantId}/${containerId}`,
+                ordererUrl,
+                storageUrl: `${storageUrl}/repos/${tenantId}`,
             },
             id: containerId,
             tokens: {},
@@ -53,10 +52,41 @@ export class AzureUrlResolver {
         return `${resolvedUrl.url}/${relativeUrl}`;
     }
 }
-export const createAzureCreateNewRequest = () => ({
-    url: "",
-    headers: {
-        [DriverHeader.createNew]: true,
-    },
-});
+function decodeAzureUrl(urlString) {
+    const url = new URL(urlString);
+    const ordererUrl = url.origin;
+    const searchParams = url.searchParams;
+    const storageUrl = searchParams.get("storage");
+    // eslint-disable-next-line no-null/no-null
+    if (storageUrl === null) {
+        throw new Error("Azure URL did not contain a storage URL");
+    }
+    const tenantId = searchParams.get("tenantId");
+    // eslint-disable-next-line no-null/no-null
+    if (tenantId === null) {
+        throw new Error("Azure URL did not contain a tenant ID");
+    }
+    const storageUrlDecoded = decodeURIComponent(storageUrl);
+    const tenantIdDecoded = decodeURIComponent(tenantId);
+    const containerId = searchParams.get("containerId");
+    // eslint-disable-next-line no-null/no-null
+    const containerIdDecoded = containerId !== null ? decodeURIComponent(containerId) : undefined;
+    return {
+        ordererUrl,
+        storageUrl: storageUrlDecoded,
+        tenantId: tenantIdDecoded,
+        containerId: containerIdDecoded,
+    };
+}
+export const createAzureCreateNewRequest = (ordererUrl, storageUrl, tenantId) => {
+    const url = new URL(ordererUrl);
+    url.searchParams.append("storage", encodeURIComponent(storageUrl));
+    url.searchParams.append("tenantId", encodeURIComponent(tenantId));
+    return {
+        url: url.href,
+        headers: {
+            [DriverHeader.createNew]: true,
+        },
+    };
+};
 //# sourceMappingURL=AzureUrlResolver.js.map

package/lib/AzureUrlResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"AzureUrlResolver.js","sourceRoot":"","sources":["../src/AzureUrlResolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACH,YAAY,GAIf,MAAM,oCAAoC,CAAC;AAE5C,2FAA2F;AAC3F,sFAAsF;AACtF,8FAA8F;AAC9F,2BAA2B;AAC3B,MAAM,OAAO,gBAAgB;IACzB,YACqB,QAAgB,EAChB,OAAe,EACf,OAAe;QAFf,aAAQ,GAAR,QAAQ,CAAQ;QAChB,YAAO,GAAP,OAAO,CAAQ;QACf,YAAO,GAAP,OAAO,CAAQ;IAChC,CAAC;IAEE,KAAK,CAAC,OAAO,CAAC,OAAiB;QAClC,oEAAoE;QACpE,uFAAuF;QACvF,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;YACrE,OAAO;gBACH,SAAS,EAAE;oBACP,eAAe,EAAE,GAAG,IAAI,CAAC,OAAO,WAAW,IAAI,CAAC,QAAQ,MAAM;oBAC9D,UAAU,EAAE,IAAI,CAAC,OAAO;oBACxB,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,UAAU,IAAI,CAAC,QAAQ,EAAE;iBACvD;gBACD,0FAA0F;gBAC1F,EAAE,EAAE,EAAE;gBACN,+EAA+E;gBAC/E,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,MAAM;aAC9C,CAAC;SACL;QACD,sFAAsF;QACtF,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC;QACtE,OAAO,OAAO,CAAC,OAAO,CAAC;YACnB,SAAS,EAAE;gBACP,eAAe,EAAE,GAAG,IAAI,CAAC,OAAO,WAAW,IAAI,CAAC,QAAQ,IAAI,WAAW,EAAE;gBACzE,UAAU,EAAE,IAAI,CAAC,OAAO;gBACxB,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,UAAU,IAAI,CAAC,QAAQ,EAAE;aACvD;YACD,EAAE,EAAE,WAAW;YACf,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,OAAO;YACb,GAAG,EAAE,WAAW;SACnB,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,WAAyB,EAAE,WAAmB;QACtE,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE;YAC9B,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACvC;QACD,OAAO,GAAG,WAAW,CAAC,GAAG,IAAI,WAAW,EAAE,CAAC;IAC/C,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,GAAa,EAAE,CAAC,CACvD;IACI,GAAG,EAAE,EAAE;IACP,OAAO,EAAE;QACL,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,IAAI;KACjC;CACJ,CACJ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IRequest } from \"@fluidframework/core-interfaces\";\nimport {\n    DriverHeader,\n    IFluidResolvedUrl,\n    IResolvedUrl,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\n\n// Implementation of a URL resolver to resolve documents stored using the Azure Fluid Relay\n// based off of the orderer and storage URLs provide. The token provider here can be a\n// InsecureTokenProvider for basic scenarios or more robust, secure providers that fulfill the\n// ITokenProvider interface\nexport class AzureUrlResolver implements IUrlResolver {\n    constructor(\n        private readonly tenantId: string,\n        private readonly orderer: string,\n        private readonly storage: string,\n    ) { }\n\n    public async resolve(request: IRequest): Promise<IFluidResolvedUrl> {\n        // determine whether the request is for creating of a new container.\n        // such request has the `createNew` header set to true and doesn't have a container ID.\n        if (request.headers && request.headers[DriverHeader.createNew] === true) {\n            return {\n                endpoints: {\n                    deltaStorageUrl: `${this.orderer}/deltas/${this.tenantId}/new`,\n                    ordererUrl: this.orderer,\n                    storageUrl: `${this.storage}/repos/${this.tenantId}`,\n                },\n                // id is a mandatory attribute, but it's ignored by the driver for new container requests.\n                id: \"\",\n                // tokens attribute is redundant as all tokens are generated via ITokenProvider\n                tokens: {},\n                type: \"fluid\",\n                url: `${this.orderer}/${this.tenantId}/new`,\n            };\n        }\n        // for an existing container we'll parse the request URL to determine the document ID.\n        const containerId = request.url.split(\"/\")[0];\n        const documentUrl = `${this.orderer}/${this.tenantId}/${containerId}`;\n        return Promise.resolve({\n            endpoints: {\n                deltaStorageUrl: `${this.orderer}/deltas/${this.tenantId}/${containerId}`,\n                ordererUrl: this.orderer,\n                storageUrl: `${this.storage}/repos/${this.tenantId}`,\n            },\n            id: containerId,\n            tokens: {},\n            type: \"fluid\",\n            url: documentUrl,\n        });\n    }\n\n    public async getAbsoluteUrl(resolvedUrl: IResolvedUrl, relativeUrl: string): Promise<string> {\n        if (resolvedUrl.type !== \"fluid\") {\n            throw Error(\"Invalid Resolved Url\");\n        }\n        return `${resolvedUrl.url}/${relativeUrl}`;\n    }\n}\n\nexport const createAzureCreateNewRequest = (): IRequest => (\n    {\n        url: \"\",\n        headers: {\n            [DriverHeader.createNew]: true,\n        },\n    }\n);\n"]}
+{"version":3,"file":"AzureUrlResolver.js","sourceRoot":"","sources":["../src/AzureUrlResolver.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IRequest } from \"@fluidframework/core-interfaces\";\nimport {\n    DriverHeader,\n    IFluidResolvedUrl,\n    IResolvedUrl,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\n\n// Implementation of a URL resolver to resolve documents stored using the Azure Fluid Relay\n// based off of the orderer and storage URLs provide. The token provider here can be a\n// InsecureTokenProvider for basic scenarios or more robust, secure providers that fulfill the\n// ITokenProvider interface\nexport class AzureUrlResolver implements IUrlResolver {\n    constructor() {}\n\n    public async resolve(request: IRequest): Promise<IFluidResolvedUrl> {\n        const { ordererUrl, storageUrl, tenantId, containerId } = decodeAzureUrl(\n            request.url,\n        );\n        // determine whether the request is for creating of a new container.\n        // such request has the `createNew` header set to true and doesn't have a container ID.\n        if (\n            request.headers &&\n            request.headers[DriverHeader.createNew] === true\n        ) {\n            return {\n                endpoints: {\n                    deltaStorageUrl: `${ordererUrl}/deltas/${tenantId}/new`,\n                    ordererUrl,\n                    storageUrl: `${storageUrl}/repos/${tenantId}`,\n                },\n                // id is a mandatory attribute, but it's ignored by the driver for new container requests.\n                id: \"\",\n                // tokens attribute is redundant as all tokens are generated via ITokenProvider\n                tokens: {},\n                type: \"fluid\",\n                url: `${ordererUrl}/${tenantId}/new`,\n            };\n        }\n        if (containerId === undefined) {\n            throw new Error(\"Azure URL did not contain containerId\");\n        }\n        const documentUrl = `${ordererUrl}/${tenantId}/${containerId}`;\n        return Promise.resolve({\n            endpoints: {\n                deltaStorageUrl: `${ordererUrl}/deltas/${tenantId}/${containerId}`,\n                ordererUrl,\n                storageUrl: `${storageUrl}/repos/${tenantId}`,\n            },\n            id: containerId,\n            tokens: {},\n            type: \"fluid\",\n            url: documentUrl,\n        });\n    }\n\n    public async getAbsoluteUrl(\n        resolvedUrl: IResolvedUrl,\n        relativeUrl: string,\n    ): Promise<string> {\n        if (resolvedUrl.type !== \"fluid\") {\n            throw Error(\"Invalid Resolved Url\");\n        }\n        return `${resolvedUrl.url}/${relativeUrl}`;\n    }\n}\n\nfunction decodeAzureUrl(urlString: string): {\n    ordererUrl: string;\n    storageUrl: string;\n    tenantId: string;\n    containerId?: string,\n} {\n    const url = new URL(urlString);\n    const ordererUrl = url.origin;\n    const searchParams = url.searchParams;\n    const storageUrl = searchParams.get(\"storage\");\n    // eslint-disable-next-line no-null/no-null\n    if (storageUrl === null) {\n        throw new Error(\"Azure URL did not contain a storage URL\");\n    }\n    const tenantId = searchParams.get(\"tenantId\");\n    // eslint-disable-next-line no-null/no-null\n    if (tenantId === null) {\n        throw new Error(\"Azure URL did not contain a tenant ID\");\n    }\n    const storageUrlDecoded = decodeURIComponent(storageUrl);\n    const tenantIdDecoded = decodeURIComponent(tenantId);\n    const containerId = searchParams.get(\"containerId\");\n    // eslint-disable-next-line no-null/no-null\n    const containerIdDecoded = containerId !== null ? decodeURIComponent(containerId) : undefined;\n    return {\n        ordererUrl,\n        storageUrl: storageUrlDecoded,\n        tenantId: tenantIdDecoded,\n        containerId: containerIdDecoded,\n    };\n}\n\nexport const createAzureCreateNewRequest = (\n    ordererUrl: string,\n    storageUrl: string,\n    tenantId: string,\n): IRequest => {\n    const url = new URL(ordererUrl);\n    url.searchParams.append(\"storage\", encodeURIComponent(storageUrl));\n    url.searchParams.append(\"tenantId\", encodeURIComponent(tenantId));\n    return {\n        url: url.href,\n        headers: {\n            [DriverHeader.createNew]: true,\n        },\n    };\n};\n"]}

package/lib/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/azure-client";
-export declare const pkgVersion = "0.52.0";
+export declare const pkgVersion = "0.54.0-47413";
 //# sourceMappingURL=packageVersion.d.ts.map

package/lib/packageVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.d.ts","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,OAAO,iCAAiC,CAAC;AACtD,eAAO,MAAM,UAAU,WAAW,CAAC"}
+{"version":3,"file":"packageVersion.d.ts","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,OAAO,iCAAiC,CAAC;AACtD,eAAO,MAAM,UAAU,iBAAiB,CAAC"}

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/azure-client";
-export const pkgVersion = "0.52.0";
+export const pkgVersion = "0.54.0-47413";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,8BAA8B,CAAC;AACtD,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/azure-client\";\nexport const pkgVersion = \"0.52.0\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,8BAA8B,CAAC;AACtD,MAAM,CAAC,MAAM,UAAU,GAAG,cAAc,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/azure-client\";\nexport const pkgVersion = \"0.54.0-47413\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/azure-client",
-  "version": "0.52.0",
+  "version": "0.54.0-47413",
   "description": "A tool to enable creation and loading of Fluid containers using the Azure Fluid Relay service",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -38,26 +38,26 @@
   },
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
-    "@fluidframework/container-definitions": "^0.42.0",
-    "@fluidframework/container-loader": "^0.52.0",
+    "@fluidframework/container-definitions": "^0.44.0-0",
+    "@fluidframework/container-loader": "0.54.0-47413",
     "@fluidframework/core-interfaces": "^0.41.0",
-    "@fluidframework/driver-definitions": "^0.42.0",
-    "@fluidframework/driver-utils": "^0.52.0",
-    "@fluidframework/fluid-static": "^0.52.0",
-    "@fluidframework/map": "^0.52.0",
+    "@fluidframework/driver-definitions": "^0.43.0",
+    "@fluidframework/driver-utils": "0.54.0-47413",
+    "@fluidframework/fluid-static": "0.54.0-47413",
+    "@fluidframework/map": "0.54.0-47413",
     "@fluidframework/protocol-definitions": "^0.1026.0",
-    "@fluidframework/routerlicious-driver": "^0.52.0",
-    "@fluidframework/runtime-utils": "^0.52.0",
+    "@fluidframework/routerlicious-driver": "0.54.0-47413",
+    "@fluidframework/runtime-utils": "0.54.0-47413",
     "@fluidframework/server-services-client": "^0.1034.0",
     "axios": "^0.21.2",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@fluidframework/aqueduct": "^0.52.0",
+    "@fluidframework/aqueduct": "0.54.0-47413",
     "@fluidframework/azure-local-service": "^0.1.38773",
     "@fluidframework/build-common": "^0.23.0",
     "@fluidframework/eslint-config-fluid": "^0.24.0",
-    "@fluidframework/test-client-utils": "^0.52.0",
+    "@fluidframework/test-client-utils": "0.54.0-47413",
     "@microsoft/api-extractor": "^7.16.1",
     "@types/mocha": "^8.2.2",
     "concurrently": "^6.2.0",

package/src/AzureClient.ts

@@ -2,11 +2,12 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { Container, Loader } from "@fluidframework/container-loader";
+import { Loader } from "@fluidframework/container-loader";
 import {
-    IDocumentServiceFactory, IUrlResolver,
+    IDocumentServiceFactory,
+    IUrlResolver,
 } from "@fluidframework/driver-definitions";
-import { AttachState } from "@fluidframework/container-definitions";
+import { AttachState, IContainer } from "@fluidframework/container-definitions";
 import { RouterliciousDocumentServiceFactory } from "@fluidframework/routerlicious-driver";
 import { requestFluidObject } from "@fluidframework/runtime-utils";
 import { ensureFluidResolvedUrl } from "@fluidframework/driver-utils";
@@ -18,12 +19,12 @@ import {
     RootDataObject,
 } from "@fluidframework/fluid-static";
 
-import {
-    AzureClientProps,
-    AzureContainerServices,
-} from "./interfaces";
+import { AzureClientProps, AzureContainerServices } from "./interfaces";
 import { AzureAudience } from "./AzureAudience";
-import { AzureUrlResolver, createAzureCreateNewRequest } from "./AzureUrlResolver";
+import {
+    AzureUrlResolver,
+    createAzureCreateNewRequest,
+} from "./AzureUrlResolver";
 
 /**
  * Strongly typed id for connecting to a local Azure Fluid Relay.
@@ -43,14 +44,11 @@ export class AzureClient {
      * @param props - Properties for initializing a new AzureClient instance
      */
     constructor(private readonly props: AzureClientProps) {
-        this.urlResolver = new AzureUrlResolver(
-            this.props.connection.tenantId,
-            this.props.connection.orderer,
-            this.props.connection.storage,
-        );
+        this.urlResolver = new AzureUrlResolver();
         // The local service implementation differs from the Azure Fluid Relay in blob
         // storage format. Azure Fluid Relay supports whole summary upload. Local currently does not.
-        const enableWholeSummaryUpload = this.props.connection.tenantId !== LOCAL_MODE_TENANT_ID;
+        const enableWholeSummaryUpload =
+            this.props.connection.tenantId !== LOCAL_MODE_TENANT_ID;
         this.documentServiceFactory = new RouterliciousDocumentServiceFactory(
             this.props.connection.tokenProvider,
             { enableWholeSummaryUpload },
@@ -64,7 +62,10 @@ export class AzureClient {
      */
     public async createContainer(
         containerSchema: ContainerSchema,
-    ): Promise<{ container: IFluidContainer; services: AzureContainerServices }> {
+    ): Promise<{
+        container: IFluidContainer;
+        services: AzureContainerServices;
+    }> {
         const loader = this.createLoader(containerSchema);
 
         const container = await loader.createDetachedContainer({
@@ -72,15 +73,23 @@ export class AzureClient {
             config: {},
         });
 
-        const rootDataObject = await requestFluidObject<RootDataObject>(container, "/");
-
+        const rootDataObject = await requestFluidObject<RootDataObject>(
+            container,
+            "/",
+        );
+        const createNewRequest = createAzureCreateNewRequest(
+            this.props.connection.orderer,
+            this.props.connection.storage,
+            this.props.connection.tenantId,
+        );
         const fluidContainer = new (class extends FluidContainer {
             async attach() {
                 if (this.attachState !== AttachState.Detached) {
-                    throw new Error("Cannot attach container. Container is not in detached state");
+                    throw new Error(
+                        "Cannot attach container. Container is not in detached state",
+                    );
                 }
-                const request = createAzureCreateNewRequest();
-                await container.attach(request);
+                await container.attach(createNewRequest);
                 const resolved = container.resolvedUrl;
                 ensureFluidResolvedUrl(resolved);
                 return resolved.id;
@@ -100,26 +109,32 @@ export class AzureClient {
     public async getContainer(
         id: string,
         containerSchema: ContainerSchema,
-    ): Promise<{ container: IFluidContainer; services: AzureContainerServices }> {
+    ): Promise<{
+        container: IFluidContainer;
+        services: AzureContainerServices;
+    }> {
         const loader = this.createLoader(containerSchema);
-        const container = await loader.resolve({ url: id });
-        const rootDataObject = await requestFluidObject<RootDataObject>(container, "/");
+        const url = new URL(this.props.connection.orderer);
+        url.searchParams.append("storage", encodeURIComponent(this.props.connection.storage));
+        url.searchParams.append("tenantId", encodeURIComponent(this.props.connection.tenantId));
+        url.searchParams.append("containerId", encodeURIComponent(id));
+        const container = await loader.resolve({ url: url.href });
+        const rootDataObject = await requestFluidObject<RootDataObject>(
+            container,
+            "/",
+        );
         const fluidContainer = new FluidContainer(container, rootDataObject);
         const services = this.getContainerServices(container);
         return { container: fluidContainer, services };
     }
 
-    private getContainerServices(
-        container: Container,
-    ): AzureContainerServices {
+    private getContainerServices(container: IContainer): AzureContainerServices {
         return {
             audience: new AzureAudience(container),
         };
     }
 
-    private createLoader(
-        containerSchema: ContainerSchema,
-    ): Loader {
+    private createLoader(containerSchema: ContainerSchema): Loader {
         const runtimeFactory = new DOProviderContainerRuntimeFactory(
             containerSchema,
         );

package/src/AzureFunctionTokenProvider.ts

@@ -34,7 +34,7 @@ export class AzureFunctionTokenProvider implements ITokenProvider {
         };
     }
 
-    private async getToken(tenantId: string, documentId: string | undefined): Promise<string> {
+    private async getToken(tenantId: string, documentId?: string): Promise<string> {
         const response = await axios.get(this.azFunctionUrl, {
             params: {
                 tenantId,

package/src/AzureUrlResolver.ts

@@ -16,38 +16,41 @@ import {
 // InsecureTokenProvider for basic scenarios or more robust, secure providers that fulfill the
 // ITokenProvider interface
 export class AzureUrlResolver implements IUrlResolver {
-    constructor(
-        private readonly tenantId: string,
-        private readonly orderer: string,
-        private readonly storage: string,
-    ) { }
+    constructor() {}
 
     public async resolve(request: IRequest): Promise<IFluidResolvedUrl> {
+        const { ordererUrl, storageUrl, tenantId, containerId } = decodeAzureUrl(
+            request.url,
+        );
         // determine whether the request is for creating of a new container.
         // such request has the `createNew` header set to true and doesn't have a container ID.
-        if (request.headers && request.headers[DriverHeader.createNew] === true) {
+        if (
+            request.headers &&
+            request.headers[DriverHeader.createNew] === true
+        ) {
             return {
                 endpoints: {
-                    deltaStorageUrl: `${this.orderer}/deltas/${this.tenantId}/new`,
-                    ordererUrl: this.orderer,
-                    storageUrl: `${this.storage}/repos/${this.tenantId}`,
+                    deltaStorageUrl: `${ordererUrl}/deltas/${tenantId}/new`,
+                    ordererUrl,
+                    storageUrl: `${storageUrl}/repos/${tenantId}`,
                 },
                 // id is a mandatory attribute, but it's ignored by the driver for new container requests.
                 id: "",
                 // tokens attribute is redundant as all tokens are generated via ITokenProvider
                 tokens: {},
                 type: "fluid",
-                url: `${this.orderer}/${this.tenantId}/new`,
+                url: `${ordererUrl}/${tenantId}/new`,
             };
         }
-        // for an existing container we'll parse the request URL to determine the document ID.
-        const containerId = request.url.split("/")[0];
-        const documentUrl = `${this.orderer}/${this.tenantId}/${containerId}`;
+        if (containerId === undefined) {
+            throw new Error("Azure URL did not contain containerId");
+        }
+        const documentUrl = `${ordererUrl}/${tenantId}/${containerId}`;
         return Promise.resolve({
             endpoints: {
-                deltaStorageUrl: `${this.orderer}/deltas/${this.tenantId}/${containerId}`,
-                ordererUrl: this.orderer,
-                storageUrl: `${this.storage}/repos/${this.tenantId}`,
+                deltaStorageUrl: `${ordererUrl}/deltas/${tenantId}/${containerId}`,
+                ordererUrl,
+                storageUrl: `${storageUrl}/repos/${tenantId}`,
             },
             id: containerId,
             tokens: {},
@@ -56,7 +59,10 @@ export class AzureUrlResolver implements IUrlResolver {
         });
     }
 
-    public async getAbsoluteUrl(resolvedUrl: IResolvedUrl, relativeUrl: string): Promise<string> {
+    public async getAbsoluteUrl(
+        resolvedUrl: IResolvedUrl,
+        relativeUrl: string,
+    ): Promise<string> {
         if (resolvedUrl.type !== "fluid") {
             throw Error("Invalid Resolved Url");
         }
@@ -64,11 +70,50 @@ export class AzureUrlResolver implements IUrlResolver {
     }
 }
 
-export const createAzureCreateNewRequest = (): IRequest => (
-    {
-        url: "",
+function decodeAzureUrl(urlString: string): {
+    ordererUrl: string;
+    storageUrl: string;
+    tenantId: string;
+    containerId?: string,
+} {
+    const url = new URL(urlString);
+    const ordererUrl = url.origin;
+    const searchParams = url.searchParams;
+    const storageUrl = searchParams.get("storage");
+    // eslint-disable-next-line no-null/no-null
+    if (storageUrl === null) {
+        throw new Error("Azure URL did not contain a storage URL");
+    }
+    const tenantId = searchParams.get("tenantId");
+    // eslint-disable-next-line no-null/no-null
+    if (tenantId === null) {
+        throw new Error("Azure URL did not contain a tenant ID");
+    }
+    const storageUrlDecoded = decodeURIComponent(storageUrl);
+    const tenantIdDecoded = decodeURIComponent(tenantId);
+    const containerId = searchParams.get("containerId");
+    // eslint-disable-next-line no-null/no-null
+    const containerIdDecoded = containerId !== null ? decodeURIComponent(containerId) : undefined;
+    return {
+        ordererUrl,
+        storageUrl: storageUrlDecoded,
+        tenantId: tenantIdDecoded,
+        containerId: containerIdDecoded,
+    };
+}
+
+export const createAzureCreateNewRequest = (
+    ordererUrl: string,
+    storageUrl: string,
+    tenantId: string,
+): IRequest => {
+    const url = new URL(ordererUrl);
+    url.searchParams.append("storage", encodeURIComponent(storageUrl));
+    url.searchParams.append("tenantId", encodeURIComponent(tenantId));
+    return {
+        url: url.href,
         headers: {
             [DriverHeader.createNew]: true,
         },
-    }
-);
+    };
+};

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/azure-client";
-export const pkgVersion = "0.52.0";
+export const pkgVersion = "0.54.0-47413";