From 4abbbecd37672cbaf4fd7565508cdeb32e7c4897 Mon Sep 17 00:00:00 2001 From: Jiaxin Peng Date: Fri, 29 Dec 2023 00:36:29 +0000 Subject: [PATCH] modify the notionapi variable --- .../upload_general/BaseUpload2NotionGeneral.ts | 13 +++++++++---- src/upload/upload_general/Upload2NotionGeneral.ts | 2 +- src/upload/upload_next/BaseUpload2NotionNext.ts | 12 +++++++++--- src/upload/upload_next/Upload2NotionNext.ts | 2 +- .../upoload_custom/BaseUpload2NotionCustom.ts | 11 ++++++++--- src/upload/upoload_custom/Upload2NotionCustom.ts | 4 ++-- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/upload/upload_general/BaseUpload2NotionGeneral.ts b/src/upload/upload_general/BaseUpload2NotionGeneral.ts index 1122ce5..a5d6795 100644 --- a/src/upload/upload_general/BaseUpload2NotionGeneral.ts +++ b/src/upload/upload_general/BaseUpload2NotionGeneral.ts @@ -4,23 +4,27 @@ import {markdownToBlocks,} from "@tryfabric/martian"; import * as yamlFrontMatter from "yaml-front-matter"; // import * as yaml from "yaml" import MyPlugin from "src/main"; +import {DatabaseDetails} from "../../ui/settingTabs"; export class UploadBaseGeneral { plugin: MyPlugin; notion: Client; agent: any; - - constructor(plugin: MyPlugin) { + dbDetails: DatabaseDetails + constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) { this.plugin = plugin; + this.dbDetails = dbDetails } async deletePage(notionID: string) { + + const {notionAPI} = this.dbDetails return requestUrl({ url: `https://api.notion.com/v1/blocks/${notionID}`, method: 'DELETE', headers: { 'Content-Type': 'application/json', - 'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, + 'Authorization': 'Bearer ' + notionAPI, 'Notion-Version': '2022-06-28', }, body: '' @@ -28,11 +32,12 @@ export class UploadBaseGeneral { } async getDataBase(databaseID: string) { + const {notionAPI} = this.dbDetails const response = await requestUrl({ url: `https://api.notion.com/v1/databases/${databaseID}`, method: 'GET', headers: { - 'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, + 'Authorization': 'Bearer ' + notionAPI, 'Notion-Version': '2022-06-28', } } diff --git a/src/upload/upload_general/Upload2NotionGeneral.ts b/src/upload/upload_general/Upload2NotionGeneral.ts index e2f6a02..b0cb5af 100644 --- a/src/upload/upload_general/Upload2NotionGeneral.ts +++ b/src/upload/upload_general/Upload2NotionGeneral.ts @@ -13,7 +13,7 @@ export class Upload2NotionGeneral extends UploadBaseGeneral { dbDetails: DatabaseDetails; constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) { - super(plugin); + super(plugin, dbDetails); this.dbDetails = dbDetails; } diff --git a/src/upload/upload_next/BaseUpload2NotionNext.ts b/src/upload/upload_next/BaseUpload2NotionNext.ts index 6295975..a67cf2b 100644 --- a/src/upload/upload_next/BaseUpload2NotionNext.ts +++ b/src/upload/upload_next/BaseUpload2NotionNext.ts @@ -4,23 +4,27 @@ import { markdownToBlocks, } from "@tryfabric/martian"; import * as yamlFrontMatter from "yaml-front-matter"; // import * as yaml from "yaml" import MyPlugin from "src/main"; +import {DatabaseDetails} from "../../ui/settingTabs"; export class UploadBaseNext { plugin: MyPlugin; notion: Client; agent: any; + dbDetails: DatabaseDetails - constructor(plugin: MyPlugin) { + constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) { this.plugin = plugin; + this.dbDetails = dbDetails } async deletePage(notionID: string) { + const {notionAPI} = this.dbDetails return requestUrl({ url: `https://api.notion.com/v1/blocks/${notionID}`, method: 'DELETE', headers: { 'Content-Type': 'application/json', - 'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, + 'Authorization': 'Bearer ' + notionAPI, 'Notion-Version': '2022-06-28', }, body: '' @@ -28,11 +32,13 @@ export class UploadBaseNext { } async getDataBase(databaseID: string) { + const {notionAPI} = this.dbDetails + const response = await requestUrl({ url: `https://api.notion.com/v1/databases/${databaseID}`, method: 'GET', headers: { - 'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, + 'Authorization': 'Bearer ' + notionAPI, 'Notion-Version': '2022-06-28', } } diff --git a/src/upload/upload_next/Upload2NotionNext.ts b/src/upload/upload_next/Upload2NotionNext.ts index d7dba41..9408b70 100644 --- a/src/upload/upload_next/Upload2NotionNext.ts +++ b/src/upload/upload_next/Upload2NotionNext.ts @@ -14,7 +14,7 @@ export class Upload2NotionNext extends UploadBaseNext { dbDetails: DatabaseDetails constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) { - super(plugin); + super(plugin, dbDetails); this.dbDetails = dbDetails } diff --git a/src/upload/upoload_custom/BaseUpload2NotionCustom.ts b/src/upload/upoload_custom/BaseUpload2NotionCustom.ts index cf135ac..5c49e60 100644 --- a/src/upload/upoload_custom/BaseUpload2NotionCustom.ts +++ b/src/upload/upoload_custom/BaseUpload2NotionCustom.ts @@ -4,23 +4,27 @@ import {markdownToBlocks,} from "@tryfabric/martian"; import * as yamlFrontMatter from "yaml-front-matter"; // import * as yaml from "yaml" import MyPlugin from "src/main"; +import {DatabaseDetails} from "../../ui/settingTabs"; export class UploadBaseCustom { plugin: MyPlugin; notion: Client; agent: any; + dbDetails: DatabaseDetails - constructor(plugin: MyPlugin) { + constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) { this.plugin = plugin; + this.dbDetails = dbDetails } async deletePage(notionID: string) { + const {notionAPI} = this.dbDetails return requestUrl({ url: `https://api.notion.com/v1/blocks/${notionID}`, method: 'DELETE', headers: { 'Content-Type': 'application/json', - 'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, + 'Authorization': 'Bearer ' + notionAPI, 'Notion-Version': '2022-06-28', }, body: '' @@ -28,11 +32,12 @@ export class UploadBaseCustom { } async getDataBase(databaseID: string) { + const {notionAPI} = this.dbDetails const response = await requestUrl({ url: `https://api.notion.com/v1/databases/${databaseID}`, method: 'GET', headers: { - 'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, + 'Authorization': 'Bearer ' + notionAPI, 'Notion-Version': '2022-06-28', } } diff --git a/src/upload/upoload_custom/Upload2NotionCustom.ts b/src/upload/upoload_custom/Upload2NotionCustom.ts index 7d9dbe4..2e2b141 100644 --- a/src/upload/upoload_custom/Upload2NotionCustom.ts +++ b/src/upload/upoload_custom/Upload2NotionCustom.ts @@ -13,7 +13,7 @@ export class Upload2NotionCustom extends UploadBaseCustom { dbDetails: DatabaseDetails; constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) { - super(plugin); + super(plugin, dbDetails); this.dbDetails = dbDetails; } @@ -116,7 +116,7 @@ export class Upload2NotionCustom extends UploadBaseCustom { "Content-Type": "application/json", // 'User-Agent': 'obsidian.md', Authorization: - "Bearer " + this.plugin.settings.notionAPIGeneral, + "Bearer " + notionAPI, "Notion-Version": "2022-06-28", }, body: JSON.stringify(bodyString),