From 1e1b573c52484b54e5e08817f38ffa313e6ac761 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 1 Aug 2022 19:34:19 +0800
Subject: [PATCH 01/25] Add integrations table in db

---
 .../db/migrations/0090.do.integrations.sql    | 23 +++++++++++++++++++
 .../db/migrations/0090.undo.integrations.sql  |  9 ++++++++
 2 files changed, 32 insertions(+)
 create mode 100755 packages/db/migrations/0090.do.integrations.sql
 create mode 100755 packages/db/migrations/0090.undo.integrations.sql

diff --git a/packages/db/migrations/0090.do.integrations.sql b/packages/db/migrations/0090.do.integrations.sql
new file mode 100755
index 000000000..ebe0c368e
--- /dev/null
+++ b/packages/db/migrations/0090.do.integrations.sql
@@ -0,0 +1,23 @@
+-- Type: DO
+-- Name: integrations
+-- Description: Create integrations table
+
+BEGIN;
+
+CREATE TABLE omnivore.integrations (
+    id uuid PRIMARY KEY DEFAULT uuid_generate_v1mc(),
+    user_id uuid NOT NULL REFERENCES omnivore.user ON DELETE CASCADE,
+    name varchar(50) NOT NULL,
+    token varchar(255) NOT NULL,
+    enabled boolean NOT NULL DEFAULT true,
+    description varchar(255),
+    url varchar(255),
+    created_at timestamptz NOT NULL DEFAULT current_timestamp,
+    updated_at timestamptz NOT NULL DEFAULT current_timestamp,
+    UNIQUE (user_id, name)
+);
+
+CREATE TRIGGER update_integration_modtime BEFORE UPDATE ON omnivore.integrations
+    FOR EACH ROW EXECUTE PROCEDURE update_updated_at_column();
+
+COMMIT;
diff --git a/packages/db/migrations/0090.undo.integrations.sql b/packages/db/migrations/0090.undo.integrations.sql
new file mode 100755
index 000000000..00835639a
--- /dev/null
+++ b/packages/db/migrations/0090.undo.integrations.sql
@@ -0,0 +1,9 @@
+-- Type: UNDO
+-- Name: integrations
+-- Description: Create integrations table
+
+BEGIN;
+
+DROP TABLE IF EXISTS omnivore.integrations;
+
+COMMIT;

From db27ac7d59cd98b01cb27c666b588a0f26e5a383 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 1 Aug 2022 19:40:10 +0800
Subject: [PATCH 02/25] Add integration entity

---
 packages/api/src/entity/integration.ts        | 35 +++++++++++++++++++
 .../db/migrations/0090.do.integrations.sql    |  2 --
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 packages/api/src/entity/integration.ts

diff --git a/packages/api/src/entity/integration.ts b/packages/api/src/entity/integration.ts
new file mode 100644
index 000000000..406e820db
--- /dev/null
+++ b/packages/api/src/entity/integration.ts
@@ -0,0 +1,35 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm'
+import { User } from './user'
+
+@Entity({ name: 'integrations' })
+export class Integration {
+  @PrimaryGeneratedColumn('uuid')
+  id!: string
+
+  @ManyToOne(() => User, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'user_id' })
+  user!: User
+
+  @Column('varchar')
+  name!: string
+
+  @Column('varchar')
+  token!: string
+
+  @Column('boolean', { default: true })
+  enabled!: boolean
+
+  @CreateDateColumn({ default: () => 'CURRENT_TIMESTAMP' })
+  createdAt!: Date
+
+  @UpdateDateColumn({ default: () => 'CURRENT_TIMESTAMP' })
+  updatedAt!: Date
+}
diff --git a/packages/db/migrations/0090.do.integrations.sql b/packages/db/migrations/0090.do.integrations.sql
index ebe0c368e..5f5c836ca 100755
--- a/packages/db/migrations/0090.do.integrations.sql
+++ b/packages/db/migrations/0090.do.integrations.sql
@@ -10,8 +10,6 @@ CREATE TABLE omnivore.integrations (
     name varchar(50) NOT NULL,
     token varchar(255) NOT NULL,
     enabled boolean NOT NULL DEFAULT true,
-    description varchar(255),
-    url varchar(255),
     created_at timestamptz NOT NULL DEFAULT current_timestamp,
     updated_at timestamptz NOT NULL DEFAULT current_timestamp,
     UNIQUE (user_id, name)

From e66d047d5104d3df77210b4f3c3fed7920edc1cf Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 1 Aug 2022 21:53:39 +0800
Subject: [PATCH 03/25] Add createIntegration API to the GQL schema

---
 packages/api/src/entity/integration.ts        |  8 +-
 packages/api/src/generated/graphql.ts         | 83 +++++++++++++++++++
 packages/api/src/generated/schema.graphql     | 35 ++++++++
 packages/api/src/schema.ts                    | 37 +++++++++
 .../db/migrations/0090.do.integrations.sql    |  8 +-
 .../db/migrations/0090.undo.integrations.sql  |  2 +
 6 files changed, 168 insertions(+), 5 deletions(-)

diff --git a/packages/api/src/entity/integration.ts b/packages/api/src/entity/integration.ts
index 406e820db..c4d2bbc88 100644
--- a/packages/api/src/entity/integration.ts
+++ b/packages/api/src/entity/integration.ts
@@ -9,6 +9,10 @@ import {
 } from 'typeorm'
 import { User } from './user'
 
+export enum IntegrationType {
+  Readwise = 'READWISE',
+}
+
 @Entity({ name: 'integrations' })
 export class Integration {
   @PrimaryGeneratedColumn('uuid')
@@ -18,8 +22,8 @@ export class Integration {
   @JoinColumn({ name: 'user_id' })
   user!: User
 
-  @Column('varchar')
-  name!: string
+  @Column('enum', { enum: IntegrationType })
+  type!: IntegrationType
 
   @Column('varchar')
   token!: string
diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts
index 1ce355cbd..3a8ca3dc9 100644
--- a/packages/api/src/generated/graphql.ts
+++ b/packages/api/src/generated/graphql.ts
@@ -331,6 +331,30 @@ export type CreateHighlightSuccess = {
   highlight: Highlight;
 };
 
+export type CreateIntegrationError = {
+  __typename?: 'CreateIntegrationError';
+  errorCodes: Array<CreateIntegrationErrorCode>;
+};
+
+export enum CreateIntegrationErrorCode {
+  BadRequest = 'BAD_REQUEST',
+  InvalidToken = 'INVALID_TOKEN',
+  NotFound = 'NOT_FOUND',
+  Unauthorized = 'UNAUTHORIZED'
+}
+
+export type CreateIntegrationInput = {
+  token: Scalars['String'];
+  type: IntegrationType;
+};
+
+export type CreateIntegrationResult = CreateIntegrationError | CreateIntegrationSuccess;
+
+export type CreateIntegrationSuccess = {
+  __typename?: 'CreateIntegrationSuccess';
+  integration: Integration;
+};
+
 export type CreateLabelError = {
   __typename?: 'CreateLabelError';
   errorCodes: Array<CreateLabelErrorCode>;
@@ -745,6 +769,19 @@ export type HighlightStats = {
   highlightCount: Scalars['Int'];
 };
 
+export type Integration = {
+  __typename?: 'Integration';
+  createdAt: Scalars['Date'];
+  enabled: Scalars['Boolean'];
+  id: Scalars['ID'];
+  type: IntegrationType;
+  updatedAt: Scalars['Date'];
+};
+
+export enum IntegrationType {
+  Readwise = 'READWISE'
+}
+
 export type Label = {
   __typename?: 'Label';
   color: Scalars['String'];
@@ -897,6 +934,7 @@ export type Mutation = {
   createArticleSavingRequest: CreateArticleSavingRequestResult;
   createHighlight: CreateHighlightResult;
   createHighlightReply: CreateHighlightReplyResult;
+  createIntegration: CreateIntegrationResult;
   createLabel: CreateLabelResult;
   createNewsletterEmail: CreateNewsletterEmailResult;
   createReaction: CreateReactionResult;
@@ -971,6 +1009,11 @@ export type MutationCreateHighlightReplyArgs = {
 };
 
 
+export type MutationCreateIntegrationArgs = {
+  input: CreateIntegrationInput;
+};
+
+
 export type MutationCreateLabelArgs = {
   input: CreateLabelInput;
 };
@@ -2505,6 +2548,11 @@ export type ResolversTypes = {
   CreateHighlightReplySuccess: ResolverTypeWrapper<CreateHighlightReplySuccess>;
   CreateHighlightResult: ResolversTypes['CreateHighlightError'] | ResolversTypes['CreateHighlightSuccess'];
   CreateHighlightSuccess: ResolverTypeWrapper<CreateHighlightSuccess>;
+  CreateIntegrationError: ResolverTypeWrapper<CreateIntegrationError>;
+  CreateIntegrationErrorCode: CreateIntegrationErrorCode;
+  CreateIntegrationInput: CreateIntegrationInput;
+  CreateIntegrationResult: ResolversTypes['CreateIntegrationError'] | ResolversTypes['CreateIntegrationSuccess'];
+  CreateIntegrationSuccess: ResolverTypeWrapper<CreateIntegrationSuccess>;
   CreateLabelError: ResolverTypeWrapper<CreateLabelError>;
   CreateLabelErrorCode: CreateLabelErrorCode;
   CreateLabelInput: CreateLabelInput;
@@ -2592,6 +2640,8 @@ export type ResolversTypes = {
   HighlightStats: ResolverTypeWrapper<HighlightStats>;
   ID: ResolverTypeWrapper<Scalars['ID']>;
   Int: ResolverTypeWrapper<Scalars['Int']>;
+  Integration: ResolverTypeWrapper<Integration>;
+  IntegrationType: IntegrationType;
   Label: ResolverTypeWrapper<Label>;
   LabelsError: ResolverTypeWrapper<LabelsError>;
   LabelsErrorCode: LabelsErrorCode;
@@ -2859,6 +2909,10 @@ export type ResolversParentTypes = {
   CreateHighlightReplySuccess: CreateHighlightReplySuccess;
   CreateHighlightResult: ResolversParentTypes['CreateHighlightError'] | ResolversParentTypes['CreateHighlightSuccess'];
   CreateHighlightSuccess: CreateHighlightSuccess;
+  CreateIntegrationError: CreateIntegrationError;
+  CreateIntegrationInput: CreateIntegrationInput;
+  CreateIntegrationResult: ResolversParentTypes['CreateIntegrationError'] | ResolversParentTypes['CreateIntegrationSuccess'];
+  CreateIntegrationSuccess: CreateIntegrationSuccess;
   CreateLabelError: CreateLabelError;
   CreateLabelInput: CreateLabelInput;
   CreateLabelResult: ResolversParentTypes['CreateLabelError'] | ResolversParentTypes['CreateLabelSuccess'];
@@ -2929,6 +2983,7 @@ export type ResolversParentTypes = {
   HighlightStats: HighlightStats;
   ID: Scalars['ID'];
   Int: Scalars['Int'];
+  Integration: Integration;
   Label: Label;
   LabelsError: LabelsError;
   LabelsResult: ResolversParentTypes['LabelsError'] | ResolversParentTypes['LabelsSuccess'];
@@ -3327,6 +3382,20 @@ export type CreateHighlightSuccessResolvers<ContextType = ResolverContext, Paren
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type CreateIntegrationErrorResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['CreateIntegrationError'] = ResolversParentTypes['CreateIntegrationError']> = {
+  errorCodes?: Resolver<Array<ResolversTypes['CreateIntegrationErrorCode']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type CreateIntegrationResultResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['CreateIntegrationResult'] = ResolversParentTypes['CreateIntegrationResult']> = {
+  __resolveType: TypeResolveFn<'CreateIntegrationError' | 'CreateIntegrationSuccess', ParentType, ContextType>;
+};
+
+export type CreateIntegrationSuccessResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['CreateIntegrationSuccess'] = ResolversParentTypes['CreateIntegrationSuccess']> = {
+  integration?: Resolver<ResolversTypes['Integration'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type CreateLabelErrorResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['CreateLabelError'] = ResolversParentTypes['CreateLabelError']> = {
   errorCodes?: Resolver<Array<ResolversTypes['CreateLabelErrorCode']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
@@ -3644,6 +3713,15 @@ export type HighlightStatsResolvers<ContextType = ResolverContext, ParentType ex
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type IntegrationResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['Integration'] = ResolversParentTypes['Integration']> = {
+  createdAt?: Resolver<ResolversTypes['Date'], ParentType, ContextType>;
+  enabled?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  type?: Resolver<ResolversTypes['IntegrationType'], ParentType, ContextType>;
+  updatedAt?: Resolver<ResolversTypes['Date'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type LabelResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['Label'] = ResolversParentTypes['Label']> = {
   color?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   createdAt?: Resolver<Maybe<ResolversTypes['Date']>, ParentType, ContextType>;
@@ -3755,6 +3833,7 @@ export type MutationResolvers<ContextType = ResolverContext, ParentType extends
   createArticleSavingRequest?: Resolver<ResolversTypes['CreateArticleSavingRequestResult'], ParentType, ContextType, RequireFields<MutationCreateArticleSavingRequestArgs, 'input'>>;
   createHighlight?: Resolver<ResolversTypes['CreateHighlightResult'], ParentType, ContextType, RequireFields<MutationCreateHighlightArgs, 'input'>>;
   createHighlightReply?: Resolver<ResolversTypes['CreateHighlightReplyResult'], ParentType, ContextType, RequireFields<MutationCreateHighlightReplyArgs, 'input'>>;
+  createIntegration?: Resolver<ResolversTypes['CreateIntegrationResult'], ParentType, ContextType, RequireFields<MutationCreateIntegrationArgs, 'input'>>;
   createLabel?: Resolver<ResolversTypes['CreateLabelResult'], ParentType, ContextType, RequireFields<MutationCreateLabelArgs, 'input'>>;
   createNewsletterEmail?: Resolver<ResolversTypes['CreateNewsletterEmailResult'], ParentType, ContextType>;
   createReaction?: Resolver<ResolversTypes['CreateReactionResult'], ParentType, ContextType, RequireFields<MutationCreateReactionArgs, 'input'>>;
@@ -4556,6 +4635,9 @@ export type Resolvers<ContextType = ResolverContext> = {
   CreateHighlightReplySuccess?: CreateHighlightReplySuccessResolvers<ContextType>;
   CreateHighlightResult?: CreateHighlightResultResolvers<ContextType>;
   CreateHighlightSuccess?: CreateHighlightSuccessResolvers<ContextType>;
+  CreateIntegrationError?: CreateIntegrationErrorResolvers<ContextType>;
+  CreateIntegrationResult?: CreateIntegrationResultResolvers<ContextType>;
+  CreateIntegrationSuccess?: CreateIntegrationSuccessResolvers<ContextType>;
   CreateLabelError?: CreateLabelErrorResolvers<ContextType>;
   CreateLabelResult?: CreateLabelResultResolvers<ContextType>;
   CreateLabelSuccess?: CreateLabelSuccessResolvers<ContextType>;
@@ -4617,6 +4699,7 @@ export type Resolvers<ContextType = ResolverContext> = {
   Highlight?: HighlightResolvers<ContextType>;
   HighlightReply?: HighlightReplyResolvers<ContextType>;
   HighlightStats?: HighlightStatsResolvers<ContextType>;
+  Integration?: IntegrationResolvers<ContextType>;
   Label?: LabelResolvers<ContextType>;
   LabelsError?: LabelsErrorResolvers<ContextType>;
   LabelsResult?: LabelsResultResolvers<ContextType>;
diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql
index 87c111cea..3f6bef289 100644
--- a/packages/api/src/generated/schema.graphql
+++ b/packages/api/src/generated/schema.graphql
@@ -284,6 +284,28 @@ type CreateHighlightSuccess {
   highlight: Highlight!
 }
 
+type CreateIntegrationError {
+  errorCodes: [CreateIntegrationErrorCode!]!
+}
+
+enum CreateIntegrationErrorCode {
+  BAD_REQUEST
+  INVALID_TOKEN
+  NOT_FOUND
+  UNAUTHORIZED
+}
+
+input CreateIntegrationInput {
+  token: String!
+  type: IntegrationType!
+}
+
+union CreateIntegrationResult = CreateIntegrationError | CreateIntegrationSuccess
+
+type CreateIntegrationSuccess {
+  integration: Integration!
+}
+
 type CreateLabelError {
   errorCodes: [CreateLabelErrorCode!]!
 }
@@ -658,6 +680,18 @@ type HighlightStats {
   highlightCount: Int!
 }
 
+type Integration {
+  createdAt: Date!
+  enabled: Boolean!
+  id: ID!
+  type: IntegrationType!
+  updatedAt: Date!
+}
+
+enum IntegrationType {
+  READWISE
+}
+
 type Label {
   color: String!
   createdAt: Date
@@ -796,6 +830,7 @@ type Mutation {
   createArticleSavingRequest(input: CreateArticleSavingRequestInput!): CreateArticleSavingRequestResult!
   createHighlight(input: CreateHighlightInput!): CreateHighlightResult!
   createHighlightReply(input: CreateHighlightReplyInput!): CreateHighlightReplyResult!
+  createIntegration(input: CreateIntegrationInput!): CreateIntegrationResult!
   createLabel(input: CreateLabelInput!): CreateLabelResult!
   createNewsletterEmail: CreateNewsletterEmailResult!
   createReaction(input: CreateReactionInput!): CreateReactionResult!
diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts
index 4436d17c8..a1991f77e 100755
--- a/packages/api/src/schema.ts
+++ b/packages/api/src/schema.ts
@@ -1812,6 +1812,42 @@ const schema = gql`
     NOT_FOUND
   }
 
+  union CreateIntegrationResult =
+      CreateIntegrationSuccess
+    | CreateIntegrationError
+
+  type CreateIntegrationSuccess {
+    integration: Integration!
+  }
+
+  type Integration {
+    id: ID!
+    type: IntegrationType!
+    enabled: Boolean!
+    createdAt: Date!
+    updatedAt: Date!
+  }
+
+  enum IntegrationType {
+    READWISE
+  }
+
+  type CreateIntegrationError {
+    errorCodes: [CreateIntegrationErrorCode!]!
+  }
+
+  enum CreateIntegrationErrorCode {
+    UNAUTHORIZED
+    BAD_REQUEST
+    NOT_FOUND
+    INVALID_TOKEN
+  }
+
+  input CreateIntegrationInput {
+    type: IntegrationType!
+    token: String!
+  }
+
   # Mutations
   type Mutation {
     googleLogin(input: GoogleLoginInput!): LoginResult!
@@ -1881,6 +1917,7 @@ const schema = gql`
     revokeApiKey(id: ID!): RevokeApiKeyResult!
     setLabelsForHighlight(input: SetLabelsForHighlightInput!): SetLabelsResult!
     moveLabel(input: MoveLabelInput!): MoveLabelResult!
+    createIntegration(input: CreateIntegrationInput!): CreateIntegrationResult!
   }
 
   # FIXME: remove sort from feedArticles after all cached tabs are closed
diff --git a/packages/db/migrations/0090.do.integrations.sql b/packages/db/migrations/0090.do.integrations.sql
index 5f5c836ca..c07568d25 100755
--- a/packages/db/migrations/0090.do.integrations.sql
+++ b/packages/db/migrations/0090.do.integrations.sql
@@ -4,15 +4,17 @@
 
 BEGIN;
 
+CREATE TYPE omnivore.integration_type AS ENUM ('READWISE');
+
 CREATE TABLE omnivore.integrations (
     id uuid PRIMARY KEY DEFAULT uuid_generate_v1mc(),
     user_id uuid NOT NULL REFERENCES omnivore.user ON DELETE CASCADE,
-    name varchar(50) NOT NULL,
+    "type" integration_type NOT NULL,
     token varchar(255) NOT NULL,
-    enabled boolean NOT NULL DEFAULT true,
+    "enabled" boolean NOT NULL DEFAULT true,
     created_at timestamptz NOT NULL DEFAULT current_timestamp,
     updated_at timestamptz NOT NULL DEFAULT current_timestamp,
-    UNIQUE (user_id, name)
+    UNIQUE (user_id, "type")
 );
 
 CREATE TRIGGER update_integration_modtime BEFORE UPDATE ON omnivore.integrations
diff --git a/packages/db/migrations/0090.undo.integrations.sql b/packages/db/migrations/0090.undo.integrations.sql
index 00835639a..97c7ef087 100755
--- a/packages/db/migrations/0090.undo.integrations.sql
+++ b/packages/db/migrations/0090.undo.integrations.sql
@@ -6,4 +6,6 @@ BEGIN;
 
 DROP TABLE IF EXISTS omnivore.integrations;
 
+DROP TYPE IF EXISTS omnivore.integration_type CASCADE;
+
 COMMIT;

From dd2db71876f2f68cd1dca080aed4cab79f82eee0 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 1 Aug 2022 22:42:55 +0800
Subject: [PATCH 04/25] Add createIntegration API implementation

---
 packages/api/src/entity/integration.ts        |   2 +-
 packages/api/src/generated/graphql.ts         | 119 +++++++++---------
 packages/api/src/generated/schema.graphql     |  50 ++++----
 .../api/src/resolvers/function_resolvers.ts   |   3 +
 .../api/src/resolvers/integrations/index.ts   |  97 ++++++++++++++
 packages/api/src/schema.ts                    |  20 +--
 packages/api/src/services/integrations.ts     |  27 ++++
 packages/api/src/util.ts                      |   9 ++
 8 files changed, 237 insertions(+), 90 deletions(-)
 create mode 100644 packages/api/src/resolvers/integrations/index.ts
 create mode 100644 packages/api/src/services/integrations.ts

diff --git a/packages/api/src/entity/integration.ts b/packages/api/src/entity/integration.ts
index c4d2bbc88..898aca91e 100644
--- a/packages/api/src/entity/integration.ts
+++ b/packages/api/src/entity/integration.ts
@@ -25,7 +25,7 @@ export class Integration {
   @Column('enum', { enum: IntegrationType })
   type!: IntegrationType
 
-  @Column('varchar')
+  @Column('varchar', { length: 255 })
   token!: string
 
   @Column('boolean', { default: true })
diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts
index 3a8ca3dc9..74a512f85 100644
--- a/packages/api/src/generated/graphql.ts
+++ b/packages/api/src/generated/graphql.ts
@@ -331,30 +331,6 @@ export type CreateHighlightSuccess = {
   highlight: Highlight;
 };
 
-export type CreateIntegrationError = {
-  __typename?: 'CreateIntegrationError';
-  errorCodes: Array<CreateIntegrationErrorCode>;
-};
-
-export enum CreateIntegrationErrorCode {
-  BadRequest = 'BAD_REQUEST',
-  InvalidToken = 'INVALID_TOKEN',
-  NotFound = 'NOT_FOUND',
-  Unauthorized = 'UNAUTHORIZED'
-}
-
-export type CreateIntegrationInput = {
-  token: Scalars['String'];
-  type: IntegrationType;
-};
-
-export type CreateIntegrationResult = CreateIntegrationError | CreateIntegrationSuccess;
-
-export type CreateIntegrationSuccess = {
-  __typename?: 'CreateIntegrationSuccess';
-  integration: Integration;
-};
-
 export type CreateLabelError = {
   __typename?: 'CreateLabelError';
   errorCodes: Array<CreateLabelErrorCode>;
@@ -774,6 +750,7 @@ export type Integration = {
   createdAt: Scalars['Date'];
   enabled: Scalars['Boolean'];
   id: Scalars['ID'];
+  token: Scalars['String'];
   type: IntegrationType;
   updatedAt: Scalars['Date'];
 };
@@ -934,7 +911,6 @@ export type Mutation = {
   createArticleSavingRequest: CreateArticleSavingRequestResult;
   createHighlight: CreateHighlightResult;
   createHighlightReply: CreateHighlightReplyResult;
-  createIntegration: CreateIntegrationResult;
   createLabel: CreateLabelResult;
   createNewsletterEmail: CreateNewsletterEmailResult;
   createReaction: CreateReactionResult;
@@ -962,6 +938,7 @@ export type Mutation = {
   setBookmarkArticle: SetBookmarkArticleResult;
   setDeviceToken: SetDeviceTokenResult;
   setFollow: SetFollowResult;
+  setIntegration: SetIntegrationResult;
   setLabels: SetLabelsResult;
   setLabelsForHighlight: SetLabelsResult;
   setLinkArchived: ArchiveLinkResult;
@@ -1009,11 +986,6 @@ export type MutationCreateHighlightReplyArgs = {
 };
 
 
-export type MutationCreateIntegrationArgs = {
-  input: CreateIntegrationInput;
-};
-
-
 export type MutationCreateLabelArgs = {
   input: CreateLabelInput;
 };
@@ -1139,6 +1111,11 @@ export type MutationSetFollowArgs = {
 };
 
 
+export type MutationSetIntegrationArgs = {
+  input: SetIntegrationInput;
+};
+
+
 export type MutationSetLabelsArgs = {
   input: SetLabelsInput;
 };
@@ -1737,6 +1714,33 @@ export type SetFollowSuccess = {
   updatedUser: User;
 };
 
+export type SetIntegrationError = {
+  __typename?: 'SetIntegrationError';
+  errorCodes: Array<SetIntegrationErrorCode>;
+};
+
+export enum SetIntegrationErrorCode {
+  AlreadyExists = 'ALREADY_EXISTS',
+  BadRequest = 'BAD_REQUEST',
+  InvalidToken = 'INVALID_TOKEN',
+  NotFound = 'NOT_FOUND',
+  Unauthorized = 'UNAUTHORIZED'
+}
+
+export type SetIntegrationInput = {
+  enabled?: InputMaybe<Scalars['Boolean']>;
+  id?: InputMaybe<Scalars['ID']>;
+  token: Scalars['String'];
+  type: IntegrationType;
+};
+
+export type SetIntegrationResult = SetIntegrationError | SetIntegrationSuccess;
+
+export type SetIntegrationSuccess = {
+  __typename?: 'SetIntegrationSuccess';
+  integration: Integration;
+};
+
 export type SetLabelsError = {
   __typename?: 'SetLabelsError';
   errorCodes: Array<SetLabelsErrorCode>;
@@ -2548,11 +2552,6 @@ export type ResolversTypes = {
   CreateHighlightReplySuccess: ResolverTypeWrapper<CreateHighlightReplySuccess>;
   CreateHighlightResult: ResolversTypes['CreateHighlightError'] | ResolversTypes['CreateHighlightSuccess'];
   CreateHighlightSuccess: ResolverTypeWrapper<CreateHighlightSuccess>;
-  CreateIntegrationError: ResolverTypeWrapper<CreateIntegrationError>;
-  CreateIntegrationErrorCode: CreateIntegrationErrorCode;
-  CreateIntegrationInput: CreateIntegrationInput;
-  CreateIntegrationResult: ResolversTypes['CreateIntegrationError'] | ResolversTypes['CreateIntegrationSuccess'];
-  CreateIntegrationSuccess: ResolverTypeWrapper<CreateIntegrationSuccess>;
   CreateLabelError: ResolverTypeWrapper<CreateLabelError>;
   CreateLabelErrorCode: CreateLabelErrorCode;
   CreateLabelInput: CreateLabelInput;
@@ -2732,6 +2731,11 @@ export type ResolversTypes = {
   SetFollowInput: SetFollowInput;
   SetFollowResult: ResolversTypes['SetFollowError'] | ResolversTypes['SetFollowSuccess'];
   SetFollowSuccess: ResolverTypeWrapper<SetFollowSuccess>;
+  SetIntegrationError: ResolverTypeWrapper<SetIntegrationError>;
+  SetIntegrationErrorCode: SetIntegrationErrorCode;
+  SetIntegrationInput: SetIntegrationInput;
+  SetIntegrationResult: ResolversTypes['SetIntegrationError'] | ResolversTypes['SetIntegrationSuccess'];
+  SetIntegrationSuccess: ResolverTypeWrapper<SetIntegrationSuccess>;
   SetLabelsError: ResolverTypeWrapper<SetLabelsError>;
   SetLabelsErrorCode: SetLabelsErrorCode;
   SetLabelsForHighlightInput: SetLabelsForHighlightInput;
@@ -2909,10 +2913,6 @@ export type ResolversParentTypes = {
   CreateHighlightReplySuccess: CreateHighlightReplySuccess;
   CreateHighlightResult: ResolversParentTypes['CreateHighlightError'] | ResolversParentTypes['CreateHighlightSuccess'];
   CreateHighlightSuccess: CreateHighlightSuccess;
-  CreateIntegrationError: CreateIntegrationError;
-  CreateIntegrationInput: CreateIntegrationInput;
-  CreateIntegrationResult: ResolversParentTypes['CreateIntegrationError'] | ResolversParentTypes['CreateIntegrationSuccess'];
-  CreateIntegrationSuccess: CreateIntegrationSuccess;
   CreateLabelError: CreateLabelError;
   CreateLabelInput: CreateLabelInput;
   CreateLabelResult: ResolversParentTypes['CreateLabelError'] | ResolversParentTypes['CreateLabelSuccess'];
@@ -3056,6 +3056,10 @@ export type ResolversParentTypes = {
   SetFollowInput: SetFollowInput;
   SetFollowResult: ResolversParentTypes['SetFollowError'] | ResolversParentTypes['SetFollowSuccess'];
   SetFollowSuccess: SetFollowSuccess;
+  SetIntegrationError: SetIntegrationError;
+  SetIntegrationInput: SetIntegrationInput;
+  SetIntegrationResult: ResolversParentTypes['SetIntegrationError'] | ResolversParentTypes['SetIntegrationSuccess'];
+  SetIntegrationSuccess: SetIntegrationSuccess;
   SetLabelsError: SetLabelsError;
   SetLabelsForHighlightInput: SetLabelsForHighlightInput;
   SetLabelsInput: SetLabelsInput;
@@ -3382,20 +3386,6 @@ export type CreateHighlightSuccessResolvers<ContextType = ResolverContext, Paren
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
-export type CreateIntegrationErrorResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['CreateIntegrationError'] = ResolversParentTypes['CreateIntegrationError']> = {
-  errorCodes?: Resolver<Array<ResolversTypes['CreateIntegrationErrorCode']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
-export type CreateIntegrationResultResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['CreateIntegrationResult'] = ResolversParentTypes['CreateIntegrationResult']> = {
-  __resolveType: TypeResolveFn<'CreateIntegrationError' | 'CreateIntegrationSuccess', ParentType, ContextType>;
-};
-
-export type CreateIntegrationSuccessResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['CreateIntegrationSuccess'] = ResolversParentTypes['CreateIntegrationSuccess']> = {
-  integration?: Resolver<ResolversTypes['Integration'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
 export type CreateLabelErrorResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['CreateLabelError'] = ResolversParentTypes['CreateLabelError']> = {
   errorCodes?: Resolver<Array<ResolversTypes['CreateLabelErrorCode']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
@@ -3717,6 +3707,7 @@ export type IntegrationResolvers<ContextType = ResolverContext, ParentType exten
   createdAt?: Resolver<ResolversTypes['Date'], ParentType, ContextType>;
   enabled?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  token?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   type?: Resolver<ResolversTypes['IntegrationType'], ParentType, ContextType>;
   updatedAt?: Resolver<ResolversTypes['Date'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
@@ -3833,7 +3824,6 @@ export type MutationResolvers<ContextType = ResolverContext, ParentType extends
   createArticleSavingRequest?: Resolver<ResolversTypes['CreateArticleSavingRequestResult'], ParentType, ContextType, RequireFields<MutationCreateArticleSavingRequestArgs, 'input'>>;
   createHighlight?: Resolver<ResolversTypes['CreateHighlightResult'], ParentType, ContextType, RequireFields<MutationCreateHighlightArgs, 'input'>>;
   createHighlightReply?: Resolver<ResolversTypes['CreateHighlightReplyResult'], ParentType, ContextType, RequireFields<MutationCreateHighlightReplyArgs, 'input'>>;
-  createIntegration?: Resolver<ResolversTypes['CreateIntegrationResult'], ParentType, ContextType, RequireFields<MutationCreateIntegrationArgs, 'input'>>;
   createLabel?: Resolver<ResolversTypes['CreateLabelResult'], ParentType, ContextType, RequireFields<MutationCreateLabelArgs, 'input'>>;
   createNewsletterEmail?: Resolver<ResolversTypes['CreateNewsletterEmailResult'], ParentType, ContextType>;
   createReaction?: Resolver<ResolversTypes['CreateReactionResult'], ParentType, ContextType, RequireFields<MutationCreateReactionArgs, 'input'>>;
@@ -3861,6 +3851,7 @@ export type MutationResolvers<ContextType = ResolverContext, ParentType extends
   setBookmarkArticle?: Resolver<ResolversTypes['SetBookmarkArticleResult'], ParentType, ContextType, RequireFields<MutationSetBookmarkArticleArgs, 'input'>>;
   setDeviceToken?: Resolver<ResolversTypes['SetDeviceTokenResult'], ParentType, ContextType, RequireFields<MutationSetDeviceTokenArgs, 'input'>>;
   setFollow?: Resolver<ResolversTypes['SetFollowResult'], ParentType, ContextType, RequireFields<MutationSetFollowArgs, 'input'>>;
+  setIntegration?: Resolver<ResolversTypes['SetIntegrationResult'], ParentType, ContextType, RequireFields<MutationSetIntegrationArgs, 'input'>>;
   setLabels?: Resolver<ResolversTypes['SetLabelsResult'], ParentType, ContextType, RequireFields<MutationSetLabelsArgs, 'input'>>;
   setLabelsForHighlight?: Resolver<ResolversTypes['SetLabelsResult'], ParentType, ContextType, RequireFields<MutationSetLabelsForHighlightArgs, 'input'>>;
   setLinkArchived?: Resolver<ResolversTypes['ArchiveLinkResult'], ParentType, ContextType, RequireFields<MutationSetLinkArchivedArgs, 'input'>>;
@@ -4167,6 +4158,20 @@ export type SetFollowSuccessResolvers<ContextType = ResolverContext, ParentType
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type SetIntegrationErrorResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['SetIntegrationError'] = ResolversParentTypes['SetIntegrationError']> = {
+  errorCodes?: Resolver<Array<ResolversTypes['SetIntegrationErrorCode']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type SetIntegrationResultResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['SetIntegrationResult'] = ResolversParentTypes['SetIntegrationResult']> = {
+  __resolveType: TypeResolveFn<'SetIntegrationError' | 'SetIntegrationSuccess', ParentType, ContextType>;
+};
+
+export type SetIntegrationSuccessResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['SetIntegrationSuccess'] = ResolversParentTypes['SetIntegrationSuccess']> = {
+  integration?: Resolver<ResolversTypes['Integration'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type SetLabelsErrorResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['SetLabelsError'] = ResolversParentTypes['SetLabelsError']> = {
   errorCodes?: Resolver<Array<ResolversTypes['SetLabelsErrorCode']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
@@ -4635,9 +4640,6 @@ export type Resolvers<ContextType = ResolverContext> = {
   CreateHighlightReplySuccess?: CreateHighlightReplySuccessResolvers<ContextType>;
   CreateHighlightResult?: CreateHighlightResultResolvers<ContextType>;
   CreateHighlightSuccess?: CreateHighlightSuccessResolvers<ContextType>;
-  CreateIntegrationError?: CreateIntegrationErrorResolvers<ContextType>;
-  CreateIntegrationResult?: CreateIntegrationResultResolvers<ContextType>;
-  CreateIntegrationSuccess?: CreateIntegrationSuccessResolvers<ContextType>;
   CreateLabelError?: CreateLabelErrorResolvers<ContextType>;
   CreateLabelResult?: CreateLabelResultResolvers<ContextType>;
   CreateLabelSuccess?: CreateLabelSuccessResolvers<ContextType>;
@@ -4760,6 +4762,9 @@ export type Resolvers<ContextType = ResolverContext> = {
   SetFollowError?: SetFollowErrorResolvers<ContextType>;
   SetFollowResult?: SetFollowResultResolvers<ContextType>;
   SetFollowSuccess?: SetFollowSuccessResolvers<ContextType>;
+  SetIntegrationError?: SetIntegrationErrorResolvers<ContextType>;
+  SetIntegrationResult?: SetIntegrationResultResolvers<ContextType>;
+  SetIntegrationSuccess?: SetIntegrationSuccessResolvers<ContextType>;
   SetLabelsError?: SetLabelsErrorResolvers<ContextType>;
   SetLabelsResult?: SetLabelsResultResolvers<ContextType>;
   SetLabelsSuccess?: SetLabelsSuccessResolvers<ContextType>;
diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql
index 3f6bef289..af1193142 100644
--- a/packages/api/src/generated/schema.graphql
+++ b/packages/api/src/generated/schema.graphql
@@ -284,28 +284,6 @@ type CreateHighlightSuccess {
   highlight: Highlight!
 }
 
-type CreateIntegrationError {
-  errorCodes: [CreateIntegrationErrorCode!]!
-}
-
-enum CreateIntegrationErrorCode {
-  BAD_REQUEST
-  INVALID_TOKEN
-  NOT_FOUND
-  UNAUTHORIZED
-}
-
-input CreateIntegrationInput {
-  token: String!
-  type: IntegrationType!
-}
-
-union CreateIntegrationResult = CreateIntegrationError | CreateIntegrationSuccess
-
-type CreateIntegrationSuccess {
-  integration: Integration!
-}
-
 type CreateLabelError {
   errorCodes: [CreateLabelErrorCode!]!
 }
@@ -684,6 +662,7 @@ type Integration {
   createdAt: Date!
   enabled: Boolean!
   id: ID!
+  token: String!
   type: IntegrationType!
   updatedAt: Date!
 }
@@ -830,7 +809,6 @@ type Mutation {
   createArticleSavingRequest(input: CreateArticleSavingRequestInput!): CreateArticleSavingRequestResult!
   createHighlight(input: CreateHighlightInput!): CreateHighlightResult!
   createHighlightReply(input: CreateHighlightReplyInput!): CreateHighlightReplyResult!
-  createIntegration(input: CreateIntegrationInput!): CreateIntegrationResult!
   createLabel(input: CreateLabelInput!): CreateLabelResult!
   createNewsletterEmail: CreateNewsletterEmailResult!
   createReaction(input: CreateReactionInput!): CreateReactionResult!
@@ -858,6 +836,7 @@ type Mutation {
   setBookmarkArticle(input: SetBookmarkArticleInput!): SetBookmarkArticleResult!
   setDeviceToken(input: SetDeviceTokenInput!): SetDeviceTokenResult!
   setFollow(input: SetFollowInput!): SetFollowResult!
+  setIntegration(input: SetIntegrationInput!): SetIntegrationResult!
   setLabels(input: SetLabelsInput!): SetLabelsResult!
   setLabelsForHighlight(input: SetLabelsForHighlightInput!): SetLabelsResult!
   setLinkArchived(input: ArchiveLinkInput!): ArchiveLinkResult!
@@ -1260,6 +1239,31 @@ type SetFollowSuccess {
   updatedUser: User!
 }
 
+type SetIntegrationError {
+  errorCodes: [SetIntegrationErrorCode!]!
+}
+
+enum SetIntegrationErrorCode {
+  ALREADY_EXISTS
+  BAD_REQUEST
+  INVALID_TOKEN
+  NOT_FOUND
+  UNAUTHORIZED
+}
+
+input SetIntegrationInput {
+  enabled: Boolean
+  id: ID
+  token: String!
+  type: IntegrationType!
+}
+
+union SetIntegrationResult = SetIntegrationError | SetIntegrationSuccess
+
+type SetIntegrationSuccess {
+  integration: Integration!
+}
+
 type SetLabelsError {
   errorCodes: [SetLabelsErrorCode!]!
 }
diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts
index 686d31a5a..400fe1632 100644
--- a/packages/api/src/resolvers/function_resolvers.ts
+++ b/packages/api/src/resolvers/function_resolvers.ts
@@ -97,6 +97,7 @@ import {
   generateUploadFilePathName,
 } from '../utils/uploads'
 import { getPageByParam } from '../elastic/pages'
+import { setIntegrationResolver } from './integrations'
 
 /* eslint-disable @typescript-eslint/naming-convention */
 type ResultResolveType = {
@@ -165,6 +166,7 @@ export const functionResolvers = {
     revokeApiKey: revokeApiKeyResolver,
     setLabelsForHighlight: setLabelsForHighlightResolver,
     moveLabel: moveLabelResolver,
+    setIntegration: setIntegrationResolver,
   },
   Query: {
     me: getMeUserResolver,
@@ -592,4 +594,5 @@ export const functionResolvers = {
   ...resultResolveTypeResolver('TypeaheadSearch'),
   ...resultResolveTypeResolver('UpdatesSince'),
   ...resultResolveTypeResolver('MoveLabel'),
+  ...resultResolveTypeResolver('SetIntegration'),
 }
diff --git a/packages/api/src/resolvers/integrations/index.ts b/packages/api/src/resolvers/integrations/index.ts
new file mode 100644
index 000000000..42bb0a405
--- /dev/null
+++ b/packages/api/src/resolvers/integrations/index.ts
@@ -0,0 +1,97 @@
+import { authorized } from '../../utils/helpers'
+import {
+  MutationSetIntegrationArgs,
+  SetIntegrationError,
+  SetIntegrationErrorCode,
+  SetIntegrationSuccess,
+} from '../../generated/graphql'
+import { getRepository } from '../../entity/utils'
+import { User } from '../../entity/user'
+import { Integration } from '../../entity/integration'
+import { analytics } from '../../utils/analytics'
+import { env } from '../../env'
+import { validateToken } from '../../services/integrations'
+
+export const setIntegrationResolver = authorized<
+  SetIntegrationSuccess,
+  SetIntegrationError,
+  MutationSetIntegrationArgs
+>(async (_, { input }, { claims: { uid }, log }) => {
+  log.info('setIntegrationResolver')
+
+  try {
+    const user = await getRepository(User).findOneBy({ id: uid })
+    if (!user) {
+      return {
+        errorCodes: [SetIntegrationErrorCode.Unauthorized],
+      }
+    }
+
+    const integrationToSave: Partial<Integration> = {
+      user,
+      token: input.token,
+      type: input.type,
+      enabled: input.enabled === null ? true : input.enabled,
+    }
+
+    if (input.id) {
+      // Update
+      const existingIntegration = await getRepository(Integration).findOne({
+        where: { id: input.id },
+        relations: ['user'],
+      })
+      if (!existingIntegration) {
+        return {
+          errorCodes: [SetIntegrationErrorCode.NotFound],
+        }
+      }
+      if (existingIntegration.user.id !== uid) {
+        return {
+          errorCodes: [SetIntegrationErrorCode.Unauthorized],
+        }
+      }
+
+      integrationToSave.id = input.id
+    } else {
+      // Create
+      const existingIntegration = await getRepository(Integration).findOneBy({
+        user: { id: uid },
+        type: input.type,
+      })
+
+      if (existingIntegration) {
+        return {
+          errorCodes: [SetIntegrationErrorCode.AlreadyExists],
+        }
+      }
+
+      // validate token
+      if (!(await validateToken(input.token, input.type))) {
+        return {
+          errorCodes: [SetIntegrationErrorCode.InvalidToken],
+        }
+      }
+    }
+
+    const integration = await getRepository(Integration).save(integrationToSave)
+
+    analytics.track({
+      userId: uid,
+      event: 'integration_set',
+      properties: {
+        id: integration.id,
+        env: env.server.apiEnv,
+      },
+    })
+
+    return {
+      integration,
+    }
+  } catch (error) {
+    log.error(error)
+
+    return {
+      errorCodes: [SetIntegrationErrorCode.BadRequest],
+    }
+  }
+})
diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts
index a1991f77e..956312181 100755
--- a/packages/api/src/schema.ts
+++ b/packages/api/src/schema.ts
@@ -1812,17 +1812,16 @@ const schema = gql`
     NOT_FOUND
   }
 
-  union CreateIntegrationResult =
-      CreateIntegrationSuccess
-    | CreateIntegrationError
+  union SetIntegrationResult = SetIntegrationSuccess | SetIntegrationError
 
-  type CreateIntegrationSuccess {
+  type SetIntegrationSuccess {
     integration: Integration!
   }
 
   type Integration {
     id: ID!
     type: IntegrationType!
+    token: String!
     enabled: Boolean!
     createdAt: Date!
     updatedAt: Date!
@@ -1832,20 +1831,23 @@ const schema = gql`
     READWISE
   }
 
-  type CreateIntegrationError {
-    errorCodes: [CreateIntegrationErrorCode!]!
+  type SetIntegrationError {
+    errorCodes: [SetIntegrationErrorCode!]!
   }
 
-  enum CreateIntegrationErrorCode {
+  enum SetIntegrationErrorCode {
     UNAUTHORIZED
     BAD_REQUEST
     NOT_FOUND
     INVALID_TOKEN
+    ALREADY_EXISTS
   }
 
-  input CreateIntegrationInput {
+  input SetIntegrationInput {
+    id: ID
     type: IntegrationType!
     token: String!
+    enabled: Boolean
   }
 
   # Mutations
@@ -1917,7 +1919,7 @@ const schema = gql`
     revokeApiKey(id: ID!): RevokeApiKeyResult!
     setLabelsForHighlight(input: SetLabelsForHighlightInput!): SetLabelsResult!
     moveLabel(input: MoveLabelInput!): MoveLabelResult!
-    createIntegration(input: CreateIntegrationInput!): CreateIntegrationResult!
+    setIntegration(input: SetIntegrationInput!): SetIntegrationResult!
   }
 
   # FIXME: remove sort from feedArticles after all cached tabs are closed
diff --git a/packages/api/src/services/integrations.ts b/packages/api/src/services/integrations.ts
new file mode 100644
index 000000000..01065f371
--- /dev/null
+++ b/packages/api/src/services/integrations.ts
@@ -0,0 +1,27 @@
+import { IntegrationType } from '../generated/graphql'
+import { env } from '../env'
+import axios from 'axios'
+
+const READWISE_API_URL = 'https://readwise.io/api/v2'
+
+export const validateToken = async (
+  token: string,
+  type: IntegrationType
+): Promise<boolean> => {
+  switch (type) {
+    case IntegrationType.Readwise:
+      return validateReadwiseToken(token)
+    default:
+      return false
+  }
+}
+
+const validateReadwiseToken = async (token: string): Promise<boolean> => {
+  const authUrl = `${env.readwise.apiUrl || READWISE_API_URL}/auth`
+  const response = await axios.get(authUrl, {
+    headers: {
+      Authorization: `Token ${token}`,
+    },
+  })
+  return response.status === 204
+}
diff --git a/packages/api/src/util.ts b/packages/api/src/util.ts
index d1c6d9fd4..bbd221f12 100755
--- a/packages/api/src/util.ts
+++ b/packages/api/src/util.ts
@@ -84,6 +84,9 @@ interface BackendEnv {
     resetPasswordTemplateId: string
     installationTemplateId: string
   }
+  readwise: {
+    apiUrl: string
+  }
 }
 
 /***
@@ -132,6 +135,7 @@ const nullableEnvVars = [
   'SENDGRID_REMINDER_TEMPLATE_ID',
   'SENDGRID_RESET_PASSWORD_TEMPLATE_ID',
   'SENDGRID_INSTALLATION_TEMPLATE_ID',
+  'READWISE_API_URL',
 ] // Allow some vars to be null/empty
 
 /* If not in GAE and Prod/QA/Demo env (f.e. on localhost/dev env), allow following env vars to be null */
@@ -245,6 +249,10 @@ export function getEnv(): BackendEnv {
     installationTemplateId: parse('SENDGRID_INSTALLATION_TEMPLATE_ID'),
   }
 
+  const readwise = {
+    apiUrl: parse('READWISE_API_URL'),
+  }
+
   return {
     pg,
     client,
@@ -262,6 +270,7 @@ export function getEnv(): BackendEnv {
     elastic,
     sender,
     sendgrid,
+    readwise,
   }
 }
 

From b8dbcdb2bd1f0f4ce5c277c5a8c0251daf8aae84 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 2 Aug 2022 17:25:53 +0800
Subject: [PATCH 05/25] Add createHighlight API integration for Readwise

---
 packages/api/src/services/integrations.ts | 74 +++++++++++++++++++++--
 packages/api/src/utils/helpers.ts         |  6 ++
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/packages/api/src/services/integrations.ts b/packages/api/src/services/integrations.ts
index 01065f371..8cddb4398 100644
--- a/packages/api/src/services/integrations.ts
+++ b/packages/api/src/services/integrations.ts
@@ -1,6 +1,22 @@
 import { IntegrationType } from '../generated/graphql'
 import { env } from '../env'
 import axios from 'axios'
+import { wait } from '../utils/helpers'
+
+export interface ReadwiseHighlight {
+  text: string // The highlight text, (technically the only field required in a highlight object)
+  title?: string // The title of the page the highlight is on
+  author?: string // The author of the page the highlight is on
+  image_url?: string // The URL of the page image
+  source_url?: string // The URL of the page
+  source_type?: string // A meaningful unique identifier for your app
+  category?: string // One of: books, articles, tweets or podcasts
+  note?: string // Annotation note attached to the specific highlight
+  location?: number // Highlight's location in the source text. Used to order the highlights
+  location_type?: string // One of: page, order or time_offset
+  highlighted_at?: string // A datetime representing when the highlight was taken in the ISO 8601 format
+  highlight_url?: string // Unique url of the specific highlight
+}
 
 const READWISE_API_URL = 'https://readwise.io/api/v2'
 
@@ -18,10 +34,56 @@ export const validateToken = async (
 
 const validateReadwiseToken = async (token: string): Promise<boolean> => {
   const authUrl = `${env.readwise.apiUrl || READWISE_API_URL}/auth`
-  const response = await axios.get(authUrl, {
-    headers: {
-      Authorization: `Token ${token}`,
-    },
-  })
-  return response.status === 204
+  try {
+    const response = await axios.get(authUrl, {
+      headers: {
+        Authorization: `Token ${token}`,
+      },
+    })
+    return response.status === 204
+  } catch (error) {
+    console.log('error validating readwise token', error)
+    return false
+  }
+}
+
+export const createHighlightsInReadwise = async (
+  token: string,
+  highlights: ReadwiseHighlight[],
+  retryCount = 0
+): Promise<boolean> => {
+  const url = `${env.readwise.apiUrl || READWISE_API_URL}/highlights`
+  try {
+    const response = await axios.post(
+      url,
+      {
+        highlights: highlights.map((highlight) => ({
+          ...highlight,
+          source_type: 'omnivore',
+        })),
+      },
+      {
+        headers: {
+          Authorization: `Token ${token}`,
+          ContentType: 'application/json',
+        },
+      }
+    )
+    return response.status === 200
+  } catch (error) {
+    if (
+      axios.isAxiosError(error) &&
+      error.response?.status === 429 &&
+      retryCount < 3
+    ) {
+      console.log('Readwise API rate limit exceeded, retrying...')
+      // wait for Retry-After seconds in the header if rate limited
+      // max retry count is 3
+      const retryAfter = error.response?.headers['Retry-After'] || '10' // default to 10 seconds
+      await wait(parseInt(retryAfter, 10) * 1000)
+      return createHighlightsInReadwise(token, highlights, retryCount + 1)
+    }
+    console.log('Error creating highlights in Readwise', error)
+    return false
+  }
 }
diff --git a/packages/api/src/utils/helpers.ts b/packages/api/src/utils/helpers.ts
index 70cdb1154..98a9de742 100644
--- a/packages/api/src/utils/helpers.ts
+++ b/packages/api/src/utils/helpers.ts
@@ -254,3 +254,9 @@ export const validateUuid = (str: string): boolean => {
 export const isString = (check: any): check is string => {
   return typeof check === 'string' || check instanceof String
 }
+
+export const wait = (ms: number): Promise<void> => {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms)
+  })
+}

From 73bf695cf31652793d1675fca8b5aa993288040b Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 2 Aug 2022 20:06:16 +0800
Subject: [PATCH 06/25] Add function to get highlight start location

---
 packages/api/package.json                     |  2 ++
 packages/api/src/services/highlights.ts       |  7 ++++++
 packages/api/test/services/highlights.test.ts | 25 +++++++++++++++++++
 .../db/migrations/0090.do.integrations.sql    |  2 +-
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 packages/api/src/services/highlights.ts
 create mode 100644 packages/api/test/services/highlights.test.ts

diff --git a/packages/api/package.json b/packages/api/package.json
index 258ae3310..a52f999aa 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -46,6 +46,7 @@
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
+    "diff-match-patch": "^1.0.5",
     "dompurify": "^2.0.17",
     "dot-case": "^3.0.4",
     "dotenv": "^8.2.0",
@@ -96,6 +97,7 @@
     "@types/chai-string": "^1.4.2",
     "@types/cookie": "^0.4.0",
     "@types/cookie-parser": "^1.4.2",
+    "@types/diff-match-patch": "^1.0.32",
     "@types/dompurify": "^2.0.4",
     "@types/express": "^4.17.7",
     "@types/graphql-fields": "^1.3.4",
diff --git a/packages/api/src/services/highlights.ts b/packages/api/src/services/highlights.ts
new file mode 100644
index 000000000..62a514fc4
--- /dev/null
+++ b/packages/api/src/services/highlights.ts
@@ -0,0 +1,7 @@
+import { diff_match_patch } from 'diff-match-patch'
+
+export const getHighlightLocation = (patch: string): number | undefined => {
+  const dmp = new diff_match_patch()
+  const patches = dmp.patch_fromText(patch)
+  return patches[0].start1 || undefined
+}
diff --git a/packages/api/test/services/highlights.test.ts b/packages/api/test/services/highlights.test.ts
new file mode 100644
index 000000000..1a6a7221e
--- /dev/null
+++ b/packages/api/test/services/highlights.test.ts
@@ -0,0 +1,25 @@
+import 'mocha'
+import { expect } from 'chai'
+import { getHighlightLocation } from '../../src/services/highlights'
+
+describe('getHighlightLocation', () => {
+  let patch: string
+  let location: number
+
+  before(async () => {
+    location = 109
+    patch = `@@ -${location + 1},16 +${location + 1},36 @@
+ . We're
++%3Comnivore_highlight%3E
+ humbled
+@@ -254,16 +254,37 @@
+ h in the
++%3C/omnivore_highlight%3E
+  coming`
+  })
+
+  it('returns highlight location from patch', async () => {
+    const result = getHighlightLocation(patch)
+    expect(result).to.eql(location)
+  })
+})
diff --git a/packages/db/migrations/0090.do.integrations.sql b/packages/db/migrations/0090.do.integrations.sql
index c07568d25..33829ac77 100755
--- a/packages/db/migrations/0090.do.integrations.sql
+++ b/packages/db/migrations/0090.do.integrations.sql
@@ -9,7 +9,7 @@ CREATE TYPE omnivore.integration_type AS ENUM ('READWISE');
 CREATE TABLE omnivore.integrations (
     id uuid PRIMARY KEY DEFAULT uuid_generate_v1mc(),
     user_id uuid NOT NULL REFERENCES omnivore.user ON DELETE CASCADE,
-    "type" integration_type NOT NULL,
+    "type" omnivore.integration_type NOT NULL,
     token varchar(255) NOT NULL,
     "enabled" boolean NOT NULL DEFAULT true,
     created_at timestamptz NOT NULL DEFAULT current_timestamp,

From fa97c9511c75aaa39e6e81d9341b35dbfad4200f Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 2 Aug 2022 20:07:13 +0800
Subject: [PATCH 07/25] Add Readwise create highlight API integration

---
 packages/api/src/services/integrations.ts | 86 ++++++++++++++++++-----
 1 file changed, 67 insertions(+), 19 deletions(-)

diff --git a/packages/api/src/services/integrations.ts b/packages/api/src/services/integrations.ts
index 8cddb4398..34d45a25f 100644
--- a/packages/api/src/services/integrations.ts
+++ b/packages/api/src/services/integrations.ts
@@ -1,21 +1,35 @@
 import { IntegrationType } from '../generated/graphql'
-import { env } from '../env'
+import { env, homePageURL } from '../env'
 import axios from 'axios'
 import { wait } from '../utils/helpers'
+import { Page } from '../elastic/types'
+import { getHighlightLocation } from './highlights'
 
 export interface ReadwiseHighlight {
-  text: string // The highlight text, (technically the only field required in a highlight object)
-  title?: string // The title of the page the highlight is on
-  author?: string // The author of the page the highlight is on
-  image_url?: string // The URL of the page image
-  source_url?: string // The URL of the page
-  source_type?: string // A meaningful unique identifier for your app
-  category?: string // One of: books, articles, tweets or podcasts
-  note?: string // Annotation note attached to the specific highlight
-  location?: number // Highlight's location in the source text. Used to order the highlights
-  location_type?: string // One of: page, order or time_offset
-  highlighted_at?: string // A datetime representing when the highlight was taken in the ISO 8601 format
-  highlight_url?: string // Unique url of the specific highlight
+  // The highlight text, (technically the only field required in a highlight object)
+  text: string
+  // The title of the page the highlight is on
+  title?: string
+  // The author of the page the highlight is on
+  author?: string
+  // The URL of the page image
+  image_url?: string
+  // The URL of the page
+  source_url?: string
+  // A meaningful unique identifier for your app
+  source_type?: string
+  // One of: books, articles, tweets or podcasts
+  category?: string
+  // Annotation note attached to the specific highlight
+  note?: string
+  // Highlight's location in the source text. Used to order the highlights
+  location?: number
+  // One of: page, order or time_offset
+  location_type?: string
+  // A datetime representing when the highlight was taken in the ISO 8601 format
+  highlighted_at?: string
+  // Unique url of the specific highlight
+  highlight_url?: string
 }
 
 const READWISE_API_URL = 'https://readwise.io/api/v2'
@@ -47,7 +61,44 @@ const validateReadwiseToken = async (token: string): Promise<boolean> => {
   }
 }
 
-export const createHighlightsInReadwise = async (
+const highlightUrl = (slug: string, highlightId: string): string =>
+  `${homePageURL()}/me/${slug}#${highlightId}`
+
+const pageToReadwiseHighlight = (page: Page): ReadwiseHighlight[] => {
+  if (!page.highlights) return []
+  return page.highlights.map((highlight) => {
+    const location = getHighlightLocation(highlight.patch)
+    return {
+      text: highlight.quote,
+      title: page.title,
+      author: page.author,
+      highlight_url: highlightUrl(page.slug, highlight.id),
+      highlighted_at: highlight.createdAt.toISOString(),
+      category: 'articles',
+      image_url: page.image,
+      location,
+      location_type: location ? 'page' : 'order',
+      note: highlight.annotation || undefined,
+      source_type: 'omnivore',
+      source_url: page.url,
+    }
+  })
+}
+
+export const syncWithIntegration = async (
+  token: string,
+  type: IntegrationType,
+  pages: Page[]
+): Promise<boolean> => {
+  switch (type) {
+    case IntegrationType.Readwise:
+      return syncWithReadwise(token, pages.flatMap(pageToReadwiseHighlight))
+    default:
+      return false
+  }
+}
+
+export const syncWithReadwise = async (
   token: string,
   highlights: ReadwiseHighlight[],
   retryCount = 0
@@ -57,10 +108,7 @@ export const createHighlightsInReadwise = async (
     const response = await axios.post(
       url,
       {
-        highlights: highlights.map((highlight) => ({
-          ...highlight,
-          source_type: 'omnivore',
-        })),
+        highlights,
       },
       {
         headers: {
@@ -81,7 +129,7 @@ export const createHighlightsInReadwise = async (
       // max retry count is 3
       const retryAfter = error.response?.headers['Retry-After'] || '10' // default to 10 seconds
       await wait(parseInt(retryAfter, 10) * 1000)
-      return createHighlightsInReadwise(token, highlights, retryCount + 1)
+      return syncWithReadwise(token, highlights, retryCount + 1)
     }
     console.log('Error creating highlights in Readwise', error)
     return false

From 8f50285ad5d5e7eff40a7f693b88c5b29b229342 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 3 Aug 2022 18:50:21 +0800
Subject: [PATCH 08/25] Allow search page by highlight or label id

---
 packages/api/src/elastic/pages.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/api/src/elastic/pages.ts b/packages/api/src/elastic/pages.ts
index 9abffd52e..b8c6230f3 100644
--- a/packages/api/src/elastic/pages.ts
+++ b/packages/api/src/elastic/pages.ts
@@ -274,7 +274,7 @@ export const deletePage = async (
 }
 
 export const getPageByParam = async <K extends keyof ParamSet>(
-  param: Record<K, Page[K]>,
+  param: Record<K, ParamSet[K]>,
   includeOriginalHtml = false
 ): Promise<Page | undefined> => {
   try {
@@ -506,7 +506,7 @@ export const countByCreatedAt = async (
 }
 
 export const deletePagesByParam = async <K extends keyof ParamSet>(
-  param: Record<K, Page[K]>,
+  param: Record<K, ParamSet[K]>,
   ctx: PageContext
 ): Promise<boolean> => {
   try {

From 24caac2ed5feb11db244f1a52f7ad73bb1800e72 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 3 Aug 2022 18:50:47 +0800
Subject: [PATCH 09/25] Update integration updatedAt after syncing

---
 packages/api/src/services/highlights.ts   |  4 +++
 packages/api/src/services/integrations.ts | 33 +++++++++++++++--------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/packages/api/src/services/highlights.ts b/packages/api/src/services/highlights.ts
index 62a514fc4..7addcbb7a 100644
--- a/packages/api/src/services/highlights.ts
+++ b/packages/api/src/services/highlights.ts
@@ -1,7 +1,11 @@
 import { diff_match_patch } from 'diff-match-patch'
+import { homePageURL } from '../env'
 
 export const getHighlightLocation = (patch: string): number | undefined => {
   const dmp = new diff_match_patch()
   const patches = dmp.patch_fromText(patch)
   return patches[0].start1 || undefined
 }
+
+export const getHighlightUrl = (slug: string, highlightId: string): string =>
+  `${homePageURL()}/me/${slug}#${highlightId}`
diff --git a/packages/api/src/services/integrations.ts b/packages/api/src/services/integrations.ts
index 34d45a25f..58641bf4a 100644
--- a/packages/api/src/services/integrations.ts
+++ b/packages/api/src/services/integrations.ts
@@ -1,11 +1,13 @@
 import { IntegrationType } from '../generated/graphql'
-import { env, homePageURL } from '../env'
+import { env } from '../env'
 import axios from 'axios'
 import { wait } from '../utils/helpers'
 import { Page } from '../elastic/types'
-import { getHighlightLocation } from './highlights'
+import { getHighlightLocation, getHighlightUrl } from './highlights'
+import { Integration } from '../entity/integration'
+import { getRepository } from '../entity/utils'
 
-export interface ReadwiseHighlight {
+interface ReadwiseHighlight {
   // The highlight text, (technically the only field required in a highlight object)
   text: string
   // The title of the page the highlight is on
@@ -61,9 +63,6 @@ const validateReadwiseToken = async (token: string): Promise<boolean> => {
   }
 }
 
-const highlightUrl = (slug: string, highlightId: string): string =>
-  `${homePageURL()}/me/${slug}#${highlightId}`
-
 const pageToReadwiseHighlight = (page: Page): ReadwiseHighlight[] => {
   if (!page.highlights) return []
   return page.highlights.map((highlight) => {
@@ -72,7 +71,7 @@ const pageToReadwiseHighlight = (page: Page): ReadwiseHighlight[] => {
       text: highlight.quote,
       title: page.title,
       author: page.author,
-      highlight_url: highlightUrl(page.slug, highlight.id),
+      highlight_url: getHighlightUrl(page.slug, highlight.id),
       highlighted_at: highlight.createdAt.toISOString(),
       category: 'articles',
       image_url: page.image,
@@ -86,16 +85,28 @@ const pageToReadwiseHighlight = (page: Page): ReadwiseHighlight[] => {
 }
 
 export const syncWithIntegration = async (
-  token: string,
-  type: IntegrationType,
+  integration: Integration,
   pages: Page[]
 ): Promise<boolean> => {
-  switch (type) {
+  let result = false
+  switch (integration.type) {
     case IntegrationType.Readwise:
-      return syncWithReadwise(token, pages.flatMap(pageToReadwiseHighlight))
+      result = await syncWithReadwise(
+        integration.token,
+        pages.flatMap(pageToReadwiseHighlight)
+      )
+      break
     default:
       return false
   }
+  // update integration updatedAt if successful
+  if (result) {
+    console.log('updating integration updatedAt')
+    await getRepository(Integration).update(integration.id, {
+      updatedAt: new Date(),
+    })
+  }
+  return result
 }
 
 export const syncWithReadwise = async (

From 971bbfda7f984239c136eddbc93dfb9abbf18b09 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 3 Aug 2022 18:54:11 +0800
Subject: [PATCH 10/25] Add integrations service router to sync pages with
 integrations

---
 packages/api/src/routers/svc/integrations.ts | 137 +++++++++++++++++++
 packages/api/src/server.ts                   |   2 +
 2 files changed, 139 insertions(+)
 create mode 100644 packages/api/src/routers/svc/integrations.ts

diff --git a/packages/api/src/routers/svc/integrations.ts b/packages/api/src/routers/svc/integrations.ts
new file mode 100644
index 000000000..77d421667
--- /dev/null
+++ b/packages/api/src/routers/svc/integrations.ts
@@ -0,0 +1,137 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import express from 'express'
+import { EntityType, readPushSubscription } from '../../datalayer/pubsub'
+import { getRepository } from '../../entity/utils'
+import { Integration, IntegrationType } from '../../entity/integration'
+import { buildLogger } from '../../utils/logger'
+import { syncWithIntegration } from '../../services/integrations'
+import { getPageById, getPageByParam, searchPages } from '../../elastic/pages'
+import { Page } from '../../elastic/types'
+
+interface Message {
+  type: EntityType
+  data: any
+  userId: string
+}
+
+const logger = buildLogger('app.dispatch')
+
+export function integrationsServiceRouter() {
+  const router = express.Router()
+
+  router.post('/:integrationType/:action', async (req, res) => {
+    logger.info(
+      req.params.action,
+      'with integration',
+      req.params.integrationType
+    )
+    const { message: msgStr, expired } = readPushSubscription(req)
+
+    if (!msgStr) {
+      res.status(400).send('Bad Request')
+      return
+    }
+
+    if (expired) {
+      logger.info('discarding expired message')
+      res.status(200).send('Expired')
+      return
+    }
+
+    try {
+      const { userId, type, data }: Message = JSON.parse(msgStr)
+      if (!userId) {
+        console.log('No userId found in message')
+        res.status(400).send('Bad Request')
+        return
+      }
+
+      const integration = await getRepository(Integration).findOneBy({
+        user: { id: userId },
+        type: req.params.integrationType.toUpperCase() as IntegrationType,
+        enabled: true,
+      })
+      if (!integration) {
+        logger.info('No active integration found for user', userId)
+        res.status(200).send('No integration found')
+        return
+      }
+
+      const action = req.params.action.toUpperCase()
+      if (action === 'SYNC_UPDATED') {
+        // get updated page by id
+        const id = data.id
+        let page: Page | undefined
+        switch (type) {
+          case EntityType.PAGE:
+            page = await getPageById(id)
+            break
+          case EntityType.HIGHLIGHT:
+            page = await getPageByParam({ 'highlights.id': id })
+            break
+          case EntityType.LABEL:
+            page = await getPageByParam({ 'labels.id': id })
+            break
+        }
+        if (!page) {
+          logger.info('No page found for id', id)
+          res.status(200).send('No page found')
+          return
+        }
+        // sync updated page with integration
+        logger.info('syncing page', page.id, 'with integration', integration.id)
+
+        const synced = await syncWithIntegration(integration, [page])
+        if (!synced) {
+          logger.info(
+            'failed to sync page',
+            page.id,
+            'with integration',
+            integration.id
+          )
+          res.status(400).send('Failed to sync')
+          return
+        }
+      } else if (action === 'SYNC_ALL') {
+        // sync all pages of the user
+        const size = 50
+
+        for (
+          let hasNextPage = true, count = 0, after = 0, pages: Page[] = [];
+          hasNextPage;
+          after += size, hasNextPage = count > after
+        ) {
+          ;[pages, count] = (await searchPages({ from: after, size }, userId))!
+          const pageIds = pages.map((p) => p.id)
+
+          logger.info('syncing pages', pageIds)
+
+          const synced = await syncWithIntegration(integration, pages)
+          if (!synced) {
+            logger.info(
+              'failed to sync pages',
+              pageIds,
+              'with integration',
+              integration.id
+            )
+            res.status(400).send('Failed to sync')
+            return
+          }
+        }
+      } else {
+        logger.info('unknown action', action)
+        res.status(200).send('Unknown action')
+        return
+      }
+
+      res.status(200).send('OK')
+    } catch (err) {
+      logger.error('sync with integrations failed', err)
+      res.status(500).send(err)
+    }
+  })
+
+  return router
+}
diff --git a/packages/api/src/server.ts b/packages/api/src/server.ts
index 64f0326c0..619a4fda5 100755
--- a/packages/api/src/server.ts
+++ b/packages/api/src/server.ts
@@ -44,6 +44,7 @@ import { initElasticsearch } from './elastic'
 import { uploadServiceRouter } from './routers/svc/upload'
 import rateLimit from 'express-rate-limit'
 import { webhooksServiceRouter } from './routers/svc/webhooks'
+import { integrationsServiceRouter } from './routers/svc/integrations'
 
 const PORT = process.env.PORT || 4000
 
@@ -115,6 +116,7 @@ export const createApp = (): {
   app.use('/svc/pubsub/emails', emailsServiceRouter())
   app.use('/svc/pubsub/upload', uploadServiceRouter())
   app.use('/svc/pubsub/webhooks', webhooksServiceRouter())
+  app.use('/svc/pubsub/integrations', integrationsServiceRouter())
   app.use('/svc/reminders', remindersServiceRouter())
   app.use('/svc/pdf-attachments', pdfAttachmentsRouter())
 

From a6c9eb08e1cdfb225dbf6c29343f398fd65db228 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Thu, 4 Aug 2022 22:24:19 +0800
Subject: [PATCH 11/25] Fix conflicts after rebasing

---
 .../{0090.do.integrations.sql => 0091.do.integrations.sql}        | 0
 .../{0090.undo.integrations.sql => 0091.undo.integrations.sql}    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/db/migrations/{0090.do.integrations.sql => 0091.do.integrations.sql} (100%)
 rename packages/db/migrations/{0090.undo.integrations.sql => 0091.undo.integrations.sql} (100%)

diff --git a/packages/db/migrations/0090.do.integrations.sql b/packages/db/migrations/0091.do.integrations.sql
similarity index 100%
rename from packages/db/migrations/0090.do.integrations.sql
rename to packages/db/migrations/0091.do.integrations.sql
diff --git a/packages/db/migrations/0090.undo.integrations.sql b/packages/db/migrations/0091.undo.integrations.sql
similarity index 100%
rename from packages/db/migrations/0090.undo.integrations.sql
rename to packages/db/migrations/0091.undo.integrations.sql

From 8aa7ccdd1ec876c4da2c23866bb43a2377a5cdba Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 5 Aug 2022 12:19:08 +0800
Subject: [PATCH 12/25] Add INTEGRATION_TASK_HANDLER_URL in env

---
 packages/api/src/util.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/api/src/util.ts b/packages/api/src/util.ts
index bbd221f12..f43a9a8b2 100755
--- a/packages/api/src/util.ts
+++ b/packages/api/src/util.ts
@@ -62,6 +62,7 @@ interface BackendEnv {
     contentFetchUrl: string
     contentFetchGCFUrl: string
     reminderTaskHanderUrl: string
+    integrationTaskHandlerUrl: string
   }
   fileUpload: {
     gcsUploadBucket: string
@@ -136,6 +137,7 @@ const nullableEnvVars = [
   'SENDGRID_RESET_PASSWORD_TEMPLATE_ID',
   'SENDGRID_INSTALLATION_TEMPLATE_ID',
   'READWISE_API_URL',
+  'INTEGRATION_TASK_HANDLER_URL',
 ] // Allow some vars to be null/empty
 
 /* If not in GAE and Prod/QA/Demo env (f.e. on localhost/dev env), allow following env vars to be null */
@@ -218,6 +220,7 @@ export function getEnv(): BackendEnv {
     contentFetchUrl: parse('CONTENT_FETCH_URL'),
     contentFetchGCFUrl: parse('CONTENT_FETCH_GCF_URL'),
     reminderTaskHanderUrl: parse('REMINDER_TASK_HANDLER_URL'),
+    integrationTaskHandlerUrl: parse('INTEGRATION_TASK_HANDLER_URL'),
   }
   const imageProxy = {
     url: parse('IMAGE_PROXY_URL'),

From bd73da0571a809134e258b61eb758b512d72d994 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 5 Aug 2022 12:27:32 +0800
Subject: [PATCH 13/25] Add syncedAt field in integrations table

---
 packages/api/src/entity/integration.ts          | 3 +++
 packages/db/migrations/0091.do.integrations.sql | 1 +
 2 files changed, 4 insertions(+)

diff --git a/packages/api/src/entity/integration.ts b/packages/api/src/entity/integration.ts
index 898aca91e..0a795fca4 100644
--- a/packages/api/src/entity/integration.ts
+++ b/packages/api/src/entity/integration.ts
@@ -36,4 +36,7 @@ export class Integration {
 
   @UpdateDateColumn({ default: () => 'CURRENT_TIMESTAMP' })
   updatedAt!: Date
+
+  @Column('timestamp', { nullable: true })
+  syncedAt?: Date | null
 }
diff --git a/packages/db/migrations/0091.do.integrations.sql b/packages/db/migrations/0091.do.integrations.sql
index 33829ac77..1fc4e6d93 100755
--- a/packages/db/migrations/0091.do.integrations.sql
+++ b/packages/db/migrations/0091.do.integrations.sql
@@ -14,6 +14,7 @@ CREATE TABLE omnivore.integrations (
     "enabled" boolean NOT NULL DEFAULT true,
     created_at timestamptz NOT NULL DEFAULT current_timestamp,
     updated_at timestamptz NOT NULL DEFAULT current_timestamp,
+    synced_at timestamptz,
     UNIQUE (user_id, "type")
 );
 

From 8e9d1fcc4fa7919533c3b504ab82a20584e5c201 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 5 Aug 2022 12:28:41 +0800
Subject: [PATCH 14/25] Update integration syncedAt if successful

---
 packages/api/src/services/integrations.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/api/src/services/integrations.ts b/packages/api/src/services/integrations.ts
index 58641bf4a..fc94b629e 100644
--- a/packages/api/src/services/integrations.ts
+++ b/packages/api/src/services/integrations.ts
@@ -99,11 +99,11 @@ export const syncWithIntegration = async (
     default:
       return false
   }
-  // update integration updatedAt if successful
+  // update integration syncedAt if successful
   if (result) {
-    console.log('updating integration updatedAt')
+    console.log('updating integration syncedAt')
     await getRepository(Integration).update(integration.id, {
-      updatedAt: new Date(),
+      syncedAt: new Date(),
     })
   }
   return result

From c0c58bf75152cdd25d670acddb579e08e669b766 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 5 Aug 2022 12:33:08 +0800
Subject: [PATCH 15/25] Only sync pages that were updated after syncedAt

---
 packages/api/src/routers/svc/integrations.ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/api/src/routers/svc/integrations.ts b/packages/api/src/routers/svc/integrations.ts
index 77d421667..74928f8e4 100644
--- a/packages/api/src/routers/svc/integrations.ts
+++ b/packages/api/src/routers/svc/integrations.ts
@@ -9,10 +9,11 @@ import { buildLogger } from '../../utils/logger'
 import { syncWithIntegration } from '../../services/integrations'
 import { getPageById, getPageByParam, searchPages } from '../../elastic/pages'
 import { Page } from '../../elastic/types'
+import { DateFilter } from '../../utils/search'
 
 interface Message {
-  type: EntityType
-  data: any
+  type?: EntityType
+  data?: any
   userId: string
 }
 
@@ -103,7 +104,15 @@ export function integrationsServiceRouter() {
           hasNextPage;
           after += size, hasNextPage = count > after
         ) {
-          ;[pages, count] = (await searchPages({ from: after, size }, userId))!
+          const syncedAt = integration.syncedAt
+          // only sync pages that were updated after syncedAt
+          const dateFilters: DateFilter[] = []
+          syncedAt &&
+            dateFilters.push({ field: 'updatedAt', startDate: syncedAt })
+          ;[pages, count] = (await searchPages(
+            { from: after, size, dateFilters },
+            userId
+          ))!
           const pageIds = pages.map((p) => p.id)
 
           logger.info('syncing pages', pageIds)

From eb2ee5ab5594cb4aef0e7148d814e733561024ac Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 5 Aug 2022 12:33:32 +0800
Subject: [PATCH 16/25] Add task to handle sync with integrations

---
 packages/api/src/utils/createTask.ts | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/packages/api/src/utils/createTask.ts b/packages/api/src/utils/createTask.ts
index a0cab7909..31f137322 100644
--- a/packages/api/src/utils/createTask.ts
+++ b/packages/api/src/utils/createTask.ts
@@ -8,6 +8,7 @@ import { CreateTaskError } from './errors'
 import { buildLogger } from './logger'
 import { nanoid } from 'nanoid'
 import { google } from '@google-cloud/tasks/build/protos/protos'
+import { IntegrationType } from '../entity/integration'
 import View = google.cloud.tasks.v2.Task.View
 
 const logger = buildLogger('app.dispatch')
@@ -283,4 +284,37 @@ export const enqueueReminder = async (
   return createdTasks[0].name
 }
 
+export const enqueueSyncWithIntegration = async (
+  userId: string,
+  integrationType: IntegrationType
+): Promise<string> => {
+  const { GOOGLE_CLOUD_PROJECT } = process.env
+  const payload = {
+    userId,
+  }
+
+  // If there is no Google Cloud Project Id exposed, it means that we are in local environment
+  if (env.dev.isLocal || !GOOGLE_CLOUD_PROJECT) {
+    return nanoid()
+  }
+
+  const createdTasks = await createHttpTaskWithToken({
+    project: GOOGLE_CLOUD_PROJECT,
+    payload,
+    taskHandlerUrl: `${
+      env.queue.integrationTaskHandlerUrl
+    }/${integrationType.toLowerCase()}/sync_all`,
+    priority: 'low',
+  })
+
+  if (!createdTasks || !createdTasks[0].name) {
+    logger.error(`Unable to get the name of the task`, {
+      payload,
+      createdTasks,
+    })
+    throw new CreateTaskError(`Unable to get the name of the task`)
+  }
+  return createdTasks[0].name
+}
+
 export default createHttpTaskWithToken

From 5a8184da3a5576d58b2eb457c82298f9f2af5d3a Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 5 Aug 2022 12:45:32 +0800
Subject: [PATCH 17/25] Add taskName in integrations table

---
 packages/api/src/entity/integration.ts          | 3 +++
 packages/db/migrations/0091.do.integrations.sql | 1 +
 2 files changed, 4 insertions(+)

diff --git a/packages/api/src/entity/integration.ts b/packages/api/src/entity/integration.ts
index 0a795fca4..0d1895f64 100644
--- a/packages/api/src/entity/integration.ts
+++ b/packages/api/src/entity/integration.ts
@@ -39,4 +39,7 @@ export class Integration {
 
   @Column('timestamp', { nullable: true })
   syncedAt?: Date | null
+
+  @Column('text', { nullable: true })
+  taskName?: string | null
 }
diff --git a/packages/db/migrations/0091.do.integrations.sql b/packages/db/migrations/0091.do.integrations.sql
index 1fc4e6d93..7d87ecc9c 100755
--- a/packages/db/migrations/0091.do.integrations.sql
+++ b/packages/db/migrations/0091.do.integrations.sql
@@ -15,6 +15,7 @@ CREATE TABLE omnivore.integrations (
     created_at timestamptz NOT NULL DEFAULT current_timestamp,
     updated_at timestamptz NOT NULL DEFAULT current_timestamp,
     synced_at timestamptz,
+    task_name text,
     UNIQUE (user_id, "type")
 );
 

From 22ce59a198a8eefe6eb924a6a675e98f9229273a Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 5 Aug 2022 13:10:22 +0800
Subject: [PATCH 18/25] Enqueue or delete sync task when create or disable
 integration

---
 .../api/src/resolvers/integrations/index.ts   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/api/src/resolvers/integrations/index.ts b/packages/api/src/resolvers/integrations/index.ts
index 42bb0a405..362ee9745 100644
--- a/packages/api/src/resolvers/integrations/index.ts
+++ b/packages/api/src/resolvers/integrations/index.ts
@@ -11,6 +11,8 @@ import { Integration } from '../../entity/integration'
 import { analytics } from '../../utils/analytics'
 import { env } from '../../env'
 import { validateToken } from '../../services/integrations'
+import { deleteTask, enqueueSyncWithIntegration } from '../../utils/createTask'
+import { AppDataSource } from '../../server'
 
 export const setIntegrationResolver = authorized<
   SetIntegrationSuccess,
@@ -73,7 +75,26 @@ export const setIntegrationResolver = authorized<
       }
     }
 
-    const integration = await getRepository(Integration).save(integrationToSave)
+    const integration = await AppDataSource.transaction(async (t) => {
+      const integration = await t
+        .getRepository(Integration)
+        .save(integrationToSave)
+      if (integration.enabled) {
+        // create a task to sync all the pages
+        const taskName = await enqueueSyncWithIntegration(
+          user.id,
+          integration.type
+        )
+        log.info('enqueued task', taskName)
+        await t
+          .getRepository(Integration)
+          .update({ id: integration.id }, { taskName })
+      } else if (integration.taskName) {
+        await deleteTask(integration.taskName)
+        log.info('task deleted', integration.taskName)
+      }
+      return integration
+    })
 
     analytics.track({
       userId: uid,

From 8070273dadc630b647cc98cb213be547912d7375 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 5 Aug 2022 16:07:49 +0800
Subject: [PATCH 19/25] Fix tests

---
 packages/api/src/routers/svc/integrations.ts  |  12 +-
 packages/api/test/elastic/highlights.test.ts  |  57 +++++
 packages/api/test/elastic/labels.test.ts      | 141 +++++++++++
 .../elastic/{index.test.ts => pages.test.ts}  | 223 +++++-------------
 packages/api/test/resolvers/article.test.ts   |   2 +-
 packages/api/test/resolvers/highlight.test.ts |   2 +-
 packages/api/test/resolvers/labels.test.ts    |  10 +-
 packages/api/test/resolvers/reminders.test.ts |   2 +-
 packages/api/test/resolvers/report.test.ts    |   2 +-
 packages/api/test/resolvers/update.test.ts    |  30 +--
 packages/api/test/util.ts                     |  24 +-
 11 files changed, 290 insertions(+), 215 deletions(-)
 create mode 100644 packages/api/test/elastic/highlights.test.ts
 create mode 100644 packages/api/test/elastic/labels.test.ts
 rename packages/api/test/elastic/{index.test.ts => pages.test.ts} (55%)

diff --git a/packages/api/src/routers/svc/integrations.ts b/packages/api/src/routers/svc/integrations.ts
index 74928f8e4..a07a6b451 100644
--- a/packages/api/src/routers/svc/integrations.ts
+++ b/packages/api/src/routers/svc/integrations.ts
@@ -7,7 +7,7 @@ import { getRepository } from '../../entity/utils'
 import { Integration, IntegrationType } from '../../entity/integration'
 import { buildLogger } from '../../utils/logger'
 import { syncWithIntegration } from '../../services/integrations'
-import { getPageById, getPageByParam, searchPages } from '../../elastic/pages'
+import { getPageById, searchPages } from '../../elastic/pages'
 import { Page } from '../../elastic/types'
 import { DateFilter } from '../../utils/search'
 
@@ -63,19 +63,19 @@ export function integrationsServiceRouter() {
       const action = req.params.action.toUpperCase()
       if (action === 'SYNC_UPDATED') {
         // get updated page by id
-        const id = data.id
-        let page: Page | undefined
+        let id = ''
         switch (type) {
           case EntityType.PAGE:
-            page = await getPageById(id)
+            id = data.id
             break
           case EntityType.HIGHLIGHT:
-            page = await getPageByParam({ 'highlights.id': id })
+            id = data.articleId
             break
           case EntityType.LABEL:
-            page = await getPageByParam({ 'labels.id': id })
+            id = data.pageId
             break
         }
+        const page = await getPageById(id)
         if (!page) {
           logger.info('No page found for id', id)
           res.status(200).send('No page found')
diff --git a/packages/api/test/elastic/highlights.test.ts b/packages/api/test/elastic/highlights.test.ts
new file mode 100644
index 000000000..4950e5f62
--- /dev/null
+++ b/packages/api/test/elastic/highlights.test.ts
@@ -0,0 +1,57 @@
+import 'mocha'
+import { expect } from 'chai'
+import { Highlight, Page, PageContext } from '../../src/elastic/types'
+import { createPubSubClient } from '../../src/datalayer/pubsub'
+import { deletePage } from '../../src/elastic/pages'
+import {
+  addHighlightToPage,
+  searchHighlights,
+} from '../../src/elastic/highlights'
+import { createTestElasticPage } from '../util'
+
+describe('highlights in elastic', () => {
+  const userId = 'userId'
+  const ctx: PageContext = {
+    pubsub: createPubSubClient(),
+    refresh: true,
+    uid: userId,
+  }
+
+  describe('searchHighlights', () => {
+    const highlightId = 'highlightId'
+    let page: Page
+
+    before(async () => {
+      // create a testing page
+      page = await createTestElasticPage(userId)
+      const highlightData: Highlight = {
+        patch: 'test patch',
+        quote: 'test content',
+        shortId: 'test shortId',
+        id: highlightId,
+        userId: page.userId,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      }
+
+      await addHighlightToPage(page.id, highlightData, ctx)
+    })
+
+    after(async () => {
+      // delete the testing page
+      await deletePage(page.id, ctx)
+    })
+
+    it('searches highlights', async () => {
+      const [searchResults, count] = (await searchHighlights(
+        {
+          query: 'test',
+        },
+        page.userId
+      )) || [[], 0]
+
+      expect(count).to.eq(1)
+      expect(searchResults[0].id).to.eq(highlightId)
+    })
+  })
+})
diff --git a/packages/api/test/elastic/labels.test.ts b/packages/api/test/elastic/labels.test.ts
new file mode 100644
index 000000000..685e0a773
--- /dev/null
+++ b/packages/api/test/elastic/labels.test.ts
@@ -0,0 +1,141 @@
+import 'mocha'
+import { expect } from 'chai'
+import {
+  ArticleSavingRequestStatus,
+  Highlight,
+  Label,
+  Page,
+  PageContext,
+  PageType,
+} from '../../src/elastic/types'
+import { createPubSubClient } from '../../src/datalayer/pubsub'
+import { createPage, deletePage, getPageById } from '../../src/elastic/pages'
+import { addLabelInPage, setLabelsForHighlight } from '../../src/elastic/labels'
+import { addHighlightToPage } from '../../src/elastic/highlights'
+
+describe('labels in elastic', () => {
+  const userId = 'userId'
+  const ctx: PageContext = {
+    pubsub: createPubSubClient(),
+    refresh: true,
+    uid: userId,
+  }
+
+  describe('addLabelInPage', () => {
+    let page: Page
+    let label: Label = {
+      id: 'Test label id',
+      name: 'test label',
+      color: '#07D2D1',
+    }
+    let newLabel: Label
+
+    before(async () => {
+      // create a testing page
+      page = {
+        id: '',
+        hash: 'test hash',
+        userId: userId,
+        pageType: PageType.Article,
+        title: 'test title',
+        content: '<p>test</p>',
+        slug: 'test slug',
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        savedAt: new Date(),
+        readingProgressPercent: 100,
+        readingProgressAnchorIndex: 0,
+        url: 'https://blog.omnivore.app/p/getting-started-with-omnivore',
+        archivedAt: new Date(),
+        labels: [label],
+        state: ArticleSavingRequestStatus.Succeeded,
+      }
+      page.id = (await createPage(page, ctx))!
+    })
+
+    after(async () => {
+      // delete the testing page
+      await deletePage(page.id, ctx)
+    })
+
+    context('when the label not exist in the page', () => {
+      before(() => {
+        newLabel = {
+          id: 'new label id',
+          name: 'new label',
+          color: '#07D2D1',
+        }
+      })
+      it('adds the label to the page', async () => {
+        const result = await addLabelInPage(page.id, newLabel, ctx)
+        expect(result).to.be.true
+
+        const updatedPage = await getPageById(page.id)
+        expect(updatedPage?.labels).to.deep.include(label)
+      })
+    })
+
+    context('when the label exists in the page', () => {
+      before(() => {
+        newLabel = label
+      })
+
+      it('does not add the label to the page', async () => {
+        const result = await addLabelInPage(page.id, newLabel, ctx)
+
+        expect(result).to.be.false
+      })
+    })
+  })
+
+  describe('setLabelsForHighlight', () => {
+    const page = {
+      id: 'testPageId',
+      hash: 'test set labels for highlight hash',
+      userId: userId,
+      pageType: PageType.Article,
+      title: 'test set labels for highlight title',
+      content: '<p>test</p>',
+      slug: 'test set labels for highlight slug',
+      createdAt: new Date(),
+      savedAt: new Date(),
+      readingProgressPercent: 100,
+      readingProgressAnchorIndex: 0,
+      url: 'https://blog.omnivore.app/p/setting-labels-for-highlight',
+      state: ArticleSavingRequestStatus.Succeeded,
+    }
+    const highlightId = 'highlightId'
+    const label: Label = {
+      id: 'test label id',
+      name: 'test label',
+      color: '#07D2D1',
+    }
+
+    before(async () => {
+      // create a testing page
+      await createPage(page, ctx)
+
+      const highlightData: Highlight = {
+        patch: 'test set labels patch',
+        quote: 'test set labels quote',
+        shortId: 'test set labels shortId',
+        id: highlightId,
+        userId: page.userId,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      }
+
+      await addHighlightToPage(page.id, highlightData, ctx)
+    })
+
+    after(async () => {
+      await deletePage(page.id, ctx)
+    })
+
+    it('sets labels for highlights', async () => {
+      const result = await setLabelsForHighlight(highlightId, [label], ctx)
+
+      expect(result).to.be.true
+    })
+  })
+})
diff --git a/packages/api/test/elastic/index.test.ts b/packages/api/test/elastic/pages.test.ts
similarity index 55%
rename from packages/api/test/elastic/index.test.ts
rename to packages/api/test/elastic/pages.test.ts
index ff415a41d..3b6959eb2 100644
--- a/packages/api/test/elastic/index.test.ts
+++ b/packages/api/test/elastic/pages.test.ts
@@ -3,8 +3,6 @@ import { expect } from 'chai'
 import { InFilter, ReadFilter } from '../../src/utils/search'
 import {
   ArticleSavingRequestStatus,
-  Highlight,
-  Label,
   Page,
   PageContext,
   PageType,
@@ -21,13 +19,9 @@ import {
   searchPages,
   updatePage,
 } from '../../src/elastic/pages'
-import { addLabelInPage, setLabelsForHighlight } from '../../src/elastic/labels'
-import {
-  addHighlightToPage,
-  searchHighlights,
-} from '../../src/elastic/highlights'
+import { createTestElasticPage } from '../util'
 
-describe('elastic api', () => {
+describe('pages in elastic', () => {
   const userId = 'userId'
   const ctx: PageContext = {
     pubsub: createPubSubClient(),
@@ -35,49 +29,6 @@ describe('elastic api', () => {
     uid: userId,
   }
 
-  let page: Page
-
-  before(async () => {
-    // create a testing page
-    page = {
-      id: '',
-      hash: 'test hash',
-      userId: userId,
-      pageType: PageType.Article,
-      title: 'test title',
-      content: '<p>test</p>',
-      slug: 'test slug',
-      createdAt: new Date(),
-      updatedAt: new Date(),
-      savedAt: new Date(),
-      readingProgressPercent: 100,
-      readingProgressAnchorIndex: 0,
-      url: 'https://blog.omnivore.app/p/getting-started-with-omnivore',
-      archivedAt: new Date(),
-      labels: [
-        {
-          id: 'Test label id',
-          name: 'test label',
-          color: '#ffffff',
-          createdAt: new Date(),
-        },
-        {
-          id: 'Test label id 2',
-          name: 'test label 2',
-          color: '#eeeeee',
-          createdAt: new Date(),
-        },
-      ],
-      state: ArticleSavingRequestStatus.Succeeded,
-    }
-    page.id = (await createPage(page, ctx))!
-  })
-
-  after(async () => {
-    // delete the testing page
-    await deletePage(page.id, ctx)
-  })
-
   describe('createPage', () => {
     let newPageId: string
 
@@ -108,6 +59,18 @@ describe('elastic api', () => {
   })
 
   describe('getPageByParam', () => {
+    let page: Page
+
+    before(async () => {
+      // create a testing page
+      page = await createTestElasticPage(userId)
+    })
+
+    after(async () => {
+      // delete the testing page
+      await deletePage(page.id, ctx)
+    })
+
     it('gets a page by url', async () => {
       const pageFound = await getPageByParam({
         userId: page.userId,
@@ -119,6 +82,18 @@ describe('elastic api', () => {
   })
 
   describe('getPageById', () => {
+    let page: Page
+
+    before(async () => {
+      // create a testing page
+      page = await createTestElasticPage(userId)
+    })
+
+    after(async () => {
+      // delete the testing page
+      await deletePage(page.id, ctx)
+    })
+
     it('gets a page by id', async () => {
       const pageFound = await getPageById(page.id)
       expect(pageFound).not.undefined
@@ -126,6 +101,18 @@ describe('elastic api', () => {
   })
 
   describe('updatePage', () => {
+    let page: Page
+
+    before(async () => {
+      // create a testing page
+      page = await createTestElasticPage(userId)
+    })
+
+    after(async () => {
+      // delete the testing page
+      await deletePage(page.id, ctx)
+    })
+
     it('updates a page', async () => {
       const newTitle = 'new title'
       const updatedPageData: Partial<Page> = {
@@ -140,6 +127,18 @@ describe('elastic api', () => {
   })
 
   describe('searchPages', () => {
+    let page: Page
+
+    before(async () => {
+      // create a testing page
+      page = await createTestElasticPage(userId)
+    })
+
+    after(async () => {
+      // delete the testing page
+      await deletePage(page.id, ctx)
+    })
+
     it('searches pages', async () => {
       const searchResults = await searchPages(
         {
@@ -148,7 +147,7 @@ describe('elastic api', () => {
           inFilter: InFilter.ALL,
           labelFilters: [],
           readFilter: ReadFilter.ALL,
-          query: 'test',
+          query: page.content,
         },
         page.userId
       )
@@ -156,43 +155,12 @@ describe('elastic api', () => {
     })
   })
 
-  describe('addLabelInPage', () => {
-    context('when the label not exist in the page', () => {
-      it('adds the label to the page', async () => {
-        const newLabel = {
-          id: 'new label id',
-          name: 'new label',
-          color: '#07D2D1',
-        }
-
-        const result = await addLabelInPage(page.id, newLabel, ctx)
-        expect(result).to.be.true
-
-        const updatedPage = await getPageById(page.id)
-        expect(updatedPage?.labels).to.deep.include(newLabel)
-      })
-    })
-
-    context('when the label exists in the page', () => {
-      it('does not add the label to the page', async () => {
-        const newLabel = {
-          id: 'Test label id',
-          name: 'test label',
-          color: '#07D2D1',
-        }
-
-        const result = await addLabelInPage(page.id, newLabel, ctx)
-
-        expect(result).to.be.false
-      })
-    })
-  })
-
   describe('countByCreatedAt', () => {
     const createdAt = Date.now() - 60 * 60 * 24 * 1000
+    let page: Page
 
     before(async () => {
-      const newPageData: Page = {
+      page = {
         id: '',
         hash: 'hash',
         userId: userId,
@@ -208,93 +176,16 @@ describe('elastic api', () => {
         state: ArticleSavingRequestStatus.Succeeded,
       }
 
-      await createPage(newPageData, ctx)
-    })
-
-    it('counts pages by createdAt', async () => {
-      const count = await countByCreatedAt(userId, createdAt, createdAt)
-      expect(count).to.eq(1)
-    })
-  })
-
-  describe('searchHighlights', () => {
-    const highlightId = 'highlightId'
-
-    before(async () => {
-      const highlightData: Highlight = {
-        patch: 'test patch',
-        quote: 'test content',
-        shortId: 'test shortId',
-        id: highlightId,
-        userId: page.userId,
-        createdAt: new Date(),
-        updatedAt: new Date(),
-      }
-
-      await addHighlightToPage(page.id, highlightData, ctx)
-    })
-
-    it('searches highlights', async () => {
-      const [searchResults, count] = (await searchHighlights(
-        {
-          query: 'test',
-        },
-        page.userId
-      )) || [[], 0]
-
-      expect(count).to.eq(1)
-      expect(searchResults[0].id).to.eq(highlightId)
-    })
-  })
-
-  describe('setLabelsForHighlight', () => {
-    const page = {
-      id: 'testPageId',
-      hash: 'test set labels for highlight hash',
-      userId: userId,
-      pageType: PageType.Article,
-      title: 'test set labels for highlight title',
-      content: '<p>test</p>',
-      slug: 'test set labels for highlight slug',
-      createdAt: new Date(),
-      savedAt: new Date(),
-      readingProgressPercent: 100,
-      readingProgressAnchorIndex: 0,
-      url: 'https://blog.omnivore.app/p/setting-labels-for-highlight',
-      state: ArticleSavingRequestStatus.Succeeded,
-    }
-    const highlightId = 'highlightId'
-    const label: Label = {
-      id: 'test label id',
-      name: 'test label',
-      color: '#07D2D1',
-    }
-
-    before(async () => {
-      // create a testing page
-      await createPage(page, ctx)
-
-      const highlightData: Highlight = {
-        patch: 'test set labels patch',
-        quote: 'test set labels quote',
-        shortId: 'test set labels shortId',
-        id: highlightId,
-        userId: page.userId,
-        createdAt: new Date(),
-        updatedAt: new Date(),
-      }
-
-      await addHighlightToPage(page.id, highlightData, ctx)
+      page.id = (await createPage(page, ctx))!
     })
 
     after(async () => {
       await deletePage(page.id, ctx)
     })
 
-    it('sets labels for highlights', async () => {
-      const result = await setLabelsForHighlight(highlightId, [label], ctx)
-
-      expect(result).to.be.true
+    it('counts pages by createdAt', async () => {
+      const count = await countByCreatedAt(userId, createdAt, createdAt)
+      expect(count).to.eq(1)
     })
   })
 
diff --git a/packages/api/test/resolvers/article.test.ts b/packages/api/test/resolvers/article.test.ts
index 6e5c2e442..f9175d599 100644
--- a/packages/api/test/resolvers/article.test.ts
+++ b/packages/api/test/resolvers/article.test.ts
@@ -694,7 +694,7 @@ describe('Article API', () => {
     let pageId = ''
 
     before(async () => {
-      pageId = (await createTestElasticPage(user)).id!
+      pageId = (await createTestElasticPage(user.id)).id!
     })
 
     after(async () => {
diff --git a/packages/api/test/resolvers/highlight.test.ts b/packages/api/test/resolvers/highlight.test.ts
index fbd3158e5..d13300cd9 100644
--- a/packages/api/test/resolvers/highlight.test.ts
+++ b/packages/api/test/resolvers/highlight.test.ts
@@ -104,7 +104,7 @@ describe('Highlights API', () => {
       .send({ fakeEmail: user.email })
 
     authToken = res.body.authToken
-    pageId = (await createTestElasticPage(user)).id
+    pageId = (await createTestElasticPage(user.id)).id
     ctx = { pubsub: createPubSubClient(), uid: user.id }
   })
 
diff --git a/packages/api/test/resolvers/labels.test.ts b/packages/api/test/resolvers/labels.test.ts
index 8dca95289..d2729c4d9 100644
--- a/packages/api/test/resolvers/labels.test.ts
+++ b/packages/api/test/resolvers/labels.test.ts
@@ -246,7 +246,7 @@ describe('Labels API', () => {
         before(async () => {
           toDeleteLabel = await createTestLabel(user, 'page label', '#ffffff')
           labelId = toDeleteLabel.id
-          page = await createTestElasticPage(user, [toDeleteLabel])
+          page = await createTestElasticPage(user.id, [toDeleteLabel])
         })
 
         after(async () => {
@@ -267,7 +267,7 @@ describe('Labels API', () => {
         let page: Page
 
         before(async () => {
-          page = await createTestElasticPage(user)
+          page = await createTestElasticPage(user.id)
           toDeleteLabel = await createTestLabel(
             user,
             'highlight label',
@@ -340,7 +340,7 @@ describe('Labels API', () => {
       const label1 = await createTestLabel(user, 'label_1', '#ffffff')
       const label2 = await createTestLabel(user, 'label_2', '#eeeeee')
       labels = [label1, label2]
-      page = await createTestElasticPage(user)
+      page = await createTestElasticPage(user.id)
     })
 
     after(async () => {
@@ -497,7 +497,7 @@ describe('Labels API', () => {
         let page: Page
 
         before(async () => {
-          page = await createTestElasticPage(user, [toUpdateLabel])
+          page = await createTestElasticPage(user.id, [toUpdateLabel])
         })
 
         after(async () => {
@@ -542,7 +542,7 @@ describe('Labels API', () => {
       const label1 = await createTestLabel(user, 'label_1', '#ffffff')
       const label2 = await createTestLabel(user, 'label_2', '#eeeeee')
       labels = [label1, label2]
-      page = await createTestElasticPage(user)
+      page = await createTestElasticPage(user.id)
     })
 
     after(async () => {
diff --git a/packages/api/test/resolvers/reminders.test.ts b/packages/api/test/resolvers/reminders.test.ts
index 907c5269a..16e616ca5 100644
--- a/packages/api/test/resolvers/reminders.test.ts
+++ b/packages/api/test/resolvers/reminders.test.ts
@@ -38,7 +38,7 @@ describe('Reminders API', () => {
     authToken = res.body.authToken
 
     // create page, link and reminders test data
-    page = await createTestElasticPage(user)
+    page = await createTestElasticPage(user.id)
     reminder = await createTestReminder(user, page.id)
   })
 
diff --git a/packages/api/test/resolvers/report.test.ts b/packages/api/test/resolvers/report.test.ts
index c8fafe754..1a4ba6ea1 100644
--- a/packages/api/test/resolvers/report.test.ts
+++ b/packages/api/test/resolvers/report.test.ts
@@ -24,7 +24,7 @@ describe('Report API', () => {
     authToken = res.body.authToken
 
     // create a page
-    page = await createTestElasticPage(user)
+    page = await createTestElasticPage(user.id)
   })
 
   after(async () => {
diff --git a/packages/api/test/resolvers/update.test.ts b/packages/api/test/resolvers/update.test.ts
index abdccdf21..a742454fb 100644
--- a/packages/api/test/resolvers/update.test.ts
+++ b/packages/api/test/resolvers/update.test.ts
@@ -1,9 +1,5 @@
 import { createTestUser, deleteTestUser } from '../db'
-import {
-  createTestElasticPage,
-  graphqlRequest,
-  request,
-} from '../util'
+import { createTestElasticPage, graphqlRequest, request } from '../util'
 import { expect } from 'chai'
 import 'mocha'
 import { User } from '../../src/entity/user'
@@ -24,7 +20,7 @@ describe('Update API', () => {
       .send({ fakeEmail: user.email })
 
     authToken = res.body.authToken
-    page = await createTestElasticPage(user)
+    page = await createTestElasticPage(user.id)
   })
 
   after(async () => {
@@ -34,8 +30,8 @@ describe('Update API', () => {
 
   describe('update page', () => {
     let query: string
-    let title = "New Title"
-    let description = "New Description"
+    let title = 'New Title'
+    let description = 'New Description'
 
     beforeEach(() => {
       query = `
@@ -59,14 +55,14 @@ describe('Update API', () => {
           }
         }
       `
-      })
-
-      it('should update page', async () => {
-        const res = await graphqlRequest(query, authToken).expect(200)
-
-        const updatedPage = res?.body.data.updatePage.updatedPage
-        expect(updatedPage?.title).to.eql(title)
-        expect(updatedPage?.description).to.eql(description)
-      })
     })
+
+    it('should update page', async () => {
+      const res = await graphqlRequest(query, authToken).expect(200)
+
+      const updatedPage = res?.body.data.updatePage.updatedPage
+      expect(updatedPage?.title).to.eql(title)
+      expect(updatedPage?.description).to.eql(description)
+    })
+  })
 })
diff --git a/packages/api/test/util.ts b/packages/api/test/util.ts
index f63fca1a3..53bc16612 100644
--- a/packages/api/test/util.ts
+++ b/packages/api/test/util.ts
@@ -4,9 +4,8 @@ import { v4 } from 'uuid'
 import { corsConfig } from '../src/utils/corsConfig'
 import { ArticleSavingRequestStatus, Label, Page } from '../src/elastic/types'
 import { PageType } from '../src/generated/graphql'
-import { User } from '../src/entity/user'
 import { createPubSubClient } from '../src/datalayer/pubsub'
-import { createPage, getPageById } from '../src/elastic/pages'
+import { createPage } from '../src/elastic/pages'
 
 const { app, apollo } = createApp()
 export const request = supertest(app)
@@ -39,13 +38,13 @@ export const generateFakeUuid = () => {
 }
 
 export const createTestElasticPage = async (
-  user: User,
+  userId: string,
   labels?: Label[]
 ): Promise<Page> => {
   const page: Page = {
     id: '',
     hash: 'test hash',
-    userId: user.id,
+    userId,
     pageType: PageType.Article,
     title: 'test title',
     content: '<p>test content</p>',
@@ -59,19 +58,10 @@ export const createTestElasticPage = async (
     state: ArticleSavingRequestStatus.Succeeded,
   }
 
-  const pageId = await createPage(page, {
+  page.id = (await createPage(page, {
     pubsub: createPubSubClient(),
     refresh: true,
-    uid: user.id,
-  })
-  if (pageId) {
-    page.id = pageId
-  }
-
-  const res = await getPageById(page.id)
-  console.log('got page', res)
-  if (!res) {
-    throw new Error('Failed to create page')
-  }
-  return res
+    uid: userId,
+  }))!
+  return page
 }

From 0cf3f58258426928092a3865c923741bacdcdafe Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 8 Aug 2022 17:09:23 +0800
Subject: [PATCH 20/25] Add integration tests for setIntegration API

---
 packages/api/src/generated/graphql.ts         |   2 +-
 packages/api/src/generated/schema.graphql     |   2 +-
 .../api/src/resolvers/integrations/index.ts   |  59 ++--
 packages/api/src/routers/svc/integrations.ts  |   3 +
 packages/api/src/schema.ts                    |   2 +-
 packages/api/src/services/integrations.ts     |   2 +-
 .../api/test/resolvers/integrations.test.ts   | 303 ++++++++++++++++++
 .../api/test/routers/integrations.test.ts     |   0
 8 files changed, 341 insertions(+), 32 deletions(-)
 create mode 100644 packages/api/test/resolvers/integrations.test.ts
 create mode 100644 packages/api/test/routers/integrations.test.ts

diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts
index 74a512f85..5e930cf63 100644
--- a/packages/api/src/generated/graphql.ts
+++ b/packages/api/src/generated/graphql.ts
@@ -1728,7 +1728,7 @@ export enum SetIntegrationErrorCode {
 }
 
 export type SetIntegrationInput = {
-  enabled?: InputMaybe<Scalars['Boolean']>;
+  enabled: Scalars['Boolean'];
   id?: InputMaybe<Scalars['ID']>;
   token: Scalars['String'];
   type: IntegrationType;
diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql
index af1193142..2dbe9479c 100644
--- a/packages/api/src/generated/schema.graphql
+++ b/packages/api/src/generated/schema.graphql
@@ -1252,7 +1252,7 @@ enum SetIntegrationErrorCode {
 }
 
 input SetIntegrationInput {
-  enabled: Boolean
+  enabled: Boolean!
   id: ID
   token: String!
   type: IntegrationType!
diff --git a/packages/api/src/resolvers/integrations/index.ts b/packages/api/src/resolvers/integrations/index.ts
index 362ee9745..8a9d0b0f6 100644
--- a/packages/api/src/resolvers/integrations/index.ts
+++ b/packages/api/src/resolvers/integrations/index.ts
@@ -12,7 +12,6 @@ import { analytics } from '../../utils/analytics'
 import { env } from '../../env'
 import { validateToken } from '../../services/integrations'
 import { deleteTask, enqueueSyncWithIntegration } from '../../utils/createTask'
-import { AppDataSource } from '../../server'
 
 export const setIntegrationResolver = authorized<
   SetIntegrationSuccess,
@@ -29,13 +28,9 @@ export const setIntegrationResolver = authorized<
       }
     }
 
-    const integrationToSave: Partial<Integration> = {
+    let integrationToSave: Partial<Integration> = {
       user,
-      token: input.token,
-      type: input.type,
-      enabled: input.enabled === null ? true : input.enabled,
     }
-
     if (input.id) {
       // Update
       const existingIntegration = await getRepository(Integration).findOne({
@@ -53,7 +48,17 @@ export const setIntegrationResolver = authorized<
         }
       }
 
-      integrationToSave.id = input.id
+      if (existingIntegration.enabled === input.enabled) {
+        return {
+          integration: existingIntegration,
+        }
+      }
+      integrationToSave = {
+        ...integrationToSave,
+        id: existingIntegration.id,
+        taskName: existingIntegration.taskName,
+        enabled: input.enabled,
+      }
     } else {
       // Create
       const existingIntegration = await getRepository(Integration).findOneBy({
@@ -73,34 +78,32 @@ export const setIntegrationResolver = authorized<
           errorCodes: [SetIntegrationErrorCode.InvalidToken],
         }
       }
+      integrationToSave = {
+        ...integrationToSave,
+        token: input.token,
+        type: input.type,
+        enabled: true,
+      }
     }
 
-    const integration = await AppDataSource.transaction(async (t) => {
-      const integration = await t
-        .getRepository(Integration)
-        .save(integrationToSave)
-      if (integration.enabled) {
-        // create a task to sync all the pages
-        const taskName = await enqueueSyncWithIntegration(
-          user.id,
-          integration.type
-        )
-        log.info('enqueued task', taskName)
-        await t
-          .getRepository(Integration)
-          .update({ id: integration.id }, { taskName })
-      } else if (integration.taskName) {
-        await deleteTask(integration.taskName)
-        log.info('task deleted', integration.taskName)
-      }
-      return integration
-    })
+    if (!integrationToSave.id || integrationToSave.enabled) {
+      // create a task to sync all the pages if new integration or enable integration
+      const taskName = await enqueueSyncWithIntegration(user.id, input.type)
+      log.info('enqueued task', taskName)
+      integrationToSave.taskName = taskName
+    } else if (integrationToSave.taskName) {
+      // delete the task if disable integration and task exists
+      await deleteTask(integrationToSave.taskName)
+      integrationToSave.taskName = null
+      log.info('task deleted', integrationToSave.taskName)
+    }
+    const integration = await getRepository(Integration).save(integrationToSave)
 
     analytics.track({
       userId: uid,
       event: 'integration_set',
       properties: {
-        id: integration.id,
+        id: integrationToSave.id,
         env: env.server.apiEnv,
       },
     })
diff --git a/packages/api/src/routers/svc/integrations.ts b/packages/api/src/routers/svc/integrations.ts
index a07a6b451..2036a7eab 100644
--- a/packages/api/src/routers/svc/integrations.ts
+++ b/packages/api/src/routers/svc/integrations.ts
@@ -129,6 +129,9 @@ export function integrationsServiceRouter() {
             return
           }
         }
+        await getRepository(Integration).update(integration.id, {
+          taskName: null,
+        })
       } else {
         logger.info('unknown action', action)
         res.status(200).send('Unknown action')
diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts
index 956312181..1dd776143 100755
--- a/packages/api/src/schema.ts
+++ b/packages/api/src/schema.ts
@@ -1847,7 +1847,7 @@ const schema = gql`
     id: ID
     type: IntegrationType!
     token: String!
-    enabled: Boolean
+    enabled: Boolean!
   }
 
   # Mutations
diff --git a/packages/api/src/services/integrations.ts b/packages/api/src/services/integrations.ts
index fc94b629e..6b6cd6365 100644
--- a/packages/api/src/services/integrations.ts
+++ b/packages/api/src/services/integrations.ts
@@ -34,7 +34,7 @@ interface ReadwiseHighlight {
   highlight_url?: string
 }
 
-const READWISE_API_URL = 'https://readwise.io/api/v2'
+export const READWISE_API_URL = 'https://readwise.io/api/v2'
 
 export const validateToken = async (
   token: string,
diff --git a/packages/api/test/resolvers/integrations.test.ts b/packages/api/test/resolvers/integrations.test.ts
new file mode 100644
index 000000000..c262bc6bb
--- /dev/null
+++ b/packages/api/test/resolvers/integrations.test.ts
@@ -0,0 +1,303 @@
+import 'mocha'
+import { User } from '../../src/entity/user'
+import { createTestUser, deleteTestUser } from '../db'
+import { generateFakeUuid, graphqlRequest, request } from '../util'
+import {
+  IntegrationType,
+  SetIntegrationErrorCode,
+} from '../../src/generated/graphql'
+import { expect } from 'chai'
+import { getRepository } from '../../src/entity/utils'
+import {
+  Integration,
+  IntegrationType as DataIntegrationType,
+} from '../../src/entity/integration'
+import nock from 'nock'
+import { READWISE_API_URL } from '../../src/services/integrations'
+
+describe('Integrations resolvers', () => {
+  let loginUser: User
+  let authToken: string
+
+  before(async () => {
+    // create test user and login
+    loginUser = await createTestUser('loginUser')
+    const res = await request
+      .post('/local/debug/fake-user-login')
+      .send({ fakeEmail: loginUser.email })
+
+    authToken = res.body.authToken
+  })
+
+  after(async () => {
+    await deleteTestUser(loginUser.name)
+  })
+
+  describe('setIntegration API', () => {
+    const validToken = 'valid-token'
+    const query = (
+      id = '',
+      type: IntegrationType = IntegrationType.Readwise,
+      token: string = 'test token',
+      enabled = true
+    ) => `
+      mutation {
+        setIntegration(input: {
+          id: "${id}",
+          type: ${type},
+          token: "${token}",
+          enabled: ${enabled},
+        }) {
+          ... on SetIntegrationSuccess {
+            integration {
+              id
+              enabled
+            }
+          }
+          ... on SetIntegrationError {
+            errorCodes
+          }
+        }
+      }
+    `
+    let integrationId: string
+    let token: string
+    let integrationType: IntegrationType
+    let enabled: boolean
+
+    // mock Readwise Auth API
+    before(() => {
+      nock(READWISE_API_URL, {
+        reqheaders: { Authorization: `Token ${validToken}` },
+      })
+        .get('/auth')
+        .reply(204)
+        .persist()
+    })
+
+    after(() => {
+      nock.cleanAll()
+    })
+
+    context('when id is not in the request', () => {
+      before(() => {
+        integrationId = ''
+      })
+
+      context('when integration exists', () => {
+        let existingIntegration: Integration
+
+        before(async () => {
+          existingIntegration = await getRepository(Integration).save({
+            user: loginUser,
+            type: DataIntegrationType.Readwise,
+            token: 'fakeToken',
+          })
+          integrationType = existingIntegration.type
+        })
+
+        after(async () => {
+          await getRepository(Integration).delete({
+            id: existingIntegration.id,
+          })
+        })
+
+        it('returns AlreadyExists error code', async () => {
+          const res = await graphqlRequest(
+            query(integrationId, integrationType),
+            authToken
+          )
+          expect(res.body.data.setIntegration.errorCodes).to.eql([
+            SetIntegrationErrorCode.AlreadyExists,
+          ])
+        })
+      })
+
+      context('when integration does not exist', () => {
+        context('when token is invalid', () => {
+          before(() => {
+            token = 'invalid token'
+          })
+
+          it('returns InvalidToken error code', async () => {
+            const res = await graphqlRequest(
+              query(integrationId, integrationType, token),
+              authToken
+            )
+            expect(res.body.data.setIntegration.errorCodes).to.eql([
+              SetIntegrationErrorCode.InvalidToken,
+            ])
+          })
+        })
+
+        context('when token is valid', () => {
+          before(() => {
+            token = validToken
+          })
+
+          afterEach(async () => {
+            await getRepository(Integration).delete({
+              user: loginUser,
+              type: integrationType,
+            })
+          })
+
+          it('creates new integration', async () => {
+            const res = await graphqlRequest(
+              query(integrationId, integrationType, token),
+              authToken
+            )
+            expect(res.body.data.setIntegration.integration.enabled).to.be.true
+          })
+
+          it('creates new cloud task to sync all existing articles and highlights', async () => {
+            const res = await graphqlRequest(
+              query(integrationId, integrationType, token),
+              authToken
+            )
+            const integration = await getRepository(Integration).findOneBy({
+              id: res.body.data.setIntegration.integration.id,
+            })
+            expect(integration?.taskName).not.to.be.null
+          })
+        })
+      })
+    })
+
+    context('when id is in the request', () => {
+      let existingIntegration: Integration
+
+      context('when integration does not exist', () => {
+        before(() => {
+          integrationId = generateFakeUuid()
+        })
+
+        it('returns NotFound error code', async () => {
+          const res = await graphqlRequest(
+            query(integrationId, integrationType),
+            authToken
+          )
+          expect(res.body.data.setIntegration.errorCodes).to.eql([
+            SetIntegrationErrorCode.NotFound,
+          ])
+        })
+      })
+
+      context('when integration exists', () => {
+        context('when integration does not belong to the user', () => {
+          let otherUser: User
+
+          before(async () => {
+            otherUser = await createTestUser('otherUser')
+            existingIntegration = await getRepository(Integration).save({
+              user: otherUser,
+              type: DataIntegrationType.Readwise,
+              token: 'fakeToken',
+            })
+            integrationId = existingIntegration.id
+          })
+
+          after(async () => {
+            await deleteTestUser(otherUser.name)
+            await getRepository(Integration).delete({
+              id: existingIntegration.id,
+            })
+          })
+
+          it('returns Unauthorized error code', async () => {
+            const res = await graphqlRequest(
+              query(integrationId, integrationType),
+              authToken
+            )
+            expect(res.body.data.setIntegration.errorCodes).to.eql([
+              SetIntegrationErrorCode.Unauthorized,
+            ])
+          })
+        })
+
+        context('when integration belongs to the user', () => {
+          before(async () => {
+            existingIntegration = await getRepository(Integration).save({
+              user: loginUser,
+              type: DataIntegrationType.Readwise,
+              token: 'fakeToken',
+            })
+            integrationId = existingIntegration.id
+          })
+
+          after(async () => {
+            await getRepository(Integration).delete({
+              id: existingIntegration.id,
+            })
+          })
+
+          context('when enable is false', () => {
+            before(() => {
+              enabled = false
+            })
+
+            afterEach(async () => {
+              await getRepository(Integration).update(existingIntegration.id, {
+                taskName: 'some task name',
+                enabled: true,
+              })
+            })
+
+            it('disables integration', async () => {
+              const res = await graphqlRequest(
+                query(integrationId, integrationType, token, enabled),
+                authToken
+              )
+              expect(res.body.data.setIntegration.integration.enabled).to.be
+                .false
+            })
+
+            it('deletes cloud task', async () => {
+              const res = await graphqlRequest(
+                query(integrationId, integrationType, token, enabled),
+                authToken
+              )
+              const integration = await getRepository(Integration).findOneBy({
+                id: res.body.data.setIntegration.integration.id,
+              })
+              expect(integration?.taskName).to.be.null
+            })
+          })
+
+          context('when enable is true', () => {
+            before(() => {
+              enabled = true
+            })
+
+            afterEach(async () => {
+              await getRepository(Integration).update(existingIntegration.id, {
+                taskName: null,
+                enabled: false,
+              })
+            })
+
+            it('enables integration', async () => {
+              const res = await graphqlRequest(
+                query(integrationId, integrationType, token, enabled),
+                authToken
+              )
+              expect(res.body.data.setIntegration.integration.enabled).to.be
+                .true
+            })
+
+            it('creates new cloud task to sync all existing articles and highlights', async () => {
+              const res = await graphqlRequest(
+                query(integrationId, integrationType, token, enabled),
+                authToken
+              )
+              const integration = await getRepository(Integration).findOneBy({
+                id: res.body.data.setIntegration.integration.id,
+              })
+              expect(integration?.taskName).not.to.be.null
+            })
+          })
+        })
+      })
+    })
+  })
+})
diff --git a/packages/api/test/routers/integrations.test.ts b/packages/api/test/routers/integrations.test.ts
new file mode 100644
index 000000000..e69de29bb

From 4aa62d6031f2ce1fd9b412a10ebcac6491c359ba Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 8 Aug 2022 18:12:44 +0800
Subject: [PATCH 21/25] Add list integrations API and integration tests

---
 packages/api/src/generated/graphql.ts         | 92 +++++++++++++++++++
 packages/api/src/generated/schema.graphql     | 33 +++++++
 .../api/src/resolvers/function_resolvers.ts   |  5 +-
 packages/api/src/resolvers/index.ts           |  1 +
 .../api/src/resolvers/integrations/index.ts   | 30 ++++++
 packages/api/src/schema.ts                    | 35 +++++++
 .../api/test/resolvers/integrations.test.ts   | 49 +++++++++-
 packages/api/test/resolvers/labels.test.ts    | 16 +---
 8 files changed, 246 insertions(+), 15 deletions(-)

diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts
index 5e930cf63..600243e98 100644
--- a/packages/api/src/generated/graphql.ts
+++ b/packages/api/src/generated/graphql.ts
@@ -479,6 +479,24 @@ export type DeleteHighlightSuccess = {
   highlight: Highlight;
 };
 
+export type DeleteIntegrationError = {
+  __typename?: 'DeleteIntegrationError';
+  errorCodes: Array<DeleteIntegrationErrorCode>;
+};
+
+export enum DeleteIntegrationErrorCode {
+  BadRequest = 'BAD_REQUEST',
+  NotFound = 'NOT_FOUND',
+  Unauthorized = 'UNAUTHORIZED'
+}
+
+export type DeleteIntegrationResult = DeleteIntegrationError | DeleteIntegrationSuccess;
+
+export type DeleteIntegrationSuccess = {
+  __typename?: 'DeleteIntegrationSuccess';
+  integration: Integration;
+};
+
 export type DeleteLabelError = {
   __typename?: 'DeleteLabelError';
   errorCodes: Array<DeleteLabelErrorCode>;
@@ -759,6 +777,23 @@ export enum IntegrationType {
   Readwise = 'READWISE'
 }
 
+export type IntegrationsError = {
+  __typename?: 'IntegrationsError';
+  errorCodes: Array<IntegrationsErrorCode>;
+};
+
+export enum IntegrationsErrorCode {
+  BadRequest = 'BAD_REQUEST',
+  Unauthorized = 'UNAUTHORIZED'
+}
+
+export type IntegrationsResult = IntegrationsError | IntegrationsSuccess;
+
+export type IntegrationsSuccess = {
+  __typename?: 'IntegrationsSuccess';
+  integrations: Array<Integration>;
+};
+
 export type Label = {
   __typename?: 'Label';
   color: Scalars['String'];
@@ -918,6 +953,7 @@ export type Mutation = {
   deleteAccount: DeleteAccountResult;
   deleteHighlight: DeleteHighlightResult;
   deleteHighlightReply: DeleteHighlightReplyResult;
+  deleteIntegration: DeleteIntegrationResult;
   deleteLabel: DeleteLabelResult;
   deleteNewsletterEmail: DeleteNewsletterEmailResult;
   deleteReaction: DeleteReactionResult;
@@ -1016,6 +1052,11 @@ export type MutationDeleteHighlightReplyArgs = {
 };
 
 
+export type MutationDeleteIntegrationArgs = {
+  id: Scalars['ID'];
+};
+
+
 export type MutationDeleteLabelArgs = {
   id: Scalars['ID'];
 };
@@ -1306,6 +1347,7 @@ export type Query = {
   getFollowing: GetFollowingResult;
   getUserPersonalization: GetUserPersonalizationResult;
   hello?: Maybe<Scalars['String']>;
+  integrations: IntegrationsResult;
   labels: LabelsResult;
   me?: Maybe<User>;
   newsletterEmails: NewsletterEmailsResult;
@@ -2584,6 +2626,10 @@ export type ResolversTypes = {
   DeleteHighlightReplySuccess: ResolverTypeWrapper<DeleteHighlightReplySuccess>;
   DeleteHighlightResult: ResolversTypes['DeleteHighlightError'] | ResolversTypes['DeleteHighlightSuccess'];
   DeleteHighlightSuccess: ResolverTypeWrapper<DeleteHighlightSuccess>;
+  DeleteIntegrationError: ResolverTypeWrapper<DeleteIntegrationError>;
+  DeleteIntegrationErrorCode: DeleteIntegrationErrorCode;
+  DeleteIntegrationResult: ResolversTypes['DeleteIntegrationError'] | ResolversTypes['DeleteIntegrationSuccess'];
+  DeleteIntegrationSuccess: ResolverTypeWrapper<DeleteIntegrationSuccess>;
   DeleteLabelError: ResolverTypeWrapper<DeleteLabelError>;
   DeleteLabelErrorCode: DeleteLabelErrorCode;
   DeleteLabelResult: ResolversTypes['DeleteLabelError'] | ResolversTypes['DeleteLabelSuccess'];
@@ -2641,6 +2687,10 @@ export type ResolversTypes = {
   Int: ResolverTypeWrapper<Scalars['Int']>;
   Integration: ResolverTypeWrapper<Integration>;
   IntegrationType: IntegrationType;
+  IntegrationsError: ResolverTypeWrapper<IntegrationsError>;
+  IntegrationsErrorCode: IntegrationsErrorCode;
+  IntegrationsResult: ResolversTypes['IntegrationsError'] | ResolversTypes['IntegrationsSuccess'];
+  IntegrationsSuccess: ResolverTypeWrapper<IntegrationsSuccess>;
   Label: ResolverTypeWrapper<Label>;
   LabelsError: ResolverTypeWrapper<LabelsError>;
   LabelsErrorCode: LabelsErrorCode;
@@ -2938,6 +2988,9 @@ export type ResolversParentTypes = {
   DeleteHighlightReplySuccess: DeleteHighlightReplySuccess;
   DeleteHighlightResult: ResolversParentTypes['DeleteHighlightError'] | ResolversParentTypes['DeleteHighlightSuccess'];
   DeleteHighlightSuccess: DeleteHighlightSuccess;
+  DeleteIntegrationError: DeleteIntegrationError;
+  DeleteIntegrationResult: ResolversParentTypes['DeleteIntegrationError'] | ResolversParentTypes['DeleteIntegrationSuccess'];
+  DeleteIntegrationSuccess: DeleteIntegrationSuccess;
   DeleteLabelError: DeleteLabelError;
   DeleteLabelResult: ResolversParentTypes['DeleteLabelError'] | ResolversParentTypes['DeleteLabelSuccess'];
   DeleteLabelSuccess: DeleteLabelSuccess;
@@ -2984,6 +3037,9 @@ export type ResolversParentTypes = {
   ID: Scalars['ID'];
   Int: Scalars['Int'];
   Integration: Integration;
+  IntegrationsError: IntegrationsError;
+  IntegrationsResult: ResolversParentTypes['IntegrationsError'] | ResolversParentTypes['IntegrationsSuccess'];
+  IntegrationsSuccess: IntegrationsSuccess;
   Label: Label;
   LabelsError: LabelsError;
   LabelsResult: ResolversParentTypes['LabelsError'] | ResolversParentTypes['LabelsSuccess'];
@@ -3488,6 +3544,20 @@ export type DeleteHighlightSuccessResolvers<ContextType = ResolverContext, Paren
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type DeleteIntegrationErrorResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['DeleteIntegrationError'] = ResolversParentTypes['DeleteIntegrationError']> = {
+  errorCodes?: Resolver<Array<ResolversTypes['DeleteIntegrationErrorCode']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type DeleteIntegrationResultResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['DeleteIntegrationResult'] = ResolversParentTypes['DeleteIntegrationResult']> = {
+  __resolveType: TypeResolveFn<'DeleteIntegrationError' | 'DeleteIntegrationSuccess', ParentType, ContextType>;
+};
+
+export type DeleteIntegrationSuccessResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['DeleteIntegrationSuccess'] = ResolversParentTypes['DeleteIntegrationSuccess']> = {
+  integration?: Resolver<ResolversTypes['Integration'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type DeleteLabelErrorResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['DeleteLabelError'] = ResolversParentTypes['DeleteLabelError']> = {
   errorCodes?: Resolver<Array<ResolversTypes['DeleteLabelErrorCode']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
@@ -3713,6 +3783,20 @@ export type IntegrationResolvers<ContextType = ResolverContext, ParentType exten
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type IntegrationsErrorResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['IntegrationsError'] = ResolversParentTypes['IntegrationsError']> = {
+  errorCodes?: Resolver<Array<ResolversTypes['IntegrationsErrorCode']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type IntegrationsResultResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['IntegrationsResult'] = ResolversParentTypes['IntegrationsResult']> = {
+  __resolveType: TypeResolveFn<'IntegrationsError' | 'IntegrationsSuccess', ParentType, ContextType>;
+};
+
+export type IntegrationsSuccessResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['IntegrationsSuccess'] = ResolversParentTypes['IntegrationsSuccess']> = {
+  integrations?: Resolver<Array<ResolversTypes['Integration']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type LabelResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['Label'] = ResolversParentTypes['Label']> = {
   color?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   createdAt?: Resolver<Maybe<ResolversTypes['Date']>, ParentType, ContextType>;
@@ -3831,6 +3915,7 @@ export type MutationResolvers<ContextType = ResolverContext, ParentType extends
   deleteAccount?: Resolver<ResolversTypes['DeleteAccountResult'], ParentType, ContextType, RequireFields<MutationDeleteAccountArgs, 'userID'>>;
   deleteHighlight?: Resolver<ResolversTypes['DeleteHighlightResult'], ParentType, ContextType, RequireFields<MutationDeleteHighlightArgs, 'highlightId'>>;
   deleteHighlightReply?: Resolver<ResolversTypes['DeleteHighlightReplyResult'], ParentType, ContextType, RequireFields<MutationDeleteHighlightReplyArgs, 'highlightReplyId'>>;
+  deleteIntegration?: Resolver<ResolversTypes['DeleteIntegrationResult'], ParentType, ContextType, RequireFields<MutationDeleteIntegrationArgs, 'id'>>;
   deleteLabel?: Resolver<ResolversTypes['DeleteLabelResult'], ParentType, ContextType, RequireFields<MutationDeleteLabelArgs, 'id'>>;
   deleteNewsletterEmail?: Resolver<ResolversTypes['DeleteNewsletterEmailResult'], ParentType, ContextType, RequireFields<MutationDeleteNewsletterEmailArgs, 'newsletterEmailId'>>;
   deleteReaction?: Resolver<ResolversTypes['DeleteReactionResult'], ParentType, ContextType, RequireFields<MutationDeleteReactionArgs, 'id'>>;
@@ -3940,6 +4025,7 @@ export type QueryResolvers<ContextType = ResolverContext, ParentType extends Res
   getFollowing?: Resolver<ResolversTypes['GetFollowingResult'], ParentType, ContextType, Partial<QueryGetFollowingArgs>>;
   getUserPersonalization?: Resolver<ResolversTypes['GetUserPersonalizationResult'], ParentType, ContextType>;
   hello?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  integrations?: Resolver<ResolversTypes['IntegrationsResult'], ParentType, ContextType>;
   labels?: Resolver<ResolversTypes['LabelsResult'], ParentType, ContextType>;
   me?: Resolver<Maybe<ResolversTypes['User']>, ParentType, ContextType>;
   newsletterEmails?: Resolver<ResolversTypes['NewsletterEmailsResult'], ParentType, ContextType>;
@@ -4662,6 +4748,9 @@ export type Resolvers<ContextType = ResolverContext> = {
   DeleteHighlightReplySuccess?: DeleteHighlightReplySuccessResolvers<ContextType>;
   DeleteHighlightResult?: DeleteHighlightResultResolvers<ContextType>;
   DeleteHighlightSuccess?: DeleteHighlightSuccessResolvers<ContextType>;
+  DeleteIntegrationError?: DeleteIntegrationErrorResolvers<ContextType>;
+  DeleteIntegrationResult?: DeleteIntegrationResultResolvers<ContextType>;
+  DeleteIntegrationSuccess?: DeleteIntegrationSuccessResolvers<ContextType>;
   DeleteLabelError?: DeleteLabelErrorResolvers<ContextType>;
   DeleteLabelResult?: DeleteLabelResultResolvers<ContextType>;
   DeleteLabelSuccess?: DeleteLabelSuccessResolvers<ContextType>;
@@ -4702,6 +4791,9 @@ export type Resolvers<ContextType = ResolverContext> = {
   HighlightReply?: HighlightReplyResolvers<ContextType>;
   HighlightStats?: HighlightStatsResolvers<ContextType>;
   Integration?: IntegrationResolvers<ContextType>;
+  IntegrationsError?: IntegrationsErrorResolvers<ContextType>;
+  IntegrationsResult?: IntegrationsResultResolvers<ContextType>;
+  IntegrationsSuccess?: IntegrationsSuccessResolvers<ContextType>;
   Label?: LabelResolvers<ContextType>;
   LabelsError?: LabelsErrorResolvers<ContextType>;
   LabelsResult?: LabelsResultResolvers<ContextType>;
diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql
index 2dbe9479c..a0d0e1161 100644
--- a/packages/api/src/generated/schema.graphql
+++ b/packages/api/src/generated/schema.graphql
@@ -420,6 +420,22 @@ type DeleteHighlightSuccess {
   highlight: Highlight!
 }
 
+type DeleteIntegrationError {
+  errorCodes: [DeleteIntegrationErrorCode!]!
+}
+
+enum DeleteIntegrationErrorCode {
+  BAD_REQUEST
+  NOT_FOUND
+  UNAUTHORIZED
+}
+
+union DeleteIntegrationResult = DeleteIntegrationError | DeleteIntegrationSuccess
+
+type DeleteIntegrationSuccess {
+  integration: Integration!
+}
+
 type DeleteLabelError {
   errorCodes: [DeleteLabelErrorCode!]!
 }
@@ -671,6 +687,21 @@ enum IntegrationType {
   READWISE
 }
 
+type IntegrationsError {
+  errorCodes: [IntegrationsErrorCode!]!
+}
+
+enum IntegrationsErrorCode {
+  BAD_REQUEST
+  UNAUTHORIZED
+}
+
+union IntegrationsResult = IntegrationsError | IntegrationsSuccess
+
+type IntegrationsSuccess {
+  integrations: [Integration!]!
+}
+
 type Label {
   color: String!
   createdAt: Date
@@ -816,6 +847,7 @@ type Mutation {
   deleteAccount(userID: ID!): DeleteAccountResult!
   deleteHighlight(highlightId: ID!): DeleteHighlightResult!
   deleteHighlightReply(highlightReplyId: ID!): DeleteHighlightReplyResult!
+  deleteIntegration(id: ID!): DeleteIntegrationResult!
   deleteLabel(id: ID!): DeleteLabelResult!
   deleteNewsletterEmail(newsletterEmailId: ID!): DeleteNewsletterEmailResult!
   deleteReaction(id: ID!): DeleteReactionResult!
@@ -947,6 +979,7 @@ type Query {
   getFollowing(userId: ID): GetFollowingResult!
   getUserPersonalization: GetUserPersonalizationResult!
   hello: String
+  integrations: IntegrationsResult!
   labels: LabelsResult!
   me: User
   newsletterEmails: NewsletterEmailsResult!
diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts
index 400fe1632..2102994dd 100644
--- a/packages/api/src/resolvers/function_resolvers.ts
+++ b/packages/api/src/resolvers/function_resolvers.ts
@@ -49,6 +49,7 @@ import {
   getUserResolver,
   googleLoginResolver,
   googleSignupResolver,
+  integrationsResolver,
   labelsResolver,
   logOutResolver,
   mergeHighlightResolver,
@@ -66,6 +67,7 @@ import {
   setBookmarkArticleResolver,
   setDeviceTokenResolver,
   setFollowResolver,
+  setIntegrationResolver,
   setLabelsForHighlightResolver,
   setLabelsResolver,
   setLinkArchivedResolver,
@@ -97,7 +99,6 @@ import {
   generateUploadFilePathName,
 } from '../utils/uploads'
 import { getPageByParam } from '../elastic/pages'
-import { setIntegrationResolver } from './integrations'
 
 /* eslint-disable @typescript-eslint/naming-convention */
 type ResultResolveType = {
@@ -192,6 +193,7 @@ export const functionResolvers = {
     apiKeys: apiKeysResolver,
     typeaheadSearch: typeaheadSearchResolver,
     updatesSince: updatesSinceResolver,
+    integrations: integrationsResolver,
   },
   User: {
     async sharedArticles(
@@ -595,4 +597,5 @@ export const functionResolvers = {
   ...resultResolveTypeResolver('UpdatesSince'),
   ...resultResolveTypeResolver('MoveLabel'),
   ...resultResolveTypeResolver('SetIntegration'),
+  ...resultResolveTypeResolver('Integrations'),
 }
diff --git a/packages/api/src/resolvers/index.ts b/packages/api/src/resolvers/index.ts
index a00e6aacc..2f595e336 100644
--- a/packages/api/src/resolvers/index.ts
+++ b/packages/api/src/resolvers/index.ts
@@ -20,3 +20,4 @@ export * from './update'
 export * from './popular_reads'
 export * from './webhooks'
 export * from './api_key'
+export * from './integrations'
diff --git a/packages/api/src/resolvers/integrations/index.ts b/packages/api/src/resolvers/integrations/index.ts
index 8a9d0b0f6..43b8842af 100644
--- a/packages/api/src/resolvers/integrations/index.ts
+++ b/packages/api/src/resolvers/integrations/index.ts
@@ -1,5 +1,8 @@
 import { authorized } from '../../utils/helpers'
 import {
+  IntegrationsError,
+  IntegrationsErrorCode,
+  IntegrationsSuccess,
   MutationSetIntegrationArgs,
   SetIntegrationError,
   SetIntegrationErrorCode,
@@ -119,3 +122,30 @@ export const setIntegrationResolver = authorized<
     }
   }
 })
+
+export const integrationsResolver = authorized<
+  IntegrationsSuccess,
+  IntegrationsError
+>(async (_, __, { claims: { uid }, log }) => {
+  try {
+    const user = await getRepository(User).findOneBy({ id: uid })
+    if (!user) {
+      return {
+        errorCodes: [IntegrationsErrorCode.Unauthorized],
+      }
+    }
+    const integrations = await getRepository(Integration).findBy({
+      user: { id: uid },
+    })
+
+    return {
+      integrations,
+    }
+  } catch (error) {
+    log.error(error)
+
+    return {
+      errorCodes: [IntegrationsErrorCode.BadRequest],
+    }
+  }
+})
diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts
index 1dd776143..dc0936431 100755
--- a/packages/api/src/schema.ts
+++ b/packages/api/src/schema.ts
@@ -1850,6 +1850,39 @@ const schema = gql`
     enabled: Boolean!
   }
 
+  union IntegrationsResult = IntegrationsSuccess | IntegrationsError
+
+  type IntegrationsSuccess {
+    integrations: [Integration!]!
+  }
+
+  type IntegrationsError {
+    errorCodes: [IntegrationsErrorCode!]!
+  }
+
+  enum IntegrationsErrorCode {
+    UNAUTHORIZED
+    BAD_REQUEST
+  }
+
+  union DeleteIntegrationResult =
+      DeleteIntegrationSuccess
+    | DeleteIntegrationError
+
+  type DeleteIntegrationSuccess {
+    integration: Integration!
+  }
+
+  type DeleteIntegrationError {
+    errorCodes: [DeleteIntegrationErrorCode!]!
+  }
+
+  enum DeleteIntegrationErrorCode {
+    UNAUTHORIZED
+    BAD_REQUEST
+    NOT_FOUND
+  }
+
   # Mutations
   type Mutation {
     googleLogin(input: GoogleLoginInput!): LoginResult!
@@ -1920,6 +1953,7 @@ const schema = gql`
     setLabelsForHighlight(input: SetLabelsForHighlightInput!): SetLabelsResult!
     moveLabel(input: MoveLabelInput!): MoveLabelResult!
     setIntegration(input: SetIntegrationInput!): SetIntegrationResult!
+    deleteIntegration(id: ID!): DeleteIntegrationResult!
   }
 
   # FIXME: remove sort from feedArticles after all cached tabs are closed
@@ -1965,6 +1999,7 @@ const schema = gql`
     apiKeys: ApiKeysResult!
     typeaheadSearch(query: String!, first: Int): TypeaheadSearchResult!
     updatesSince(after: String, first: Int, since: Date!): UpdatesSinceResult!
+    integrations: IntegrationsResult!
   }
 `
 
diff --git a/packages/api/test/resolvers/integrations.test.ts b/packages/api/test/resolvers/integrations.test.ts
index c262bc6bb..4df89e4b3 100644
--- a/packages/api/test/resolvers/integrations.test.ts
+++ b/packages/api/test/resolvers/integrations.test.ts
@@ -64,10 +64,11 @@ describe('Integrations resolvers', () => {
     let token: string
     let integrationType: IntegrationType
     let enabled: boolean
+    let scope: nock.Scope
 
     // mock Readwise Auth API
     before(() => {
-      nock(READWISE_API_URL, {
+      scope = nock(READWISE_API_URL, {
         reqheaders: { Authorization: `Token ${validToken}` },
       })
         .get('/auth')
@@ -76,7 +77,7 @@ describe('Integrations resolvers', () => {
     })
 
     after(() => {
-      nock.cleanAll()
+      scope.persist(false)
     })
 
     context('when id is not in the request', () => {
@@ -300,4 +301,48 @@ describe('Integrations resolvers', () => {
       })
     })
   })
+
+  describe('integrations API', () => {
+    const query = `
+      query {
+        integrations {
+          ... on IntegrationsSuccess {
+            integrations {
+              id
+              type
+              enabled
+            }
+          }
+        }
+      }
+    `
+
+    let existingIntegration: Integration
+
+    before(async () => {
+      existingIntegration = await getRepository(Integration).save({
+        user: loginUser,
+        type: DataIntegrationType.Readwise,
+        token: 'fakeToken',
+      })
+    })
+
+    after(async () => {
+      await getRepository(Integration).delete(existingIntegration.id)
+    })
+
+    it('returns all integrations', async () => {
+      const res = await graphqlRequest(query, authToken)
+      expect(res.body.data.integrations.integrations).to.have.length(1)
+      expect(res.body.data.integrations.integrations[0].id).to.equal(
+        existingIntegration.id
+      )
+      expect(res.body.data.integrations.integrations[0].type).to.equal(
+        existingIntegration.type
+      )
+      expect(res.body.data.integrations.integrations[0].enabled).to.equal(
+        existingIntegration.enabled
+      )
+    })
+  })
 })
diff --git a/packages/api/test/resolvers/labels.test.ts b/packages/api/test/resolvers/labels.test.ts
index d2729c4d9..876c05b66 100644
--- a/packages/api/test/resolvers/labels.test.ts
+++ b/packages/api/test/resolvers/labels.test.ts
@@ -58,9 +58,7 @@ describe('Labels API', () => {
 
     after(async () => {
       // clean up
-      for (const label of labels) {
-        await getRepository(Label).delete(label.id)
-      }
+      await getRepository(Label).delete(labels.map((l) => l.id))
     })
 
     beforeEach(() => {
@@ -345,9 +343,7 @@ describe('Labels API', () => {
 
     after(async () => {
       // clean up
-      for (const label of labels) {
-        await getRepository(Label).delete(label.id)
-      }
+      await getRepository(Label).delete(labels.map((l) => l.id))
       await deletePage(page.id, ctx)
     })
 
@@ -547,9 +543,7 @@ describe('Labels API', () => {
 
     after(async () => {
       // clean up
-      for (const label of labels) {
-        await getRepository(Label).delete(label.id)
-      }
+      await getRepository(Label).delete(labels.map((l) => l.id))
       await deletePage(page.id, ctx)
     })
 
@@ -677,9 +671,7 @@ describe('Labels API', () => {
 
     after(async () => {
       // clean up
-      for (const label of labels) {
-        await getRepository(Label).delete(label.id)
-      }
+      await getRepository(Label).delete(labels.map((l) => l.id))
     })
 
     context('when label exists', () => {

From 7ac45ca748a8532e9bba158b1a98f7b1989adf2c Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 8 Aug 2022 18:34:13 +0800
Subject: [PATCH 22/25] Add deleteIntegration API and integration tests

---
 .../api/src/resolvers/function_resolvers.ts   |  3 +
 .../api/src/resolvers/integrations/index.ts   | 70 +++++++++++++++++++
 .../api/test/resolvers/integrations.test.ts   | 46 ++++++++++++
 3 files changed, 119 insertions(+)

diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts
index 2102994dd..a19bdd11f 100644
--- a/packages/api/src/resolvers/function_resolvers.ts
+++ b/packages/api/src/resolvers/function_resolvers.ts
@@ -32,6 +32,7 @@ import {
   createReminderResolver,
   deleteAccountResolver,
   deleteHighlightResolver,
+  deleteIntegrationResolver,
   deleteLabelResolver,
   deleteNewsletterEmailResolver,
   deleteReminderResolver,
@@ -168,6 +169,7 @@ export const functionResolvers = {
     setLabelsForHighlight: setLabelsForHighlightResolver,
     moveLabel: moveLabelResolver,
     setIntegration: setIntegrationResolver,
+    deleteIntegration: deleteIntegrationResolver,
   },
   Query: {
     me: getMeUserResolver,
@@ -598,4 +600,5 @@ export const functionResolvers = {
   ...resultResolveTypeResolver('MoveLabel'),
   ...resultResolveTypeResolver('SetIntegration'),
   ...resultResolveTypeResolver('Integrations'),
+  ...resultResolveTypeResolver('DeleteIntegration'),
 }
diff --git a/packages/api/src/resolvers/integrations/index.ts b/packages/api/src/resolvers/integrations/index.ts
index 43b8842af..1ae83b55b 100644
--- a/packages/api/src/resolvers/integrations/index.ts
+++ b/packages/api/src/resolvers/integrations/index.ts
@@ -1,8 +1,12 @@
 import { authorized } from '../../utils/helpers'
 import {
+  DeleteIntegrationError,
+  DeleteIntegrationErrorCode,
+  DeleteIntegrationSuccess,
   IntegrationsError,
   IntegrationsErrorCode,
   IntegrationsSuccess,
+  MutationDeleteIntegrationArgs,
   MutationSetIntegrationArgs,
   SetIntegrationError,
   SetIntegrationErrorCode,
@@ -127,6 +131,8 @@ export const integrationsResolver = authorized<
   IntegrationsSuccess,
   IntegrationsError
 >(async (_, __, { claims: { uid }, log }) => {
+  log.info('integrationsResolver')
+
   try {
     const user = await getRepository(User).findOneBy({ id: uid })
     if (!user) {
@@ -149,3 +155,67 @@ export const integrationsResolver = authorized<
     }
   }
 })
+
+export const deleteIntegrationResolver = authorized<
+  DeleteIntegrationSuccess,
+  DeleteIntegrationError,
+  MutationDeleteIntegrationArgs
+>(async (_, { id }, { claims: { uid }, log }) => {
+  log.info('deleteIntegrationResolver')
+
+  try {
+    const user = await getRepository(User).findOneBy({ id: uid })
+    if (!user) {
+      return {
+        errorCodes: [DeleteIntegrationErrorCode.Unauthorized],
+      }
+    }
+
+    const integration = await getRepository(Integration).findOne({
+      where: { id },
+      relations: ['user'],
+    })
+
+    if (!integration) {
+      return {
+        errorCodes: [DeleteIntegrationErrorCode.NotFound],
+      }
+    }
+
+    if (integration.user.id !== uid) {
+      return {
+        errorCodes: [DeleteIntegrationErrorCode.Unauthorized],
+      }
+    }
+
+    if (integration.taskName) {
+      // delete the task if task exists
+      await deleteTask(integration.taskName)
+      log.info('task deleted', integration.taskName)
+    }
+
+    const deletedIntegration = await getRepository(Integration).remove(
+      integration
+    )
+    deletedIntegration.id = id
+
+    analytics.track({
+      userId: uid,
+      event: 'integration_delete',
+      properties: {
+        integrationId: deletedIntegration.id,
+        env: env.server.apiEnv,
+      },
+    })
+
+    return {
+      integration: deletedIntegration,
+    }
+  } catch (error) {
+    log.error(error)
+
+    return {
+      errorCodes: [DeleteIntegrationErrorCode.BadRequest],
+    }
+  }
+})
diff --git a/packages/api/test/resolvers/integrations.test.ts b/packages/api/test/resolvers/integrations.test.ts
index 4df89e4b3..582160680 100644
--- a/packages/api/test/resolvers/integrations.test.ts
+++ b/packages/api/test/resolvers/integrations.test.ts
@@ -345,4 +345,50 @@ describe('Integrations resolvers', () => {
       )
     })
   })
+
+  describe('deleteIntegration API', () => {
+    const query = (id: string) => `
+      mutation {
+        deleteIntegration(id: "${id}") {
+          ... on DeleteIntegrationSuccess {
+            integration {
+              id
+            }
+          }
+          ... on DeleteIntegrationError {
+            errorCodes
+          }
+        }
+      }
+    `
+
+    context('when integration exists', () => {
+      let existingIntegration: Integration
+
+      beforeEach(async () => {
+        existingIntegration = await getRepository(Integration).save({
+          user: loginUser,
+          type: DataIntegrationType.Readwise,
+          token: 'fakeToken',
+          taskName: 'some task name',
+        })
+      })
+
+      it('deletes the integration and cloud task', async () => {
+        const res = await graphqlRequest(
+          query(existingIntegration.id),
+          authToken
+        )
+        const integration = await getRepository(Integration).findOneBy({
+          id: existingIntegration.id,
+        })
+
+        expect(res.body.data.deleteIntegration.integration).to.be.an('object')
+        expect(res.body.data.deleteIntegration.integration.id).to.eql(
+          existingIntegration.id
+        )
+        expect(integration).to.be.null
+      })
+    })
+  })
 })

From 134482a2614446c1f3a078e5a2642a6221298bb7 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 8 Aug 2022 23:11:35 +0800
Subject: [PATCH 23/25] Add integration tests for integration router

---
 packages/api/src/datalayer/pubsub.ts          |   2 +-
 packages/api/src/routers/svc/integrations.ts  |  46 +--
 packages/api/src/services/integrations.ts     |  12 +-
 packages/api/src/utils/createTask.ts          |  14 +-
 .../api/test/routers/integrations.test.ts     | 323 ++++++++++++++++++
 5 files changed, 360 insertions(+), 37 deletions(-)

diff --git a/packages/api/src/datalayer/pubsub.ts b/packages/api/src/datalayer/pubsub.ts
index e4f397acd..af8522682 100644
--- a/packages/api/src/datalayer/pubsub.ts
+++ b/packages/api/src/datalayer/pubsub.ts
@@ -111,7 +111,7 @@ interface PubSubRequestMessage {
   publishTime: string
 }
 
-interface PubSubRequestBody {
+export interface PubSubRequestBody {
   message: PubSubRequestMessage
 }
 
diff --git a/packages/api/src/routers/svc/integrations.ts b/packages/api/src/routers/svc/integrations.ts
index 2036a7eab..0193af729 100644
--- a/packages/api/src/routers/svc/integrations.ts
+++ b/packages/api/src/routers/svc/integrations.ts
@@ -11,7 +11,7 @@ import { getPageById, searchPages } from '../../elastic/pages'
 import { Page } from '../../elastic/types'
 import { DateFilter } from '../../utils/search'
 
-interface Message {
+export interface Message {
   type?: EntityType
   data?: any
   userId: string
@@ -23,11 +23,10 @@ export function integrationsServiceRouter() {
   const router = express.Router()
 
   router.post('/:integrationType/:action', async (req, res) => {
-    logger.info(
-      req.params.action,
-      'with integration',
-      req.params.integrationType
-    )
+    logger.info('start to sync with integration', {
+      action: req.params.action,
+      integrationType: req.params.integrationType,
+    })
     const { message: msgStr, expired } = readPushSubscription(req)
 
     if (!msgStr) {
@@ -44,7 +43,7 @@ export function integrationsServiceRouter() {
     try {
       const { userId, type, data }: Message = JSON.parse(msgStr)
       if (!userId) {
-        console.log('No userId found in message')
+        logger.info('No userId found in message')
         res.status(400).send('Bad Request')
         return
       }
@@ -55,7 +54,7 @@ export function integrationsServiceRouter() {
         enabled: true,
       })
       if (!integration) {
-        logger.info('No active integration found for user', userId)
+        logger.info('No active integration found for user', { userId })
         res.status(200).send('No integration found')
         return
       }
@@ -77,21 +76,22 @@ export function integrationsServiceRouter() {
         }
         const page = await getPageById(id)
         if (!page) {
-          logger.info('No page found for id', id)
+          logger.info('No page found for id', { id })
           res.status(200).send('No page found')
           return
         }
         // sync updated page with integration
-        logger.info('syncing page', page.id, 'with integration', integration.id)
+        logger.info('syncing updated page with integration', {
+          integrationId: integration.id,
+          pageId: page.id,
+        })
 
         const synced = await syncWithIntegration(integration, [page])
         if (!synced) {
-          logger.info(
-            'failed to sync page',
-            page.id,
-            'with integration',
-            integration.id
-          )
+          logger.info('failed to sync page', {
+            integrationId: integration.id,
+            pageId: page.id,
+          })
           res.status(400).send('Failed to sync')
           return
         }
@@ -115,25 +115,25 @@ export function integrationsServiceRouter() {
           ))!
           const pageIds = pages.map((p) => p.id)
 
-          logger.info('syncing pages', pageIds)
+          logger.info('syncing pages', { pageIds })
 
           const synced = await syncWithIntegration(integration, pages)
           if (!synced) {
-            logger.info(
-              'failed to sync pages',
+            logger.info('failed to sync pages', {
               pageIds,
-              'with integration',
-              integration.id
-            )
+              integrationId: integration.id,
+            })
             res.status(400).send('Failed to sync')
             return
           }
         }
+        // update integration syncedAt if successful
         await getRepository(Integration).update(integration.id, {
           taskName: null,
+          syncedAt: new Date(),
         })
       } else {
-        logger.info('unknown action', action)
+        logger.info('unknown action', { action })
         res.status(200).send('Unknown action')
         return
       }
diff --git a/packages/api/src/services/integrations.ts b/packages/api/src/services/integrations.ts
index 6b6cd6365..221bb4022 100644
--- a/packages/api/src/services/integrations.ts
+++ b/packages/api/src/services/integrations.ts
@@ -5,7 +5,6 @@ import { wait } from '../utils/helpers'
 import { Page } from '../elastic/types'
 import { getHighlightLocation, getHighlightUrl } from './highlights'
 import { Integration } from '../entity/integration'
-import { getRepository } from '../entity/utils'
 
 interface ReadwiseHighlight {
   // The highlight text, (technically the only field required in a highlight object)
@@ -72,7 +71,7 @@ const pageToReadwiseHighlight = (page: Page): ReadwiseHighlight[] => {
       title: page.title,
       author: page.author,
       highlight_url: getHighlightUrl(page.slug, highlight.id),
-      highlighted_at: highlight.createdAt.toISOString(),
+      highlighted_at: new Date(highlight.createdAt).toISOString(),
       category: 'articles',
       image_url: page.image,
       location,
@@ -99,13 +98,6 @@ export const syncWithIntegration = async (
     default:
       return false
   }
-  // update integration syncedAt if successful
-  if (result) {
-    console.log('updating integration syncedAt')
-    await getRepository(Integration).update(integration.id, {
-      syncedAt: new Date(),
-    })
-  }
   return result
 }
 
@@ -138,7 +130,7 @@ export const syncWithReadwise = async (
       console.log('Readwise API rate limit exceeded, retrying...')
       // wait for Retry-After seconds in the header if rate limited
       // max retry count is 3
-      const retryAfter = error.response?.headers['Retry-After'] || '10' // default to 10 seconds
+      const retryAfter = error.response?.headers['retry-after'] || '10' // default to 10 seconds
       await wait(parseInt(retryAfter, 10) * 1000)
       return syncWithReadwise(token, highlights, retryCount + 1)
     }
diff --git a/packages/api/src/utils/createTask.ts b/packages/api/src/utils/createTask.ts
index 31f137322..3dec00231 100644
--- a/packages/api/src/utils/createTask.ts
+++ b/packages/api/src/utils/createTask.ts
@@ -288,9 +288,17 @@ export const enqueueSyncWithIntegration = async (
   userId: string,
   integrationType: IntegrationType
 ): Promise<string> => {
-  const { GOOGLE_CLOUD_PROJECT } = process.env
+  const { GOOGLE_CLOUD_PROJECT, PUBSUB_VERIFICATION_TOKEN } = process.env
+  // use pubsub data format to send the userId to the task handler
   const payload = {
-    userId,
+    message: {
+      data: Buffer.from(
+        JSON.stringify({
+          userId,
+        })
+      ).toString('base64'),
+      publishTime: new Date().toISOString(),
+    },
   }
 
   // If there is no Google Cloud Project Id exposed, it means that we are in local environment
@@ -303,7 +311,7 @@ export const enqueueSyncWithIntegration = async (
     payload,
     taskHandlerUrl: `${
       env.queue.integrationTaskHandlerUrl
-    }/${integrationType.toLowerCase()}/sync_all`,
+    }/${integrationType.toLowerCase()}/sync_all?token=${PUBSUB_VERIFICATION_TOKEN}`,
     priority: 'low',
   })
 
diff --git a/packages/api/test/routers/integrations.test.ts b/packages/api/test/routers/integrations.test.ts
index e69de29bb..bc292ea79 100644
--- a/packages/api/test/routers/integrations.test.ts
+++ b/packages/api/test/routers/integrations.test.ts
@@ -0,0 +1,323 @@
+import 'mocha'
+import { createTestElasticPage, request } from '../util'
+import { expect } from 'chai'
+import { DateTime } from 'luxon'
+import {
+  createPubSubClient,
+  PubSubRequestBody,
+} from '../../src/datalayer/pubsub'
+import { User } from '../../src/entity/user'
+import { createTestUser, deleteTestUser } from '../db'
+import { Integration, IntegrationType } from '../../src/entity/integration'
+import { getRepository } from '../../src/entity/utils'
+import { Highlight, Page, PageContext } from '../../src/elastic/types'
+import nock from 'nock'
+import { READWISE_API_URL } from '../../src/services/integrations'
+import { addHighlightToPage } from '../../src/elastic/highlights'
+import { getHighlightUrl } from '../../src/services/highlights'
+import { deletePage } from '../../src/elastic/pages'
+
+describe('Integrations routers', () => {
+  let token: string
+
+  describe('sync with integrations', () => {
+    const endpoint = (token: string, type = 'type', action = 'action') =>
+      `/svc/pubsub/integrations/${type}/${action}?token=${token}`
+    let action: string
+    let data: PubSubRequestBody
+    let integrationType: string
+
+    context('when token is invalid', () => {
+      before(() => {
+        token = 'invalid-token'
+      })
+
+      it('returns 400', async () => {
+        return request.post(endpoint(token)).send(data).expect(400)
+      })
+    })
+
+    context('when token is valid', () => {
+      before(() => {
+        token = process.env.PUBSUB_VERIFICATION_TOKEN!
+      })
+
+      context('when data is expired', () => {
+        before(() => {
+          data = {
+            message: {
+              data: Buffer.from(
+                JSON.stringify({ userId: 'userId', type: 'page' })
+              ).toString('base64'),
+              publishTime: DateTime.now().minus({ hours: 12 }).toISO(),
+            },
+          }
+        })
+
+        it('returns 200 with Expired', async () => {
+          const res = await request.post(endpoint(token)).send(data).expect(200)
+          expect(res.text).to.eql('Expired')
+        })
+      })
+
+      context('when userId is empty', () => {
+        before(() => {
+          data = {
+            message: {
+              data: Buffer.from(
+                JSON.stringify({ userId: '', type: 'page' })
+              ).toString('base64'),
+              publishTime: new Date().toISOString(),
+            },
+          }
+        })
+
+        it('returns 400', async () => {
+          return request.post(endpoint(token)).send(data).expect(400)
+        })
+      })
+
+      context('when user exists', () => {
+        let user: User
+
+        before(async () => {
+          user = await createTestUser('fakeUser')
+        })
+
+        after(async () => {
+          await deleteTestUser(user.name)
+        })
+
+        context('when integration not found', () => {
+          before(() => {
+            integrationType = IntegrationType.Readwise
+            data = {
+              message: {
+                data: Buffer.from(
+                  JSON.stringify({ userId: user.id, type: 'page' })
+                ).toString('base64'),
+                publishTime: new Date().toISOString(),
+              },
+            }
+          })
+
+          it('returns 200 with No integration found', async () => {
+            const res = await request
+              .post(endpoint(token, integrationType))
+              .send(data)
+              .expect(200)
+            expect(res.text).to.eql('No integration found')
+          })
+        })
+
+        context('when integration is readwise and enabled', () => {
+          let integration: Integration
+          let ctx: PageContext
+          let page: Page
+          let highlight: Highlight
+          let highlightsData: string
+
+          before(async () => {
+            integration = await getRepository(Integration).save({
+              user: { id: user.id },
+              type: IntegrationType.Readwise,
+              token: 'token',
+            })
+            integrationType = integration.type
+            // create page
+            page = await createTestElasticPage(user.id)
+            ctx = {
+              uid: user.id,
+              pubsub: createPubSubClient(),
+              refresh: true,
+            }
+            // create highlight
+            const location = 109
+            const patch = `@@ -${location + 1},16 +${location + 1},36 @@
+ . We're
++%3Comnivore_highlight%3E
+ humbled
+@@ -254,16 +254,37 @@
+ h in the
++%3C/omnivore_highlight%3E
+  coming`
+            highlight = {
+              createdAt: new Date(),
+              id: 'test id',
+              patch,
+              quote: 'test quote',
+              shortId: 'test shortId',
+              updatedAt: new Date(),
+              userId: user.id,
+            }
+            await addHighlightToPage(page.id, highlight, ctx)
+            // create highlights data for integration request
+            highlightsData = JSON.stringify({
+              highlights: [
+                {
+                  text: highlight.quote,
+                  title: page.title,
+                  author: page.author,
+                  highlight_url: getHighlightUrl(page.slug, highlight.id),
+                  highlighted_at: highlight.createdAt.toISOString(),
+                  category: 'articles',
+                  image_url: page.image,
+                  location,
+                  location_type: 'page',
+                  note: highlight.annotation,
+                  source_type: 'omnivore',
+                  source_url: page.url,
+                },
+              ],
+            })
+          })
+
+          after(async () => {
+            await getRepository(Integration).delete(integration.id)
+            await deletePage(page.id, ctx)
+          })
+
+          context('when action is sync_updated', () => {
+            before(async () => {
+              action = 'sync_updated'
+            })
+
+            context('when entity type is page', () => {
+              before(() => {
+                data = {
+                  message: {
+                    data: Buffer.from(
+                      JSON.stringify({
+                        userId: user.id,
+                        type: 'page',
+                        data: { id: page.id },
+                      })
+                    ).toString('base64'),
+                    publishTime: new Date().toISOString(),
+                  },
+                }
+                // mock Readwise Highlight API
+                nock(READWISE_API_URL, {
+                  reqheaders: {
+                    Authorization: `Token ${integration.token}`,
+                    ContentType: 'application/json',
+                  },
+                })
+                  .post('/highlights', highlightsData)
+                  .reply(200)
+              })
+
+              it('returns 200 with OK', async () => {
+                const res = await request
+                  .post(endpoint(token, integrationType, action))
+                  .send(data)
+                  .expect(200)
+                expect(res.text).to.eql('OK')
+              })
+
+              context('when readwise highlight API reaches rate limits', () => {
+                before(() => {
+                  // mock Readwise Highlight API with rate limits
+                  // retry after 1 second
+                  nock(READWISE_API_URL, {
+                    reqheaders: {
+                      Authorization: `Token ${integration.token}`,
+                      ContentType: 'application/json',
+                    },
+                  })
+                    .post('/highlights')
+                    .reply(429, 'Rate Limited', { 'Retry-After': '1' })
+                  // mock Readwise Highlight API after 1 second
+                  nock(READWISE_API_URL, {
+                    reqheaders: {
+                      Authorization: `Token ${integration.token}`,
+                      ContentType: 'application/json',
+                    },
+                  })
+                    .post('/highlights')
+                    .delay(1000)
+                    .reply(200)
+                })
+
+                it('returns 200 with OK', async () => {
+                  const res = await request
+                    .post(endpoint(token, integrationType, action))
+                    .send(data)
+                    .expect(200)
+                  expect(res.text).to.eql('OK')
+                })
+              })
+            })
+
+            context('when entity type is highlight', () => {
+              before(() => {
+                data = {
+                  message: {
+                    data: Buffer.from(
+                      JSON.stringify({
+                        userId: user.id,
+                        type: 'highlight',
+                        data: { articleId: page.id },
+                      })
+                    ).toString('base64'),
+                    publishTime: new Date().toISOString(),
+                  },
+                }
+                // mock Readwise Highlight API
+                nock(READWISE_API_URL, {
+                  reqheaders: {
+                    Authorization: `Token ${integration.token}`,
+                    ContentType: 'application/json',
+                  },
+                })
+                  .post('/highlights', highlightsData)
+                  .reply(200)
+              })
+
+              it('returns 200 with OK', async () => {
+                const res = await request
+                  .post(endpoint(token, integrationType, action))
+                  .send(data)
+                  .expect(200)
+                expect(res.text).to.eql('OK')
+              })
+            })
+          })
+
+          context('when action is sync_all', () => {
+            before(() => {
+              action = 'sync_all'
+              data = {
+                message: {
+                  data: Buffer.from(
+                    JSON.stringify({
+                      userId: user.id,
+                    })
+                  ).toString('base64'),
+                  publishTime: new Date().toISOString(),
+                },
+              }
+              // mock Readwise Highlight API
+              nock(READWISE_API_URL, {
+                reqheaders: {
+                  Authorization: `Token ${integration.token}`,
+                  ContentType: 'application/json',
+                },
+              })
+                .post('/highlights', highlightsData)
+                .reply(200)
+            })
+
+            it('returns 200 with OK', async () => {
+              const res = await request
+                .post(endpoint(token, integrationType, action))
+                .send(data)
+                .expect(200)
+              expect(res.text).to.eql('OK')
+            })
+          })
+        })
+      })
+    })
+  })
+})

From 427cecf6b93d46814ad3da6992cffd1b78cf6e2e Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 9 Aug 2022 09:51:31 +0800
Subject: [PATCH 24/25] Update syncedAt after syncing

---
 packages/api/src/routers/svc/integrations.ts   | 3 +--
 packages/api/src/services/integrations.ts      | 8 ++++++++
 packages/api/test/routers/integrations.test.ts | 6 +++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/api/src/routers/svc/integrations.ts b/packages/api/src/routers/svc/integrations.ts
index 0193af729..f8dda9d40 100644
--- a/packages/api/src/routers/svc/integrations.ts
+++ b/packages/api/src/routers/svc/integrations.ts
@@ -127,10 +127,9 @@ export function integrationsServiceRouter() {
             return
           }
         }
-        // update integration syncedAt if successful
+        // delete task name if completed
         await getRepository(Integration).update(integration.id, {
           taskName: null,
-          syncedAt: new Date(),
         })
       } else {
         logger.info('unknown action', { action })
diff --git a/packages/api/src/services/integrations.ts b/packages/api/src/services/integrations.ts
index 221bb4022..f13b68d3e 100644
--- a/packages/api/src/services/integrations.ts
+++ b/packages/api/src/services/integrations.ts
@@ -5,6 +5,7 @@ import { wait } from '../utils/helpers'
 import { Page } from '../elastic/types'
 import { getHighlightLocation, getHighlightUrl } from './highlights'
 import { Integration } from '../entity/integration'
+import { getRepository } from '../entity/utils'
 
 interface ReadwiseHighlight {
   // The highlight text, (technically the only field required in a highlight object)
@@ -98,6 +99,13 @@ export const syncWithIntegration = async (
     default:
       return false
   }
+  // update integration syncedAt if successful
+  if (result) {
+    console.log('updating integration syncedAt')
+    await getRepository(Integration).update(integration.id, {
+      syncedAt: new Date(),
+    })
+  }
   return result
 }
 
diff --git a/packages/api/test/routers/integrations.test.ts b/packages/api/test/routers/integrations.test.ts
index bc292ea79..99892f724 100644
--- a/packages/api/test/routers/integrations.test.ts
+++ b/packages/api/test/routers/integrations.test.ts
@@ -285,7 +285,7 @@ describe('Integrations routers', () => {
           })
 
           context('when action is sync_all', () => {
-            before(() => {
+            before(async () => {
               action = 'sync_all'
               data = {
                 message: {
@@ -306,6 +306,10 @@ describe('Integrations routers', () => {
               })
                 .post('/highlights', highlightsData)
                 .reply(200)
+              await getRepository(Integration).update(integration.id, {
+                syncedAt: null,
+                taskName: 'some task name',
+              })
             })
 
             it('returns 200 with OK', async () => {

From 5da6a5e0360d690fc966b8e8305d64858777b9b7 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 9 Aug 2022 10:10:07 +0800
Subject: [PATCH 25/25] Fix setLabelsForHighlights integration tests

---
 packages/api/test/resolvers/labels.test.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/api/test/resolvers/labels.test.ts b/packages/api/test/resolvers/labels.test.ts
index 876c05b66..6b81a36c8 100644
--- a/packages/api/test/resolvers/labels.test.ts
+++ b/packages/api/test/resolvers/labels.test.ts
@@ -20,15 +20,13 @@ import {
 import { refreshIndex } from '../../src/elastic'
 
 describe('Labels API', () => {
-  const username = 'fakeUser'
-
   let user: User
   let authToken: string
   let ctx: PageContext
 
   before(async () => {
     // create test user and login
-    user = await createTestUser(username)
+    user = await createTestUser('fakeUser')
     const res = await request
       .post('/local/debug/fake-user-login')
       .send({ fakeEmail: user.email })
@@ -42,7 +40,7 @@ describe('Labels API', () => {
 
   after(async () => {
     // clean up
-    await deleteTestUser(username)
+    await deleteTestUser(user.name)
   })
 
   describe('GET labels', () => {
@@ -575,7 +573,7 @@ describe('Labels API', () => {
 
     context('when labels exists', () => {
       before(async () => {
-        highlightId = 'highlight-id'
+        highlightId = generateFakeUuid()
         const highlight: Highlight = {
           createdAt: new Date(),
           id: highlightId,
@@ -599,7 +597,7 @@ describe('Labels API', () => {
 
     context('when labels not exist', () => {
       before(async () => {
-        highlightId = 'highlight-id-2'
+        highlightId = generateFakeUuid()
         const highlight: Highlight = {
           createdAt: new Date(),
           id: highlightId,