Merge pull request pnp#2260 from patrick-rodgers/version-3

Version 3
smolattack · May 10, 2022 · 2e2563b · 2e2563b
2 parents 1f9a6e7 + 257c3ca
commit 2e2563b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/docs/sp/site-users.md b/docs/sp/site-users.md
@@ -40,7 +40,7 @@ import "@pnp/sp/site-users/web";
 const sp = spfi(...);
 
 const id = 6;
-user = await sp.web.getUserById(id);
+user = await sp.web.getUserById(id)();
 ```
 
 ### Ensure user
@@ -103,13 +103,13 @@ import "@pnp/sp/site-users/web";
 const sp = spfi(...);
 
 // get user object by id
-const user = await sp.web.siteUsers.getById(6);
+const user = await sp.web.siteUsers.getById(6)();
 
 //get user object by Email
-const user = await sp.web.siteUsers.getByEmail("[email protected]");
+const user = await sp.web.siteUsers.getByEmail("[email protected]")();
 
 //get user object by LoginName
-const user = await sp.web.siteUsers.getByLoginName("userLoginName");
+const user = await sp.web.siteUsers.getByLoginName("userLoginName")();
 ```
 
 ### Update user

diff --git a/packages/graph/decorators.ts b/packages/graph/decorators.ts
@@ -149,7 +149,7 @@ export function getById<R>(factory: (...args: any[]) => R) {
 
         return class extends target {
             public getById(this: IGraphQueryable, id: string): R {
-                return factory(this, id);
+                return factory(this, encodeURIComponent(id));
             }
         };
     };

diff --git a/packages/sp/sputilities/types.ts b/packages/sp/sputilities/types.ts
@@ -17,6 +17,17 @@ export class _Utilities extends _SPQueryable implements IUtilities {
     }
 
     public sendEmail(properties: IEmailProperties): Promise<void> {
+
+        if (properties.AdditionalHeaders) {
+
+            // we have to remap the additional headers into this format #2253
+            properties.AdditionalHeaders = <any>Reflect.ownKeys(properties.AdditionalHeaders).map(key => ({
+                Key: key,
+                Value: Reflect.get(properties.AdditionalHeaders, key),
+                ValueType: "Edm.String",
+            }));
+        }
+
         return UtilitiesCloneFactory(this, "SendEmail").excute<void>({ properties });
     }