Merge pull request #3287 from pnp/version-4

juliemturner · web-flow · commit d89a0da448a0 · 2025-07-14T14:46:31.000Z
Merge Release 4.15.0 to Main
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 4.15.0 - 2025-Jul-14
+
+- sp
+  - Small fix for addChunked for small files.
+
+- graph
+  - Fix issues with addCopyFromContentTypeHub returning queryable and header for polling api
+
 ## 4.14.0 - 2025-Jun-9
 
 - sp
diff --git a/docs/sp/sp-utilities-utility.md b/docs/sp/sp-utilities-utility.md
@@ -4,6 +4,9 @@ Through the REST api you are able to call a subset of the SP.Utilities.Utility m
 
 ## sendEmail
 
+> ⚠️ **Deprecated**: This method is deprecated in favor of the [Graph module's `sendMessage`](https://pnp.github.io/pnpjs/graph/mail-messages/#send-message).
+> Please migrate to the Graph module for sending emails. This functionality will be removed in future versions.
+
 This methods allows you to send an email based on the supplied arguments. The method takes a single argument, a plain object defined by the EmailProperties interface (shown below).
 
 ### EmailProperties
@@ -63,7 +66,8 @@ const sp = spfi(...);
 
 let addressString: string = await sp.utility.getCurrentUserEmailAddresses();
 
-// and use it with sendEmail
+// and use it with sendEmail 
+// note: sendEmail has been deprecated in favor of Graph module's sendMessage functionality
 await sp.utility.sendEmail({
     To: [addressString],
     Subject: "This email is about...",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,10 +2,10 @@
     "name": "@pnp/monorepo",
     "private": true,
     "type": "module",
-    "version": "4.14.0",
+    "version": "4.15.0",
     "description": "A JavaScript library for SharePoint & Graph development.",
     "devDependencies": {
-        "@azure/identity": "4.10.0",
+        "@azure/identity": "4.10.2",
         "@azure/msal-browser": "3.28.1",
         "@azure/msal-node": "2.16.2",
         "@microsoft/microsoft-graph-types": "2.40.0",
diff --git a/packages/azidjsclient/package.json b/packages/azidjsclient/package.json
@@ -7,7 +7,7 @@
     "dependencies": {
         "@pnp/core": "0.0.0-PLACEHOLDER",
         "@pnp/queryable": "0.0.0-PLACEHOLDER",
-        "@azure/identity": "4.9.1",
+        "@azure/identity": "4.10.2",
         "tslib": "2.8.1"
     }
 }
diff --git a/packages/graph/content-types/types.ts b/packages/graph/content-types/types.ts
@@ -81,11 +81,11 @@ export class _ContentTypes extends _GraphCollection<IContentTypeEntity[]>{
      */
     public async addCopyFromContentTypeHub(contentTypeId: string): Promise<IContentTypeAddResult> {
         const creator = ContentType(this, "addCopyFromContentTypeHub").using(JSONHeaderParse());
-        const data = await graphPost(creator, body({ contentTypeId }));
-        const pendingLocation = data?.headers?.location || null;
+        const result = await graphPost(creator, body({ contentTypeId }));
+        const pendingLocation = result?.headers?.get("location") || null;
         return {
-            data: data.data,
-            contentType: (<any>this).getById(data.id),
+            data: result.data,
+            contentType: (<any>this).getById(result.data.id),
             pendingLocation,
         };
     }
diff --git a/packages/queryable/behaviors/parsers.ts b/packages/queryable/behaviors/parsers.ts
@@ -48,14 +48,14 @@ export function JSONHeaderParse(): TimelinePipe {
     return parseBinderWithErrorCheck(async (response) => {
 
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        if ((response.headers.has("Content-Length") && parseFloat(response.headers.get("Content-Length")!) === 0) || response.status === 204) {
+        if (response.status === 204) {
             return {};
         }
 
         // patch to handle cases of 200 response with no or whitespace only bodies (#487 & #545)
         const txt = await response.text();
         const json = txt.replace(/\s/ig, "").length > 0 ? JSON.parse(txt) : {};
-        return { data: { ...parseODataJSON(json) }, headers: { ...response.headers } };
+        return { data: { ...parseODataJSON(json) }, headers: response.headers };
     });
 }
 
diff --git a/packages/sp/files/types.ts b/packages/sp/files/types.ts
@@ -422,25 +422,30 @@ export class _File extends ReadableFile<IFileInfo> {
                 buffer = newBuffer;
             }
 
-            while (buffer.length >= chunkSize || (chunk.done && buffer.length > 0)) {
+            while (buffer.length >= chunkSize) {
                 const chunkToUpload = buffer.slice(0, chunkSize);
                 buffer = buffer.slice(chunkSize);
 
                 if (first) {
                     progress({ offset, stage: "starting", uploadId });
                     offset = await spPost(File(fileRef, `startUpload(uploadId=guid'${uploadId}')`), { body: chunkToUpload });
                     first = false;
-                } else if (chunk.done && buffer.length === 0) {
-                    progress({ offset, stage: "finishing", uploadId });
-                    return spPost(File(fileRef, `finishUpload(uploadId=guid'${uploadId}',fileOffset=${offset})`), { body: chunkToUpload });
                 } else {
                     progress({ offset, stage: "continue", uploadId });
                     offset = await spPost(File(fileRef, `continueUpload(uploadId=guid'${uploadId}',fileOffset=${offset})`), { body: chunkToUpload });
                 }
             }
 
             if (chunk.done) {
-                break;
+                if (first) {
+                    // Small file: not enough data to trigger a chunk upload
+                    progress({ offset, stage: "starting", uploadId });
+                    offset = await spPost(File(fileRef, `startUpload(uploadId=guid'${uploadId}')`), { body: buffer });
+                    first = false;
+                    buffer = new Uint8Array(); // reset buffer on small file upload, so we don't duplicate the buffer on finishUpload. Issue #3278
+                }
+                progress({ offset, stage: "finishing", uploadId });
+                return spPost(File(fileRef, `finishUpload(uploadId=guid'${uploadId}',fileOffset=${offset})`), { body: buffer.length ? buffer : "" });
             }
         }
     }
diff --git a/packages/sp/sputilities/types.ts b/packages/sp/sputilities/types.ts
@@ -89,8 +89,14 @@ export class _Utilities extends _SPQueryable implements IUtilities {
 export interface IUtilities {
 
     /**
-     * This methods will send an e-mail based on the incoming properties of the IEmailProperties parameter.
-     * @param props IEmailProperties object
+     * Sends an email based on the provided {@link IEmailProperties}.
+     *
+     * @param props - The email configuration object.
+     *
+     * @deprecated This method is deprecated in favor of the Graph module's email functionality.
+     * Use {@link https://pnp.github.io/pnpjs/graph/mail-messages/#send-message | Graph: sendMessage} instead.
+     *
+     * @see {@link https://pnp.github.io/pnpjs/graph/mail-messages/#send-message}
      */
     sendEmail(props: IEmailProperties): Promise<void>;
 
diff --git a/test/graph/admin.ts b/test/graph/admin.ts
@@ -8,7 +8,7 @@ describe("Admin", function () {
     // let propertyId = "";
 
     // Ensure we have the data to test against
-    before(async function  () {
+    before(async function () {
 
         if (!this.pnp.settings.enableWebTests || stringIsNullOrEmpty(this.pnp.settings.testUser)) {
             this.skip();
@@ -36,36 +36,36 @@ describe("Admin", function () {
     });
 
     describe("SharePoint", function () {
-        it("Get SharePoint Settings", pnpTest("923c1bd6-8621-41d2-9ea9-004a4a735c9f", async function  () {
+        it("Get SharePoint Settings", pnpTest("923c1bd6-8621-41d2-9ea9-004a4a735c9f", async function () {
             const sharePointSettings = await this.pnp.graph.admin.sharepoint.settings();
             return expect(sharePointSettings.availableManagedPathsForSiteCreation.length > 0).is.true;
         }));
 
-        it("Update SharePoint Settings", pnpTest("bbf52535-3a7e-452b-b0eb-9940832163aa", async function  () {
+        it("Update SharePoint Settings", pnpTest("bbf52535-3a7e-452b-b0eb-9940832163aa", async function () {
             const sharePointSettings = await this.pnp.graph.admin.sharepoint.settings.update({ deletedUserPersonalSiteRetentionPeriodInDays: 30 });
             return expect(sharePointSettings.deletedUserPersonalSiteRetentionPeriodInDays === 30).is.true;
         }));
     });
 
     describe("People", function () {
-        it("Get People Settings", pnpTest("9bd5a022-65d3-4a34-b8c4-c74381b98551", async function  () {
+        it("Get People Settings", pnpTest("9bd5a022-65d3-4a34-b8c4-c74381b98551", async function () {
             const settings = await this.pnp.graph.admin.people();
             return expect(settings.profileCardProperties).is.not.null;
         }));
 
-        it("Get Pronoun Settings", pnpTest("bbc0e5af-3620-4164-9120-556ac534db39", async function  () {
+        it("Get Pronoun Settings", pnpTest("bbc0e5af-3620-4164-9120-556ac534db39", async function () {
             const settings = await this.pnp.graph.admin.people.pronounSettings();
             return expect(settings.isEnabledInOrganization).to.be.an("boolean");
         }));
 
-        it.skip("Update Pronoun Settings", pnpTest("830c2b41-5642-40d6-8585-3e26207e3f13", async function  () {
+        it.skip("Update Pronoun Settings", pnpTest("830c2b41-5642-40d6-8585-3e26207e3f13", async function () {
             const settings = await this.pnp.graph.admin.people.pronounSettings.update({
                 isEnabledInOrganization: true,
             });
             return expect(settings.isEnabledInOrganization).is.true;
         }));
 
-        it.skip("Add Profile Card Property", pnpTest("49b98899-0af3-4b8b-8f66-3748410420b7", async function  () {
+        it.skip("Add Profile Card Property", pnpTest("49b98899-0af3-4b8b-8f66-3748410420b7", async function () {
             const property = await this.pnp.graph.admin.people.profileCardProperties.add({
                 directoryPropertyName: "CustomAttribute2",
                 annotations: [{
@@ -81,12 +81,12 @@ describe("Admin", function () {
             return expect(property.id).is.not.null;
         }));
 
-        it.skip("Get Profile Card Property", pnpTest("05d8f50a-1b47-4631-9576-2aa3c5efcf75", async function  () {
+        it.skip("Get Profile Card Property", pnpTest("05d8f50a-1b47-4631-9576-2aa3c5efcf75", async function () {
             const property = await this.pnp.graph.admin.people.profileCardProperties.getById(customUserProperty)();
             return expect(property.id).is.not.null;
         }));
 
-        it.skip("Update Profile Card Property", pnpTest("04fb914e-41c6-4b8e-a326-63c41e6672a4", async function  () {
+        it.skip("Update Profile Card Property", pnpTest("04fb914e-41c6-4b8e-a326-63c41e6672a4", async function () {
             const displayName = getRandomString(5) + "Cost Center";
             const property = await this.pnp.graph.admin.people.profileCardProperties.getById(customUserProperty).update({
                 directoryPropertyName: this.customUserProperty,
@@ -103,7 +103,7 @@ describe("Admin", function () {
             return expect(property.annotations[0]?.displayName).equals(displayName);
         }));
 
-        it.skip("Delete Profile Card Property", pnpTest("fbfae956-d776-4bd7-8ad2-3db384ec02c3", async function  () {
+        it.skip("Delete Profile Card Property", pnpTest("fbfae956-d776-4bd7-8ad2-3db384ec02c3", async function () {
             const property = await this.pnp.graph.admin.people.profileCardProperties.add({
                 directoryPropertyName: getRandomString(5) + "CustomAttribute2",
                 annotations: [{
@@ -122,55 +122,62 @@ describe("Admin", function () {
     });
 
     describe("Service Health", function () {
-        it("Get Health Overviews", pnpTest("79f7392b-053d-44a0-87f6-a1c2332d6841", async function  () {
+        it("Get Health Overviews", pnpTest("79f7392b-053d-44a0-87f6-a1c2332d6841", async function () {
             const healthOverviews = await this.pnp.graph.admin.serviceAnnouncements.healthOverviews();
             return expect(healthOverviews).to.be.an("array");
         }));
 
-        it("Get Health By Service Name", pnpTest("f06cd76b-3a61-4728-ba5e-f97bb6e718a8", async function  () {
+        it("Get Health By Service Name", pnpTest("f06cd76b-3a61-4728-ba5e-f97bb6e718a8", async function () {
             const serviceHealth = await this.pnp.graph.admin.serviceAnnouncements.healthOverviews.getByName("Microsoft 365 suite")();
             return expect(serviceHealth).has.property("id");
         }));
 
-        it("Get Health Issues", pnpTest("6b04e99e-dcbb-48ee-87c2-4d17b1fad12d", async function  () {
+        it("Get Health Issues", pnpTest("6b04e99e-dcbb-48ee-87c2-4d17b1fad12d", async function () {
             const issues = await this.pnp.graph.admin.serviceAnnouncements.issues();
             return expect(issues).to.be.an("array");
         }));
 
-        it("Get Health Messages", pnpTest("d06cd76b-3a61-4728-ba5e-f97bb6e718a8", async function  () {
+        it("Get Health Messages", pnpTest("d06cd76b-3a61-4728-ba5e-f97bb6e718a8", async function () {
             const messages = await this.pnp.graph.admin.serviceAnnouncements.messages();
             return expect(messages).to.be.an("array");
         }));
 
-        it("Get Health Message by ID", pnpTest("2cc3edd5-b7af-4967-b8b4-840d161f1b61", async function  () {
+        it("Get Health Message by ID", pnpTest("2cc3edd5-b7af-4967-b8b4-840d161f1b61", async function () {
             const messages = await this.pnp.graph.admin.serviceAnnouncements.messages();
-            if(messages.length > 0){
+            if (messages.length > 0) {
                 const messageById = await this.pnp.graph.admin.serviceAnnouncements.messages.getById(messages[0]?.id)();
                 return expect(messageById).is.not.null;
-            }else{
+            } else {
                 console.log("No messages to test");
                 return true;
             }
         }));
 
-        it("Get Health Message Attachments", pnpTest("2e26b2a1-5ce8-4cf9-a0dc-4decddba5641", async function  () {
+        it("Get Health Message Attachments", pnpTest("2e26b2a1-5ce8-4cf9-a0dc-4decddba5641", async function () {
             const messages = await this.pnp.graph.admin.serviceAnnouncements.messages();
 
             const attachments = await this.pnp.graph.admin.serviceAnnouncements.messages.getById(messages[0]?.id).attachments();
             return expect(attachments).to.be.an("array");
         }));
 
-        it("Get Health Message Attachments by Id", pnpTest("2cef2a70-31c9-4180-91bf-f0bab86e3501", async function  () {
+        it("Get Health Message Attachments by Id", pnpTest("2cef2a70-31c9-4180-91bf-f0bab86e3501", async function () {
             const messages = await this.pnp.graph.admin.serviceAnnouncements.messages();
-            const attachments = await this.pnp.graph.admin.serviceAnnouncements.messages.getById(messages[0]?.id).attachments();
-            const attachmentById = await this.pnp.graph.admin.serviceAnnouncements.messages.getById(attachments[0]?.id)();
-
-            return expect(attachmentById).is.ok;
+            if (messages.length > 0) {
+                const attachments = await this.pnp.graph.admin.serviceAnnouncements.messages.getById(messages[0]?.id).attachments();
+                if (attachments.length > 0) {
+                    const attachmentById = await this.pnp.graph.admin.serviceAnnouncements.messages.getById(attachments[0]?.id)();
+                    return expect(attachmentById).is.ok;
+                } else {
+                    return true;
+                }
+            } else {
+                return true;
+            }
         }));
     });
 
 
-    after(async function  () {
+    after(async function () {
 
         // Only needed when profile card properties can be created with application permissions
         // if (!stringIsNullOrEmpty(propertyId)) {
diff --git a/test/graph/onenote.ts b/test/graph/onenote.ts
@@ -8,7 +8,8 @@ import "@pnp/graph/onenote";
 import "@pnp/graph/files";
 import getValidUser from "./utilities/getValidUser.js";
 
-describe("OneNote", function () {
+// App permissions removed for OneNote, can no longer test
+describe.skip("OneNote", function () {
     let notebookId: string;
     let testUserName: string;
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"dependencies": {`
`8`	`8`	`"@pnp/core": "0.0.0-PLACEHOLDER",`
`9`	`9`	`"@pnp/queryable": "0.0.0-PLACEHOLDER",`
`10`		`- "@azure/identity": "4.9.1",`
	`10`	`+ "@azure/identity": "4.10.2",`
`11`	`11`	`"tslib": "2.8.1"`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,14 @@ export function JSONHeaderParse(): TimelinePipe {`
`48`	`48`	`return parseBinderWithErrorCheck(async (response) => {`
`49`	`49`
`50`	`50`	`// eslint-disable-next-line @typescript-eslint/no-non-null-assertion`
`51`		`- if ((response.headers.has("Content-Length") && parseFloat(response.headers.get("Content-Length")!) === 0) \|\| response.status === 204) {`
	`51`	`+ if (response.status === 204) {`
`52`	`52`	`return {};`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// patch to handle cases of 200 response with no or whitespace only bodies (#487 & #545)`
`56`	`56`	`const txt = await response.text();`
`57`	`57`	`const json = txt.replace(/\s/ig, "").length > 0 ? JSON.parse(txt) : {};`
`58`		`- return { data: { ...parseODataJSON(json) }, headers: { ...response.headers } };`
	`58`	`+ return { data: { ...parseODataJSON(json) }, headers: response.headers };`
`59`	`59`	`});`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -422,25 +422,30 @@ export class _File extends ReadableFile<IFileInfo> {`
`422`	`422`	`buffer = newBuffer;`
`423`	`423`	`}`
`424`	`424`
`425`		`- while (buffer.length >= chunkSize \|\| (chunk.done && buffer.length > 0)) {`
	`425`	`+ while (buffer.length >= chunkSize) {`
`426`	`426`	`const chunkToUpload = buffer.slice(0, chunkSize);`
`427`	`427`	`buffer = buffer.slice(chunkSize);`
`428`	`428`
`429`	`429`	`if (first) {`
`430`	`430`	`progress({ offset, stage: "starting", uploadId });`
`431`	`431`	offset = await spPost(File(fileRef, `startUpload(uploadId=guid'${uploadId}')`), { body: chunkToUpload });
`432`	`432`	`first = false;`
`433`		`- } else if (chunk.done && buffer.length === 0) {`
`434`		`- progress({ offset, stage: "finishing", uploadId });`
`435`		- return spPost(File(fileRef, `finishUpload(uploadId=guid'${uploadId}',fileOffset=${offset})`), { body: chunkToUpload });
`436`	`433`	`} else {`
`437`	`434`	`progress({ offset, stage: "continue", uploadId });`
`438`	`435`	offset = await spPost(File(fileRef, `continueUpload(uploadId=guid'${uploadId}',fileOffset=${offset})`), { body: chunkToUpload });
`439`	`436`	`}`
`440`	`437`	`}`
`441`	`438`
`442`	`439`	`if (chunk.done) {`
`443`		`- break;`
	`440`	`+ if (first) {`
	`441`	`+ // Small file: not enough data to trigger a chunk upload`
	`442`	`+ progress({ offset, stage: "starting", uploadId });`
	`443`	+ offset = await spPost(File(fileRef, `startUpload(uploadId=guid'${uploadId}')`), { body: buffer });
	`444`	`+ first = false;`
	`445`	`+ buffer = new Uint8Array(); // reset buffer on small file upload, so we don't duplicate the buffer on finishUpload. Issue #3278`
	`446`	`+ }`
	`447`	`+ progress({ offset, stage: "finishing", uploadId });`
	`448`	+ return spPost(File(fileRef, `finishUpload(uploadId=guid'${uploadId}',fileOffset=${offset})`), { body: buffer.length ? buffer : "" });
`444`	`449`	`}`
`445`	`450`	`}`
`446`	`451`	`}`