removing property interfaces with wrong property names

patrick-rodgers · patrick-rodgers · commit fa08126ea3f2 · 2017-01-05T09:46:48.000-05:00
diff --git a/src/sharepoint/index.ts b/src/sharepoint/index.ts
@@ -88,8 +88,7 @@ export {
 } from "./sitegroups";
 
 export {
-    UserUpdateResult,
-    UserProps
+    UserUpdateResult
 } from "./siteusers";
 
 export {
diff --git a/src/sharepoint/sitegroups.ts b/src/sharepoint/sitegroups.ts
@@ -1,45 +1,7 @@
 import { Queryable, QueryableInstance, QueryableCollection } from "./queryable";
-import { SiteUser, SiteUsers } from "./siteusers";
+import { SiteUsers } from "./siteusers";
 import { Util } from "../utils/util";
-
-/**
- * Properties that provide a getter, but no setter.
- *
- */
-export interface GroupReadOnlyProperties {
-    canCurrentUserEditMembership?: boolean;
-    canCurrentUserManageGroup?: boolean;
-    canCurrentUserViewMembership?: boolean;
-    id?: number;
-    isHiddenInUI?: boolean;
-    loginName?: string;
-    ownerTitle?: string;
-    principalType?: PrincipalType;
-    users?: SiteUsers;
-}
-
-/**
- * Properties that provide both a getter, and a setter.
- *
- */
-export interface GroupWriteableProperties {
-    allowMembersEditMembership?: boolean;
-    allowRequestToJoinLeave?: boolean;
-    autoAcceptRequestToJoinLeave?: boolean;
-    description?: string;
-    onlyAllowMembersViewMembership?: boolean;
-    owner?: number | SiteUser | SiteGroup;
-    requestToJoinLeaveEmailSetting?: string;
-    title?: string;
-}
-
-/**
- * Group Properties
- *
- */
-export interface GroupProperties extends GroupReadOnlyProperties, GroupWriteableProperties {
-    __metadata: { id?: string, url?: string, type?: string };
-}
+import { TypedHash } from "../collections/collections";
 
 /**
  * Principal Type enum
@@ -93,7 +55,7 @@ export class SiteGroups extends QueryableCollection {
      *
      * @param props The properties to be updated
      */
-    public add(properties: GroupWriteableProperties): Promise<GroupAddResult> {
+    public add(properties: TypedHash<any>): Promise<GroupAddResult> {
         let postBody = JSON.stringify(Util.extend(
             { "__metadata": { "type": "SP.Group" } }, properties));
 
@@ -175,7 +137,7 @@ export class SiteGroup extends QueryableInstance {
     * @param properties A GroupWriteableProperties object of property names and values to update for the user
     */
     /* tslint:disable no-string-literal */
-    public update(properties: GroupWriteableProperties): Promise<GroupUpdateResult> {
+    public update(properties: TypedHash<any>): Promise<GroupUpdateResult> {
 
         let postBody = Util.extend({ "__metadata": { "type": "SP.Group" } }, properties);
 
@@ -188,8 +150,8 @@ export class SiteGroup extends QueryableInstance {
 
             let retGroup: SiteGroup = this;
 
-            if (properties.hasOwnProperty("title")) {
-                retGroup = this.getParent(SiteGroup, this.parentUrl, `getByName('${properties.title}')`);
+            if (properties.hasOwnProperty("Title")) {
+                retGroup = this.getParent(SiteGroup, this.parentUrl, `getByName('${properties["Title"]}')`);
             }
 
             return {
@@ -203,5 +165,5 @@ export class SiteGroup extends QueryableInstance {
 
 export interface SiteGroupAddResult {
     group: SiteGroup;
-    data: GroupProperties;
+    data: any;
 }
diff --git a/src/sharepoint/siteusers.ts b/src/sharepoint/siteusers.ts
@@ -1,29 +1,7 @@
 import { Queryable, QueryableInstance, QueryableCollection } from "./queryable";
 import { SiteGroups } from "./sitegroups";
 import { Util } from "../utils/util";
-import { UserIdInfo, PrincipalType } from "./types";
-
-/**
- * Properties that provide a getter, but no setter.
- *
- */
-export interface UserReadOnlyProperties {
-    id?: number;
-    isHiddenInUI?: boolean;
-    loginName?: string;
-    principalType?: PrincipalType;
-    userIdInfo?: UserIdInfo;
-}
-
-/**
- * Properties that provide both a getter, and a setter.
- *
- */
-export interface UserWriteableProperties {
-    isSiteAdmin?: string;
-    email?: string;
-    title?: string;
-}
+import { TypedHash } from "../collections/collections";
 
 /**
  * Properties that provide both a getter, and a setter.
@@ -34,11 +12,6 @@ export interface UserUpdateResult {
     data: any;
 }
 
-export interface UserProps extends UserReadOnlyProperties, UserWriteableProperties {
-    __metadata: { id?: string, url?: string, type?: string };
-}
-
-
 /**
  * Describes a collection of all site collection users
  *
@@ -89,7 +62,7 @@ export class SiteUsers extends QueryableCollection {
      *
      * @param id The id of the user
      */
-    public removeById(id: number | Queryable): Promise<void> {
+    public removeById(id: number | Queryable): Promise<any> {
         let o = new SiteUsers(this, `removeById(${id})`);
         return o.post();
     }
@@ -148,7 +121,7 @@ export class SiteUser extends QueryableInstance {
     *
     * @param properties A plain object of property names and values to update for the user
     */
-    public update(properties: UserWriteableProperties): Promise<UserUpdateResult> {
+    public update(properties: TypedHash<any>): Promise<UserUpdateResult> {
 
         let postBody = Util.extend({ "__metadata": { "type": "SP.User" } }, properties);
 
