@fluidframework/tinylicious-driver 0.47.1 → 0.48.0-38105

package/dist/insecureTinyliciousTokenProvider.d.ts

@@ -8,7 +8,7 @@ import { ITokenProvider, ITokenResponse } from "@fluidframework/routerlicious-dr
  * to get up and running.
  */
 export declare class InsecureTinyliciousTokenProvider implements ITokenProvider {
-    fetchOrdererToken(tenantId: string, documentId: string): Promise<ITokenResponse>;
+    fetchOrdererToken(tenantId: string, documentId?: string): Promise<ITokenResponse>;
     fetchStorageToken(tenantId: string, documentId: string): Promise<ITokenResponse>;
     private getSignedToken;
 }

package/dist/insecureTinyliciousTokenProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insecureTinyliciousTokenProvider.d.ts","sourceRoot":"","sources":["../src/insecureTinyliciousTokenProvider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAKtF;;;GAGG;AACH,qBAAa,gCAAiC,YAAW,cAAc;IACtD,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAOhF,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAO7F,OAAO,CAAC,cAAc;CAuBzB"}
+{"version":3,"file":"insecureTinyliciousTokenProvider.d.ts","sourceRoot":"","sources":["../src/insecureTinyliciousTokenProvider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAKtF;;;GAGG;AACH,qBAAa,gCAAiC,YAAW,cAAc;IACtD,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAOjF,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAO7F,OAAO,CAAC,cAAc;CAuBzB"}

package/dist/insecureTinyliciousTokenProvider.js

@@ -31,7 +31,7 @@ class InsecureTinyliciousTokenProvider {
         const now = Math.round((new Date()).getTime() / 1000);
         const user = { id: uuid_1.v4(), name: server_services_client_1.getRandomName() };
         const claims = {
-            documentId,
+            documentId: documentId !== null && documentId !== void 0 ? documentId : "",
             scopes: [protocol_definitions_1.ScopeType.DocRead, protocol_definitions_1.ScopeType.DocWrite, protocol_definitions_1.ScopeType.SummaryWrite],
             tenantId,
             user,

package/dist/insecureTinyliciousTokenProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"insecureTinyliciousTokenProvider.js","sourceRoot":"","sources":["../src/insecureTinyliciousTokenProvider.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+EAA+E;AAE/E,mFAAuE;AACvE,yCAA8C;AAC9C,+BAAkC;AAElC;;;GAGG;AACH,MAAa,gCAAgC;IAClC,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;QAC/D,OAAO;YACH,SAAS,EAAE,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;QAC/D,OAAO;YACH,SAAS,EAAE,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEO,cAAc,CAClB,QAAgB,EAChB,UAAkB,EAClB,WAAmB,EAAE,GAAG,EAAE,EAC1B,MAAc,KAAK;QACnB,0BAA0B;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,EAAE,EAAE,EAAE,SAAI,EAAE,EAAE,IAAI,EAAE,sCAAa,EAAE,EAAE,CAAC;QAEnD,MAAM,MAAM,GAAiB;YACzB,UAAU;YACV,MAAM,EAAE,CAAC,gCAAS,CAAC,OAAO,EAAE,gCAAS,CAAC,QAAQ,EAAE,gCAAS,CAAC,YAAY,CAAC;YACvE,QAAQ;YACR,IAAI;YACJ,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG,GAAG,QAAQ;YACnB,GAAG;SACN,CAAC;QAEF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAClC,2CAA2C;QAC3C,OAAO,gBAAS,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACtG,CAAC;CACJ;AAtCD,4EAsCC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ScopeType, ITokenClaims } from \"@fluidframework/protocol-definitions\";\nimport { ITokenProvider, ITokenResponse } from \"@fluidframework/routerlicious-driver\";\nimport { getRandomName } from \"@fluidframework/server-services-client\";\nimport { KJUR as jsrsasign } from \"jsrsasign\";\nimport { v4 as uuid } from \"uuid\";\n\n/**\n * As the name implies this is not secure and should not be used in production. It simply makes the example easier\n * to get up and running.\n */\nexport class InsecureTinyliciousTokenProvider implements ITokenProvider {\n    public async fetchOrdererToken(tenantId: string, documentId: string): Promise<ITokenResponse> {\n        return {\n            fromCache: true,\n            jwt: this.getSignedToken(tenantId, documentId),\n        };\n    }\n\n    public async fetchStorageToken(tenantId: string, documentId: string): Promise<ITokenResponse> {\n        return {\n            fromCache: true,\n            jwt: this.getSignedToken(tenantId, documentId),\n        };\n    }\n\n    private getSignedToken(\n        tenantId: string,\n        documentId: string,\n        lifetime: number = 60 * 60,\n        ver: string = \"1.0\"): string {\n        // Current time in seconds\n        const now = Math.round((new Date()).getTime() / 1000);\n        const user = { id: uuid(), name: getRandomName() };\n\n        const claims: ITokenClaims = {\n            documentId,\n            scopes: [ScopeType.DocRead, ScopeType.DocWrite, ScopeType.SummaryWrite],\n            tenantId,\n            user,\n            iat: now,\n            exp: now + lifetime,\n            ver,\n        };\n\n        const utf8Key = { utf8: \"12345\" };\n        // eslint-disable-next-line no-null/no-null\n        return jsrsasign.jws.JWS.sign(null, JSON.stringify({ alg:\"HS256\", typ: \"JWT\" }), claims, utf8Key);\n    }\n}\n"]}
+{"version":3,"file":"insecureTinyliciousTokenProvider.js","sourceRoot":"","sources":["../src/insecureTinyliciousTokenProvider.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+EAA+E;AAE/E,mFAAuE;AACvE,yCAA8C;AAC9C,+BAAkC;AAElC;;;GAGG;AACH,MAAa,gCAAgC;IAClC,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAmB;QAChE,OAAO;YACH,SAAS,EAAE,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;QAC/D,OAAO;YACH,SAAS,EAAE,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEO,cAAc,CAClB,QAAgB,EAChB,UAA8B,EAC9B,WAAmB,EAAE,GAAG,EAAE,EAC1B,MAAc,KAAK;QACnB,0BAA0B;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,EAAE,EAAE,EAAE,SAAI,EAAE,EAAE,IAAI,EAAE,sCAAa,EAAE,EAAE,CAAC;QAEnD,MAAM,MAAM,GAAiB;YACzB,UAAU,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE;YAC5B,MAAM,EAAE,CAAC,gCAAS,CAAC,OAAO,EAAE,gCAAS,CAAC,QAAQ,EAAE,gCAAS,CAAC,YAAY,CAAC;YACvE,QAAQ;YACR,IAAI;YACJ,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG,GAAG,QAAQ;YACnB,GAAG;SACN,CAAC;QAEF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAClC,2CAA2C;QAC3C,OAAO,gBAAS,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACtG,CAAC;CACJ;AAtCD,4EAsCC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ScopeType, ITokenClaims } from \"@fluidframework/protocol-definitions\";\nimport { ITokenProvider, ITokenResponse } from \"@fluidframework/routerlicious-driver\";\nimport { getRandomName } from \"@fluidframework/server-services-client\";\nimport { KJUR as jsrsasign } from \"jsrsasign\";\nimport { v4 as uuid } from \"uuid\";\n\n/**\n * As the name implies this is not secure and should not be used in production. It simply makes the example easier\n * to get up and running.\n */\nexport class InsecureTinyliciousTokenProvider implements ITokenProvider {\n    public async fetchOrdererToken(tenantId: string, documentId?: string): Promise<ITokenResponse> {\n        return {\n            fromCache: true,\n            jwt: this.getSignedToken(tenantId, documentId),\n        };\n    }\n\n    public async fetchStorageToken(tenantId: string, documentId: string): Promise<ITokenResponse> {\n        return {\n            fromCache: true,\n            jwt: this.getSignedToken(tenantId, documentId),\n        };\n    }\n\n    private getSignedToken(\n        tenantId: string,\n        documentId: string | undefined,\n        lifetime: number = 60 * 60,\n        ver: string = \"1.0\"): string {\n        // Current time in seconds\n        const now = Math.round((new Date()).getTime() / 1000);\n        const user = { id: uuid(), name: getRandomName() };\n\n        const claims: ITokenClaims = {\n            documentId: documentId ?? \"\",\n            scopes: [ScopeType.DocRead, ScopeType.DocWrite, ScopeType.SummaryWrite],\n            tenantId,\n            user,\n            iat: now,\n            exp: now + lifetime,\n            ver,\n        };\n\n        const utf8Key = { utf8: \"12345\" };\n        // eslint-disable-next-line no-null/no-null\n        return jsrsasign.jws.JWS.sign(null, JSON.stringify({ alg:\"HS256\", typ: \"JWT\" }), claims, utf8Key);\n    }\n}\n"]}

package/dist/insecureTinyliciousUrlResolver.d.ts

@@ -13,13 +13,11 @@ export declare const defaultTinyliciousEndpoint = "http://localhost";
  * documentId/containerRelativePathing
  */
 export declare class InsecureTinyliciousUrlResolver implements IUrlResolver {
-    private readonly tinyliciousPort;
-    private readonly tinyliciousEndpoint;
     private readonly fluidProtocolEndpoint;
-    constructor(tinyliciousPort?: number, tinyliciousEndpoint?: string);
+    private readonly tinyliciousEndpoint;
+    constructor(port?: number, endpoint?: string);
     resolve(request: IRequest): Promise<IResolvedUrl>;
     getAbsoluteUrl(resolvedUrl: IFluidResolvedUrl, relativeUrl: string): Promise<string>;
-    private auth;
 }
-export declare const createTinyliciousCreateNewRequest: (documentId: string) => IRequest;
+export declare const createTinyliciousCreateNewRequest: (documentId?: string | undefined) => IRequest;
 //# sourceMappingURL=insecureTinyliciousUrlResolver.d.ts.map

package/dist/insecureTinyliciousUrlResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insecureTinyliciousUrlResolver.d.ts","sourceRoot":"","sources":["../src/insecureTinyliciousUrlResolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EACH,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACf,MAAM,oCAAoC,CAAC;AAK5C,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAC3C,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAE7D;;;;;GAKG;AACH,qBAAa,8BAA+B,YAAW,YAAY;IAG3D,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAHxC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAS;gBAE1B,eAAe,SAAyB,EACxC,mBAAmB,SAA6B;IAKxD,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC;IA0BjD,cAAc,CAAC,WAAW,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAajG,OAAO,CAAC,IAAI;CAef;AAED,eAAO,MAAM,iCAAiC,eAC7B,MAAM,KAAG,QAOrB,CAAC"}
+{"version":3,"file":"insecureTinyliciousUrlResolver.d.ts","sourceRoot":"","sources":["../src/insecureTinyliciousUrlResolver.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;AAE5C,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAC3C,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAE7D;;;;;GAKG;AACH,qBAAa,8BAA+B,YAAW,YAAY;IAC/D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAS;IAC/C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;gBAEzC,IAAI,SAAyB,EAC7B,QAAQ,SAA6B;IAM5B,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC;IA6CjD,cAAc,CAAC,WAAW,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAYpG;AAED,eAAO,MAAM,iCAAiC,uCACnB,QAOtB,CAAC"}

package/dist/insecureTinyliciousUrlResolver.js

@@ -5,8 +5,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTinyliciousCreateNewRequest = exports.InsecureTinyliciousUrlResolver = exports.defaultTinyliciousEndpoint = exports.defaultTinyliciousPort = void 0;
-const jsrsasign_1 = require("jsrsasign");
-const uuid_1 = require("uuid");
+const driver_definitions_1 = require("@fluidframework/driver-definitions");
 exports.defaultTinyliciousPort = 7070;
 exports.defaultTinyliciousEndpoint = "http://localhost";
 /**
@@ -16,35 +15,51 @@ exports.defaultTinyliciousEndpoint = "http://localhost";
  * documentId/containerRelativePathing
  */
 class InsecureTinyliciousUrlResolver {
-    constructor(tinyliciousPort = exports.defaultTinyliciousPort, tinyliciousEndpoint = exports.defaultTinyliciousEndpoint) {
-        this.tinyliciousPort = tinyliciousPort;
-        this.tinyliciousEndpoint = tinyliciousEndpoint;
+    constructor(port = exports.defaultTinyliciousPort, endpoint = exports.defaultTinyliciousEndpoint) {
+        this.tinyliciousEndpoint = `${endpoint}:${port}`;
         this.fluidProtocolEndpoint = this.tinyliciousEndpoint.replace(/(^\w+:|^)\/\//, "fluid://");
     }
     async resolve(request) {
-        const url = request.url.replace(`${this.tinyliciousEndpoint}:${this.tinyliciousPort}/`, "");
+        // 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) {
+            return {
+                endpoints: {
+                    deltaStorageUrl: `${this.tinyliciousEndpoint}/deltas/tinylicious/new`,
+                    ordererUrl: this.tinyliciousEndpoint,
+                    storageUrl: `${this.tinyliciousEndpoint}/repos/tinylicious`,
+                },
+                // 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.fluidProtocolEndpoint}/tinylicious/new`,
+            };
+        }
+        // for an existing container we'll parse the request URL to determine the document ID.
+        const url = request.url.replace(`${this.tinyliciousEndpoint}/`, "");
         const documentId = url.split("/")[0];
         const encodedDocId = encodeURIComponent(documentId);
         const documentRelativePath = url.slice(documentId.length);
-        // eslint-disable-next-line max-len
-        const documentUrl = `${this.fluidProtocolEndpoint}:${this.tinyliciousPort}/tinylicious/${encodedDocId}${documentRelativePath}`;
-        const deltaStorageUrl = `${this.tinyliciousEndpoint}:${this.tinyliciousPort}/deltas/tinylicious/${encodedDocId}`;
-        const storageUrl = `${this.tinyliciousEndpoint}:${this.tinyliciousPort}/repos/tinylicious`;
+        const documentUrl = `${this.fluidProtocolEndpoint}/tinylicious/${encodedDocId}${documentRelativePath}`;
+        const deltaStorageUrl = `${this.tinyliciousEndpoint}/deltas/tinylicious/${encodedDocId}`;
+        const storageUrl = `${this.tinyliciousEndpoint}/repos/tinylicious`;
         const response = {
             endpoints: {
                 deltaStorageUrl,
-                ordererUrl: `${this.tinyliciousEndpoint}:${this.tinyliciousPort}`,
+                ordererUrl: this.tinyliciousEndpoint,
                 storageUrl,
             },
             id: documentId,
-            tokens: { jwt: this.auth(documentId) },
+            tokens: {},
             type: "fluid",
             url: documentUrl,
         };
         return response;
     }
     async getAbsoluteUrl(resolvedUrl, relativeUrl) {
-        const documentId = decodeURIComponent(resolvedUrl.url.replace(`${this.fluidProtocolEndpoint}:${this.tinyliciousPort}/tinylicious/`, ""));
+        const documentId = decodeURIComponent(resolvedUrl.url.replace(`${this.fluidProtocolEndpoint}/tinylicious/`, ""));
         /*
          * The detached container flow will ultimately call getAbsoluteUrl() with the resolved.url produced by
          * resolve().  The container expects getAbsoluteUrl's return value to be a URL that can then be roundtripped
@@ -53,26 +68,12 @@ class InsecureTinyliciousUrlResolver {
          */
         return `${documentId}/${relativeUrl}`;
     }
-    auth(documentId) {
-        const claims = {
-            documentId,
-            scopes: ["doc:read", "doc:write", "summary:write"],
-            tenantId: "tinylicious",
-            user: { id: uuid_1.v4() },
-            iat: Math.round(new Date().getTime() / 1000),
-            exp: Math.round(new Date().getTime() / 1000) + 60 * 60,
-            ver: "1.0",
-        };
-        const utf8Key = { utf8: "12345" };
-        // eslint-disable-next-line no-null/no-null
-        return jsrsasign_1.KJUR.jws.JWS.sign(null, JSON.stringify({ alg: "HS256", typ: "JWT" }), claims, utf8Key);
-    }
 }
 exports.InsecureTinyliciousUrlResolver = InsecureTinyliciousUrlResolver;
 const createTinyliciousCreateNewRequest = (documentId) => ({
-    url: documentId,
+    url: documentId !== null && documentId !== void 0 ? documentId : "",
     headers: {
-        createNew: true,
+        [driver_definitions_1.DriverHeader.createNew]: true,
     },
 });
 exports.createTinyliciousCreateNewRequest = createTinyliciousCreateNewRequest;

package/dist/insecureTinyliciousUrlResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"insecureTinyliciousUrlResolver.js","sourceRoot":"","sources":["../src/insecureTinyliciousUrlResolver.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    IFluidResolvedUrl,\n    IResolvedUrl,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\nimport { ITokenClaims } from \"@fluidframework/protocol-definitions\";\nimport { KJUR as jsrsasign } from \"jsrsasign\";\nimport { v4 as uuid } from \"uuid\";\n\nexport const defaultTinyliciousPort = 7070;\nexport const defaultTinyliciousEndpoint = \"http://localhost\";\n\n/**\n * InsecureTinyliciousUrlResolver knows how to get the URLs to the service (in this case Tinylicious) to use\n * for a given request.  This particular implementation has a goal to avoid imposing requirements on the app's\n * URL shape, so it expects the request url to have this format (as opposed to a more traditional URL):\n * documentId/containerRelativePathing\n */\nexport class InsecureTinyliciousUrlResolver implements IUrlResolver {\n    private readonly fluidProtocolEndpoint: string;\n    public constructor(\n        private readonly tinyliciousPort = defaultTinyliciousPort,\n        private readonly tinyliciousEndpoint = defaultTinyliciousEndpoint,\n        ) {\n            this.fluidProtocolEndpoint = this.tinyliciousEndpoint.replace(/(^\\w+:|^)\\/\\//, \"fluid://\");\n         }\n\n    public async resolve(request: IRequest): Promise<IResolvedUrl> {\n        const url = request.url.replace(`${this.tinyliciousEndpoint}:${this.tinyliciousPort}/`, \"\");\n        const documentId = url.split(\"/\")[0];\n        const encodedDocId = encodeURIComponent(documentId);\n        const documentRelativePath = url.slice(documentId.length);\n\n        // eslint-disable-next-line max-len\n        const documentUrl = `${this.fluidProtocolEndpoint}:${this.tinyliciousPort}/tinylicious/${encodedDocId}${documentRelativePath}`;\n        const deltaStorageUrl =\n            `${this.tinyliciousEndpoint}:${this.tinyliciousPort}/deltas/tinylicious/${encodedDocId}`;\n        const storageUrl = `${this.tinyliciousEndpoint}:${this.tinyliciousPort}/repos/tinylicious`;\n\n        const response: IFluidResolvedUrl = {\n            endpoints: {\n                deltaStorageUrl,\n                ordererUrl: `${this.tinyliciousEndpoint}:${this.tinyliciousPort}`,\n                storageUrl,\n            },\n            id: documentId,\n            tokens: { jwt: this.auth(documentId) },\n            type: \"fluid\",\n            url: documentUrl,\n        };\n        return response;\n    }\n\n    public async getAbsoluteUrl(resolvedUrl: IFluidResolvedUrl, relativeUrl: string): Promise<string> {\n        const documentId = decodeURIComponent(\n            resolvedUrl.url.replace(`${this.fluidProtocolEndpoint}:${this.tinyliciousPort}/tinylicious/`, \"\"),\n        );\n        /*\n         * The detached container flow will ultimately call getAbsoluteUrl() with the resolved.url produced by\n         * resolve().  The container expects getAbsoluteUrl's return value to be a URL that can then be roundtripped\n         * back through resolve() again, and get the same result again.  So we'll return a \"URL\" with the same format\n         * described above.\n         */\n        return `${documentId}/${relativeUrl}`;\n    }\n\n    private auth(documentId: string) {\n        const claims: ITokenClaims = {\n            documentId,\n            scopes: [\"doc:read\", \"doc:write\", \"summary:write\"],\n            tenantId: \"tinylicious\",\n            user: { id: uuid() },\n            iat: Math.round(new Date().getTime() / 1000),\n            exp: Math.round(new Date().getTime() / 1000) + 60 * 60, // 1 hour expiration\n            ver: \"1.0\",\n        };\n\n        const utf8Key = { utf8: \"12345\" };\n        // eslint-disable-next-line no-null/no-null\n        return jsrsasign.jws.JWS.sign(null, JSON.stringify({ alg: \"HS256\", typ: \"JWT\" }), claims, utf8Key);\n    }\n}\n\nexport const createTinyliciousCreateNewRequest =\n    (documentId: string): IRequest => (\n        {\n            url: documentId,\n            headers: {\n                createNew: true,\n            },\n        }\n    );\n"]}
+{"version":3,"file":"insecureTinyliciousUrlResolver.js","sourceRoot":"","sources":["../src/insecureTinyliciousUrlResolver.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,2EAK4C;AAE/B,QAAA,sBAAsB,GAAG,IAAI,CAAC;AAC9B,QAAA,0BAA0B,GAAG,kBAAkB,CAAC;AAE7D;;;;;GAKG;AACH,MAAa,8BAA8B;IAGvC,YACI,IAAI,GAAG,8BAAsB,EAC7B,QAAQ,GAAG,kCAA0B;QAErC,IAAI,CAAC,mBAAmB,GAAG,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC;QACjD,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAC/F,CAAC;IAEM,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,mBAAmB,yBAAyB;oBACrE,UAAU,EAAE,IAAI,CAAC,mBAAmB;oBACpC,UAAU,EAAE,GAAG,IAAI,CAAC,mBAAmB,oBAAoB;iBAC9D;gBACD,0FAA0F;gBAC1F,EAAE,EAAE,EAAE;gBACN,+EAA+E;gBAC/E,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,GAAG,IAAI,CAAC,qBAAqB,kBAAkB;aACvD,CAAC;SACL;QACD,sFAAsF;QACtF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,mBAAmB,GAAG,EAAE,EAAE,CAAC,CAAC;QACpE,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,YAAY,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,oBAAoB,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAE1D,MAAM,WAAW,GACb,GAAG,IAAI,CAAC,qBAAqB,gBAAgB,YAAY,GAAG,oBAAoB,EAAE,CAAC;QACvF,MAAM,eAAe,GACjB,GAAG,IAAI,CAAC,mBAAmB,uBAAuB,YAAY,EAAE,CAAC;QACrE,MAAM,UAAU,GACZ,GAAG,IAAI,CAAC,mBAAmB,oBAAoB,CAAC;QAEpD,MAAM,QAAQ,GAAsB;YAChC,SAAS,EAAE;gBACP,eAAe;gBACf,UAAU,EAAE,IAAI,CAAC,mBAAmB;gBACpC,UAAU;aACb;YACD,EAAE,EAAE,UAAU;YACd,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,OAAO;YACb,GAAG,EAAE,WAAW;SACnB,CAAC;QACF,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,WAA8B,EAAE,WAAmB;QAC3E,MAAM,UAAU,GAAG,kBAAkB,CACjC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,qBAAqB,eAAe,EAAE,EAAE,CAAC,CAC5E,CAAC;QACF;;;;;WAKG;QACH,OAAO,GAAG,UAAU,IAAI,WAAW,EAAE,CAAC;IAC1C,CAAC;CACJ;AApED,wEAoEC;AAEM,MAAM,iCAAiC,GAC1C,CAAC,UAAmB,EAAY,EAAE,CAAC,CAC/B;IACI,GAAG,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE;IACrB,OAAO,EAAE;QACL,CAAC,iCAAY,CAAC,SAAS,CAAC,EAAE,IAAI;KACjC;CACJ,CACJ,CAAC;AARO,QAAA,iCAAiC,qCAQxC","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\nexport const defaultTinyliciousPort = 7070;\nexport const defaultTinyliciousEndpoint = \"http://localhost\";\n\n/**\n * InsecureTinyliciousUrlResolver knows how to get the URLs to the service (in this case Tinylicious) to use\n * for a given request.  This particular implementation has a goal to avoid imposing requirements on the app's\n * URL shape, so it expects the request url to have this format (as opposed to a more traditional URL):\n * documentId/containerRelativePathing\n */\nexport class InsecureTinyliciousUrlResolver implements IUrlResolver {\n    private readonly fluidProtocolEndpoint: string;\n    private readonly tinyliciousEndpoint: string;\n    public constructor(\n        port = defaultTinyliciousPort,\n        endpoint = defaultTinyliciousEndpoint,\n    ) {\n        this.tinyliciousEndpoint = `${endpoint}:${port}`;\n        this.fluidProtocolEndpoint = this.tinyliciousEndpoint.replace(/(^\\w+:|^)\\/\\//, \"fluid://\");\n    }\n\n    public async resolve(request: IRequest): Promise<IResolvedUrl> {\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.tinyliciousEndpoint}/deltas/tinylicious/new`,\n                    ordererUrl: this.tinyliciousEndpoint,\n                    storageUrl: `${this.tinyliciousEndpoint}/repos/tinylicious`,\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.fluidProtocolEndpoint}/tinylicious/new`,\n            };\n        }\n        // for an existing container we'll parse the request URL to determine the document ID.\n        const url = request.url.replace(`${this.tinyliciousEndpoint}/`, \"\");\n        const documentId = url.split(\"/\")[0];\n        const encodedDocId = encodeURIComponent(documentId);\n        const documentRelativePath = url.slice(documentId.length);\n\n        const documentUrl =\n            `${this.fluidProtocolEndpoint}/tinylicious/${encodedDocId}${documentRelativePath}`;\n        const deltaStorageUrl =\n            `${this.tinyliciousEndpoint}/deltas/tinylicious/${encodedDocId}`;\n        const storageUrl =\n            `${this.tinyliciousEndpoint}/repos/tinylicious`;\n\n        const response: IFluidResolvedUrl = {\n            endpoints: {\n                deltaStorageUrl,\n                ordererUrl: this.tinyliciousEndpoint,\n                storageUrl,\n            },\n            id: documentId,\n            tokens: {},\n            type: \"fluid\",\n            url: documentUrl,\n        };\n        return response;\n    }\n\n    public async getAbsoluteUrl(resolvedUrl: IFluidResolvedUrl, relativeUrl: string): Promise<string> {\n        const documentId = decodeURIComponent(\n            resolvedUrl.url.replace(`${this.fluidProtocolEndpoint}/tinylicious/`, \"\"),\n        );\n        /*\n         * The detached container flow will ultimately call getAbsoluteUrl() with the resolved.url produced by\n         * resolve().  The container expects getAbsoluteUrl's return value to be a URL that can then be roundtripped\n         * back through resolve() again, and get the same result again.  So we'll return a \"URL\" with the same format\n         * described above.\n         */\n        return `${documentId}/${relativeUrl}`;\n    }\n}\n\nexport const createTinyliciousCreateNewRequest =\n    (documentId?: string): IRequest => (\n        {\n            url: documentId ?? \"\",\n            headers: {\n                [DriverHeader.createNew]: true,\n            },\n        }\n    );\n"]}

package/lib/insecureTinyliciousTokenProvider.d.ts

@@ -8,7 +8,7 @@ import { ITokenProvider, ITokenResponse } from "@fluidframework/routerlicious-dr
  * to get up and running.
  */
 export declare class InsecureTinyliciousTokenProvider implements ITokenProvider {
-    fetchOrdererToken(tenantId: string, documentId: string): Promise<ITokenResponse>;
+    fetchOrdererToken(tenantId: string, documentId?: string): Promise<ITokenResponse>;
     fetchStorageToken(tenantId: string, documentId: string): Promise<ITokenResponse>;
     private getSignedToken;
 }

package/lib/insecureTinyliciousTokenProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insecureTinyliciousTokenProvider.d.ts","sourceRoot":"","sources":["../src/insecureTinyliciousTokenProvider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAKtF;;;GAGG;AACH,qBAAa,gCAAiC,YAAW,cAAc;IACtD,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAOhF,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAO7F,OAAO,CAAC,cAAc;CAuBzB"}
+{"version":3,"file":"insecureTinyliciousTokenProvider.d.ts","sourceRoot":"","sources":["../src/insecureTinyliciousTokenProvider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAKtF;;;GAGG;AACH,qBAAa,gCAAiC,YAAW,cAAc;IACtD,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAOjF,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAO7F,OAAO,CAAC,cAAc;CAuBzB"}

package/lib/insecureTinyliciousTokenProvider.js

@@ -28,7 +28,7 @@ export class InsecureTinyliciousTokenProvider {
         const now = Math.round((new Date()).getTime() / 1000);
         const user = { id: uuid(), name: getRandomName() };
         const claims = {
-            documentId,
+            documentId: documentId !== null && documentId !== void 0 ? documentId : "",
             scopes: [ScopeType.DocRead, ScopeType.DocWrite, ScopeType.SummaryWrite],
             tenantId,
             user,

package/lib/insecureTinyliciousTokenProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"insecureTinyliciousTokenProvider.js","sourceRoot":"","sources":["../src/insecureTinyliciousTokenProvider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAgB,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC;;;GAGG;AACH,MAAM,OAAO,gCAAgC;IAClC,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;QAC/D,OAAO;YACH,SAAS,EAAE,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;QAC/D,OAAO;YACH,SAAS,EAAE,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEO,cAAc,CAClB,QAAgB,EAChB,UAAkB,EAClB,WAAmB,EAAE,GAAG,EAAE,EAC1B,MAAc,KAAK;QACnB,0BAA0B;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC;QAEnD,MAAM,MAAM,GAAiB;YACzB,UAAU;YACV,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,YAAY,CAAC;YACvE,QAAQ;YACR,IAAI;YACJ,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG,GAAG,QAAQ;YACnB,GAAG;SACN,CAAC;QAEF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAClC,2CAA2C;QAC3C,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACtG,CAAC;CACJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ScopeType, ITokenClaims } from \"@fluidframework/protocol-definitions\";\nimport { ITokenProvider, ITokenResponse } from \"@fluidframework/routerlicious-driver\";\nimport { getRandomName } from \"@fluidframework/server-services-client\";\nimport { KJUR as jsrsasign } from \"jsrsasign\";\nimport { v4 as uuid } from \"uuid\";\n\n/**\n * As the name implies this is not secure and should not be used in production. It simply makes the example easier\n * to get up and running.\n */\nexport class InsecureTinyliciousTokenProvider implements ITokenProvider {\n    public async fetchOrdererToken(tenantId: string, documentId: string): Promise<ITokenResponse> {\n        return {\n            fromCache: true,\n            jwt: this.getSignedToken(tenantId, documentId),\n        };\n    }\n\n    public async fetchStorageToken(tenantId: string, documentId: string): Promise<ITokenResponse> {\n        return {\n            fromCache: true,\n            jwt: this.getSignedToken(tenantId, documentId),\n        };\n    }\n\n    private getSignedToken(\n        tenantId: string,\n        documentId: string,\n        lifetime: number = 60 * 60,\n        ver: string = \"1.0\"): string {\n        // Current time in seconds\n        const now = Math.round((new Date()).getTime() / 1000);\n        const user = { id: uuid(), name: getRandomName() };\n\n        const claims: ITokenClaims = {\n            documentId,\n            scopes: [ScopeType.DocRead, ScopeType.DocWrite, ScopeType.SummaryWrite],\n            tenantId,\n            user,\n            iat: now,\n            exp: now + lifetime,\n            ver,\n        };\n\n        const utf8Key = { utf8: \"12345\" };\n        // eslint-disable-next-line no-null/no-null\n        return jsrsasign.jws.JWS.sign(null, JSON.stringify({ alg:\"HS256\", typ: \"JWT\" }), claims, utf8Key);\n    }\n}\n"]}
+{"version":3,"file":"insecureTinyliciousTokenProvider.js","sourceRoot":"","sources":["../src/insecureTinyliciousTokenProvider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAgB,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC;;;GAGG;AACH,MAAM,OAAO,gCAAgC;IAClC,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAmB;QAChE,OAAO;YACH,SAAS,EAAE,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;QAC/D,OAAO;YACH,SAAS,EAAE,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC;SACjD,CAAC;IACN,CAAC;IAEO,cAAc,CAClB,QAAgB,EAChB,UAA8B,EAC9B,WAAmB,EAAE,GAAG,EAAE,EAC1B,MAAc,KAAK;QACnB,0BAA0B;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC;QAEnD,MAAM,MAAM,GAAiB;YACzB,UAAU,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE;YAC5B,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,YAAY,CAAC;YACvE,QAAQ;YACR,IAAI;YACJ,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG,GAAG,QAAQ;YACnB,GAAG;SACN,CAAC;QAEF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAClC,2CAA2C;QAC3C,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACtG,CAAC;CACJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ScopeType, ITokenClaims } from \"@fluidframework/protocol-definitions\";\nimport { ITokenProvider, ITokenResponse } from \"@fluidframework/routerlicious-driver\";\nimport { getRandomName } from \"@fluidframework/server-services-client\";\nimport { KJUR as jsrsasign } from \"jsrsasign\";\nimport { v4 as uuid } from \"uuid\";\n\n/**\n * As the name implies this is not secure and should not be used in production. It simply makes the example easier\n * to get up and running.\n */\nexport class InsecureTinyliciousTokenProvider implements ITokenProvider {\n    public async fetchOrdererToken(tenantId: string, documentId?: string): Promise<ITokenResponse> {\n        return {\n            fromCache: true,\n            jwt: this.getSignedToken(tenantId, documentId),\n        };\n    }\n\n    public async fetchStorageToken(tenantId: string, documentId: string): Promise<ITokenResponse> {\n        return {\n            fromCache: true,\n            jwt: this.getSignedToken(tenantId, documentId),\n        };\n    }\n\n    private getSignedToken(\n        tenantId: string,\n        documentId: string | undefined,\n        lifetime: number = 60 * 60,\n        ver: string = \"1.0\"): string {\n        // Current time in seconds\n        const now = Math.round((new Date()).getTime() / 1000);\n        const user = { id: uuid(), name: getRandomName() };\n\n        const claims: ITokenClaims = {\n            documentId: documentId ?? \"\",\n            scopes: [ScopeType.DocRead, ScopeType.DocWrite, ScopeType.SummaryWrite],\n            tenantId,\n            user,\n            iat: now,\n            exp: now + lifetime,\n            ver,\n        };\n\n        const utf8Key = { utf8: \"12345\" };\n        // eslint-disable-next-line no-null/no-null\n        return jsrsasign.jws.JWS.sign(null, JSON.stringify({ alg:\"HS256\", typ: \"JWT\" }), claims, utf8Key);\n    }\n}\n"]}

package/lib/insecureTinyliciousUrlResolver.d.ts

@@ -13,13 +13,11 @@ export declare const defaultTinyliciousEndpoint = "http://localhost";
  * documentId/containerRelativePathing
  */
 export declare class InsecureTinyliciousUrlResolver implements IUrlResolver {
-    private readonly tinyliciousPort;
-    private readonly tinyliciousEndpoint;
     private readonly fluidProtocolEndpoint;
-    constructor(tinyliciousPort?: number, tinyliciousEndpoint?: string);
+    private readonly tinyliciousEndpoint;
+    constructor(port?: number, endpoint?: string);
     resolve(request: IRequest): Promise<IResolvedUrl>;
     getAbsoluteUrl(resolvedUrl: IFluidResolvedUrl, relativeUrl: string): Promise<string>;
-    private auth;
 }
-export declare const createTinyliciousCreateNewRequest: (documentId: string) => IRequest;
+export declare const createTinyliciousCreateNewRequest: (documentId?: string | undefined) => IRequest;
 //# sourceMappingURL=insecureTinyliciousUrlResolver.d.ts.map

package/lib/insecureTinyliciousUrlResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insecureTinyliciousUrlResolver.d.ts","sourceRoot":"","sources":["../src/insecureTinyliciousUrlResolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EACH,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACf,MAAM,oCAAoC,CAAC;AAK5C,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAC3C,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAE7D;;;;;GAKG;AACH,qBAAa,8BAA+B,YAAW,YAAY;IAG3D,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAHxC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAS;gBAE1B,eAAe,SAAyB,EACxC,mBAAmB,SAA6B;IAKxD,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC;IA0BjD,cAAc,CAAC,WAAW,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAajG,OAAO,CAAC,IAAI;CAef;AAED,eAAO,MAAM,iCAAiC,eAC7B,MAAM,KAAG,QAOrB,CAAC"}
+{"version":3,"file":"insecureTinyliciousUrlResolver.d.ts","sourceRoot":"","sources":["../src/insecureTinyliciousUrlResolver.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;AAE5C,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAC3C,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAE7D;;;;;GAKG;AACH,qBAAa,8BAA+B,YAAW,YAAY;IAC/D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAS;IAC/C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;gBAEzC,IAAI,SAAyB,EAC7B,QAAQ,SAA6B;IAM5B,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC;IA6CjD,cAAc,CAAC,WAAW,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAYpG;AAED,eAAO,MAAM,iCAAiC,uCACnB,QAOtB,CAAC"}

package/lib/insecureTinyliciousUrlResolver.js

@@ -2,8 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { KJUR as jsrsasign } from "jsrsasign";
-import { v4 as uuid } from "uuid";
+import { DriverHeader, } from "@fluidframework/driver-definitions";
 export const defaultTinyliciousPort = 7070;
 export const defaultTinyliciousEndpoint = "http://localhost";
 /**
@@ -13,35 +12,51 @@ export const defaultTinyliciousEndpoint = "http://localhost";
  * documentId/containerRelativePathing
  */
 export class InsecureTinyliciousUrlResolver {
-    constructor(tinyliciousPort = defaultTinyliciousPort, tinyliciousEndpoint = defaultTinyliciousEndpoint) {
-        this.tinyliciousPort = tinyliciousPort;
-        this.tinyliciousEndpoint = tinyliciousEndpoint;
+    constructor(port = defaultTinyliciousPort, endpoint = defaultTinyliciousEndpoint) {
+        this.tinyliciousEndpoint = `${endpoint}:${port}`;
         this.fluidProtocolEndpoint = this.tinyliciousEndpoint.replace(/(^\w+:|^)\/\//, "fluid://");
     }
     async resolve(request) {
-        const url = request.url.replace(`${this.tinyliciousEndpoint}:${this.tinyliciousPort}/`, "");
+        // 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) {
+            return {
+                endpoints: {
+                    deltaStorageUrl: `${this.tinyliciousEndpoint}/deltas/tinylicious/new`,
+                    ordererUrl: this.tinyliciousEndpoint,
+                    storageUrl: `${this.tinyliciousEndpoint}/repos/tinylicious`,
+                },
+                // 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.fluidProtocolEndpoint}/tinylicious/new`,
+            };
+        }
+        // for an existing container we'll parse the request URL to determine the document ID.
+        const url = request.url.replace(`${this.tinyliciousEndpoint}/`, "");
         const documentId = url.split("/")[0];
         const encodedDocId = encodeURIComponent(documentId);
         const documentRelativePath = url.slice(documentId.length);
-        // eslint-disable-next-line max-len
-        const documentUrl = `${this.fluidProtocolEndpoint}:${this.tinyliciousPort}/tinylicious/${encodedDocId}${documentRelativePath}`;
-        const deltaStorageUrl = `${this.tinyliciousEndpoint}:${this.tinyliciousPort}/deltas/tinylicious/${encodedDocId}`;
-        const storageUrl = `${this.tinyliciousEndpoint}:${this.tinyliciousPort}/repos/tinylicious`;
+        const documentUrl = `${this.fluidProtocolEndpoint}/tinylicious/${encodedDocId}${documentRelativePath}`;
+        const deltaStorageUrl = `${this.tinyliciousEndpoint}/deltas/tinylicious/${encodedDocId}`;
+        const storageUrl = `${this.tinyliciousEndpoint}/repos/tinylicious`;
         const response = {
             endpoints: {
                 deltaStorageUrl,
-                ordererUrl: `${this.tinyliciousEndpoint}:${this.tinyliciousPort}`,
+                ordererUrl: this.tinyliciousEndpoint,
                 storageUrl,
             },
             id: documentId,
-            tokens: { jwt: this.auth(documentId) },
+            tokens: {},
             type: "fluid",
             url: documentUrl,
         };
         return response;
     }
     async getAbsoluteUrl(resolvedUrl, relativeUrl) {
-        const documentId = decodeURIComponent(resolvedUrl.url.replace(`${this.fluidProtocolEndpoint}:${this.tinyliciousPort}/tinylicious/`, ""));
+        const documentId = decodeURIComponent(resolvedUrl.url.replace(`${this.fluidProtocolEndpoint}/tinylicious/`, ""));
         /*
          * The detached container flow will ultimately call getAbsoluteUrl() with the resolved.url produced by
          * resolve().  The container expects getAbsoluteUrl's return value to be a URL that can then be roundtripped
@@ -50,25 +65,11 @@ export class InsecureTinyliciousUrlResolver {
          */
         return `${documentId}/${relativeUrl}`;
     }
-    auth(documentId) {
-        const claims = {
-            documentId,
-            scopes: ["doc:read", "doc:write", "summary:write"],
-            tenantId: "tinylicious",
-            user: { id: uuid() },
-            iat: Math.round(new Date().getTime() / 1000),
-            exp: Math.round(new Date().getTime() / 1000) + 60 * 60,
-            ver: "1.0",
-        };
-        const utf8Key = { utf8: "12345" };
-        // eslint-disable-next-line no-null/no-null
-        return jsrsasign.jws.JWS.sign(null, JSON.stringify({ alg: "HS256", typ: "JWT" }), claims, utf8Key);
-    }
 }
 export const createTinyliciousCreateNewRequest = (documentId) => ({
-    url: documentId,
+    url: documentId !== null && documentId !== void 0 ? documentId : "",
     headers: {
-        createNew: true,
+        [DriverHeader.createNew]: true,
     },
 });
 //# sourceMappingURL=insecureTinyliciousUrlResolver.js.map

package/lib/insecureTinyliciousUrlResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"insecureTinyliciousUrlResolver.js","sourceRoot":"","sources":["../src/insecureTinyliciousUrlResolver.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    IFluidResolvedUrl,\n    IResolvedUrl,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\nimport { ITokenClaims } from \"@fluidframework/protocol-definitions\";\nimport { KJUR as jsrsasign } from \"jsrsasign\";\nimport { v4 as uuid } from \"uuid\";\n\nexport const defaultTinyliciousPort = 7070;\nexport const defaultTinyliciousEndpoint = \"http://localhost\";\n\n/**\n * InsecureTinyliciousUrlResolver knows how to get the URLs to the service (in this case Tinylicious) to use\n * for a given request.  This particular implementation has a goal to avoid imposing requirements on the app's\n * URL shape, so it expects the request url to have this format (as opposed to a more traditional URL):\n * documentId/containerRelativePathing\n */\nexport class InsecureTinyliciousUrlResolver implements IUrlResolver {\n    private readonly fluidProtocolEndpoint: string;\n    public constructor(\n        private readonly tinyliciousPort = defaultTinyliciousPort,\n        private readonly tinyliciousEndpoint = defaultTinyliciousEndpoint,\n        ) {\n            this.fluidProtocolEndpoint = this.tinyliciousEndpoint.replace(/(^\\w+:|^)\\/\\//, \"fluid://\");\n         }\n\n    public async resolve(request: IRequest): Promise<IResolvedUrl> {\n        const url = request.url.replace(`${this.tinyliciousEndpoint}:${this.tinyliciousPort}/`, \"\");\n        const documentId = url.split(\"/\")[0];\n        const encodedDocId = encodeURIComponent(documentId);\n        const documentRelativePath = url.slice(documentId.length);\n\n        // eslint-disable-next-line max-len\n        const documentUrl = `${this.fluidProtocolEndpoint}:${this.tinyliciousPort}/tinylicious/${encodedDocId}${documentRelativePath}`;\n        const deltaStorageUrl =\n            `${this.tinyliciousEndpoint}:${this.tinyliciousPort}/deltas/tinylicious/${encodedDocId}`;\n        const storageUrl = `${this.tinyliciousEndpoint}:${this.tinyliciousPort}/repos/tinylicious`;\n\n        const response: IFluidResolvedUrl = {\n            endpoints: {\n                deltaStorageUrl,\n                ordererUrl: `${this.tinyliciousEndpoint}:${this.tinyliciousPort}`,\n                storageUrl,\n            },\n            id: documentId,\n            tokens: { jwt: this.auth(documentId) },\n            type: \"fluid\",\n            url: documentUrl,\n        };\n        return response;\n    }\n\n    public async getAbsoluteUrl(resolvedUrl: IFluidResolvedUrl, relativeUrl: string): Promise<string> {\n        const documentId = decodeURIComponent(\n            resolvedUrl.url.replace(`${this.fluidProtocolEndpoint}:${this.tinyliciousPort}/tinylicious/`, \"\"),\n        );\n        /*\n         * The detached container flow will ultimately call getAbsoluteUrl() with the resolved.url produced by\n         * resolve().  The container expects getAbsoluteUrl's return value to be a URL that can then be roundtripped\n         * back through resolve() again, and get the same result again.  So we'll return a \"URL\" with the same format\n         * described above.\n         */\n        return `${documentId}/${relativeUrl}`;\n    }\n\n    private auth(documentId: string) {\n        const claims: ITokenClaims = {\n            documentId,\n            scopes: [\"doc:read\", \"doc:write\", \"summary:write\"],\n            tenantId: \"tinylicious\",\n            user: { id: uuid() },\n            iat: Math.round(new Date().getTime() / 1000),\n            exp: Math.round(new Date().getTime() / 1000) + 60 * 60, // 1 hour expiration\n            ver: \"1.0\",\n        };\n\n        const utf8Key = { utf8: \"12345\" };\n        // eslint-disable-next-line no-null/no-null\n        return jsrsasign.jws.JWS.sign(null, JSON.stringify({ alg: \"HS256\", typ: \"JWT\" }), claims, utf8Key);\n    }\n}\n\nexport const createTinyliciousCreateNewRequest =\n    (documentId: string): IRequest => (\n        {\n            url: documentId,\n            headers: {\n                createNew: true,\n            },\n        }\n    );\n"]}
+{"version":3,"file":"insecureTinyliciousUrlResolver.js","sourceRoot":"","sources":["../src/insecureTinyliciousUrlResolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACH,YAAY,GAIf,MAAM,oCAAoC,CAAC;AAE5C,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAC3C,MAAM,CAAC,MAAM,0BAA0B,GAAG,kBAAkB,CAAC;AAE7D;;;;;GAKG;AACH,MAAM,OAAO,8BAA8B;IAGvC,YACI,IAAI,GAAG,sBAAsB,EAC7B,QAAQ,GAAG,0BAA0B;QAErC,IAAI,CAAC,mBAAmB,GAAG,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC;QACjD,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAC/F,CAAC;IAEM,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,mBAAmB,yBAAyB;oBACrE,UAAU,EAAE,IAAI,CAAC,mBAAmB;oBACpC,UAAU,EAAE,GAAG,IAAI,CAAC,mBAAmB,oBAAoB;iBAC9D;gBACD,0FAA0F;gBAC1F,EAAE,EAAE,EAAE;gBACN,+EAA+E;gBAC/E,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,GAAG,IAAI,CAAC,qBAAqB,kBAAkB;aACvD,CAAC;SACL;QACD,sFAAsF;QACtF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,mBAAmB,GAAG,EAAE,EAAE,CAAC,CAAC;QACpE,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,YAAY,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,oBAAoB,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAE1D,MAAM,WAAW,GACb,GAAG,IAAI,CAAC,qBAAqB,gBAAgB,YAAY,GAAG,oBAAoB,EAAE,CAAC;QACvF,MAAM,eAAe,GACjB,GAAG,IAAI,CAAC,mBAAmB,uBAAuB,YAAY,EAAE,CAAC;QACrE,MAAM,UAAU,GACZ,GAAG,IAAI,CAAC,mBAAmB,oBAAoB,CAAC;QAEpD,MAAM,QAAQ,GAAsB;YAChC,SAAS,EAAE;gBACP,eAAe;gBACf,UAAU,EAAE,IAAI,CAAC,mBAAmB;gBACpC,UAAU;aACb;YACD,EAAE,EAAE,UAAU;YACd,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,OAAO;YACb,GAAG,EAAE,WAAW;SACnB,CAAC;QACF,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,WAA8B,EAAE,WAAmB;QAC3E,MAAM,UAAU,GAAG,kBAAkB,CACjC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,qBAAqB,eAAe,EAAE,EAAE,CAAC,CAC5E,CAAC;QACF;;;;;WAKG;QACH,OAAO,GAAG,UAAU,IAAI,WAAW,EAAE,CAAC;IAC1C,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,iCAAiC,GAC1C,CAAC,UAAmB,EAAY,EAAE,CAAC,CAC/B;IACI,GAAG,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE;IACrB,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\nexport const defaultTinyliciousPort = 7070;\nexport const defaultTinyliciousEndpoint = \"http://localhost\";\n\n/**\n * InsecureTinyliciousUrlResolver knows how to get the URLs to the service (in this case Tinylicious) to use\n * for a given request.  This particular implementation has a goal to avoid imposing requirements on the app's\n * URL shape, so it expects the request url to have this format (as opposed to a more traditional URL):\n * documentId/containerRelativePathing\n */\nexport class InsecureTinyliciousUrlResolver implements IUrlResolver {\n    private readonly fluidProtocolEndpoint: string;\n    private readonly tinyliciousEndpoint: string;\n    public constructor(\n        port = defaultTinyliciousPort,\n        endpoint = defaultTinyliciousEndpoint,\n    ) {\n        this.tinyliciousEndpoint = `${endpoint}:${port}`;\n        this.fluidProtocolEndpoint = this.tinyliciousEndpoint.replace(/(^\\w+:|^)\\/\\//, \"fluid://\");\n    }\n\n    public async resolve(request: IRequest): Promise<IResolvedUrl> {\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.tinyliciousEndpoint}/deltas/tinylicious/new`,\n                    ordererUrl: this.tinyliciousEndpoint,\n                    storageUrl: `${this.tinyliciousEndpoint}/repos/tinylicious`,\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.fluidProtocolEndpoint}/tinylicious/new`,\n            };\n        }\n        // for an existing container we'll parse the request URL to determine the document ID.\n        const url = request.url.replace(`${this.tinyliciousEndpoint}/`, \"\");\n        const documentId = url.split(\"/\")[0];\n        const encodedDocId = encodeURIComponent(documentId);\n        const documentRelativePath = url.slice(documentId.length);\n\n        const documentUrl =\n            `${this.fluidProtocolEndpoint}/tinylicious/${encodedDocId}${documentRelativePath}`;\n        const deltaStorageUrl =\n            `${this.tinyliciousEndpoint}/deltas/tinylicious/${encodedDocId}`;\n        const storageUrl =\n            `${this.tinyliciousEndpoint}/repos/tinylicious`;\n\n        const response: IFluidResolvedUrl = {\n            endpoints: {\n                deltaStorageUrl,\n                ordererUrl: this.tinyliciousEndpoint,\n                storageUrl,\n            },\n            id: documentId,\n            tokens: {},\n            type: \"fluid\",\n            url: documentUrl,\n        };\n        return response;\n    }\n\n    public async getAbsoluteUrl(resolvedUrl: IFluidResolvedUrl, relativeUrl: string): Promise<string> {\n        const documentId = decodeURIComponent(\n            resolvedUrl.url.replace(`${this.fluidProtocolEndpoint}/tinylicious/`, \"\"),\n        );\n        /*\n         * The detached container flow will ultimately call getAbsoluteUrl() with the resolved.url produced by\n         * resolve().  The container expects getAbsoluteUrl's return value to be a URL that can then be roundtripped\n         * back through resolve() again, and get the same result again.  So we'll return a \"URL\" with the same format\n         * described above.\n         */\n        return `${documentId}/${relativeUrl}`;\n    }\n}\n\nexport const createTinyliciousCreateNewRequest =\n    (documentId?: string): IRequest => (\n        {\n            url: documentId ?? \"\",\n            headers: {\n                [DriverHeader.createNew]: true,\n            },\n        }\n    );\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/tinylicious-driver",
-  "version": "0.47.1",
+  "version": "0.48.0-38105",
   "description": "Driver for tinylicious",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -29,15 +29,15 @@
   "dependencies": {
     "@fluidframework/core-interfaces": "^0.39.7",
     "@fluidframework/driver-definitions": "^0.39.6",
-    "@fluidframework/driver-utils": "^0.47.1",
+    "@fluidframework/driver-utils": "0.48.0-38105",
     "@fluidframework/protocol-definitions": "^0.1024.0",
-    "@fluidframework/routerlicious-driver": "^0.47.1",
-    "@fluidframework/server-services-client": "^0.1030.0",
+    "@fluidframework/routerlicious-driver": "0.48.0-38105",
+    "@fluidframework/server-services-client": "^0.1031.0-37526",
     "jsrsasign": "^10.2.0",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@fluidframework/build-common": "^0.23.0",
+    "@fluidframework/build-common": "^0.23.0-0",
     "@fluidframework/eslint-config-fluid": "^0.23.0",
     "@fluidframework/test-tools": "^0.2.3074",
     "@types/jsrsasign": "^8.0.8",

package/src/insecureTinyliciousTokenProvider.ts

@@ -14,7 +14,7 @@ import { v4 as uuid } from "uuid";
  * to get up and running.
  */
 export class InsecureTinyliciousTokenProvider implements ITokenProvider {
-    public async fetchOrdererToken(tenantId: string, documentId: string): Promise<ITokenResponse> {
+    public async fetchOrdererToken(tenantId: string, documentId?: string): Promise<ITokenResponse> {
         return {
             fromCache: true,
             jwt: this.getSignedToken(tenantId, documentId),
@@ -30,7 +30,7 @@ export class InsecureTinyliciousTokenProvider implements ITokenProvider {
 
     private getSignedToken(
         tenantId: string,
-        documentId: string,
+        documentId: string | undefined,
         lifetime: number = 60 * 60,
         ver: string = "1.0"): string {
         // Current time in seconds
@@ -38,7 +38,7 @@ export class InsecureTinyliciousTokenProvider implements ITokenProvider {
         const user = { id: uuid(), name: getRandomName() };
 
         const claims: ITokenClaims = {
-            documentId,
+            documentId: documentId ?? "",
             scopes: [ScopeType.DocRead, ScopeType.DocWrite, ScopeType.SummaryWrite],
             tenantId,
             user,

package/src/insecureTinyliciousUrlResolver.ts

@@ -5,13 +5,11 @@
 
 import { IRequest } from "@fluidframework/core-interfaces";
 import {
+    DriverHeader,
     IFluidResolvedUrl,
     IResolvedUrl,
     IUrlResolver,
 } from "@fluidframework/driver-definitions";
-import { ITokenClaims } from "@fluidframework/protocol-definitions";
-import { KJUR as jsrsasign } from "jsrsasign";
-import { v4 as uuid } from "uuid";
 
 export const defaultTinyliciousPort = 7070;
 export const defaultTinyliciousEndpoint = "http://localhost";
@@ -24,33 +22,54 @@ export const defaultTinyliciousEndpoint = "http://localhost";
  */
 export class InsecureTinyliciousUrlResolver implements IUrlResolver {
     private readonly fluidProtocolEndpoint: string;
+    private readonly tinyliciousEndpoint: string;
     public constructor(
-        private readonly tinyliciousPort = defaultTinyliciousPort,
-        private readonly tinyliciousEndpoint = defaultTinyliciousEndpoint,
-        ) {
-            this.fluidProtocolEndpoint = this.tinyliciousEndpoint.replace(/(^\w+:|^)\/\//, "fluid://");
-         }
+        port = defaultTinyliciousPort,
+        endpoint = defaultTinyliciousEndpoint,
+    ) {
+        this.tinyliciousEndpoint = `${endpoint}:${port}`;
+        this.fluidProtocolEndpoint = this.tinyliciousEndpoint.replace(/(^\w+:|^)\/\//, "fluid://");
+    }
 
     public async resolve(request: IRequest): Promise<IResolvedUrl> {
-        const url = request.url.replace(`${this.tinyliciousEndpoint}:${this.tinyliciousPort}/`, "");
+        // 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) {
+            return {
+                endpoints: {
+                    deltaStorageUrl: `${this.tinyliciousEndpoint}/deltas/tinylicious/new`,
+                    ordererUrl: this.tinyliciousEndpoint,
+                    storageUrl: `${this.tinyliciousEndpoint}/repos/tinylicious`,
+                },
+                // 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.fluidProtocolEndpoint}/tinylicious/new`,
+            };
+        }
+        // for an existing container we'll parse the request URL to determine the document ID.
+        const url = request.url.replace(`${this.tinyliciousEndpoint}/`, "");
         const documentId = url.split("/")[0];
         const encodedDocId = encodeURIComponent(documentId);
         const documentRelativePath = url.slice(documentId.length);
 
-        // eslint-disable-next-line max-len
-        const documentUrl = `${this.fluidProtocolEndpoint}:${this.tinyliciousPort}/tinylicious/${encodedDocId}${documentRelativePath}`;
+        const documentUrl =
+            `${this.fluidProtocolEndpoint}/tinylicious/${encodedDocId}${documentRelativePath}`;
         const deltaStorageUrl =
-            `${this.tinyliciousEndpoint}:${this.tinyliciousPort}/deltas/tinylicious/${encodedDocId}`;
-        const storageUrl = `${this.tinyliciousEndpoint}:${this.tinyliciousPort}/repos/tinylicious`;
+            `${this.tinyliciousEndpoint}/deltas/tinylicious/${encodedDocId}`;
+        const storageUrl =
+            `${this.tinyliciousEndpoint}/repos/tinylicious`;
 
         const response: IFluidResolvedUrl = {
             endpoints: {
                 deltaStorageUrl,
-                ordererUrl: `${this.tinyliciousEndpoint}:${this.tinyliciousPort}`,
+                ordererUrl: this.tinyliciousEndpoint,
                 storageUrl,
             },
             id: documentId,
-            tokens: { jwt: this.auth(documentId) },
+            tokens: {},
             type: "fluid",
             url: documentUrl,
         };
@@ -59,7 +78,7 @@ export class InsecureTinyliciousUrlResolver implements IUrlResolver {
 
     public async getAbsoluteUrl(resolvedUrl: IFluidResolvedUrl, relativeUrl: string): Promise<string> {
         const documentId = decodeURIComponent(
-            resolvedUrl.url.replace(`${this.fluidProtocolEndpoint}:${this.tinyliciousPort}/tinylicious/`, ""),
+            resolvedUrl.url.replace(`${this.fluidProtocolEndpoint}/tinylicious/`, ""),
         );
         /*
          * The detached container flow will ultimately call getAbsoluteUrl() with the resolved.url produced by
@@ -69,30 +88,14 @@ export class InsecureTinyliciousUrlResolver implements IUrlResolver {
          */
         return `${documentId}/${relativeUrl}`;
     }
-
-    private auth(documentId: string) {
-        const claims: ITokenClaims = {
-            documentId,
-            scopes: ["doc:read", "doc:write", "summary:write"],
-            tenantId: "tinylicious",
-            user: { id: uuid() },
-            iat: Math.round(new Date().getTime() / 1000),
-            exp: Math.round(new Date().getTime() / 1000) + 60 * 60, // 1 hour expiration
-            ver: "1.0",
-        };
-
-        const utf8Key = { utf8: "12345" };
-        // eslint-disable-next-line no-null/no-null
-        return jsrsasign.jws.JWS.sign(null, JSON.stringify({ alg: "HS256", typ: "JWT" }), claims, utf8Key);
-    }
 }
 
 export const createTinyliciousCreateNewRequest =
-    (documentId: string): IRequest => (
+    (documentId?: string): IRequest => (
         {
-            url: documentId,
+            url: documentId ?? "",
             headers: {
-                createNew: true,
+                [DriverHeader.createNew]: true,
             },
         }
     );