From 319c0c4bcd9454df55d020ffe6e00a751e25d12c Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Thu, 24 Nov 2022 16:25:27 +0800 Subject: [PATCH] Allow changing byline in update api --- packages/api/src/generated/graphql.ts | 1 + packages/api/src/generated/schema.graphql | 1 + packages/api/src/resolvers/update/index.ts | 5 +++-- packages/api/src/schema.ts | 1 + packages/api/src/util.ts | 6 ------ 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts index dc609a3b7..7799c8206 100644 --- a/packages/api/src/generated/graphql.ts +++ b/packages/api/src/generated/graphql.ts @@ -2387,6 +2387,7 @@ export enum UpdatePageErrorCode { } export type UpdatePageInput = { + byline?: InputMaybe; description?: InputMaybe; pageId: Scalars['ID']; title?: InputMaybe; diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql index e2548394a..a36267736 100644 --- a/packages/api/src/generated/schema.graphql +++ b/packages/api/src/generated/schema.graphql @@ -1832,6 +1832,7 @@ enum UpdatePageErrorCode { } input UpdatePageInput { + byline: String description: String pageId: ID! title: String diff --git a/packages/api/src/resolvers/update/index.ts b/packages/api/src/resolvers/update/index.ts index 46607d1a7..ce01f1ddf 100644 --- a/packages/api/src/resolvers/update/index.ts +++ b/packages/api/src/resolvers/update/index.ts @@ -1,11 +1,11 @@ import { + MutationUpdatePageArgs, UpdatePageError, UpdatePageErrorCode, UpdatePageSuccess, - MutationUpdatePageArgs, } from '../../generated/graphql' import { authorized, userDataToUser } from '../../utils/helpers' -import { updatePage, getPageById } from '../../elastic/pages' +import { getPageById, updatePage } from '../../elastic/pages' import { Page } from '../../entity/page' import { Merge } from '../../util' @@ -39,6 +39,7 @@ export const updatePageResolver = authorized< id: input.pageId, title: input.title || undefined, description: input.description || '', + author: input.byline ?? undefined, } const updateResult = await updatePage(input.pageId, pageData, { ...ctx, uid }) diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts index c8ef50ce2..4402f43da 100755 --- a/packages/api/src/schema.ts +++ b/packages/api/src/schema.ts @@ -530,6 +530,7 @@ const schema = gql` pageId: ID! title: String description: String + byline: String } type UpdatePageSuccess { diff --git a/packages/api/src/util.ts b/packages/api/src/util.ts index 970e139b4..0ca9ad8b8 100755 --- a/packages/api/src/util.ts +++ b/packages/api/src/util.ts @@ -65,8 +65,6 @@ interface BackendEnv { reminderTaskHanderUrl: string integrationTaskHandlerUrl: string textToSpeechTaskHandlerUrl: string - notificationEndpoint: string - verificationToken: string } fileUpload: { gcsUploadBucket: string @@ -154,8 +152,6 @@ const nullableEnvVars = [ 'AZURE_SPEECH_KEY', 'AZURE_SPEECH_REGION', 'GCP_LOCATION', - 'NOTIFICATION_ENDPOINT', - 'PUBSUB_VERIFICATION_TOKEN', ] // 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 */ @@ -241,8 +237,6 @@ export function getEnv(): BackendEnv { reminderTaskHanderUrl: parse('REMINDER_TASK_HANDLER_URL'), integrationTaskHandlerUrl: parse('INTEGRATION_TASK_HANDLER_URL'), textToSpeechTaskHandlerUrl: parse('TEXT_TO_SPEECH_TASK_HANDLER_URL'), - notificationEndpoint: parse('NOTIFICATION_ENDPOINT'), - verificationToken: parse('PUBSUB_VERIFICATION_TOKEN'), } const imageProxy = { url: parse('IMAGE_PROXY_URL'),