blsmedia/bot
2
0
Fork 0
Code Activity

fix(integration): 🐛 Attempt to fix Google Sheets refresh

Browse Source
This commit is contained in:
Baptiste Arnaud
2022-03-04 18:36:26 +01:00
parent ec18912879
commit c7d31bebf8
2 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/builder/libs/google-sheets.ts
View File

@ -1,5 +1,5 @@
import { Credentials as CredentialsFromDb } from 'db'
import { OAuth2Client } from 'google-auth-library'
import { OAuth2Client, Credentials } from 'google-auth-library'
import { GoogleSheetsCredentialsData } from 'models'
import { decrypt, encrypt } from 'utils'
import prisma from './prisma'
@ -22,16 +22,21 @@ export const getAuthenticatedGoogleClient = async (
credentials.data,
credentials.iv
) as GoogleSheetsCredentialsData
oauth2Client.setCredentials(data)
oauth2Client.on('tokens', updateTokens(credentialsId))
oauth2Client.on('tokens', updateTokens(credentialsId, data))
return oauth2Client
}
const updateTokens =
(credentialsId: string) =>
async (credentials: GoogleSheetsCredentialsData) => {
const { encryptedData, iv } = encrypt(credentials)
return prisma.credentials.update({
(credentialsId: string, existingCredentials: GoogleSheetsCredentialsData) =>
async (credentials: Credentials) => {
const newCredentials = {
refresh_token: existingCredentials.refresh_token,
...credentials,
}
const { encryptedData, iv } = encrypt(newCredentials)
await prisma.credentials.update({
where: { id: credentialsId },
data: { data: encryptedData, iv },
})

36
apps/viewer/libs/google-sheets.ts
View File

@ -4,31 +4,37 @@ import { GoogleSheetsCredentialsData } from 'models'
import { decrypt, encrypt } from 'utils'
import prisma from './prisma'
export const oauth2Client = new OAuth2Client(
process.env.GOOGLE_CLIENT_ID,
process.env.GOOGLE_CLIENT_SECRET,
`${process.env.NEXTAUTH_URL}/api/credentials/google-sheets/callback`
)
export const getAuthenticatedGoogleClient = async (
credentialsId: string
): Promise<OAuth2Client | undefined> => {
const credentials = (await prisma.credentials.findFirst({
where: { id: credentialsId },
})) as CredentialsFromDb
const data = decrypt(credentials.data, credentials.iv) as
| GoogleSheetsCredentialsData
| undefined
if (!data) return
})) as CredentialsFromDb | undefined
if (!credentials) return
const data = decrypt(
credentials.data,
credentials.iv
) as GoogleSheetsCredentialsData
const oauth2Client = new OAuth2Client(
process.env.GOOGLE_CLIENT_ID,
process.env.GOOGLE_CLIENT_SECRET,
`${process.env.NEXTAUTH_URL}/api/credentials/google-sheets/callback`
)
oauth2Client.setCredentials(data)
oauth2Client.on('tokens', updateTokens(credentialsId))
oauth2Client.on('tokens', updateTokens(credentialsId, data))
return oauth2Client
}
const updateTokens =
(credentialsId: string) => async (credentials: Credentials) => {
const { encryptedData, iv } = encrypt(credentials)
return prisma.credentials.update({
(credentialsId: string, existingCredentials: GoogleSheetsCredentialsData) =>
async (credentials: Credentials) => {
const newCredentials = {
refresh_token: existingCredentials.refresh_token,
...credentials,
}
const { encryptedData, iv } = encrypt(newCredentials)
await prisma.credentials.update({
where: { id: credentialsId },
data: { data: encryptedData, iv },
})