Browse Source

tidy up

pull/4434/head
Martin McKeaveney 5 years ago
parent
commit
328aef00e1
  1. 1
      packages/backend-core/src/middleware/passport/google.js
  2. 7
      packages/server/src/api/controllers/datasource.js
  3. 3
      packages/server/src/definitions/datasource.ts
  4. 6
      packages/server/src/integrations/googlesheets.ts

1
packages/backend-core/src/middleware/passport/google.js

@ -46,7 +46,6 @@ exports.strategyFactory = async function (
clientID: config.clientID, clientID: config.clientID,
clientSecret: config.clientSecret, clientSecret: config.clientSecret,
callbackURL: callbackUrl, callbackURL: callbackUrl,
store: true,
}, },
verify verify
) )

7
packages/server/src/api/controllers/datasource.js

@ -38,6 +38,13 @@ exports.fetch = async function (ctx) {
) )
).rows.map(row => row.doc) ).rows.map(row => row.doc)
for (let datasource of datasources) {
if (datasource.config && datasource.config.auth) {
// strip secrets from response so they don't show in the network request
delete datasource.config.auth
}
}
ctx.body = [bbInternalDb, ...datasources] ctx.body = [bbInternalDb, ...datasources]
} }

3
packages/server/src/definitions/datasource.ts

@ -87,8 +87,7 @@ export interface ExtraQueryConfig {
export interface Integration { export interface Integration {
docs: string docs: string
plus?: boolean plus?: boolean
// TODO: use a proper type here auth?: { type: string }
auth?: { type: "google" }
description: string description: string
friendlyName: string friendlyName: string
datasource: {} datasource: {}

6
packages/server/src/integrations/googlesheets.ts

@ -248,11 +248,11 @@ module GoogleSheetsModule {
} }
} }
async deleteTable(query: any) { async deleteTable(sheet: any) {
try { try {
await this.connect() await this.connect()
const sheet = await this.client.sheetsByTitle[query.sheet] const sheetToDelete = await this.client.sheetsByTitle[sheet]
return await sheet.delete() return await sheetToDelete.delete()
} catch (err) { } catch (err) {
console.error("Error deleting table in google sheets", err) console.error("Error deleting table in google sheets", err)
throw err throw err

Loading…
Cancel
Save