From 78068387167a4775705c792cf35563a6ed2fd057 Mon Sep 17 00:00:00 2001
From: Pedro Alves <pedroalves0@gmail.com>
Date: Wed, 15 Jan 2025 15:58:37 +0100
Subject: [PATCH 1/4] feat: [BREAKING] migrate from REST API to Sync API

---
 src/TodoistApi.ts             | 184 ++++++++++++++++++++++------------
 src/consts/endpoints.ts       |  16 +--
 src/restClient.ts             |   4 +-
 src/testUtils/testDefaults.ts |  16 ++-
 src/types/entities.ts         |  67 ++++++-------
 src/types/requests.ts         |  55 ++++++++--
 src/utils/taskConverters.ts   |  22 ++--
 7 files changed, 222 insertions(+), 142 deletions(-)

diff --git a/src/TodoistApi.ts b/src/TodoistApi.ts
index d48977a..a2215a9 100644
--- a/src/TodoistApi.ts
+++ b/src/TodoistApi.ts
@@ -26,11 +26,14 @@ import {
     GetSharedLabelsArgs,
     RenameSharedLabelArgs,
     RemoveSharedLabelArgs,
+    GetProjectsArgs,
+    GetProjectCollaboratorsArgs,
+    GetSections,
+    GetLabelsArgs,
 } from './types/requests'
 import { request, isSuccess } from './restClient'
 import { getTaskFromQuickAddResponse } from './utils/taskConverters'
 import {
-    getRestBaseUri,
     getSyncBaseUri,
     ENDPOINT_REST_TASKS,
     ENDPOINT_REST_PROJECTS,
@@ -73,19 +76,16 @@ export class TodoistApi {
 
     constructor(authToken: string, baseUrl?: string) {
         this.authToken = authToken
-
-        this.restApiBase = getRestBaseUri(baseUrl)
         this.syncApiBase = getSyncBaseUri(baseUrl)
     }
 
-    private restApiBase: string
     private syncApiBase: string
 
     async getTask(id: string): Promise<Task> {
         String.check(id)
         const response = await request<Task>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_TASKS, id),
             this.authToken,
         )
@@ -93,22 +93,27 @@ export class TodoistApi {
         return validateTask(response.data)
     }
 
-    async getTasks(args?: GetTasksArgs): Promise<Task[]> {
-        const response = await request<Task[]>(
-            'GET',
-            this.restApiBase,
-            ENDPOINT_REST_TASKS,
-            this.authToken,
-            args,
-        )
+    async getTasks(args: GetTasksArgs = {}): Promise<{
+        results: Task[]
+        nextCursor: string | null
+    }> {
+        const {
+            data: { results, nextCursor },
+        } = await request<{
+            results: Task[]
+            nextCursor: string | null
+        }>('GET', this.syncApiBase, ENDPOINT_REST_TASKS, this.authToken, args)
 
-        return validateTaskArray(response.data)
+        return {
+            results: validateTaskArray(results),
+            nextCursor,
+        }
     }
 
     async addTask(args: AddTaskArgs, requestId?: string): Promise<Task> {
         const response = await request<Task>(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_TASKS,
             this.authToken,
             args,
@@ -136,7 +141,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_TASKS, id),
             this.authToken,
             args,
@@ -149,7 +154,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_TASKS, id, ENDPOINT_REST_TASK_CLOSE),
             this.authToken,
             undefined,
@@ -162,7 +167,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_TASKS, id, ENDPOINT_REST_TASK_REOPEN),
             this.authToken,
             undefined,
@@ -175,7 +180,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'DELETE',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_TASKS, id),
             this.authToken,
             undefined,
@@ -188,7 +193,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request<Project>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_PROJECTS, id),
             this.authToken,
         )
@@ -196,21 +201,29 @@ export class TodoistApi {
         return validateProject(response.data)
     }
 
-    async getProjects(): Promise<Project[]> {
-        const response = await request<Project[]>(
+    async getProjects(
+        args: GetProjectsArgs = {},
+    ): Promise<{ results: Project[]; nextCursor: string | null }> {
+        const {
+            data: { results, nextCursor },
+        } = await request<{ results: Project[]; nextCursor: string | null }>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_PROJECTS,
             this.authToken,
+            args,
         )
 
-        return validateProjectArray(response.data)
+        return {
+            results: validateProjectArray(results),
+            nextCursor,
+        }
     }
 
     async addProject(args: AddProjectArgs, requestId?: string): Promise<Project> {
         const response = await request<Project>(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_PROJECTS,
             this.authToken,
             args,
@@ -224,7 +237,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_PROJECTS, id),
             this.authToken,
             args,
@@ -237,7 +250,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'DELETE',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_PROJECTS, id),
             this.authToken,
             undefined,
@@ -246,35 +259,51 @@ export class TodoistApi {
         return isSuccess(response)
     }
 
-    async getProjectCollaborators(projectId: string): Promise<User[]> {
+    async getProjectCollaborators(
+        projectId: string,
+        args: GetProjectCollaboratorsArgs = {},
+    ): Promise<{ results: User[]; nextCursor: string | null }> {
         String.check(projectId)
-        const response = await request<User[]>(
+        const {
+            data: { results, nextCursor },
+        } = await request<{ results: User[]; nextCursor: string | null }>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_PROJECTS, projectId, ENDPOINT_REST_PROJECT_COLLABORATORS),
             this.authToken,
+            args,
         )
 
-        return validateUserArray(response.data)
+        return {
+            results: validateUserArray(results),
+            nextCursor,
+        }
     }
 
-    async getSections(projectId?: string): Promise<Section[]> {
-        const response = await request<Section[]>(
+    async getSections(
+        args: GetSections,
+    ): Promise<{ results: Section[]; nextCursor: string | null }> {
+        const {
+            data: { results, nextCursor },
+        } = await request<{ results: Section[]; nextCursor: string | null }>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_SECTIONS,
             this.authToken,
-            projectId ? { projectId } : undefined,
+            args,
         )
 
-        return validateSectionArray(response.data)
+        return {
+            results: validateSectionArray(results),
+            nextCursor,
+        }
     }
 
     async getSection(id: string): Promise<Section> {
         String.check(id)
         const response = await request<Section>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_SECTIONS, id),
             this.authToken,
         )
@@ -285,7 +314,7 @@ export class TodoistApi {
     async addSection(args: AddSectionArgs, requestId?: string): Promise<Section> {
         const response = await request<Section>(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_SECTIONS,
             this.authToken,
             args,
@@ -299,7 +328,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_SECTIONS, id),
             this.authToken,
             args,
@@ -312,7 +341,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'DELETE',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_SECTIONS, id),
             this.authToken,
             undefined,
@@ -328,7 +357,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request<Label>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_LABELS, id),
             this.authToken,
         )
@@ -339,15 +368,23 @@ export class TodoistApi {
     /**
      * Fetches the personal labels
      */
-    async getLabels(): Promise<Label[]> {
-        const response = await request<Label[]>(
+    async getLabels(
+        args: GetLabelsArgs = {},
+    ): Promise<{ results: Label[]; nextCursor: string | null }> {
+        const {
+            data: { results, nextCursor: nextCursor },
+        } = await request<{ results: Label[]; nextCursor: string | null }>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_LABELS,
             this.authToken,
+            args,
         )
 
-        return validateLabelArray(response.data)
+        return {
+            results: validateLabelArray(results),
+            nextCursor,
+        }
     }
 
     /**
@@ -356,7 +393,7 @@ export class TodoistApi {
     async addLabel(args: AddLabelArgs, requestId?: string): Promise<Label> {
         const response = await request<Label>(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_LABELS,
             this.authToken,
             args,
@@ -373,7 +410,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_LABELS, id),
             this.authToken,
             args,
@@ -389,7 +426,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'DELETE',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_LABELS, id),
             this.authToken,
             undefined,
@@ -398,55 +435,70 @@ export class TodoistApi {
         return isSuccess(response)
     }
 
-    async getSharedLabels(args?: GetSharedLabelsArgs): Promise<string[]> {
-        const response = await request<string[]>(
+    async getSharedLabels(
+        args?: GetSharedLabelsArgs,
+    ): Promise<{ results: string[]; nextCursor: string | null }> {
+        const {
+            data: { results, nextCursor: nextCursor },
+        } = await request<{ results: string[]; nextCursor: string | null }>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_LABELS_SHARED,
             this.authToken,
             args,
         )
 
-        return response.data
+        return { results, nextCursor }
     }
 
-    async renameSharedLabel(args: RenameSharedLabelArgs): Promise<void> {
-        await request<void>(
+    async renameSharedLabel(args: RenameSharedLabelArgs): Promise<boolean> {
+        const response = await request<void>(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_LABELS_SHARED_RENAME,
             this.authToken,
             args,
         )
+
+        return isSuccess(response)
     }
 
-    async removeSharedLabel(args: RemoveSharedLabelArgs): Promise<void> {
-        await request<void>(
+    async removeSharedLabel(args: RemoveSharedLabelArgs): Promise<boolean> {
+        const response = await request<void>(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_LABELS_SHARED_REMOVE,
             this.authToken,
             args,
         )
+
+        return isSuccess(response)
     }
 
-    async getComments(args: GetTaskCommentsArgs | GetProjectCommentsArgs): Promise<Comment[]> {
-        const response = await request<Comment[]>(
+    async getComments(
+        args: GetTaskCommentsArgs | GetProjectCommentsArgs,
+    ): Promise<{ results: Comment[]; nextCursor: string | null }> {
+        const {
+            data: { results, nextCursor },
+        } = await request<{ results: Comment[]; nextCursor: string | null }>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_COMMENTS,
             this.authToken,
             args,
         )
 
-        return validateCommentArray(response.data)
+        return {
+            results: validateCommentArray(results),
+            nextCursor,
+        }
     }
 
     async getComment(id: string): Promise<Comment> {
         String.check(id)
         const response = await request<Comment>(
             'GET',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_COMMENTS, id),
             this.authToken,
         )
@@ -457,7 +509,7 @@ export class TodoistApi {
     async addComment(args: AddCommentArgs, requestId?: string): Promise<Comment> {
         const response = await request<Comment>(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             ENDPOINT_REST_COMMENTS,
             this.authToken,
             args,
@@ -471,7 +523,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request<boolean>(
             'POST',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_COMMENTS, id),
             this.authToken,
             args,
@@ -484,7 +536,7 @@ export class TodoistApi {
         String.check(id)
         const response = await request(
             'DELETE',
-            this.restApiBase,
+            this.syncApiBase,
             generatePath(ENDPOINT_REST_COMMENTS, id),
             this.authToken,
             undefined,
diff --git a/src/consts/endpoints.ts b/src/consts/endpoints.ts
index 57d9d77..a038980 100644
--- a/src/consts/endpoints.ts
+++ b/src/consts/endpoints.ts
@@ -1,15 +1,15 @@
 const BASE_URI = 'https://api.todoist.com'
-const API_REST_BASE_URI = '/rest/v2/'
-export const API_SYNC_BASE_URI = '/sync/v9/'
 const TODOIST_URI = 'https://todoist.com'
-const API_AUTHORIZATION_BASE_URI = '/oauth/'
 
-export function getRestBaseUri(domainBase: string = BASE_URI): string {
-    return new URL(API_REST_BASE_URI, domainBase).toString()
-}
+// The API version is not configurable, to ensure
+// compatibility between the API and the client.
+export const API_VERSION = 'v9.208'
+
+export const API_BASE_URI = `/api/${API_VERSION}/`
+const API_AUTHORIZATION_BASE_URI = '/oauth/'
 
 export function getSyncBaseUri(domainBase: string = BASE_URI): string {
-    return new URL(API_SYNC_BASE_URI, domainBase).toString()
+    return new URL(API_BASE_URI, domainBase).toString()
 }
 
 export function getAuthBaseUri(domainBase: string = TODOIST_URI): string {
@@ -28,7 +28,7 @@ export const ENDPOINT_REST_TASK_CLOSE = 'close'
 export const ENDPOINT_REST_TASK_REOPEN = 'reopen'
 export const ENDPOINT_REST_PROJECT_COLLABORATORS = 'collaborators'
 
-export const ENDPOINT_SYNC_QUICK_ADD = 'quick/add'
+export const ENDPOINT_SYNC_QUICK_ADD = 'quick'
 
 export const ENDPOINT_AUTHORIZATION = 'authorize'
 export const ENDPOINT_GET_TOKEN = 'access_token'
diff --git a/src/restClient.ts b/src/restClient.ts
index e8928f1..55c070b 100644
--- a/src/restClient.ts
+++ b/src/restClient.ts
@@ -5,7 +5,7 @@ import { TodoistRequestError } from './types/errors'
 import { HttpMethod } from './types/http'
 import { v4 as uuidv4 } from 'uuid'
 import axiosRetry from 'axios-retry'
-import { API_SYNC_BASE_URI } from './consts/endpoints'
+import { API_BASE_URI } from './consts/endpoints'
 
 export function paramsSerializer(params: Record<string, unknown>) {
     const qs = new URLSearchParams()
@@ -98,7 +98,7 @@ export async function request<T>(
 
     try {
         // Sync api don't allow a request id in the CORS
-        if (httpMethod === 'POST' && !requestId && !baseUri.includes(API_SYNC_BASE_URI)) {
+        if (httpMethod === 'POST' && !requestId && !baseUri.includes(API_BASE_URI)) {
             requestId = uuidv4()
         }
 
diff --git a/src/testUtils/testDefaults.ts b/src/testUtils/testDefaults.ts
index bb26b90..fc51978 100644
--- a/src/testUtils/testDefaults.ts
+++ b/src/testUtils/testDefaults.ts
@@ -8,6 +8,7 @@ import {
     Comment,
     Attachment,
     Duration,
+    Deadline,
 } from '../types'
 
 const DEFAULT_TASK_ID = '1234'
@@ -43,6 +44,8 @@ export const DEFAULT_DUE_DATE = {
     isRecurring: false,
     string: 'a date string',
     date: DEFAULT_DATE,
+    lang: 'en',
+    timezone: null,
 }
 
 export const DEFAULT_DURATION: Duration = {
@@ -50,9 +53,9 @@ export const DEFAULT_DURATION: Duration = {
     unit: 'minute',
 }
 
-export const INVALID_DUE_DATE = {
-    ...DEFAULT_DUE_DATE,
-    isRecurring: 'false',
+export const DEFAULT_DEADLINE: Deadline = {
+    date: '2020-09-08',
+    lang: 'en',
 }
 
 export const DEFAULT_QUICK_ADD_RESPONSE: QuickAddTaskResponse = {
@@ -77,6 +80,8 @@ export const DEFAULT_QUICK_ADD_RESPONSE: QuickAddTaskResponse = {
         lang: 'en',
         isRecurring: false,
     },
+    deadline: DEFAULT_DEADLINE,
+    assignedByUid: DEFAULT_CREATOR,
 }
 
 export const DEFAULT_TASK: Task = {
@@ -94,14 +99,16 @@ export const DEFAULT_TASK: Task = {
     createdAt: DEFAULT_DATE,
     url: 'https://todoist.com/showTask?id=1234',
     due: DEFAULT_DUE_DATE,
+    assignerId: DEFAULT_CREATOR,
     assigneeId: DEFAULT_ASSIGNEE,
     creatorId: DEFAULT_CREATOR,
     duration: DEFAULT_DURATION,
+    deadline: DEFAULT_DEADLINE,
 }
 
 export const INVALID_TASK = {
     ...DEFAULT_TASK,
-    due: INVALID_DUE_DATE,
+    due: '2020-01-31',
 }
 
 export const TASK_WITH_OPTIONALS_AS_NULL: Task = {
@@ -190,6 +197,7 @@ export const INVALID_ATTACHMENT = {
 export const DEFAULT_COMMENT: Comment = {
     id: DEFAULT_COMMENT_ID,
     content: DEFAULT_COMMENT_CONTENT,
+    taskId: null,
     projectId: DEFAULT_PROJECT_ID,
     attachment: DEFAULT_ATTACHMENT,
     postedAt: DEFAULT_DATE,
diff --git a/src/types/entities.ts b/src/types/entities.ts
index bf866e7..d769a50 100644
--- a/src/types/entities.ts
+++ b/src/types/entities.ts
@@ -48,54 +48,56 @@ export const Duration = Record({
 
 export type Duration = Static<typeof Duration>
 
+export const Deadline = Record({
+    date: String,
+    lang: String,
+})
+
+export type Deadline = Static<typeof Deadline>
+
 export const Task = Record({
     id: String,
+    assignerId: String.Or(Null),
+    assigneeId: String.Or(Null),
+    projectId: String,
+    sectionId: String.Or(Null),
+    parentId: String.Or(Null),
     order: Int,
     content: String,
     description: String,
-    projectId: String,
     isCompleted: Boolean,
     labels: Array(String),
     priority: Int,
     commentCount: Int,
+    creatorId: String,
     createdAt: String,
+    due: DueDate.Or(Null),
     url: String,
-    creatorId: String,
-}).And(
-    Partial({
-        due: DueDate.Or(Null),
-        duration: Duration.Or(Null),
-        assigneeId: String.Or(Null),
-        assignerId: String.Or(Null),
-        parentId: String.Or(Null),
-        sectionId: String.Or(Null),
-    }),
-)
+    duration: Duration.Or(Null),
+    deadline: Deadline.Or(Null),
+})
 
 export type Task = Static<typeof Task>
 
 export const Project = Record({
     id: String,
-    name: String,
+    parentId: String.Or(Null),
+    order: Int.Or(Null),
     color: String,
+    name: String,
     commentCount: Int,
     isShared: Boolean,
     isFavorite: Boolean,
-    url: String,
     isInboxProject: Boolean,
     isTeamInbox: Boolean,
-    order: Int,
+    url: String,
     viewStyle: String,
-}).And(
-    Partial({
-        parentId: String.Or(Null),
-    }),
-)
+})
 
 export type Project = Static<typeof Project>
 
 // This allows us to accept any string during validation, but provide intellisense for the two possible values in request args
-export type ProjectViewStyle = 'list' | 'board'
+export type ProjectViewStyle = 'list' | 'board' | 'calendar'
 
 export const Section = Record({
     id: String,
@@ -108,7 +110,7 @@ export type Section = Static<typeof Section>
 
 export const Label = Record({
     id: String,
-    order: Int,
+    order: Int.Or(Null),
     name: String,
     color: String,
     isFavorite: Boolean,
@@ -138,15 +140,12 @@ export type Attachment = Static<typeof Attachment>
 
 export const Comment = Record({
     id: String,
+    taskId: String.Or(Null),
+    projectId: String.Or(Null),
     content: String,
     postedAt: String,
-}).And(
-    Partial({
-        taskId: String.Or(Null),
-        projectId: String.Or(Null),
-        attachment: Attachment.Or(Null),
-    }),
-)
+    attachment: Attachment.Or(Null),
+})
 
 export type Comment = Static<typeof Comment>
 
@@ -195,16 +194,12 @@ export type QuickAddTaskResponse = {
     parentId: string | null
     childOrder: number // order
     labels: string[]
+    assignedByUid: string | null
     responsibleUid: string | null
     checked: boolean // completed
     addedAt: string // created
     addedByUid: string | null
     duration: Duration | null
-    due: {
-        date: string
-        timezone: string | null
-        isRecurring: boolean
-        string: string
-        lang: string
-    } | null
+    due: DueDate | null
+    deadline: Deadline | null
 }
diff --git a/src/types/requests.ts b/src/types/requests.ts
index d988184..c7f0e64 100644
--- a/src/types/requests.ts
+++ b/src/types/requests.ts
@@ -10,9 +10,11 @@ export type AddTaskArgs = {
     order?: number
     labels?: string[]
     priority?: number
-    dueLang?: string
     assigneeId?: string
     dueString?: string
+    dueLang?: string
+    deadlineLang?: string
+    deadlineDate?: string
 } & RequireOneOrNone<{
     dueDate?: string
     dueDatetime?: string
@@ -27,6 +29,7 @@ export type QuickAddTaskArgs = {
     note?: string
     reminder?: string
     autoReminder?: boolean
+    meta?: boolean
 }
 
 export type GetTasksArgs = {
@@ -36,6 +39,8 @@ export type GetTasksArgs = {
     filter?: string
     lang?: string
     ids?: string[]
+    cursor?: string | null
+    limit?: number
 }
 
 export type UpdateTaskArgs = {
@@ -43,9 +48,11 @@ export type UpdateTaskArgs = {
     description?: string
     labels?: string[]
     priority?: number
+    dueString?: string
     dueLang?: string | null
     assigneeId?: string | null
-    dueString?: string
+    deadlineDate?: string | null
+    deadlineLang?: string | null
 } & RequireOneOrNone<{
     dueDate?: string
     dueDatetime?: string
@@ -55,10 +62,15 @@ export type UpdateTaskArgs = {
         durationUnit?: Duration['unit']
     }>
 
+export type GetProjectsArgs = {
+    cursor?: string | null
+    limit?: number
+}
+
 export type AddProjectArgs = {
     name: string
     parentId?: string
-    color?: string
+    color?: string | number
     isFavorite?: boolean
     viewStyle?: ProjectViewStyle
 }
@@ -70,36 +82,57 @@ export type UpdateProjectArgs = {
     viewStyle?: ProjectViewStyle
 }
 
+export type GetProjectCollaboratorsArgs = {
+    cursor?: string | null
+    limit?: number
+}
+
+export type GetSections = {
+    projectId: string | null
+    cursor?: string | null
+    limit?: number
+}
+
 export type AddSectionArgs = {
     name: string
     projectId: string
-    order?: number
+    order?: number | null
 }
 
 export type UpdateSectionArgs = {
     name: string
 }
 
+export type GetLabelsArgs = {
+    cursor?: string | null
+    limit?: number
+}
+
 export type AddLabelArgs = {
     name: string
-    order?: number
-    color?: string
+    order?: number | null
+    color?: string | number
     isFavorite?: boolean
 }
 
 export type UpdateLabelArgs = {
     name?: string
-    order?: number
+    order?: number | null
     color?: string
     isFavorite?: boolean
 }
 
-export type GetTaskCommentsArgs = {
+export type GetCommentsBaseArgs = {
+    cursor?: string | null
+    limit?: number
+}
+
+export type GetTaskCommentsArgs = GetCommentsBaseArgs & {
     taskId: string
     projectId?: never
 }
 
-export type GetProjectCommentsArgs = {
+export type GetProjectCommentsArgs = GetCommentsBaseArgs & {
     projectId: string
     taskId?: never
 }
@@ -111,7 +144,7 @@ export type AddCommentArgs = {
         fileUrl: string
         fileType?: string
         resourceType?: string
-    }
+    } | null
 } & RequireExactlyOne<{
     taskId?: string
     projectId?: string
@@ -123,6 +156,8 @@ export type UpdateCommentArgs = {
 
 export type GetSharedLabelsArgs = {
     omitPersonal?: boolean
+    cursor?: string | null
+    limit?: number
 }
 
 export type RenameSharedLabelArgs = {
diff --git a/src/utils/taskConverters.ts b/src/utils/taskConverters.ts
index c65036a..ae8e579 100644
--- a/src/utils/taskConverters.ts
+++ b/src/utils/taskConverters.ts
@@ -7,23 +7,13 @@ function getTaskUrlFromQuickAddResponse(responseData: QuickAddTaskResponse) {
 }
 
 export function getTaskFromQuickAddResponse(responseData: QuickAddTaskResponse): Task {
-    const due = responseData.due
-        ? {
-              isRecurring: responseData.due.isRecurring,
-              string: responseData.due.string,
-              date: responseData.due.date,
-              ...(responseData.due.timezone !== null && { datetime: responseData.due.date }),
-              ...(responseData.due.timezone !== null && { timezone: responseData.due.timezone }),
-          }
-        : undefined
-
     const task = {
         id: responseData.id,
         order: responseData.childOrder,
         content: responseData.content,
         description: responseData.description,
         projectId: responseData.projectId,
-        sectionId: responseData.sectionId ? responseData.sectionId : undefined,
+        sectionId: responseData.sectionId,
         isCompleted: responseData.checked,
         labels: responseData.labels,
         priority: responseData.priority,
@@ -31,12 +21,12 @@ export function getTaskFromQuickAddResponse(responseData: QuickAddTaskResponse):
         createdAt: responseData.addedAt,
         url: getTaskUrlFromQuickAddResponse(responseData),
         creatorId: responseData.addedByUid ?? '',
-        ...(due !== undefined && { due }),
-        ...(responseData.parentId !== null && { parentId: responseData.parentId }),
-        ...(responseData.responsibleUid !== null && {
-            assigneeId: responseData.responsibleUid,
-        }),
+        parentId: responseData.parentId,
         duration: responseData.duration,
+        assignerId: responseData.assignedByUid,
+        assigneeId: responseData.responsibleUid,
+        deadline: responseData.deadline,
+        due: responseData.due,
     }
 
     return task

From c45e576af90a588dcb9cf47684dd24f6d5b20b5d Mon Sep 17 00:00:00 2001
From: Pedro Alves <pedroalves0@gmail.com>
Date: Wed, 15 Jan 2025 15:58:59 +0100
Subject: [PATCH 2/4] chore: update unit tests

---
 src/TodoistApi.comments.test.ts  | 24 ++++++++++--------
 src/TodoistApi.labels.test.ts    | 33 ++++++++++++++++--------
 src/TodoistApi.projects.test.ts  | 43 +++++++++++++++++++-------------
 src/TodoistApi.sections.test.ts  | 29 ++++++++++++---------
 src/TodoistApi.tasks.test.ts     | 31 +++++++++++++----------
 src/authentication.test.ts       |  3 ++-
 src/restClient.test.ts           |  4 +--
 src/utils/taskConverters.test.ts | 36 --------------------------
 8 files changed, 101 insertions(+), 102 deletions(-)

diff --git a/src/TodoistApi.comments.test.ts b/src/TodoistApi.comments.test.ts
index 5aa6159..9ea0e24 100644
--- a/src/TodoistApi.comments.test.ts
+++ b/src/TodoistApi.comments.test.ts
@@ -7,7 +7,7 @@ import {
     DEFAULT_COMMENT,
     DEFAULT_REQUEST_ID,
 } from './testUtils/testDefaults'
-import { getRestBaseUri, ENDPOINT_REST_COMMENTS } from './consts/endpoints'
+import { getSyncBaseUri, ENDPOINT_REST_COMMENTS } from './consts/endpoints'
 import { setupRestClientMock } from './testUtils/mocks'
 
 function getTarget() {
@@ -17,8 +17,11 @@ function getTarget() {
 describe('TodoistApi comment endpoints', () => {
     describe('getComments', () => {
         test('calls get request with expected params', async () => {
-            const getCommentsArgs = { projectId: '12' }
-            const requestMock = setupRestClientMock([DEFAULT_COMMENT])
+            const getCommentsArgs = { projectId: '12', limit: 10, cursor: '0' }
+            const requestMock = setupRestClientMock({
+                results: [DEFAULT_COMMENT],
+                next_cursor: '123',
+            })
             const api = getTarget()
 
             await api.getComments(getCommentsArgs)
@@ -26,7 +29,7 @@ describe('TodoistApi comment endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 ENDPOINT_REST_COMMENTS,
                 DEFAULT_AUTH_TOKEN,
                 getCommentsArgs,
@@ -40,12 +43,13 @@ describe('TodoistApi comment endpoints', () => {
                 COMMENT_WITH_OPTIONALS_AS_NULL_PROJECT,
                 COMMENT_WITH_ATTACHMENT_WITH_OPTIONALS_AS_NULL,
             ]
-            setupRestClientMock(expectedComments)
+            setupRestClientMock({ results: expectedComments, next_cursor: '123' })
             const api = getTarget()
 
-            const comments = await api.getComments({ taskId: '12' })
+            const { results: comments, nextCursor } = await api.getComments({ taskId: '12' })
 
             expect(comments).toEqual(expectedComments)
+            expect(nextCursor).toBe('123')
         })
     })
 
@@ -60,7 +64,7 @@ describe('TodoistApi comment endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_COMMENTS}/${commentId}`,
                 DEFAULT_AUTH_TOKEN,
             )
@@ -92,7 +96,7 @@ describe('TodoistApi comment endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 ENDPOINT_REST_COMMENTS,
                 DEFAULT_AUTH_TOKEN,
                 addCommentArgs,
@@ -126,7 +130,7 @@ describe('TodoistApi comment endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_COMMENTS}/${taskId}`,
                 DEFAULT_AUTH_TOKEN,
                 updateCommentArgs,
@@ -156,7 +160,7 @@ describe('TodoistApi comment endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'DELETE',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_COMMENTS}/${taskId}`,
                 DEFAULT_AUTH_TOKEN,
                 undefined,
diff --git a/src/TodoistApi.labels.test.ts b/src/TodoistApi.labels.test.ts
index 42a42e7..895d26f 100644
--- a/src/TodoistApi.labels.test.ts
+++ b/src/TodoistApi.labels.test.ts
@@ -1,6 +1,6 @@
 import { TodoistApi } from '.'
 import { DEFAULT_AUTH_TOKEN, DEFAULT_LABEL, DEFAULT_REQUEST_ID } from './testUtils/testDefaults'
-import { getRestBaseUri, ENDPOINT_REST_LABELS } from './consts/endpoints'
+import { getSyncBaseUri, ENDPOINT_REST_LABELS } from './consts/endpoints'
 import { setupRestClientMock } from './testUtils/mocks'
 
 function getTarget() {
@@ -19,7 +19,7 @@ describe('TodoistApi label endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_LABELS}/${labelId}`,
                 DEFAULT_AUTH_TOKEN,
             )
@@ -37,28 +37,39 @@ describe('TodoistApi label endpoints', () => {
 
     describe('getLabels', () => {
         test('calls get on labels endpoint', async () => {
-            const requestMock = setupRestClientMock([DEFAULT_LABEL])
+            const requestMock = setupRestClientMock({
+                results: [DEFAULT_LABEL],
+                next_cursor: '123',
+            })
             const api = getTarget()
 
-            await api.getLabels()
+            await api.getLabels({ limit: 10, cursor: '0' })
 
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 ENDPOINT_REST_LABELS,
                 DEFAULT_AUTH_TOKEN,
+                {
+                    limit: 10,
+                    cursor: '0',
+                },
             )
         })
 
         test('returns result from rest client', async () => {
             const labels = [DEFAULT_LABEL]
-            setupRestClientMock(labels)
+            setupRestClientMock({
+                results: [DEFAULT_LABEL],
+                next_cursor: '123',
+            })
             const api = getTarget()
 
-            const response = await api.getLabels()
+            const { results, nextCursor } = await api.getLabels()
 
-            expect(response).toEqual(labels)
+            expect(results).toEqual(labels)
+            expect(nextCursor).toBe('123')
         })
     })
 
@@ -76,7 +87,7 @@ describe('TodoistApi label endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 ENDPOINT_REST_LABELS,
                 DEFAULT_AUTH_TOKEN,
                 DEFAULT_ADD_LABEL_ARGS,
@@ -109,7 +120,7 @@ describe('TodoistApi label endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_LABELS}/${labelId}`,
                 DEFAULT_AUTH_TOKEN,
                 DEFAULT_UPDATE_LABEL_ARGS,
@@ -139,7 +150,7 @@ describe('TodoistApi label endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'DELETE',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_LABELS}/${labelId}`,
                 DEFAULT_AUTH_TOKEN,
                 undefined,
diff --git a/src/TodoistApi.projects.test.ts b/src/TodoistApi.projects.test.ts
index cc07b69..f6d401f 100644
--- a/src/TodoistApi.projects.test.ts
+++ b/src/TodoistApi.projects.test.ts
@@ -7,7 +7,7 @@ import {
     PROJECT_WITH_OPTIONALS_AS_NULL,
 } from './testUtils/testDefaults'
 import {
-    getRestBaseUri,
+    getSyncBaseUri,
     ENDPOINT_REST_PROJECTS,
     ENDPOINT_REST_PROJECT_COLLABORATORS,
 } from './consts/endpoints'
@@ -29,7 +29,7 @@ describe('TodoistApi project endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_PROJECTS}/${projectId}`,
                 DEFAULT_AUTH_TOKEN,
             )
@@ -47,28 +47,34 @@ describe('TodoistApi project endpoints', () => {
 
     describe('getProjects', () => {
         test('calls get on projects endpoint', async () => {
-            const requestMock = setupRestClientMock([DEFAULT_PROJECT])
+            const requestMock = setupRestClientMock({
+                results: [DEFAULT_PROJECT],
+                next_cursor: '123',
+            })
             const api = getTarget()
 
-            await api.getProjects()
+            const args = { limit: 10, cursor: '0' }
+            await api.getProjects(args)
 
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 ENDPOINT_REST_PROJECTS,
                 DEFAULT_AUTH_TOKEN,
+                args,
             )
         })
 
         test('returns result from rest client', async () => {
             const projects = [DEFAULT_PROJECT, PROJECT_WITH_OPTIONALS_AS_NULL]
-            setupRestClientMock(projects)
+            setupRestClientMock({ results: projects, next_cursor: '123' })
             const api = getTarget()
 
-            const response = await api.getProjects()
+            const { results, nextCursor } = await api.getProjects()
 
-            expect(response).toEqual(projects)
+            expect(results).toEqual(projects)
+            expect(nextCursor).toBe('123')
         })
     })
 
@@ -86,7 +92,7 @@ describe('TodoistApi project endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 ENDPOINT_REST_PROJECTS,
                 DEFAULT_AUTH_TOKEN,
                 DEFAULT_ADD_PROJECT_ARGS,
@@ -117,7 +123,7 @@ describe('TodoistApi project endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_PROJECTS}/${projectId}`,
                 DEFAULT_AUTH_TOKEN,
                 updateArgs,
@@ -147,7 +153,7 @@ describe('TodoistApi project endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'DELETE',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_PROJECTS}/${projectId}`,
                 DEFAULT_AUTH_TOKEN,
                 undefined,
@@ -170,27 +176,30 @@ describe('TodoistApi project endpoints', () => {
         const users = [DEFAULT_USER]
 
         test('calls get on expected endpoint', async () => {
-            const requestMock = setupRestClientMock(users)
+            const requestMock = setupRestClientMock({ results: users, next_cursor: '123' })
             const api = getTarget()
 
-            await api.getProjectCollaborators(projectId)
+            const args = { limit: 10, cursor: '0' }
+            await api.getProjectCollaborators(projectId, args)
 
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_PROJECTS}/${projectId}/${ENDPOINT_REST_PROJECT_COLLABORATORS}`,
                 DEFAULT_AUTH_TOKEN,
+                args,
             )
         })
 
         test('returns result from rest client', async () => {
-            setupRestClientMock(users)
+            setupRestClientMock({ results: users, next_cursor: '123' })
             const api = getTarget()
 
-            const returnedUsers = await api.getProjectCollaborators(projectId)
+            const { results, nextCursor } = await api.getProjectCollaborators(projectId)
 
-            expect(returnedUsers).toEqual(users)
+            expect(results).toEqual(users)
+            expect(nextCursor).toBe('123')
         })
     })
 })
diff --git a/src/TodoistApi.sections.test.ts b/src/TodoistApi.sections.test.ts
index ec4f211..1ea2713 100644
--- a/src/TodoistApi.sections.test.ts
+++ b/src/TodoistApi.sections.test.ts
@@ -1,6 +1,6 @@
 import { TodoistApi } from '.'
 import { DEFAULT_AUTH_TOKEN, DEFAULT_REQUEST_ID, DEFAULT_SECTION } from './testUtils/testDefaults'
-import { getRestBaseUri, ENDPOINT_REST_SECTIONS } from './consts/endpoints'
+import { getSyncBaseUri, ENDPOINT_REST_SECTIONS } from './consts/endpoints'
 import { setupRestClientMock } from './testUtils/mocks'
 
 function getTarget() {
@@ -19,7 +19,7 @@ describe('TodoistApi section endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_SECTIONS}/${sectionId}`,
                 DEFAULT_AUTH_TOKEN,
             )
@@ -38,29 +38,34 @@ describe('TodoistApi section endpoints', () => {
     describe('getSections', () => {
         test('calls get on sections endpoint', async () => {
             const projectId = '123'
-            const requestMock = setupRestClientMock([DEFAULT_SECTION])
+            const requestMock = setupRestClientMock({
+                results: [DEFAULT_SECTION],
+                next_cursor: '123',
+            })
             const api = getTarget()
 
-            await api.getSections(projectId)
+            const args = { projectId, limit: 10, cursor: '0' }
+            await api.getSections(args)
 
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 ENDPOINT_REST_SECTIONS,
                 DEFAULT_AUTH_TOKEN,
-                { projectId },
+                args,
             )
         })
 
         test('returns result from rest client', async () => {
             const sections = [DEFAULT_SECTION]
-            setupRestClientMock(sections)
+            setupRestClientMock({ results: sections, next_cursor: '123' })
             const api = getTarget()
 
-            const response = await api.getSections()
+            const { results, nextCursor } = await api.getSections({ projectId: '123' })
 
-            expect(response).toEqual(sections)
+            expect(results).toEqual(sections)
+            expect(nextCursor).toBe('123')
         })
     })
 
@@ -79,7 +84,7 @@ describe('TodoistApi section endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 ENDPOINT_REST_SECTIONS,
                 DEFAULT_AUTH_TOKEN,
                 DEFAULT_ADD_SECTION_ARGS,
@@ -110,7 +115,7 @@ describe('TodoistApi section endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_SECTIONS}/${sectionId}`,
                 DEFAULT_AUTH_TOKEN,
                 DEFAULT_UPDATE_SECTION_ARGS,
@@ -140,7 +145,7 @@ describe('TodoistApi section endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'DELETE',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_SECTIONS}/${sectionId}`,
                 DEFAULT_AUTH_TOKEN,
                 undefined,
diff --git a/src/TodoistApi.tasks.test.ts b/src/TodoistApi.tasks.test.ts
index 886f7a8..6246954 100644
--- a/src/TodoistApi.tasks.test.ts
+++ b/src/TodoistApi.tasks.test.ts
@@ -9,7 +9,6 @@ import {
     TASK_WITH_OPTIONALS_AS_NULL,
 } from './testUtils/testDefaults'
 import {
-    getRestBaseUri,
     getSyncBaseUri,
     ENDPOINT_REST_TASK_CLOSE,
     ENDPOINT_REST_TASK_REOPEN,
@@ -41,7 +40,7 @@ describe('TodoistApi task endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 ENDPOINT_REST_TASKS,
                 DEFAULT_AUTH_TOKEN,
                 DEFAULT_ADD_TASK_ARGS,
@@ -58,7 +57,7 @@ describe('TodoistApi task endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri('https://staging.todoist.com'),
+                getSyncBaseUri('https://staging.todoist.com'),
                 ENDPOINT_REST_TASKS,
                 DEFAULT_AUTH_TOKEN,
                 DEFAULT_ADD_TASK_ARGS,
@@ -89,7 +88,7 @@ describe('TodoistApi task endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_TASKS}/${taskId}`,
                 DEFAULT_AUTH_TOKEN,
                 DEFAULT_UPDATE_TASK_ARGS,
@@ -119,7 +118,7 @@ describe('TodoistApi task endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_TASKS}/${taskId}/${ENDPOINT_REST_TASK_CLOSE}`,
                 DEFAULT_AUTH_TOKEN,
                 undefined,
@@ -148,7 +147,7 @@ describe('TodoistApi task endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_TASKS}/${taskId}/${ENDPOINT_REST_TASK_REOPEN}`,
                 DEFAULT_AUTH_TOKEN,
                 undefined,
@@ -177,7 +176,7 @@ describe('TodoistApi task endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'DELETE',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_TASKS}/${taskId}`,
                 DEFAULT_AUTH_TOKEN,
                 undefined,
@@ -243,7 +242,7 @@ describe('TodoistApi task endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 `${ENDPOINT_REST_TASKS}/${taskId}`,
                 DEFAULT_AUTH_TOKEN,
             )
@@ -253,10 +252,15 @@ describe('TodoistApi task endpoints', () => {
     describe('getTasks', () => {
         const DEFAULT_GET_TASKS_ARGS = {
             projectId: '123',
+            limit: 10,
+            cursor: '0',
         }
 
         test('calls get on expected endpoint with args', async () => {
-            const requestMock = setupRestClientMock([DEFAULT_TASK, TASK_WITH_OPTIONALS_AS_NULL])
+            const requestMock = setupRestClientMock({
+                results: [DEFAULT_TASK, TASK_WITH_OPTIONALS_AS_NULL],
+                next_cursor: '123',
+            })
             const api = getTarget()
 
             await api.getTasks(DEFAULT_GET_TASKS_ARGS)
@@ -264,7 +268,7 @@ describe('TodoistApi task endpoints', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'GET',
-                getRestBaseUri(),
+                getSyncBaseUri(),
                 ENDPOINT_REST_TASKS,
                 DEFAULT_AUTH_TOKEN,
                 DEFAULT_GET_TASKS_ARGS,
@@ -273,12 +277,13 @@ describe('TodoistApi task endpoints', () => {
 
         test('returns result from rest client', async () => {
             const tasks = [DEFAULT_TASK]
-            setupRestClientMock(tasks)
+            setupRestClientMock({ results: tasks, next_cursor: '123' })
             const api = getTarget()
 
-            const response = await api.getTasks(DEFAULT_GET_TASKS_ARGS)
+            const { results, nextCursor } = await api.getTasks(DEFAULT_GET_TASKS_ARGS)
 
-            expect(response).toEqual(tasks)
+            expect(results).toEqual(tasks)
+            expect(nextCursor).toBe('123')
         })
     })
 })
diff --git a/src/authentication.test.ts b/src/authentication.test.ts
index 0aa8b47..d8c41f6 100644
--- a/src/authentication.test.ts
+++ b/src/authentication.test.ts
@@ -2,6 +2,7 @@ import { getAuthorizationUrl, getAuthToken, revokeAuthToken, Permission } from '
 import { setupRestClientMock } from './testUtils/mocks'
 import { assertInstance } from './testUtils/asserts'
 import { TodoistRequestError } from './types'
+import { getSyncBaseUri } from './consts/endpoints'
 
 describe('authentication', () => {
     describe('getAuthorizationUrl', () => {
@@ -144,7 +145,7 @@ describe('authentication', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                'https://api.todoist.com/sync/v9/',
+                getSyncBaseUri(),
                 'access_tokens/revoke',
                 undefined,
                 revokeTokenRequest,
diff --git a/src/restClient.test.ts b/src/restClient.test.ts
index a4dd1be..eab4515 100644
--- a/src/restClient.test.ts
+++ b/src/restClient.test.ts
@@ -5,7 +5,7 @@ import { TodoistRequestError } from './types/errors'
 import * as caseConverter from 'axios-case-converter'
 import { assertInstance } from './testUtils/asserts'
 import { DEFAULT_REQUEST_ID } from './testUtils/testDefaults'
-import { API_SYNC_BASE_URI } from './consts/endpoints'
+import { API_BASE_URI } from './consts/endpoints'
 
 const RANDOM_ID = 'SomethingRandom'
 
@@ -195,7 +195,7 @@ describe('restClient', () => {
     })
 
     test('random request ID is not created if none provided for POST request on the sync endpoint', async () => {
-        const syncUrl = new URL(API_SYNC_BASE_URI, DEFAULT_BASE_URI).toString()
+        const syncUrl = new URL(API_BASE_URI, DEFAULT_BASE_URI).toString()
         await request('POST', syncUrl, DEFAULT_ENDPOINT, DEFAULT_AUTH_TOKEN, DEFAULT_PAYLOAD)
 
         expect(axiosMock.create).toBeCalledWith({
diff --git a/src/utils/taskConverters.test.ts b/src/utils/taskConverters.test.ts
index 08c889a..dd2b45c 100644
--- a/src/utils/taskConverters.test.ts
+++ b/src/utils/taskConverters.test.ts
@@ -7,33 +7,6 @@ describe('getTaskFromQuickAddResponse', () => {
         expect(task).toEqual({ ...DEFAULT_TASK, labels: ['personal', 'work', 'hobby'] })
     })
 
-    test('converts null sectionId to null', () => {
-        const quickAddResponse = {
-            ...DEFAULT_QUICK_ADD_RESPONSE,
-            sectionId: null,
-        }
-        const task = getTaskFromQuickAddResponse(quickAddResponse)
-        expect(task.sectionId).toEqual(undefined)
-    })
-
-    test('converts null parentId to undefined', () => {
-        const quickAddResponse = {
-            ...DEFAULT_QUICK_ADD_RESPONSE,
-            parentId: null,
-        }
-        const task = getTaskFromQuickAddResponse(quickAddResponse)
-        expect(task.parentId).toEqual(undefined)
-    })
-
-    test('converts null assigneeId to undefined', () => {
-        const quickAddResponse = {
-            ...DEFAULT_QUICK_ADD_RESPONSE,
-            responsibleUid: null,
-        }
-        const task = getTaskFromQuickAddResponse(quickAddResponse)
-        expect(task.assigneeId).toEqual(undefined)
-    })
-
     const completedTheories = [
         [false, false],
         [true, true],
@@ -52,15 +25,6 @@ describe('getTaskFromQuickAddResponse', () => {
         },
     )
 
-    test('converts null due date to undefined', () => {
-        const quickAddResponse = {
-            ...DEFAULT_QUICK_ADD_RESPONSE,
-            due: null,
-        }
-        const task = getTaskFromQuickAddResponse(quickAddResponse)
-        expect(task.due).toEqual(undefined)
-    })
-
     const taskUrlTheories = [
         ['1234', 'https://todoist.com/showTask?id=1234'],
         ['1234', 'https://todoist.com/showTask?id=1234'],

From 58b91d29f54b37378877f406d0255dd2e886e124 Mon Sep 17 00:00:00 2001
From: Pedro Alves <pedroalves0@gmail.com>
Date: Wed, 15 Jan 2025 15:59:46 +0100
Subject: [PATCH 3/4] doc: update README with migration disclaimer

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index a0b42c3..39e6fc7 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,9 @@
 
 This is the official TypeScript API client for the Todoist REST API.
 
+> [!IMPORTANT]  
+> This library is currently being migrated from the Todoist REST API to the Todoist Sync API. As a result, parts of the documentation may be outdated. However, the client API remains consistent with the latest stable release, [v3.0.3](https://github.com/Doist/todoist-api-typescript/releases/tag/v3.0.3). Please note that some client methods may return unexpected data or encounter failures during this transition.
+
 ## Installation
 
 ```

From d14da19fc8d054add8dec0972c24c601dccb4e9a Mon Sep 17 00:00:00 2001
From: Pedro Alves <pedroalves0@gmail.com>
Date: Wed, 15 Jan 2025 16:36:37 +0100
Subject: [PATCH 4/4] fix: update snake case property in tests with correct
 camel case

---
 src/TodoistApi.comments.test.ts | 4 ++--
 src/TodoistApi.labels.test.ts   | 4 ++--
 src/TodoistApi.projects.test.ts | 8 ++++----
 src/TodoistApi.sections.test.ts | 4 ++--
 src/TodoistApi.tasks.test.ts    | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/TodoistApi.comments.test.ts b/src/TodoistApi.comments.test.ts
index 9ea0e24..8263ada 100644
--- a/src/TodoistApi.comments.test.ts
+++ b/src/TodoistApi.comments.test.ts
@@ -20,7 +20,7 @@ describe('TodoistApi comment endpoints', () => {
             const getCommentsArgs = { projectId: '12', limit: 10, cursor: '0' }
             const requestMock = setupRestClientMock({
                 results: [DEFAULT_COMMENT],
-                next_cursor: '123',
+                nextCursor: '123',
             })
             const api = getTarget()
 
@@ -43,7 +43,7 @@ describe('TodoistApi comment endpoints', () => {
                 COMMENT_WITH_OPTIONALS_AS_NULL_PROJECT,
                 COMMENT_WITH_ATTACHMENT_WITH_OPTIONALS_AS_NULL,
             ]
-            setupRestClientMock({ results: expectedComments, next_cursor: '123' })
+            setupRestClientMock({ results: expectedComments, nextCursor: '123' })
             const api = getTarget()
 
             const { results: comments, nextCursor } = await api.getComments({ taskId: '12' })
diff --git a/src/TodoistApi.labels.test.ts b/src/TodoistApi.labels.test.ts
index 895d26f..61d0617 100644
--- a/src/TodoistApi.labels.test.ts
+++ b/src/TodoistApi.labels.test.ts
@@ -39,7 +39,7 @@ describe('TodoistApi label endpoints', () => {
         test('calls get on labels endpoint', async () => {
             const requestMock = setupRestClientMock({
                 results: [DEFAULT_LABEL],
-                next_cursor: '123',
+                nextCursor: '123',
             })
             const api = getTarget()
 
@@ -62,7 +62,7 @@ describe('TodoistApi label endpoints', () => {
             const labels = [DEFAULT_LABEL]
             setupRestClientMock({
                 results: [DEFAULT_LABEL],
-                next_cursor: '123',
+                nextCursor: '123',
             })
             const api = getTarget()
 
diff --git a/src/TodoistApi.projects.test.ts b/src/TodoistApi.projects.test.ts
index f6d401f..5e0a61c 100644
--- a/src/TodoistApi.projects.test.ts
+++ b/src/TodoistApi.projects.test.ts
@@ -49,7 +49,7 @@ describe('TodoistApi project endpoints', () => {
         test('calls get on projects endpoint', async () => {
             const requestMock = setupRestClientMock({
                 results: [DEFAULT_PROJECT],
-                next_cursor: '123',
+                nextCursor: '123',
             })
             const api = getTarget()
 
@@ -68,7 +68,7 @@ describe('TodoistApi project endpoints', () => {
 
         test('returns result from rest client', async () => {
             const projects = [DEFAULT_PROJECT, PROJECT_WITH_OPTIONALS_AS_NULL]
-            setupRestClientMock({ results: projects, next_cursor: '123' })
+            setupRestClientMock({ results: projects, nextCursor: '123' })
             const api = getTarget()
 
             const { results, nextCursor } = await api.getProjects()
@@ -176,7 +176,7 @@ describe('TodoistApi project endpoints', () => {
         const users = [DEFAULT_USER]
 
         test('calls get on expected endpoint', async () => {
-            const requestMock = setupRestClientMock({ results: users, next_cursor: '123' })
+            const requestMock = setupRestClientMock({ results: users, nextCursor: '123' })
             const api = getTarget()
 
             const args = { limit: 10, cursor: '0' }
@@ -193,7 +193,7 @@ describe('TodoistApi project endpoints', () => {
         })
 
         test('returns result from rest client', async () => {
-            setupRestClientMock({ results: users, next_cursor: '123' })
+            setupRestClientMock({ results: users, nextCursor: '123' })
             const api = getTarget()
 
             const { results, nextCursor } = await api.getProjectCollaborators(projectId)
diff --git a/src/TodoistApi.sections.test.ts b/src/TodoistApi.sections.test.ts
index 1ea2713..0068ee1 100644
--- a/src/TodoistApi.sections.test.ts
+++ b/src/TodoistApi.sections.test.ts
@@ -40,7 +40,7 @@ describe('TodoistApi section endpoints', () => {
             const projectId = '123'
             const requestMock = setupRestClientMock({
                 results: [DEFAULT_SECTION],
-                next_cursor: '123',
+                nextCursor: '123',
             })
             const api = getTarget()
 
@@ -59,7 +59,7 @@ describe('TodoistApi section endpoints', () => {
 
         test('returns result from rest client', async () => {
             const sections = [DEFAULT_SECTION]
-            setupRestClientMock({ results: sections, next_cursor: '123' })
+            setupRestClientMock({ results: sections, nextCursor: '123' })
             const api = getTarget()
 
             const { results, nextCursor } = await api.getSections({ projectId: '123' })
diff --git a/src/TodoistApi.tasks.test.ts b/src/TodoistApi.tasks.test.ts
index 6246954..9c3cbbe 100644
--- a/src/TodoistApi.tasks.test.ts
+++ b/src/TodoistApi.tasks.test.ts
@@ -259,7 +259,7 @@ describe('TodoistApi task endpoints', () => {
         test('calls get on expected endpoint with args', async () => {
             const requestMock = setupRestClientMock({
                 results: [DEFAULT_TASK, TASK_WITH_OPTIONALS_AS_NULL],
-                next_cursor: '123',
+                nextCursor: '123',
             })
             const api = getTarget()
 
@@ -277,7 +277,7 @@ describe('TodoistApi task endpoints', () => {
 
         test('returns result from rest client', async () => {
             const tasks = [DEFAULT_TASK]
-            setupRestClientMock({ results: tasks, next_cursor: '123' })
+            setupRestClientMock({ results: tasks, nextCursor: '123' })
             const api = getTarget()
 
             const { results, nextCursor } = await api.getTasks(DEFAULT_GET_TASKS_ARGS)