Merge pull request #75 from pullflow/EN-311

Release 3.0

.vscode/launch.json

@@ -3,7 +3,7 @@
 // Hover to view descriptions of existing attributes.
 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
 {
-	"version": "2.0.1",
+	"version": "3.0.0",
 	"configurations": [
 		{
 			"name": "Run Extension",

.vscode/tasks.json

@@ -1,7 +1,7 @@
 // See https://go.microsoft.com/fwlink/?LinkId=733558
 // for the documentation about the tasks.json format
 {
-	"version": "2.0.1",
+	"version": "2.0.0",
 	"tasks": [
 		{
 			"type": "npm",

package.json

@@ -3,7 +3,7 @@
   "publisher": "Pullflow",
   "displayName": "Pullflow",
   "description": "Code review collaboration across GitHub, Slack, and VS Code.",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "preview": true,
   "license": "MIT",
   "engines": {

src/api/messageApi.ts

@@ -22,13 +22,13 @@ export const MessageApi = {
     body,
     parentMessageXid,
     chatChannelId,
-    authToken,
+    accessToken,
     context,
   }: {
     body: string
     parentMessageXid: string
     chatChannelId: string
-    authToken: string
+    accessToken: string
     context: ExtensionContext
   }) => {
     log.info(
@@ -38,7 +38,7 @@ export const MessageApi = {
       module
     )
 
-    const pullflowApi = new PullflowApi(context, authToken)
+    const pullflowApi = new PullflowApi(context, accessToken)
     try {
       const data = await pullflowApi.fetch(SEND_CODE_REVIEW_THREAD_MESSAGE, {
         body,
@@ -57,22 +57,22 @@ export const MessageApi = {
     codeAccountXid,
     codeReviewId,
     chatLink,
-    authToken,
+    accessToken,
     message,
     fromAuthor,
     context,
   }: {
     codeAccountXid: string
     chatLink: string
-    authToken: string
+    accessToken: string
     codeReviewId: string
     message: string
     fromAuthor: boolean
     context: ExtensionContext
   }) => {
     log.info(`nudging user: ${{ codeAccountXid }}, ${{ chatLink }}`, module)
 
-    const pullflowApi = new PullflowApi(context, authToken)
+    const pullflowApi = new PullflowApi(context, accessToken)
     try {
       const data = await pullflowApi.fetch(SEND_CODE_REVIEW_DIRECT_MESSAGE, {
         codeAccountXid,

src/api/presenceApi.ts

@@ -14,18 +14,18 @@ const SET_USER_PRESENCE = `
 export const PresenceApi = {
   setPresence: async ({
     status,
-    authToken,
+    accessToken,
     repoInfo,
     context,
   }: {
     status: PresenceStatus
-    authToken: string
+    accessToken: string
     repoInfo: RepoInfo
     context: ExtensionContext
   }) => {
     log.info(`setting user presence: ${{ status }}`, module)
 
-    const pullflowApi = new PullflowApi(context, authToken)
+    const pullflowApi = new PullflowApi(context, accessToken)
     try {
       const data = await pullflowApi.fetch(SET_USER_PRESENCE, {
         status,

src/api/pullRequestQuickActionsApi.ts

@@ -61,19 +61,19 @@ mutation setCodeReviewReminder($codeReviewId: String!, $duration: Int!) {
 
 export const PullRequestQuickActionsApi = {
   addLabels: async ({
-    authToken,
+    accessToken,
     labels,
     codeReviewId,
     context,
   }: {
-    authToken: string
+    accessToken: string
     labels: string
     codeReviewId: string
     context: ExtensionContext
   }) => {
     log.info(`adding labels to pull request: ${{ labels }}}`, module)
 
-    const pullflowApi = new PullflowApi(context, authToken)
+    const pullflowApi = new PullflowApi(context, accessToken)
     try {
       const data = await pullflowApi.fetch(ADD_LABELS, {
         labels,
@@ -88,19 +88,19 @@ export const PullRequestQuickActionsApi = {
   },
 
   approve: async ({
-    authToken,
+    accessToken,
     codeReviewId,
     body,
     context,
   }: {
-    authToken: string
+    accessToken: string
     codeReviewId: string
     body: string
     context: ExtensionContext
   }) => {
     log.info(`approving pull request: ${{ codeReviewId }}}`, module)
 
-    const pullflowApi = new PullflowApi(context, authToken)
+    const pullflowApi = new PullflowApi(context, accessToken)
     try {
       const data = await pullflowApi.fetch(APPROVE_CODE_REVIEW, {
         codeReviewId,
@@ -115,19 +115,19 @@ export const PullRequestQuickActionsApi = {
   },
 
   addAssignee: async ({
-    authToken,
+    accessToken,
     codeReviewId,
     assigneeXid,
     context,
   }: {
-    authToken: string
+    accessToken: string
     codeReviewId: string
     assigneeXid: string
     context: ExtensionContext
   }) => {
     log.info(`add assignee to pull request: ${{ assigneeXid }}}`, module)
 
-    const pullflowApi = new PullflowApi(context, authToken)
+    const pullflowApi = new PullflowApi(context, accessToken)
     try {
       const data = await pullflowApi.fetch(ADD_ASSIGNEE, {
         codeReviewId,
@@ -144,17 +144,17 @@ export const PullRequestQuickActionsApi = {
   requestReview: async ({
     codeReviewId,
     reviewerXid,
-    authToken,
+    accessToken,
     context,
   }: {
     codeReviewId: string
     reviewerXid: string
-    authToken: string
+    accessToken: string
     context: ExtensionContext
   }) => {
     log.info(`requesting review: ${{ reviewerXid }}}`, module)
 
-    const pullflowApi = new PullflowApi(context, authToken)
+    const pullflowApi = new PullflowApi(context, accessToken)
     try {
       const data = await pullflowApi.fetch(REQUEST_REVIEW, {
         codeReviewId,
@@ -170,16 +170,16 @@ export const PullRequestQuickActionsApi = {
 
   refresh: async ({
     codeReviewId,
-    authToken,
+    accessToken,
     context,
   }: {
     codeReviewId: string
-    authToken: string
+    accessToken: string
     context: ExtensionContext
   }) => {
     log.info(`requesting review: ${{ codeReviewId }}}`, module)
 
-    const pullflowApi = new PullflowApi(context, authToken)
+    const pullflowApi = new PullflowApi(context, accessToken)
     try {
       const data = await pullflowApi.fetch(REFRESH_CODE_REVIEW, {
         codeReviewId,
@@ -194,17 +194,17 @@ export const PullRequestQuickActionsApi = {
   setReminder: async ({
     duration,
     codeReviewId,
-    authToken,
+    accessToken,
     context,
   }: {
     duration: number
     codeReviewId: string
-    authToken: string
+    accessToken: string
     context: ExtensionContext
   }) => {
     log.info(`setting reminder: ${{ duration, codeReviewId }}}`, module)
 
-    const pullflowApi = new PullflowApi(context, authToken)
+    const pullflowApi = new PullflowApi(context, accessToken)
     try {
       const data = await pullflowApi.fetch(SET_REMINDER, {
         codeReviewId,

src/api/spaceUsersApi.ts

@@ -16,17 +16,17 @@ const SPACE_USERS_QUERY = `query spaceUsersForVscode($codeReviewId: String!) {
 `
 export const SpaceUsersApi = {
   get: async ({
-    authToken,
+    accessToken,
     codeReviewId,
     context,
   }: {
-    authToken: string
+    accessToken: string
     codeReviewId: string
     context: ExtensionContext
   }) => {
     log.info(`fetching space users`, module)
 
-    const pullflowApi = new PullflowApi(context, authToken)
+    const pullflowApi = new PullflowApi(context, accessToken)
     try {
       const data = await pullflowApi.fetch(SPACE_USERS_QUERY, { codeReviewId })
       return data.spaceUsersForVscode

src/commands/reconnect.ts

@@ -35,9 +35,7 @@ export const Reconnect = async (
 
   if (codeReviews.error) {
     log.info(`Failed to reconnect`, module)
-    window.showInformationMessage(
-      `Pullflow: Failed to reconnect. Please check your internet connection and try again.`
-    )
+    StatusBar.update({ context, statusBar, state: StatusBarState.Error })
     return
   }
 

src/commands/signOut.ts

@@ -21,6 +21,7 @@ export const SignOut = async ({
   }
 }) => {
   await context.secrets.store(AppConfig.app.sessionSecret, '')
+  await context.secrets.store('userRefreshToken', '')
   await Store.clear(context)
   StatusBar.update({ context, statusBar, state: StatusBarState.SignedOut })
   clearInterval(pollIntervalId) // stopping polling interval

src/extension.ts

@@ -33,12 +33,13 @@ export async function activate(context: ExtensionContext) {
       const query = new URLSearchParams(uri.query)
       const user = {
         username: query.get('username') as string,
-        authToken: query.get('accessToken') as string,
+        accessToken: query.get('accessToken') as string,
+        refreshToken: query.get('refreshToken') as string,
       }
       await Store.set(context, {
         user,
       })
-      if (user.authToken) {
+      if (user.accessToken) {
         await Authorization.createSession({ user, context })
         await initialize({ context, statusBar })
       }

src/messages/messagePublisher.ts

@@ -34,7 +34,7 @@ export const MessagePublisher = {
       body: inputText || "I'm on it.",
       parentMessageXid: codeReview.parentMessageXid,
       chatChannelId: codeReview.chatChannelId,
-      authToken: session?.accessToken ?? '',
+      accessToken: session?.accessToken ?? '',
       context,
     })
 
@@ -98,7 +98,7 @@ export const MessagePublisher = {
       message,
       codeAccountXid: toAccount.xid,
       chatLink,
-      authToken: session?.accessToken ?? '',
+      accessToken: session?.accessToken ?? '',
       codeReviewId,
       fromAuthor,
       context,

src/models/presence.ts

@@ -29,7 +29,7 @@ export const Presence = {
 
     const response = await PresenceApi.setPresence({
       status,
-      authToken: session.accessToken,
+      accessToken: session.accessToken,
       context,
       repoInfo,
     })

src/models/spaceUsers.ts

@@ -13,7 +13,7 @@ export const SpaceUsers = {
     const session = await Authorization.currentSession(context)
     const response = await SpaceUsersApi.get({
       codeReviewId,
-      authToken: session?.accessToken ?? '',
+      accessToken: session?.accessToken ?? '',
       context,
     })
 

src/pullRequestQuickActions/pullRequestQuickActions.test.ts

@@ -31,7 +31,7 @@ describe('Pull Request Quick Actions', () => {
     ).toHaveBeenCalledWith({
       body: mockText,
       codeReviewId: mockModel.id,
-      authToken: mockSession.accessToken,
+      accessToken: mockSession.accessToken,
       context: mockModel,
     })
     expect(mockPresence.Presence.set).toBeCalled()

src/pullRequestQuickActions/pullRequestQuickActions.ts

@@ -34,7 +34,7 @@ export const PullRequestQuickActions = {
     const response = await PullRequestQuickActionsApi.addLabels({
       labels: inputText,
       codeReviewId: codeReview.id,
-      authToken: session?.accessToken ?? '',
+      accessToken: session?.accessToken ?? '',
       context,
     })
 
@@ -80,7 +80,7 @@ export const PullRequestQuickActions = {
     const response = await PullRequestQuickActionsApi.approve({
       body: inputText,
       codeReviewId: codeReview.id,
-      authToken: session?.accessToken ?? '',
+      accessToken: session?.accessToken ?? '',
       context,
     })
 
@@ -139,7 +139,7 @@ export const PullRequestQuickActions = {
         const response = await PullRequestQuickActionsApi.addAssignee({
           assigneeXid: item[0].description,
           codeReviewId: codeReview.id,
-          authToken: session?.accessToken ?? '',
+          accessToken: session?.accessToken ?? '',
           context,
         })
 
@@ -198,7 +198,7 @@ export const PullRequestQuickActions = {
         const response = await PullRequestQuickActionsApi.requestReview({
           reviewerXid: item[0].description,
           codeReviewId: codeReview.id,
-          authToken: session?.accessToken ?? '',
+          accessToken: session?.accessToken ?? '',
           context,
         })
 
@@ -244,7 +244,7 @@ export const PullRequestQuickActions = {
     const session = await Authorization.currentSession(context)
     const response = await PullRequestQuickActionsApi.refresh({
       codeReviewId,
-      authToken: session?.accessToken ?? '',
+      accessToken: session?.accessToken ?? '',
       context,
     })
     if (response.error || response.message) {
@@ -287,7 +287,7 @@ export const PullRequestQuickActions = {
       const response = await PullRequestQuickActionsApi.setReminder({
         codeReviewId: codeReview.id,
         duration,
-        authToken: session?.accessToken ?? '',
+        accessToken: session?.accessToken ?? '',
         context,
       })
       if (response.message || response.error || !response.success) {