confluence.js 1.3.0 → 1.3.1

package/src/api/contentVersions.ts

@@ -41,7 +41,7 @@ export class ContentVersions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentVersions' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -80,7 +80,7 @@ export class ContentVersions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'restoreContentVersion' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -112,7 +112,7 @@ export class ContentVersions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentVersion' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -141,6 +141,6 @@ export class ContentVersions {
       method: 'DELETE',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'deleteContentVersion' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/contentWatches.ts

@@ -52,7 +52,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getWatchesForPage' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -102,7 +102,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getWatchesForSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /** Returns a list of watchers of a space */
@@ -128,7 +128,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getWatchersForSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -171,7 +171,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentWatchStatus' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -212,7 +212,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addContentWatcher' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -255,7 +255,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeContentWatcher' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -295,7 +295,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'isWatchingLabel' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -336,7 +336,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addLabelWatcher' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -373,7 +373,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeLabelWatcher' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -413,7 +413,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'isWatchingSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -454,7 +454,7 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addSpaceWatcher' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -488,6 +488,6 @@ export class ContentWatches {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeSpaceWatch' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/dynamicModules.ts

@@ -24,7 +24,7 @@ export class DynamicModules {
       method: 'GET',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getModules' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -53,7 +53,7 @@ export class DynamicModules {
       method: 'POST',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'registerModules' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -77,6 +77,6 @@ export class DynamicModules {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeModules' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/experimental.ts

@@ -37,7 +37,7 @@ export class Experimental {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getLabelsForSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -76,7 +76,7 @@ export class Experimental {
       method: 'POST',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addLabelsToSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   async deleteLabelFromSpace<T = void>(
@@ -97,7 +97,7 @@ export class Experimental {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'deleteLabelFromSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /** Get the total number of views a piece of content has. */
@@ -113,7 +113,7 @@ export class Experimental {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getViews' });
+    return this.client.sendRequest(config, callback);
   }
 
   /** Get the total number of distinct viewers a piece of content has. */
@@ -132,6 +132,6 @@ export class Experimental {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getViewers' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/group.ts

@@ -38,7 +38,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getGroups' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -65,7 +65,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createGroup' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -89,7 +89,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeGroup' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -124,7 +124,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getGroupByQueryParam' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -156,7 +156,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getGroupByGroupId' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -180,7 +180,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeGroupById' });
+    return this.client.sendRequest(config, callback);
   }
 
   /** @deprecated Will be removed in the next major version. Use `getGroupByName` instead. */
@@ -190,6 +190,7 @@ export class Group {
   async getGroup<T = Models.Group>(parameters: Parameters.GetGroup, callback?: Callback<T>): Promise<void | T> {
     return this.getGroupByName(parameters, callback!);
   }
+
   /**
    * Returns a user group for a given group name.
    *
@@ -217,7 +218,7 @@ export class Group {
       method: 'GET',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getGroupByName' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -254,7 +255,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getMembersByQueryParam' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -291,7 +292,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getGroupMembers' });
+    return this.client.sendRequest(config, callback);
   }
 
   /** @deprecated Will be removed in the next major version. Use `searchGroups` instead. */
@@ -332,7 +333,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'searchGroups' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -368,7 +369,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addUserToGroupByGroupId' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -402,7 +403,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeMemberFromGroupByGroupId' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -442,7 +443,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getGroupMembersByGroupId' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -469,7 +470,7 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addUserToGroup' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -500,6 +501,6 @@ export class Group {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeMemberFromGroup' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/inlineTasks.ts

@@ -49,7 +49,7 @@ export class InlineTasks {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'searchTasks' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -72,7 +72,7 @@ export class InlineTasks {
       method: 'GET',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getTaskById' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -101,6 +101,6 @@ export class InlineTasks {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'updateTaskById' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/labelInfo.ts

@@ -42,6 +42,6 @@ export class LabelInfo {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getAllLabelContent' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/longRunningTask.ts

@@ -39,7 +39,7 @@ export class LongRunningTask {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getTasks' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -70,6 +70,6 @@ export class LongRunningTask {
       method: 'GET',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getTask' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/relation.ts

@@ -53,7 +53,7 @@ export class Relation {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'findTargetFromSource' });
+    return this.client.sendRequest(config, callback);
   }
 
   /** @deprecated Will be removed in the next major version. Use `getRelationship` instead. */
@@ -113,7 +113,7 @@ export class Relation {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getRelationship' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -159,7 +159,7 @@ export class Relation {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createRelationship' });
+    return this.client.sendRequest(config, callback);
   }
 
   /** @deprecated Will be removed in the next major version. Use `deleteRelationship` instead. */
@@ -201,7 +201,7 @@ export class Relation {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'deleteRelationship' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -252,6 +252,6 @@ export class Relation {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'findSourcesForTarget' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/search.ts

@@ -74,7 +74,7 @@ export class Search {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'searchByCQL' });
+    return this.client.sendRequest(config, callback);
   }
 
   /** @deprecated Will be removed in the next major version. Use `searchUser` instead. */
@@ -93,12 +93,13 @@ export class Search {
   ): Promise<void | T> {
     return this.searchUser(parameters, callback!);
   }
+
   /**
    * Searches for users using user-specific queries from the [Confluence Query Language
    * (CQL)](https://developer.atlassian.com/cloud/confluence/advanced-searching-using-cql/).
    *
    * Note that some user fields may be set to null depending on the user's privacy settings. These are: email,
-   * profilePicture, and displayName.
+   * profilePicture, displayName, and timeZone.
    */
   async searchUser<T = Models.SearchPageResponseSearchResult>(
     parameters: Parameters.SearchUser,
@@ -109,7 +110,7 @@ export class Search {
    * (CQL)](https://developer.atlassian.com/cloud/confluence/advanced-searching-using-cql/).
    *
    * Note that some user fields may be set to null depending on the user's privacy settings. These are: email,
-   * profilePicture, and displayName.
+   * profilePicture, displayName, and timeZone.
    */
   async searchUser<T = Models.SearchPageResponseSearchResult>(
     parameters: Parameters.SearchUser,
@@ -126,9 +127,10 @@ export class Search {
         cql: parameters.cql,
         start: parameters.start,
         limit: parameters.limit,
+        expand: parameters.expand,
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'searchUser' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/settings.ts

@@ -43,7 +43,7 @@ export class Settings {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getLookAndFeelSettings' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -81,7 +81,7 @@ export class Settings {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'updateLookAndFeel' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -133,7 +133,7 @@ export class Settings {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'updateLookAndFeelSettings' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -170,7 +170,7 @@ export class Settings {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'resetLookAndFeelSettings' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -205,7 +205,7 @@ export class Settings {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'setLookAndFeelSettings' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -228,6 +228,6 @@ export class Settings {
       method: 'GET',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getSystemInfo' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/space.ts

@@ -31,7 +31,7 @@ export class Space {
       url: '/api/space',
       method: 'GET',
       params: {
-        spaceKey: parameters?.spaceKey?.map((key, index) => index ? `&spaceKey=${key}` : key),
+        spaceKey: () => parameters?.spaceKey?.map((key) => `spaceKey=${key}`).join('&'),
         spaceId: parameters?.spaceId,
         type: parameters?.type,
         status: parameters?.status,
@@ -43,7 +43,7 @@ export class Space {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getSpaces' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -73,7 +73,7 @@ export class Space {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -110,7 +110,7 @@ export class Space {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createPrivateSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -131,7 +131,7 @@ export class Space {
       method: 'GET',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -165,7 +165,7 @@ export class Space {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'updateSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -193,7 +193,7 @@ export class Space {
       method: 'DELETE',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'deleteSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -232,7 +232,7 @@ export class Space {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentForSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -269,6 +269,6 @@ export class Space {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentByTypeForSpace' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/spacePermissions.ts

@@ -61,7 +61,7 @@ export class SpacePermissions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addPermissionToSpace' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -103,7 +103,7 @@ export class SpacePermissions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addCustomContentPermissions' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -130,6 +130,6 @@ export class SpacePermissions {
       method: 'DELETE',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removePermission' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/spaceProperties.ts

@@ -39,7 +39,7 @@ export class SpaceProperties {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getSpaceProperties' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -74,7 +74,7 @@ export class SpaceProperties {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createSpaceProperty' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -107,7 +107,7 @@ export class SpaceProperties {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getSpaceProperty' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -142,7 +142,7 @@ export class SpaceProperties {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createSpacePropertyForKey' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -176,7 +176,7 @@ export class SpaceProperties {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'updateSpaceProperty' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -200,6 +200,6 @@ export class SpaceProperties {
       method: 'DELETE',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'deleteSpaceProperty' });
+    return this.client.sendRequest(config, callback);
   }
 }