Merge pull request #2854 from bcameron1231/fix2850

Adding Photos w/ Dimension support

docs/graph/photos.md

@@ -25,6 +25,23 @@ const blobUrl = url.createObjectURL(photoValue);
 document.getElementById("photoElement").setAttribute("src", blobUrl);
 ```
 
+## Current User Photo by Size
+
+This example shows the getBlob() endpoint, there is also a getBuffer() endpoint to support node.js
+
+```TypeScript
+import { graphfi } from "@pnp/graph";
+import "@pnp/graph/users";
+import "@pnp/graph/photos";
+
+const graph = graphfi(...);
+
+const photoValue = await graph.me.photos.getBySize("48x48").getBlob();
+const url = window.URL || window.webkitURL;
+const blobUrl = url.createObjectURL(photoValue);
+document.getElementById("photoElement").setAttribute("src", blobUrl);
+```
+
 ## Current Group Photo
 
 This example shows the getBlob() endpoint, there is also a getBuffer() endpoint to support node.js
@@ -42,6 +59,40 @@ const blobUrl = url.createObjectURL(photoValue);
 document.getElementById("photoElement").setAttribute("src", blobUrl);
 ```
 
+## Current Group Photo by Size
+
+This example shows the getBlob() endpoint, there is also a getBuffer() endpoint to support node.js
+
+```TypeScript
+import { graphfi } from "@pnp/graph";
+import "@pnp/graph/groups";
+import "@pnp/graph/photos";
+
+const graph = graphfi(...);
+
+const photoValue = await graph.groups.getById("7d2b9355-0891-47d3-84c8-bf2cd9c62177").photos.getBySize("120x120").getBlob();
+const url = window.URL || window.webkitURL;
+const blobUrl = url.createObjectURL(photoValue);
+document.getElementById("photoElement").setAttribute("src", blobUrl);
+```
+
+## Current Team Photo
+
+This example shows the getBlob() endpoint, there is also a getBuffer() endpoint to support node.js
+
+```TypeScript
+import { graphfi } from "@pnp/graph";
+import "@pnp/graph/teams";
+import "@pnp/graph/photos";
+
+const graph = graphfi(...);
+
+const photoValue = await graph.teams.getById("7d2b9355-0891-47d3-84c8-bf2cd9c62177").photo.getBlob();
+const url = window.URL || window.webkitURL;
+const blobUrl = url.createObjectURL(photoValue);
+document.getElementById("photoElement").setAttribute("src", blobUrl);
+```
+
 ## Set User Photo
 
 ```TypeScript
@@ -67,5 +118,19 @@ const graph = graphfi(...);
 
 const input = <HTMLInputElement>document.getElementById("thefileinput");
 const file = input.files[0];
-await graph.me.photo.setContent(file);
+await graph.groups.getById("7d2b9355-0891-47d3-84c8-bf2cd9c62177").photo.setContent(file);
+```
+
+## Set Team Photo
+
+```TypeScript
+import { graphfi } from "@pnp/graph";
+import "@pnp/graph/teams";
+import "@pnp/graph/photos";
+
+const graph = graphfi(...);
+
+const input = <HTMLInputElement>document.getElementById("thefileinput");
+const file = input.files[0];
+await graph.teams.getById("7d2b9355-0891-47d3-84c8-bf2cd9c62177").photo.setContent(file);
 ```

packages/graph/photos/groups.ts

@@ -1,14 +1,17 @@
 import { addProp } from "@pnp/queryable";
 import { _Group } from "../groups/types.js";
-import { Photo, IPhoto } from "./types.js";
+import { Photo, IPhoto, IPhotos, Photos } from "./types.js";
 
 declare module "../groups/types" {
     interface _Group {
         readonly photo: IPhoto;
+        readonly photos: IPhotos;
     }
     interface IGroup {
         readonly photo: IPhoto;
+        readonly photos: IPhotos;
     }
 }
 
 addProp(_Group, "photo", Photo);
+addProp(_Group, "photos", Photos);

packages/graph/photos/index.ts

@@ -1,5 +1,6 @@
 import "./groups.js";
 import "./users.js";
+import "./teams.js";
 
 export {
     IPhoto,

packages/graph/photos/teams.ts

@@ -0,0 +1,14 @@
+import { addProp } from "@pnp/queryable";
+import { _Team } from "../teams/types.js";
+import { Photo, IPhoto } from "./types.js";
+
+declare module "../teams/types" {
+    interface _Team {
+        readonly photo: IPhoto;
+    }
+    interface ITeam {
+        readonly photo: IPhoto;
+    }
+}
+
+addProp(_Team, "photo", Photo);

packages/graph/photos/types.ts

@@ -1,11 +1,11 @@
-import { _GraphQueryableInstance, graphInvokableFactory } from "../graphqueryable.js";
+import { _GraphQueryableCollection, _GraphQueryableInstance, graphInvokableFactory } from "../graphqueryable.js";
 import { BlobParse, BufferParse } from "@pnp/queryable";
-import { Photo as IPhotoType } from "@microsoft/microsoft-graph-types";
+import { ProfilePhoto as IProfilePhotoType } from "@microsoft/microsoft-graph-types";
 import { defaultPath } from "../decorators.js";
 import { graphPatch } from "../operations.js";
 
 @defaultPath("photo")
-export class _Photo extends _GraphQueryableInstance<IPhotoType> {
+export class _Photo extends _GraphQueryableInstance<IProfilePhotoType> {
     /**
      * Gets the image bytes as a blob (browser)
      */
@@ -31,3 +31,15 @@ export class _Photo extends _GraphQueryableInstance<IPhotoType> {
 }
 export interface IPhoto extends _Photo { }
 export const Photo = graphInvokableFactory<IPhoto>(_Photo);
+
+@defaultPath("photos")
+export class _Photos extends _GraphQueryableCollection<IProfilePhotoType[]> {
+    /**
+     * Gets the image reference by size. 48x48, 64x64, 96x96, 120x120, 240x240, 360x360, 432x432, 504x504, and 648x648.
+     */
+    public getBySize(size: string): IPhoto {
+        return Photo(this, `/${size}`);
+    }
+}
+export interface IPhotos extends _Photos { }
+export const Photos = graphInvokableFactory<IPhotos>(_Photos);

packages/graph/photos/users.ts

@@ -1,14 +1,17 @@
 import { addProp } from "@pnp/queryable";
 import { _User } from "../users/types.js";
-import { Photo, IPhoto } from "./types.js";
+import { Photo, IPhoto, IPhotos, Photos } from "./types.js";
 
 declare module "../users/types" {
     interface _User {
         readonly photo: IPhoto;
+        readonly photos: IPhotos;
     }
     interface IUser {
         readonly photo: IPhoto;
+        readonly photos: IPhotos;
     }
 }
 
 addProp(_User, "photo", Photo);
+addProp(_User, "photos", Photos);