Adding currentUser property to web, associated tests, updating tests to fix getAs signature update

patrick-rodgers · patrick-rodgers · commit 51b9baa74a3f · 2016-12-19T13:09:41.000-05:00
diff --git a/src/sharepoint/siteusers.ts b/src/sharepoint/siteusers.ts
@@ -177,3 +177,13 @@ export class SiteUser extends QueryableInstance {
         });
     }
 }
+
+/**
+ * Represents the current user
+ */
+export class CurrentUser extends QueryableInstance {
+
+    constructor(baseUrl: string | Queryable, path = "currentuser") {
+        super(baseUrl, path);
+    }
+}
diff --git a/src/sharepoint/webs.ts b/src/sharepoint/webs.ts
@@ -12,7 +12,7 @@ import { TypedHash } from "../collections/collections";
 import { Util } from "../utils/util";
 import * as Types from "./types";
 import { List } from "./lists";
-import { SiteUsers, SiteUser } from "./siteusers";
+import { SiteUsers, SiteUser, CurrentUser } from "./siteusers";
 import { UserCustomActions } from "./usercustomactions";
 import { extractOdataId, ODataBatch } from "./odata";
 
@@ -139,6 +139,13 @@ export class Web extends QueryableSecurable {
         return new SiteGroups(this);
     }
 
+    /**
+     * Gets the current user
+     */
+    public get currentUser(): CurrentUser {
+        return new CurrentUser(this);
+    }
+
     /**
      * Get the folders in this web
      *
diff --git a/tests/sharepoint/lists.test.ts b/tests/sharepoint/lists.test.ts
@@ -57,7 +57,7 @@ describe("Lists", () => {
         describe("getById", () => {
             it("Should get a list by id with the expected title", function () {
                 this.timeout(15000);
-                return expect(pnp.sp.web.lists.getByTitle("Documents").select("ID").getAs<any, { Id: string }>().then((list) => {
+                return expect(pnp.sp.web.lists.getByTitle("Documents").select("ID").getAs<{ Id: string }>().then((list) => {
                     return pnp.sp.web.lists.getById(list.Id).select("Title").get();
                 })).to.eventually.have.property("Title", "Documents");
             });
diff --git a/tests/sharepoint/web.test.ts b/tests/sharepoint/web.test.ts
@@ -113,6 +113,12 @@ describe("Web", () => {
         });
     });
 
+    describe("currentUser", () => {
+        it("should return _api/web/currentuser", () => {
+            expect(web.currentUser.toUrl()).to.match(toMatchEndRegex("_api/web/currentuser"));
+        });
+    });
+
     if (testSettings.enableWebTests) {
 
         describe("webs", () => {
@@ -172,7 +178,7 @@ describe("Web", () => {
 
         describe("getFolderByServerRelativeUrl", () => {
             it("should get a folder by the server relative url", function () {
-                return expect(pnp.sp.web.select("ServerRelativeUrl").getAs<any, { ServerRelativeUrl: string }>().then(w => {
+                return expect(pnp.sp.web.select("ServerRelativeUrl").getAs<{ ServerRelativeUrl: string }>().then(w => {
                     let url = Util.combinePaths(w.ServerRelativeUrl, "SitePages");
                     return pnp.sp.web.getFolderByServerRelativeUrl(url);
                 })).to.eventually.be.fulfilled;
@@ -181,7 +187,7 @@ describe("Web", () => {
 
         describe("getFileByServerRelativeUrl", () => {
             it("should get a file by the server relative url", function () {
-                return expect(pnp.sp.web.select("ServerRelativeUrl").getAs<any, { ServerRelativeUrl: string }>().then(w => {
+                return expect(pnp.sp.web.select("ServerRelativeUrl").getAs<{ ServerRelativeUrl: string }>().then(w => {
                     let url = Util.combinePaths(w.ServerRelativeUrl, "SitePages", "Home.aspx");
                     return pnp.sp.web.getFileByServerRelativeUrl(url);
                 })).to.eventually.be.fulfilled;
@@ -190,12 +196,12 @@ describe("Web", () => {
 
         describe("update", () => {
             it("should update the title of the web", function () {
-                return expect(pnp.sp.web.select("Title").getAs<any, { Title: string }>().then(w => {
+                return expect(pnp.sp.web.select("Title").getAs<{ Title: string }>().then(w => {
 
                     let newTitle = w.Title + " updated";
                     pnp.sp.web.update({ Title: newTitle }).then(() => {
 
-                        pnp.sp.web.select("Title").getAs<any, { Title: string }>().then(w2 => {
+                        pnp.sp.web.select("Title").getAs<{ Title: string }>().then(w2 => {
                             if (w2.Title !== newTitle) {
                                 throw new Error("Update web failed");
                             }
@@ -243,7 +249,7 @@ describe("Web", () => {
 
         describe("availableWebTemplates", () => {
             it("should check for all the available web templates", function () {
-                return expect(pnp.sp.web.availableWebTemplates().getAs<any, any[]>()).to.eventually.be.not.empty;
+                return expect(pnp.sp.web.availableWebTemplates().getAs<any[]>()).to.eventually.be.not.empty;
             });
         });
 
@@ -276,5 +282,11 @@ describe("Web", () => {
                 return expect(pnp.sp.web.mapToIcon("test.docx")).to.eventually.be.fulfilled;
             });
         });
+
+        describe("currentUser", () => {
+            it("should return _api/web/currentuser", () => {
+                return expect(pnp.sp.web.currentUser.get()).to.eventually.be.fulfilled;
+            });
+        });
     }
 });

Original file line number	Diff line number	Diff line change
`@@ -177,3 +177,13 @@ export class SiteUser extends QueryableInstance {`
`177`	`177`	`});`
`178`	`178`	`}`
`179`	`179`	`}`
	`180`	`+`
	`181`	`+/**`
	`182`	`+ * Represents the current user`
	`183`	`+ */`
	`184`	`+export class CurrentUser extends QueryableInstance {`
	`185`	`+`
	`186`	`+ constructor(baseUrl: string \| Queryable, path = "currentuser") {`
	`187`	`+ super(baseUrl, path);`
	`188`	`+ }`
	`189`	`+}`