From 78a1574c4f7084e5f001b6d69a946fb1d7359e99 Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Wed, 24 Aug 2022 12:55:19 +0100
Subject: [PATCH 01/11] chore: Updates existing entities to new types

---
 src/consts/endpoints.ts          |  2 +-
 src/testUtils/testDefaults.ts    | 47 +++++++++++----------
 src/types/entities.ts            | 72 ++++++++++++++++----------------
 src/types/requests.ts            | 16 ++++---
 src/utils/taskConverters.test.ts | 18 ++++----
 src/utils/taskConverters.ts      | 16 ++++---
 6 files changed, 87 insertions(+), 84 deletions(-)

diff --git a/src/consts/endpoints.ts b/src/consts/endpoints.ts
index 3f15318..9b1e698 100644
--- a/src/consts/endpoints.ts
+++ b/src/consts/endpoints.ts
@@ -1,5 +1,5 @@
 const BASE_URI = 'https://api.todoist.com'
-const API_REST_BASE_URI = '/rest/v1/'
+const API_REST_BASE_URI = '/rest/v2/'
 const API_SYNC_BASE_URI = '/sync/v8/'
 const TODOIST_URI = 'https://todoist.com'
 const API_AUTHORIZATION_BASE_URI = '/oauth/'
diff --git a/src/testUtils/testDefaults.ts b/src/testUtils/testDefaults.ts
index f346810..17d131d 100644
--- a/src/testUtils/testDefaults.ts
+++ b/src/testUtils/testDefaults.ts
@@ -9,26 +9,27 @@ import {
     Attachment,
 } from '../types'
 
-const DEFAULT_TASK_ID = 1234
+const DEFAULT_TASK_ID = '1234'
 const DEFAULT_TASK_CONTENT = 'This is a task'
 const DEFAULT_TASK_DESCRIPTION = 'A description'
 const DEFAULT_TASK_PRIORITY = 1
 const DEFAULT_ORDER = 3
-const DEFAULT_PROJECT_ID = 123
+const DEFAULT_PROJECT_ID = '123'
 const DEFAULT_PROJECT_NAME = 'This is a project'
-const DEFAULT_LABEL_ID = 456
+const DEFAULT_PROJECT_VIEW_STYLE = 'list'
+const DEFAULT_LABEL_ID = '456'
 const DEFAULT_LABEL_NAME = 'This is a label'
-const DEFAULT_SECTION_ID = 456
+const DEFAULT_SECTION_ID = '456'
 const DEFAULT_SECTION_NAME = 'This is a section'
-const DEFAULT_PARENT_ID = 5678
-const DEFAULT_ASSIGNEE = 1234
+const DEFAULT_PARENT_ID = '5678'
+const DEFAULT_ASSIGNEE = '1234'
 const DEFAULT_DATE = '2020-09-08T12:00:00Z'
-const DEFAULT_ENTITY_COLOR = 30
-const DEFAULT_LABELS = [1, 2, 3]
-const DEFAULT_USER_ID = 5
+const DEFAULT_ENTITY_COLOR = 'berry_red'
+const DEFAULT_LABELS = ['personal', 'work', 'hobby']
+const DEFAULT_USER_ID = '5'
 const DEFAULT_USER_NAME = 'A User'
 const DEFAULT_USER_EMAIL = 'atestuser@doist.com'
-const DEFAULT_COMMENT_ID = 4
+const DEFAULT_COMMENT_ID = '4'
 const DEFAULT_COMMENT_CONTENT = 'A comment'
 
 export const DEFAULT_AUTH_TOKEN = 'AToken'
@@ -37,14 +38,14 @@ export const DEFAULT_REQUEST_ID = 'ARequestID'
 export const INVALID_ENTITY_ID = 'invalid/entity/id' as unknown as number
 
 export const DEFAULT_DUE_DATE = {
-    recurring: false,
+    isRecurring: false,
     string: 'a date string',
     date: DEFAULT_DATE,
 }
 
 export const INVALID_DUE_DATE = {
     ...DEFAULT_DUE_DATE,
-    recurring: 'false',
+    isRecurring: 'false',
 }
 
 export const DEFAULT_QUICK_ADD_RESPONSE: QuickAddTaskResponse = {
@@ -60,7 +61,6 @@ export const DEFAULT_QUICK_ADD_RESPONSE: QuickAddTaskResponse = {
     responsibleUid: DEFAULT_ASSIGNEE,
     checked: 0,
     dateAdded: DEFAULT_DATE,
-    syncId: null,
     due: {
         date: DEFAULT_DATE,
         timezone: null,
@@ -78,14 +78,14 @@ export const DEFAULT_TASK: Task = {
     description: DEFAULT_TASK_DESCRIPTION,
     projectId: DEFAULT_PROJECT_ID,
     sectionId: DEFAULT_SECTION_ID,
-    completed: false,
-    labelIds: DEFAULT_LABELS,
+    isCompleted: false,
+    labels: DEFAULT_LABELS,
     priority: DEFAULT_TASK_PRIORITY,
     commentCount: 0,
-    created: DEFAULT_DATE,
+    createdAt: DEFAULT_DATE,
     url: 'https://todoist.com/showTask?id=1234',
     due: DEFAULT_DUE_DATE,
-    assignee: DEFAULT_ASSIGNEE,
+    assigneeId: DEFAULT_ASSIGNEE,
 }
 
 export const INVALID_TASK = {
@@ -100,8 +100,11 @@ export const DEFAULT_PROJECT: Project = {
     order: DEFAULT_ORDER,
     parentId: DEFAULT_PROJECT_ID,
     commentCount: 0,
-    favorite: false,
-    shared: false,
+    isFavorite: false,
+    isShared: false,
+    isInboxProject: false,
+    isTeamInbox: false,
+    viewStyle: DEFAULT_PROJECT_VIEW_STYLE,
     url: `https://todoist.com/showProject?id=123`,
 }
 
@@ -127,12 +130,12 @@ export const DEFAULT_LABEL: Label = {
     name: DEFAULT_LABEL_NAME,
     color: DEFAULT_ENTITY_COLOR,
     order: DEFAULT_ORDER,
-    favorite: false,
+    isFavorite: false,
 }
 
 export const INVALID_LABEL = {
     ...DEFAULT_LABEL,
-    favorite: 'true',
+    isFavorite: 'true',
 }
 
 export const DEFAULT_USER: User = {
@@ -163,7 +166,7 @@ export const DEFAULT_COMMENT: Comment = {
     content: DEFAULT_COMMENT_CONTENT,
     projectId: DEFAULT_PROJECT_ID,
     attachment: DEFAULT_ATTACHMENT,
-    posted: DEFAULT_DATE,
+    postedAt: DEFAULT_DATE,
 }
 
 export const INVALID_COMMENT = {
diff --git a/src/types/entities.ts b/src/types/entities.ts
index e7eee5e..9027151 100644
--- a/src/types/entities.ts
+++ b/src/types/entities.ts
@@ -11,7 +11,7 @@ import {
 } from 'runtypes'
 
 export const Int = NumberRunType.withConstraint(
-    (n) => Number.isInteger(n) || `${n} is not a valid entity id. Should be an integer`,
+    (n) => Number.isInteger(n) || `${n} is not a valid entity id. Should be a string`,
 )
 
 export type TodoistEntity = {
@@ -27,7 +27,7 @@ export type EntityInHierarchy = OrderedEntity & {
 }
 
 export const DueDate = Record({
-    recurring: Boolean,
+    isRecurring: Boolean,
     string: String,
     date: String,
 }).And(
@@ -40,63 +40,64 @@ export const DueDate = Record({
 export type DueDate = Static<typeof DueDate>
 
 export const Task = Record({
-    id: Int,
+    id: String,
     order: Int,
     content: String,
     description: String,
-    projectId: Int,
-    sectionId: Int,
-    completed: Boolean,
-    labelIds: Array(Int),
+    projectId: String,
+    isCompleted: Boolean,
+    labels: Array(String),
     priority: Int,
     commentCount: Int,
-    created: String,
+    createdAt: String,
     url: String,
 }).And(
     Partial({
-        parentId: Int,
         due: DueDate,
-        assignee: Int,
+        assigneeId: String,
+        assignerId: String,
+        parentId: String,
+        sectionId: String,
     }),
 )
 
 export type Task = Static<typeof Task>
 
 export const Project = Record({
-    id: Int,
+    id: String,
     name: String,
-    color: Int,
+    color: String,
     commentCount: Int,
-    shared: Boolean,
-    favorite: Boolean,
+    isShared: Boolean,
+    isFavorite: Boolean,
     url: String,
+    isInboxProject: Boolean,
+    isTeamInbox: Boolean,
+    order: Int,
+    viewStyle: String,
 }).And(
     Partial({
-        parentId: Int,
-        order: Int,
-        inboxProject: Boolean,
-        teamInbox: Boolean,
-        syncId: Int,
+        parentId: String,
     }),
 )
 
 export type Project = Static<typeof Project>
 
 export const Section = Record({
-    id: Int,
+    id: String,
     order: Int,
     name: String,
-    projectId: Int,
+    projectId: String,
 })
 
 export type Section = Static<typeof Section>
 
 export const Label = Record({
-    id: Int,
+    id: String,
     order: Int,
     name: String,
-    color: Int,
-    favorite: Boolean,
+    color: String,
+    isFavorite: Boolean,
 })
 
 export type Label = Static<typeof Label>
@@ -122,13 +123,13 @@ export const Attachment = Record({
 export type Attachment = Static<typeof Attachment>
 
 export const Comment = Record({
-    id: Int,
+    id: String,
     content: String,
-    posted: String,
+    postedAt: String,
 }).And(
     Partial({
-        taskId: Int,
-        projectId: Int,
+        taskId: String,
+        projectId: String,
         attachment: Attachment,
     }),
 )
@@ -136,7 +137,7 @@ export const Comment = Record({
 export type Comment = Static<typeof Comment>
 
 export const User = Record({
-    id: Int,
+    id: String,
     name: String,
     email: String,
 })
@@ -149,19 +150,18 @@ export type Color = TodoistEntity & {
 }
 
 export type QuickAddTaskResponse = {
-    id: number
-    projectId: number
+    id: string
+    projectId: string
     content: string
     description: string
     priority: number
-    sectionId: number | null
-    parentId: number | null
+    sectionId: string | null
+    parentId: string | null
     childOrder: number // order
-    labels: number[] // labelIds
-    responsibleUid: number | null
+    labels: string[] // labelIds
+    responsibleUid: string | null
     checked: number // completed
     dateAdded: string // created
-    syncId: number | null
     due: {
         date: string
         timezone: string | null
diff --git a/src/types/requests.ts b/src/types/requests.ts
index 5031a1b..8f0ed0d 100644
--- a/src/types/requests.ts
+++ b/src/types/requests.ts
@@ -11,7 +11,7 @@ export type AddTaskArgs = {
     dueLang?: string
     dueDate?: string
     dueDatetime?: string
-    assignee?: number
+    assigneeId?: number
 }
 
 export type QuickAddTaskArgs = {
@@ -39,20 +39,24 @@ export type UpdateTaskArgs = {
     dueLang?: string
     dueDate?: string
     dueDatetime?: string
-    assignee?: number
+    assigneeId?: number
 }
 
+export type ProjectViewStyle = 'list' | 'board'
+
 export type AddProjectArgs = {
     name: string
     parentId?: number
     color?: number
-    favorite?: boolean
+    isFavorite?: boolean
+    viewStyle?: ProjectViewStyle
 }
 
 export type UpdateProjectArgs = {
     name?: string
     color?: number
-    favorite?: boolean
+    isFavorite?: boolean
+    viewStyle?: ProjectViewStyle
 }
 
 export type AddSectionArgs = {
@@ -69,14 +73,14 @@ export type AddLabelArgs = {
     name: string
     order?: number
     color?: number
-    favorite?: boolean
+    isFavorite?: boolean
 }
 
 export type UpdateLabelArgs = {
     name?: string
     order?: number
     color?: number
-    favorite?: boolean
+    isFavorite?: boolean
 }
 
 export type GetTaskCommentsArgs = {
diff --git a/src/utils/taskConverters.test.ts b/src/utils/taskConverters.test.ts
index d1b9696..43ec8ca 100644
--- a/src/utils/taskConverters.test.ts
+++ b/src/utils/taskConverters.test.ts
@@ -7,13 +7,13 @@ describe('getTaskFromQuickAddResponse', () => {
         expect(task).toEqual(DEFAULT_TASK)
     })
 
-    test('converts null sectionId to 0', () => {
+    test('converts null sectionId to null', () => {
         const quickAddResponse = {
             ...DEFAULT_QUICK_ADD_RESPONSE,
             sectionId: null,
         }
         const task = getTaskFromQuickAddResponse(quickAddResponse)
-        expect(task.sectionId).toEqual(0)
+        expect(task.sectionId).toEqual(undefined)
     })
 
     test('converts null parentId to undefined', () => {
@@ -25,13 +25,13 @@ describe('getTaskFromQuickAddResponse', () => {
         expect(task.parentId).toEqual(undefined)
     })
 
-    test('converts null assignee to undefined', () => {
+    test('converts null assigneeId to undefined', () => {
         const quickAddResponse = {
             ...DEFAULT_QUICK_ADD_RESPONSE,
             responsibleUid: null,
         }
         const task = getTaskFromQuickAddResponse(quickAddResponse)
-        expect(task.assignee).toEqual(undefined)
+        expect(task.assigneeId).toEqual(undefined)
     })
 
     const completedTheories = [
@@ -48,7 +48,7 @@ describe('getTaskFromQuickAddResponse', () => {
             }
 
             const task = getTaskFromQuickAddResponse(quickAddResponse)
-            expect(task.completed).toEqual(completedBoolean)
+            expect(task.isCompleted).toEqual(completedBoolean)
         },
     )
 
@@ -62,16 +62,14 @@ describe('getTaskFromQuickAddResponse', () => {
     })
 
     const taskUrlTheories = [
-        [1234, null, 'https://todoist.com/showTask?id=1234'],
-        [1234, 0, 'https://todoist.com/showTask?id=1234'],
-        [1234, 5678, 'https://todoist.com/showTask?id=1234&sync_id=5678'],
+        ['1234', 'https://todoist.com/showTask?id=1234'],
+        ['1234', 'https://todoist.com/showTask?id=1234'],
     ] as const
 
-    test.each(taskUrlTheories)('with id %p and syncId %p returns url %p', (id, syncId, url) => {
+    test.each(taskUrlTheories)('with id %p and syncId %p returns url %p', (id, url) => {
         const quickAddResponse = {
             ...DEFAULT_QUICK_ADD_RESPONSE,
             id,
-            syncId,
         }
         const task = getTaskFromQuickAddResponse(quickAddResponse)
         expect(task.url).toEqual(url)
diff --git a/src/utils/taskConverters.ts b/src/utils/taskConverters.ts
index 6bd0080..cfd5e6a 100644
--- a/src/utils/taskConverters.ts
+++ b/src/utils/taskConverters.ts
@@ -3,15 +3,13 @@ import { QuickAddTaskResponse, Task } from '../types'
 const showTaskEndpoint = 'https://todoist.com/showTask'
 
 function getTaskUrlFromQuickAddResponse(responseData: QuickAddTaskResponse) {
-    return responseData.syncId
-        ? `${showTaskEndpoint}?id=${responseData.id}&sync_id=${responseData.syncId}`
-        : `${showTaskEndpoint}?id=${responseData.id}`
+    return `${showTaskEndpoint}?id=${responseData.id}`
 }
 
 export function getTaskFromQuickAddResponse(responseData: QuickAddTaskResponse): Task {
     const due = responseData.due
         ? {
-              recurring: responseData.due.isRecurring,
+              isRecurring: responseData.due.isRecurring,
               string: responseData.due.string,
               date: responseData.due.date,
               ...(responseData.due.timezone !== null && { datetime: responseData.due.date }),
@@ -25,16 +23,16 @@ export function getTaskFromQuickAddResponse(responseData: QuickAddTaskResponse):
         content: responseData.content,
         description: responseData.description,
         projectId: responseData.projectId,
-        sectionId: responseData.sectionId ?? 0,
-        completed: responseData.checked === 1,
-        labelIds: responseData.labels,
+        sectionId: responseData.sectionId ?? undefined,
+        isCompleted: responseData.checked === 1,
+        labels: responseData.labels,
         priority: responseData.priority,
         commentCount: 0, // Will always be 0 for a quick add
-        created: responseData.dateAdded,
+        createdAt: responseData.dateAdded,
         url: getTaskUrlFromQuickAddResponse(responseData),
         ...(due !== undefined && { due }),
         ...(responseData.parentId !== null && { parentId: responseData.parentId }),
-        ...(responseData.responsibleUid !== null && { assignee: responseData.responsibleUid }),
+        ...(responseData.responsibleUid !== null && { assigneeId: responseData.responsibleUid }),
     }
 
     return task

From f2a667b1dbac0788102f3d4c4116c10c81fb4a91 Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Wed, 24 Aug 2022 12:58:42 +0100
Subject: [PATCH 02/11] chore: Updates Color helper functions

---
 src/utils/colors.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/utils/colors.ts b/src/utils/colors.ts
index 403854c..3c6028a 100644
--- a/src/utils/colors.ts
+++ b/src/utils/colors.ts
@@ -44,7 +44,12 @@ export const colors = [
     taupe,
 ]
 
-export function getColor(colorId: number): Color {
+export function getColorById(colorId: number): Color {
     const color = colors.find((color) => color.id === colorId)
     return color ?? charcoal
 }
+
+export function getColorByName(colorName: string): Color {
+    const color = colors.find((color) => color.name === colorName)
+    return color ?? charcoal
+}

From 100efccc6db4de9a37c0b43bdc898991635aabc1 Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Wed, 24 Aug 2022 13:21:42 +0100
Subject: [PATCH 03/11] chore: Updates request types

---
 src/types/requests.ts | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/types/requests.ts b/src/types/requests.ts
index 8f0ed0d..ff42d53 100644
--- a/src/types/requests.ts
+++ b/src/types/requests.ts
@@ -1,17 +1,17 @@
 export type AddTaskArgs = {
     content: string
     description?: string
-    projectId?: number
-    sectionId?: number
-    parentId?: number
+    projectId?: string
+    sectionId?: string
+    parentId?: string
     order?: number
-    labelIds?: number[]
+    labels?: string[]
     priority?: number
     dueString?: string
     dueLang?: string
     dueDate?: string
     dueDatetime?: string
-    assigneeId?: number
+    assigneeId?: string
 }
 
 export type QuickAddTaskArgs = {
@@ -22,9 +22,9 @@ export type QuickAddTaskArgs = {
 }
 
 export type GetTasksArgs = {
-    projectId?: number
-    sectionId?: number
-    labelId?: number
+    projectId?: string
+    sectionId?: string
+    label?: string
     filter?: string
     lang?: string
     ids?: number[]
@@ -33,20 +33,20 @@ export type GetTasksArgs = {
 export type UpdateTaskArgs = {
     content?: string
     description?: string
-    labelIds?: number[]
+    labels?: string[]
     priority?: number
     dueString?: string
     dueLang?: string
     dueDate?: string
     dueDatetime?: string
-    assigneeId?: number
+    assigneeId?: string
 }
 
 export type ProjectViewStyle = 'list' | 'board'
 
 export type AddProjectArgs = {
     name: string
-    parentId?: number
+    parentId?: string
     color?: number
     isFavorite?: boolean
     viewStyle?: ProjectViewStyle
@@ -61,7 +61,7 @@ export type UpdateProjectArgs = {
 
 export type AddSectionArgs = {
     name: string
-    projectId: number
+    projectId: string
     order?: number
 }
 
@@ -84,12 +84,12 @@ export type UpdateLabelArgs = {
 }
 
 export type GetTaskCommentsArgs = {
-    taskId: number
+    taskId: string
     projectId?: never
 }
 
 export type GetProjectCommentsArgs = {
-    projectId: number
+    projectId: string
     taskId?: never
 }
 
@@ -104,15 +104,24 @@ type AddCommentArgs = {
 }
 
 export type AddTaskCommentArgs = AddCommentArgs & {
-    taskId: number
+    taskId: string
     projectId?: never
 }
 
 export type AddProjectCommentArgs = AddCommentArgs & {
-    projectId: number
+    projectId: string
     taskId?: never
 }
 
 export type UpdateCommentArgs = {
     content: string
 }
+
+export type RenameSharedLabelArgs = {
+    name: string
+    newName: string
+}
+
+export type RemoveSharedLabelArgs = {
+    name: string
+}

From 449cf5a8a5635f5f028108dd4f937eba79e935f5 Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Wed, 24 Aug 2022 13:22:07 +0100
Subject: [PATCH 04/11] feat: Adds new shared labels endpoints and functions

---
 src/TodoistApi.ts       | 51 +++++++++++++++++++++++++++++++++++++++++
 src/consts/endpoints.ts |  3 +++
 2 files changed, 54 insertions(+)

diff --git a/src/TodoistApi.ts b/src/TodoistApi.ts
index 8b2d1a7..a49f0e1 100644
--- a/src/TodoistApi.ts
+++ b/src/TodoistApi.ts
@@ -24,6 +24,8 @@ import {
     UpdateSectionArgs,
     UpdateTaskArgs,
     QuickAddTaskArgs,
+    RenameSharedLabelArgs,
+    RemoveSharedLabelArgs,
 } from './types/requests'
 import { request, isSuccess } from './restClient'
 import { getTaskFromQuickAddResponse } from './utils/taskConverters'
@@ -39,6 +41,9 @@ import {
     ENDPOINT_REST_PROJECT_COLLABORATORS,
     ENDPOINT_REST_SECTIONS,
     ENDPOINT_REST_COMMENTS,
+    ENDPOINT_REST_LABELS_SHARED,
+    ENDPOINT_REST_LABELS_SHARED_RENAME,
+    ENDPOINT_REST_LABELS_SHARED_REMOVE,
 } from './consts/endpoints'
 import {
     validateComment,
@@ -319,6 +324,9 @@ export class TodoistApi {
         return isSuccess(response)
     }
 
+    /**
+     * Fetches a personal label
+     */
     async getLabel(id: number): Promise<Label> {
         Int.check(id)
         const response = await request<Label>(
@@ -331,6 +339,9 @@ export class TodoistApi {
         return validateLabel(response.data)
     }
 
+    /**
+     * Fetches the personal labels
+     */
     async getLabels(): Promise<Label[]> {
         const response = await request<Label[]>(
             'GET',
@@ -342,6 +353,9 @@ export class TodoistApi {
         return validateLabelArray(response.data)
     }
 
+    /**
+     * Adds a personal label
+     */
     async addLabel(args: AddLabelArgs, requestId?: string): Promise<Label> {
         const response = await request<Label>(
             'POST',
@@ -355,6 +369,9 @@ export class TodoistApi {
         return validateLabel(response.data)
     }
 
+    /**
+     * Updates a personal label
+     */
     async updateLabel(id: number, args: UpdateLabelArgs, requestId?: string): Promise<boolean> {
         Int.check(id)
         const response = await request(
@@ -368,6 +385,9 @@ export class TodoistApi {
         return isSuccess(response)
     }
 
+    /**
+     * Deletes a personal label
+     */
     async deleteLabel(id: number, requestId?: string): Promise<boolean> {
         Int.check(id)
         const response = await request(
@@ -381,6 +401,37 @@ export class TodoistApi {
         return isSuccess(response)
     }
 
+    async getSharedLabels(): Promise<string[]> {
+        const response = await request<string[]>(
+            'GET',
+            API_REST_BASE_URI,
+            ENDPOINT_REST_LABELS_SHARED,
+            this.authToken,
+        )
+
+        return response.data
+    }
+
+    async renameSharedLabel(args: RenameSharedLabelArgs): Promise<void> {
+        await request<void>(
+            'POST',
+            API_REST_BASE_URI,
+            ENDPOINT_REST_LABELS_SHARED_RENAME,
+            this.authToken,
+            args,
+        )
+    }
+
+    async removeSharedLabel(args: RemoveSharedLabelArgs): Promise<void> {
+        await request<void>(
+            'POST',
+            API_REST_BASE_URI,
+            ENDPOINT_REST_LABELS_SHARED_REMOVE,
+            this.authToken,
+            args,
+        )
+    }
+
     async getComments(args: GetTaskCommentsArgs | GetProjectCommentsArgs): Promise<Comment[]> {
         const response = await request<Comment[]>(
             'GET',
diff --git a/src/consts/endpoints.ts b/src/consts/endpoints.ts
index 9b1e698..966cd02 100644
--- a/src/consts/endpoints.ts
+++ b/src/consts/endpoints.ts
@@ -20,6 +20,9 @@ export const ENDPOINT_REST_TASKS = 'tasks'
 export const ENDPOINT_REST_PROJECTS = 'projects'
 export const ENDPOINT_REST_SECTIONS = 'sections'
 export const ENDPOINT_REST_LABELS = 'labels'
+export const ENDPOINT_REST_LABELS_SHARED = ENDPOINT_REST_LABELS + '/shared'
+export const ENDPOINT_REST_LABELS_SHARED_RENAME = ENDPOINT_REST_LABELS_SHARED + '/rename'
+export const ENDPOINT_REST_LABELS_SHARED_REMOVE = ENDPOINT_REST_LABELS_SHARED + '/remove'
 export const ENDPOINT_REST_COMMENTS = 'comments'
 export const ENDPOINT_REST_TASK_CLOSE = 'close'
 export const ENDPOINT_REST_TASK_REOPEN = 'reopen'

From 7e10cda4e3938dacc816b81d4d8f40c52c0f5559 Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Wed, 24 Aug 2022 13:35:53 +0100
Subject: [PATCH 05/11] chore: Corrects the quick add types and fixes the tests

---
 src/TodoistApi.comments.test.ts  |  6 +++---
 src/TodoistApi.sections.test.ts  |  2 +-
 src/TodoistApi.tasks.test.ts     |  2 +-
 src/testUtils/testDefaults.ts    | 15 +++++++++------
 src/types/entities.ts            | 14 ++++++++------
 src/utils/colors.test.ts         |  4 ++--
 src/utils/taskConverters.test.ts |  6 +++---
 src/utils/taskConverters.ts      | 15 +++++++++------
 8 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/TodoistApi.comments.test.ts b/src/TodoistApi.comments.test.ts
index 457af60..977fdff 100644
--- a/src/TodoistApi.comments.test.ts
+++ b/src/TodoistApi.comments.test.ts
@@ -16,7 +16,7 @@ function getTarget() {
 describe('TodoistApi comment endpoints', () => {
     describe('getComments', () => {
         test('calls get request with expected params', async () => {
-            const getCommentsArgs = { projectId: 12 }
+            const getCommentsArgs = { projectId: '12' }
             const requestMock = setupRestClientMock([DEFAULT_COMMENT])
             const api = getTarget()
 
@@ -37,7 +37,7 @@ describe('TodoistApi comment endpoints', () => {
             setupRestClientMock(expectedComments)
             const api = getTarget()
 
-            const comments = await api.getComments({ taskId: 12 })
+            const comments = await api.getComments({ taskId: '12' })
 
             expect(comments).toEqual(expectedComments)
         })
@@ -80,7 +80,7 @@ describe('TodoistApi comment endpoints', () => {
     describe('addComment', () => {
         const addCommentArgs = {
             content: 'A comment',
-            taskId: 123,
+            taskId: '123',
         }
 
         test('makes post request with expected params', async () => {
diff --git a/src/TodoistApi.sections.test.ts b/src/TodoistApi.sections.test.ts
index 771c607..195cfbf 100644
--- a/src/TodoistApi.sections.test.ts
+++ b/src/TodoistApi.sections.test.ts
@@ -79,7 +79,7 @@ describe('TodoistApi section endpoints', () => {
     describe('addSection', () => {
         const DEFAULT_ADD_SECTION_ARGS = {
             name: 'This is a section',
-            projectId: 123,
+            projectId: '123',
         }
 
         test('calls post on restClient with expected parameters', async () => {
diff --git a/src/TodoistApi.tasks.test.ts b/src/TodoistApi.tasks.test.ts
index cd0e23c..93cdac9 100644
--- a/src/TodoistApi.tasks.test.ts
+++ b/src/TodoistApi.tasks.test.ts
@@ -282,7 +282,7 @@ describe('TodoistApi task endpoints', () => {
 
     describe('getTasks', () => {
         const DEFAULT_GET_TASKS_ARGS = {
-            projectId: 123,
+            projectId: '123',
         }
 
         test('calls get on expected endpoint with args', async () => {
diff --git a/src/testUtils/testDefaults.ts b/src/testUtils/testDefaults.ts
index 17d131d..6eac738 100644
--- a/src/testUtils/testDefaults.ts
+++ b/src/testUtils/testDefaults.ts
@@ -23,6 +23,7 @@ const DEFAULT_SECTION_ID = '456'
 const DEFAULT_SECTION_NAME = 'This is a section'
 const DEFAULT_PARENT_ID = '5678'
 const DEFAULT_ASSIGNEE = '1234'
+const DEFAULT_CREATOR = '1234'
 const DEFAULT_DATE = '2020-09-08T12:00:00Z'
 const DEFAULT_ENTITY_COLOR = 'berry_red'
 const DEFAULT_LABELS = ['personal', 'work', 'hobby']
@@ -49,18 +50,19 @@ export const INVALID_DUE_DATE = {
 }
 
 export const DEFAULT_QUICK_ADD_RESPONSE: QuickAddTaskResponse = {
-    id: DEFAULT_TASK_ID,
-    projectId: DEFAULT_PROJECT_ID,
+    id: parseInt(DEFAULT_TASK_ID),
+    projectId: parseInt(DEFAULT_PROJECT_ID),
     content: DEFAULT_TASK_CONTENT,
     description: DEFAULT_TASK_DESCRIPTION,
     priority: DEFAULT_TASK_PRIORITY,
-    sectionId: DEFAULT_SECTION_ID,
-    parentId: DEFAULT_PARENT_ID,
+    sectionId: parseInt(DEFAULT_SECTION_ID),
+    parentId: parseInt(DEFAULT_PARENT_ID),
     childOrder: DEFAULT_ORDER,
-    labels: DEFAULT_LABELS,
-    responsibleUid: DEFAULT_ASSIGNEE,
+    labels: [1, 2, 3],
+    responsibleUid: parseInt(DEFAULT_ASSIGNEE),
     checked: 0,
     dateAdded: DEFAULT_DATE,
+    creatorId: parseInt(DEFAULT_CREATOR),
     due: {
         date: DEFAULT_DATE,
         timezone: null,
@@ -86,6 +88,7 @@ export const DEFAULT_TASK: Task = {
     url: 'https://todoist.com/showTask?id=1234',
     due: DEFAULT_DUE_DATE,
     assigneeId: DEFAULT_ASSIGNEE,
+    creatorId: DEFAULT_CREATOR,
 }
 
 export const INVALID_TASK = {
diff --git a/src/types/entities.ts b/src/types/entities.ts
index 9027151..3081336 100644
--- a/src/types/entities.ts
+++ b/src/types/entities.ts
@@ -51,6 +51,7 @@ export const Task = Record({
     commentCount: Int,
     createdAt: String,
     url: String,
+    creatorId: String,
 }).And(
     Partial({
         due: DueDate,
@@ -150,18 +151,19 @@ export type Color = TodoistEntity & {
 }
 
 export type QuickAddTaskResponse = {
-    id: string
-    projectId: string
+    id: number
+    projectId: number
     content: string
     description: string
     priority: number
-    sectionId: string | null
-    parentId: string | null
+    sectionId: number | null
+    parentId: number | null
     childOrder: number // order
-    labels: string[] // labelIds
-    responsibleUid: string | null
+    labels: number[] // labelIds
+    responsibleUid: number | null
     checked: number // completed
     dateAdded: string // created
+    creatorId: number | null
     due: {
         date: string
         timezone: string | null
diff --git a/src/utils/colors.test.ts b/src/utils/colors.test.ts
index d9aef71..41000a2 100644
--- a/src/utils/colors.test.ts
+++ b/src/utils/colors.test.ts
@@ -1,4 +1,4 @@
-import { getColor, berryRed, charcoal, taupe } from './colors'
+import { berryRed, charcoal, taupe, getColorById } from './colors'
 
 describe('getColor', () => {
     const colorTheories = [
@@ -9,7 +9,7 @@ describe('getColor', () => {
     ] as const
 
     test.each(colorTheories)('id %p returns color %p', (id, expected) => {
-        const color = getColor(id)
+        const color = getColorById(id)
         expect(color).toEqual(expected)
     })
 })
diff --git a/src/utils/taskConverters.test.ts b/src/utils/taskConverters.test.ts
index 43ec8ca..0268dfd 100644
--- a/src/utils/taskConverters.test.ts
+++ b/src/utils/taskConverters.test.ts
@@ -4,7 +4,7 @@ import { DEFAULT_QUICK_ADD_RESPONSE, DEFAULT_TASK } from '../testUtils/testDefau
 describe('getTaskFromQuickAddResponse', () => {
     test('maps sync data to expected task properties', () => {
         const task = getTaskFromQuickAddResponse(DEFAULT_QUICK_ADD_RESPONSE)
-        expect(task).toEqual(DEFAULT_TASK)
+        expect(task).toEqual({ ...DEFAULT_TASK, labels: ['1', '2', '3'] })
     })
 
     test('converts null sectionId to null', () => {
@@ -62,8 +62,8 @@ describe('getTaskFromQuickAddResponse', () => {
     })
 
     const taskUrlTheories = [
-        ['1234', 'https://todoist.com/showTask?id=1234'],
-        ['1234', 'https://todoist.com/showTask?id=1234'],
+        [1234, 'https://todoist.com/showTask?id=1234'],
+        [1234, 'https://todoist.com/showTask?id=1234'],
     ] as const
 
     test.each(taskUrlTheories)('with id %p and syncId %p returns url %p', (id, url) => {
diff --git a/src/utils/taskConverters.ts b/src/utils/taskConverters.ts
index cfd5e6a..64fc148 100644
--- a/src/utils/taskConverters.ts
+++ b/src/utils/taskConverters.ts
@@ -18,21 +18,24 @@ export function getTaskFromQuickAddResponse(responseData: QuickAddTaskResponse):
         : undefined
 
     const task = {
-        id: responseData.id,
+        id: String(responseData.id),
         order: responseData.childOrder,
         content: responseData.content,
         description: responseData.description,
-        projectId: responseData.projectId,
-        sectionId: responseData.sectionId ?? undefined,
+        projectId: String(responseData.projectId),
+        sectionId: responseData.sectionId ? String(responseData.sectionId) : undefined,
         isCompleted: responseData.checked === 1,
-        labels: responseData.labels,
+        labels: responseData.labels.map((x) => String(x)),
         priority: responseData.priority,
         commentCount: 0, // Will always be 0 for a quick add
         createdAt: responseData.dateAdded,
         url: getTaskUrlFromQuickAddResponse(responseData),
+        creatorId: responseData.creatorId ? String(responseData.creatorId) : '',
         ...(due !== undefined && { due }),
-        ...(responseData.parentId !== null && { parentId: responseData.parentId }),
-        ...(responseData.responsibleUid !== null && { assigneeId: responseData.responsibleUid }),
+        ...(responseData.parentId !== null && { parentId: String(responseData.parentId) }),
+        ...(responseData.responsibleUid !== null && {
+            assigneeId: String(responseData.responsibleUid),
+        }),
     }
 
     return task

From 92f1522804b3c73afc8bc02bdc03042f21e5cdd7 Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Wed, 24 Aug 2022 14:15:10 +0100
Subject: [PATCH 06/11] chore: Bumps the version of the package to v2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d0ef608..31b62b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@doist/todoist-api-typescript",
-    "version": "1.7.0",
+    "version": "2.0.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@doist/todoist-api-typescript",
-            "version": "1.7.0",
+            "version": "2.0.0",
             "license": "MIT",
             "dependencies": {
                 "axios": "^0.27.0",
diff --git a/package.json b/package.json
index a490018..9f7b347 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@doist/todoist-api-typescript",
-    "version": "1.7.0",
+    "version": "2.0.0",
     "description": "A typescript wrapper for the Todoist REST API.",
     "author": "Doist developers",
     "repository": "git@github.com:doist/todoist-api-typescript.git",

From e2fe6ab3b2e61553cd7cec72ea0d02e7581f5d23 Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Thu, 1 Sep 2022 10:43:59 +0100
Subject: [PATCH 07/11] chore: Set update methods to return object, not bool

---
 src/TodoistApi.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/TodoistApi.ts b/src/TodoistApi.ts
index a49f0e1..5f7b8fe 100644
--- a/src/TodoistApi.ts
+++ b/src/TodoistApi.ts
@@ -132,7 +132,7 @@ export class TodoistApi {
         return validateTask(task)
     }
 
-    async updateTask(id: number, args: UpdateTaskArgs, requestId?: string): Promise<boolean> {
+    async updateTask(id: number, args: UpdateTaskArgs, requestId?: string): Promise<Task> {
         Int.check(id)
         const response = await request(
             'POST',
@@ -142,7 +142,7 @@ export class TodoistApi {
             args,
             requestId,
         )
-        return isSuccess(response)
+        return validateTask(response.data)
     }
 
     async closeTask(id: number, requestId?: string): Promise<boolean> {
@@ -220,7 +220,7 @@ export class TodoistApi {
         return validateProject(response.data)
     }
 
-    async updateProject(id: number, args: UpdateProjectArgs, requestId?: string): Promise<boolean> {
+    async updateProject(id: number, args: UpdateProjectArgs, requestId?: string): Promise<Project> {
         Int.check(id)
         const response = await request(
             'POST',
@@ -230,7 +230,7 @@ export class TodoistApi {
             args,
             requestId,
         )
-        return isSuccess(response)
+        return validateProject(response.data)
     }
 
     async deleteProject(id: number, requestId?: string): Promise<boolean> {
@@ -298,7 +298,7 @@ export class TodoistApi {
         return validateSection(response.data)
     }
 
-    async updateSection(id: number, args: UpdateSectionArgs, requestId?: string): Promise<boolean> {
+    async updateSection(id: number, args: UpdateSectionArgs, requestId?: string): Promise<Section> {
         Int.check(id)
         const response = await request(
             'POST',
@@ -308,7 +308,7 @@ export class TodoistApi {
             args,
             requestId,
         )
-        return isSuccess(response)
+        return validateSection(response.data)
     }
 
     async deleteSection(id: number, requestId?: string): Promise<boolean> {
@@ -372,7 +372,7 @@ export class TodoistApi {
     /**
      * Updates a personal label
      */
-    async updateLabel(id: number, args: UpdateLabelArgs, requestId?: string): Promise<boolean> {
+    async updateLabel(id: number, args: UpdateLabelArgs, requestId?: string): Promise<Label> {
         Int.check(id)
         const response = await request(
             'POST',
@@ -382,7 +382,7 @@ export class TodoistApi {
             args,
             requestId,
         )
-        return isSuccess(response)
+        return validateLabel(response.data)
     }
 
     /**
@@ -472,7 +472,7 @@ export class TodoistApi {
         return validateComment(response.data)
     }
 
-    async updateComment(id: number, args: UpdateCommentArgs, requestId?: string): Promise<boolean> {
+    async updateComment(id: number, args: UpdateCommentArgs, requestId?: string): Promise<Comment> {
         Int.check(id)
         const response = await request<boolean>(
             'POST',
@@ -482,7 +482,7 @@ export class TodoistApi {
             args,
             requestId,
         )
-        return isSuccess(response)
+        return validateComment(response.data)
     }
 
     async deleteComment(id: number, requestId?: string): Promise<boolean> {

From 4096734f95295dd5dbae688e7aa1b90b241ea1b6 Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Thu, 1 Sep 2022 11:49:32 +0100
Subject: [PATCH 08/11] tests: Updates tests for update methods

---
 src/TodoistApi.comments.test.ts |  7 ++++---
 src/TodoistApi.labels.test.ts   |  7 ++++---
 src/TodoistApi.projects.test.ts | 13 ++++++++-----
 src/TodoistApi.sections.test.ts | 18 ++++++++++--------
 src/TodoistApi.tasks.test.ts    | 16 +++++++++-------
 5 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/TodoistApi.comments.test.ts b/src/TodoistApi.comments.test.ts
index 977fdff..b4342c2 100644
--- a/src/TodoistApi.comments.test.ts
+++ b/src/TodoistApi.comments.test.ts
@@ -118,7 +118,7 @@ describe('TodoistApi comment endpoints', () => {
 
         test('makes post request with expected params', async () => {
             const taskId = 1
-            const requestMock = setupRestClientMock(undefined, 204)
+            const requestMock = setupRestClientMock(DEFAULT_COMMENT, 204)
             const api = getTarget()
 
             await api.updateComment(taskId, updateCommentArgs, DEFAULT_REQUEST_ID)
@@ -135,12 +135,13 @@ describe('TodoistApi comment endpoints', () => {
         })
 
         test('returns success result from rest client', async () => {
-            setupRestClientMock(undefined, 204)
+            const returnedComment = { ...DEFAULT_COMMENT, ...updateCommentArgs }
+            setupRestClientMock(returnedComment, 204)
             const api = getTarget()
 
             const result = await api.updateComment(1, updateCommentArgs)
 
-            expect(result).toEqual(true)
+            expect(result).toEqual(returnedComment)
         })
 
         test('throws validation error for invalid id input', async () => {
diff --git a/src/TodoistApi.labels.test.ts b/src/TodoistApi.labels.test.ts
index 186abaa..195daec 100644
--- a/src/TodoistApi.labels.test.ts
+++ b/src/TodoistApi.labels.test.ts
@@ -113,7 +113,7 @@ describe('TodoistApi label endpoints', () => {
 
         test('calls post on restClient with expected parameters', async () => {
             const labelId = 123
-            const requestMock = setupRestClientMock(undefined, 204)
+            const requestMock = setupRestClientMock(DEFAULT_LABEL, 204)
             const api = getTarget()
 
             await api.updateLabel(labelId, DEFAULT_UPDATE_LABEL_ARGS, DEFAULT_REQUEST_ID)
@@ -130,12 +130,13 @@ describe('TodoistApi label endpoints', () => {
         })
 
         test('returns success result from rest client', async () => {
-            setupRestClientMock(undefined, 204)
+            const returnedTask = { ...DEFAULT_LABEL, ...DEFAULT_UPDATE_LABEL_ARGS }
+            setupRestClientMock(returnedTask, 204)
             const api = getTarget()
 
             const result = await api.updateLabel(123, DEFAULT_UPDATE_LABEL_ARGS)
 
-            expect(result).toEqual(true)
+            expect(result).toEqual(returnedTask)
         })
 
         test('throws validation error for invalid id input', async () => {
diff --git a/src/TodoistApi.projects.test.ts b/src/TodoistApi.projects.test.ts
index 82fd5b2..95dfc71 100644
--- a/src/TodoistApi.projects.test.ts
+++ b/src/TodoistApi.projects.test.ts
@@ -112,10 +112,11 @@ describe('TodoistApi project endpoints', () => {
     })
 
     describe('updateProject', () => {
+        const DEFAULT_UPDATE_PROJECT_ARGS = { name: 'a name' }
         test('calls post on restClient with expected parameters', async () => {
             const projectId = 123
             const updateArgs = { name: 'a new name' }
-            const requestMock = setupRestClientMock(undefined, 204)
+            const requestMock = setupRestClientMock(DEFAULT_PROJECT, 204)
             const api = getTarget()
 
             await api.updateProject(projectId, updateArgs, DEFAULT_REQUEST_ID)
@@ -132,17 +133,19 @@ describe('TodoistApi project endpoints', () => {
         })
 
         test('returns success result from rest client', async () => {
-            setupRestClientMock(undefined, 204)
+            const returnedProject = { ...DEFAULT_PROJECT, DEFAULT_UPDATE_PROJECT_ARGS }
+            setupRestClientMock(returnedProject, 204)
             const api = getTarget()
 
-            const result = await api.updateProject(123, { name: 'a name' })
+            const result = await api.updateProject(123, DEFAULT_UPDATE_PROJECT_ARGS)
 
-            expect(result).toEqual(true)
+            expect(result).toEqual(returnedProject)
         })
 
         test('throws validation error for invalid id input', async () => {
             await assertInputValidationError(
-                async () => await getTarget().updateProject(INVALID_ENTITY_ID, { name: 'a name' }),
+                async () =>
+                    await getTarget().updateProject(INVALID_ENTITY_ID, DEFAULT_UPDATE_PROJECT_ARGS),
             )
         })
     })
diff --git a/src/TodoistApi.sections.test.ts b/src/TodoistApi.sections.test.ts
index 195cfbf..b68cb01 100644
--- a/src/TodoistApi.sections.test.ts
+++ b/src/TodoistApi.sections.test.ts
@@ -110,13 +110,14 @@ describe('TodoistApi section endpoints', () => {
     })
 
     describe('updateSection', () => {
+        const DEFAULT_UPDATE_SECTION_ARGS = { name: 'a new name' }
+
         test('calls post on restClient with expected parameters', async () => {
             const sectionId = 123
-            const updateArgs = { name: 'a new name' }
-            const requestMock = setupRestClientMock(undefined, 204)
+            const requestMock = setupRestClientMock(DEFAULT_SECTION, 204)
             const api = getTarget()
 
-            await api.updateSection(sectionId, updateArgs, DEFAULT_REQUEST_ID)
+            await api.updateSection(sectionId, DEFAULT_UPDATE_SECTION_ARGS, DEFAULT_REQUEST_ID)
 
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
@@ -124,24 +125,25 @@ describe('TodoistApi section endpoints', () => {
                 getRestBaseUri(),
                 `${ENDPOINT_REST_SECTIONS}/${sectionId}`,
                 DEFAULT_AUTH_TOKEN,
-                updateArgs,
+                DEFAULT_UPDATE_SECTION_ARGS,
                 DEFAULT_REQUEST_ID,
             )
         })
 
         test('returns success result from rest client', async () => {
-            setupRestClientMock(undefined, 204)
+            const returnedSection = { ...DEFAULT_SECTION, ...DEFAULT_UPDATE_SECTION_ARGS }
+            setupRestClientMock(returnedSection, 204)
             const api = getTarget()
 
-            const response = await api.updateSection(123, { name: 'a new name' })
+            const response = await api.updateSection(123, DEFAULT_UPDATE_SECTION_ARGS)
 
-            expect(response).toEqual(true)
+            expect(response).toEqual(returnedSection)
         })
 
         test('throws validation error for invalid id input', async () => {
             await assertInputValidationError(
                 async () =>
-                    await getTarget().updateSection(INVALID_ENTITY_ID, { name: 'a new name' }),
+                    await getTarget().updateSection(INVALID_ENTITY_ID, DEFAULT_UPDATE_SECTION_ARGS),
             )
         })
     })
diff --git a/src/TodoistApi.tasks.test.ts b/src/TodoistApi.tasks.test.ts
index 93cdac9..cd9c2d9 100644
--- a/src/TodoistApi.tasks.test.ts
+++ b/src/TodoistApi.tasks.test.ts
@@ -78,13 +78,14 @@ describe('TodoistApi task endpoints', () => {
     })
 
     describe('updateTask', () => {
+        const DEFAULT_UPDATE_TASK_ARGS = { content: 'some new content' }
+
         test('calls post on restClient with expected parameters', async () => {
             const taskId = 123
-            const updateArgs = { content: 'some new content' }
-            const requestMock = setupRestClientMock(undefined, 204)
+            const requestMock = setupRestClientMock(DEFAULT_TASK, 204)
             const api = getTarget()
 
-            await api.updateTask(taskId, updateArgs, DEFAULT_REQUEST_ID)
+            await api.updateTask(taskId, DEFAULT_UPDATE_TASK_ARGS, DEFAULT_REQUEST_ID)
 
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
@@ -92,18 +93,19 @@ describe('TodoistApi task endpoints', () => {
                 getRestBaseUri(),
                 `${ENDPOINT_REST_TASKS}/${taskId}`,
                 DEFAULT_AUTH_TOKEN,
-                updateArgs,
+                DEFAULT_UPDATE_TASK_ARGS,
                 DEFAULT_REQUEST_ID,
             )
         })
 
         test('returns success result from rest client', async () => {
-            setupRestClientMock(undefined, 204)
+            const returnedTask = { ...DEFAULT_TASK, ...DEFAULT_UPDATE_TASK_ARGS }
+            setupRestClientMock(returnedTask, 204)
             const api = getTarget()
 
-            const response = await api.updateTask(123, { content: 'some content' })
+            const response = await api.updateTask(123, DEFAULT_UPDATE_TASK_ARGS)
 
-            expect(response).toEqual(true)
+            expect(response).toEqual(returnedTask)
         })
 
         test('throws validation error for invalid id input', async () => {

From 25bc91f242109e3e2db42cb5773097a3744da97d Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Mon, 5 Sep 2022 11:25:28 +0100
Subject: [PATCH 09/11] chore: Updates quick add to use v9 of sync

---
 src/authentication.test.ts    |  2 +-
 src/consts/endpoints.ts       |  2 +-
 src/testUtils/testDefaults.ts | 16 ++++++++--------
 src/types/entities.ts         | 16 ++++++++--------
 src/utils/taskConverters.ts   | 16 ++++++++--------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/authentication.test.ts b/src/authentication.test.ts
index 968b9fc..64bcf82 100644
--- a/src/authentication.test.ts
+++ b/src/authentication.test.ts
@@ -144,7 +144,7 @@ describe('authentication', () => {
             expect(requestMock).toBeCalledTimes(1)
             expect(requestMock).toBeCalledWith(
                 'POST',
-                'https://api.todoist.com/sync/v8/',
+                'https://api.todoist.com/sync/v9/',
                 'access_tokens/revoke',
                 undefined,
                 revokeTokenRequest,
diff --git a/src/consts/endpoints.ts b/src/consts/endpoints.ts
index 966cd02..b20e93b 100644
--- a/src/consts/endpoints.ts
+++ b/src/consts/endpoints.ts
@@ -1,6 +1,6 @@
 const BASE_URI = 'https://api.todoist.com'
 const API_REST_BASE_URI = '/rest/v2/'
-const API_SYNC_BASE_URI = '/sync/v8/'
+const API_SYNC_BASE_URI = '/sync/v9/'
 const TODOIST_URI = 'https://todoist.com'
 const API_AUTHORIZATION_BASE_URI = '/oauth/'
 
diff --git a/src/testUtils/testDefaults.ts b/src/testUtils/testDefaults.ts
index 6eac738..15efb2a 100644
--- a/src/testUtils/testDefaults.ts
+++ b/src/testUtils/testDefaults.ts
@@ -50,19 +50,19 @@ export const INVALID_DUE_DATE = {
 }
 
 export const DEFAULT_QUICK_ADD_RESPONSE: QuickAddTaskResponse = {
-    id: parseInt(DEFAULT_TASK_ID),
-    projectId: parseInt(DEFAULT_PROJECT_ID),
+    id: DEFAULT_TASK_ID,
+    projectId: DEFAULT_PROJECT_ID,
     content: DEFAULT_TASK_CONTENT,
     description: DEFAULT_TASK_DESCRIPTION,
     priority: DEFAULT_TASK_PRIORITY,
-    sectionId: parseInt(DEFAULT_SECTION_ID),
-    parentId: parseInt(DEFAULT_PARENT_ID),
+    sectionId: DEFAULT_SECTION_ID,
+    parentId: DEFAULT_PARENT_ID,
     childOrder: DEFAULT_ORDER,
-    labels: [1, 2, 3],
-    responsibleUid: parseInt(DEFAULT_ASSIGNEE),
+    labels: DEFAULT_LABELS,
+    responsibleUid: DEFAULT_ASSIGNEE,
     checked: 0,
-    dateAdded: DEFAULT_DATE,
-    creatorId: parseInt(DEFAULT_CREATOR),
+    added_at: DEFAULT_DATE,
+    added_by_uid: DEFAULT_CREATOR,
     due: {
         date: DEFAULT_DATE,
         timezone: null,
diff --git a/src/types/entities.ts b/src/types/entities.ts
index 3081336..f6000a3 100644
--- a/src/types/entities.ts
+++ b/src/types/entities.ts
@@ -151,19 +151,19 @@ export type Color = TodoistEntity & {
 }
 
 export type QuickAddTaskResponse = {
-    id: number
-    projectId: number
+    id: string
+    projectId: string
     content: string
     description: string
     priority: number
-    sectionId: number | null
-    parentId: number | null
+    sectionId: string | null
+    parentId: string | null
     childOrder: number // order
-    labels: number[] // labelIds
-    responsibleUid: number | null
+    labels: string[]
+    responsibleUid: string | null
     checked: number // completed
-    dateAdded: string // created
-    creatorId: number | null
+    added_at: string // created
+    added_by_uid: string | null
     due: {
         date: string
         timezone: string | null
diff --git a/src/utils/taskConverters.ts b/src/utils/taskConverters.ts
index 64fc148..14e195a 100644
--- a/src/utils/taskConverters.ts
+++ b/src/utils/taskConverters.ts
@@ -18,23 +18,23 @@ export function getTaskFromQuickAddResponse(responseData: QuickAddTaskResponse):
         : undefined
 
     const task = {
-        id: String(responseData.id),
+        id: responseData.id,
         order: responseData.childOrder,
         content: responseData.content,
         description: responseData.description,
-        projectId: String(responseData.projectId),
-        sectionId: responseData.sectionId ? String(responseData.sectionId) : undefined,
+        projectId: responseData.projectId,
+        sectionId: responseData.sectionId ? responseData.sectionId : undefined,
         isCompleted: responseData.checked === 1,
-        labels: responseData.labels.map((x) => String(x)),
+        labels: responseData.labels,
         priority: responseData.priority,
         commentCount: 0, // Will always be 0 for a quick add
-        createdAt: responseData.dateAdded,
+        createdAt: responseData.added_at,
         url: getTaskUrlFromQuickAddResponse(responseData),
-        creatorId: responseData.creatorId ? String(responseData.creatorId) : '',
+        creatorId: responseData.added_by_uid ? responseData.added_by_uid : '',
         ...(due !== undefined && { due }),
-        ...(responseData.parentId !== null && { parentId: String(responseData.parentId) }),
+        ...(responseData.parentId !== null && { parentId: responseData.parentId }),
         ...(responseData.responsibleUid !== null && {
-            assigneeId: String(responseData.responsibleUid),
+            assigneeId: responseData.responsibleUid,
         }),
     }
 

From 87f392f9cc86f0ee85bca2bd5a427c749af3a9e0 Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Mon, 5 Sep 2022 11:31:23 +0100
Subject: [PATCH 10/11] tests: Corrects tests with v9 types

---
 src/utils/taskConverters.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/taskConverters.test.ts b/src/utils/taskConverters.test.ts
index 0268dfd..a80f53f 100644
--- a/src/utils/taskConverters.test.ts
+++ b/src/utils/taskConverters.test.ts
@@ -4,7 +4,7 @@ import { DEFAULT_QUICK_ADD_RESPONSE, DEFAULT_TASK } from '../testUtils/testDefau
 describe('getTaskFromQuickAddResponse', () => {
     test('maps sync data to expected task properties', () => {
         const task = getTaskFromQuickAddResponse(DEFAULT_QUICK_ADD_RESPONSE)
-        expect(task).toEqual({ ...DEFAULT_TASK, labels: ['1', '2', '3'] })
+        expect(task).toEqual({ ...DEFAULT_TASK, labels: ['personal', 'work', 'hobby'] })
     })
 
     test('converts null sectionId to null', () => {
@@ -62,8 +62,8 @@ describe('getTaskFromQuickAddResponse', () => {
     })
 
     const taskUrlTheories = [
-        [1234, 'https://todoist.com/showTask?id=1234'],
-        [1234, 'https://todoist.com/showTask?id=1234'],
+        ['1234', 'https://todoist.com/showTask?id=1234'],
+        ['1234', 'https://todoist.com/showTask?id=1234'],
     ] as const
 
     test.each(taskUrlTheories)('with id %p and syncId %p returns url %p', (id, url) => {

From 62727505c1b6ecf05ad0f1aa75f3cb244ae0abd3 Mon Sep 17 00:00:00 2001
From: Scott Lovegrove <scott@ferretlabs.com>
Date: Thu, 8 Sep 2022 09:35:33 +0100
Subject: [PATCH 11/11] chore: Fix changes after merge

---
 src/TodoistApi.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TodoistApi.ts b/src/TodoistApi.ts
index 5f7b8fe..86c4fef 100644
--- a/src/TodoistApi.ts
+++ b/src/TodoistApi.ts
@@ -404,7 +404,7 @@ export class TodoistApi {
     async getSharedLabels(): Promise<string[]> {
         const response = await request<string[]>(
             'GET',
-            API_REST_BASE_URI,
+            this.restApiBase,
             ENDPOINT_REST_LABELS_SHARED,
             this.authToken,
         )
@@ -415,7 +415,7 @@ export class TodoistApi {
     async renameSharedLabel(args: RenameSharedLabelArgs): Promise<void> {
         await request<void>(
             'POST',
-            API_REST_BASE_URI,
+            this.restApiBase,
             ENDPOINT_REST_LABELS_SHARED_RENAME,
             this.authToken,
             args,
@@ -425,7 +425,7 @@ export class TodoistApi {
     async removeSharedLabel(args: RemoveSharedLabelArgs): Promise<void> {
         await request<void>(
             'POST',
-            API_REST_BASE_URI,
+            this.restApiBase,
             ENDPOINT_REST_LABELS_SHARED_REMOVE,
             this.authToken,
             args,