Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix auth tests

Browse Source
This commit is contained in:
Hongbo Wu
2023-09-11 23:58:57 +09:00
parent 024d558cfe
commit c3caf15e44
14 changed files with 115 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/api/src/routers/svc/email_attachment.ts
View File

@ -10,7 +10,7 @@ import { env } from '../../env'
import { UploadFileStatus } from '../../generated/graphql'
import { authTrx } from '../../repository'
import { createLibraryItem } from '../../services/library_item'
import { findNewsletterEmail } from '../../services/newsletters'
import { findNewsletterEmailByAddress } from '../../services/newsletters'
import { updateReceivedEmail } from '../../services/received_emails'
import {
findUploadFileById,
@ -45,7 +45,7 @@ export function emailAttachmentRouter() {
return res.status(401).send('UNAUTHORIZED')
}
const newsletterEmail = await findNewsletterEmail(email)
const newsletterEmail = await findNewsletterEmailByAddress(email)
if (!newsletterEmail || !newsletterEmail.user) {
return res.status(401).send('UNAUTHORIZED')
}
@ -112,7 +112,7 @@ export function emailAttachmentRouter() {
return res.status(401).send('UNAUTHORIZED')
}
const newsletterEmail = await findNewsletterEmail(email)
const newsletterEmail = await findNewsletterEmailByAddress(email)
if (!newsletterEmail || !newsletterEmail.user) {
return res.status(401).send('UNAUTHORIZED')
}

8
packages/api/src/routers/svc/emails.ts
View File

@ -2,7 +2,7 @@ import cors from 'cors'
import express from 'express'
import { env } from '../../env'
import { readPushSubscription } from '../../pubsub'
import { findNewsletterEmail } from '../../services/newsletters'
import { findNewsletterEmailByAddress } from '../../services/newsletters'
import { saveReceivedEmail } from '../../services/received_emails'
import { saveNewsletter } from '../../services/save_newsletter_email'
import { analytics } from '../../utils/analytics'
@ -57,12 +57,12 @@ export function emailsServiceRouter() {
const data = JSON.parse(message) as unknown
if (!isEmailMessage(data)) {
logger.error('Invalid message')
res.status(400).send('Bad Request')
res.status(200).send('Bad Request')
return
}
// get user from newsletter email
const newsletterEmail = await findNewsletterEmail(data.to)
const newsletterEmail = await findNewsletterEmailByAddress(data.to)
if (!newsletterEmail) {
logger.info('newsletter email not found', { email: data.to })
@ -150,7 +150,7 @@ export function emailsServiceRouter() {
try {
// get user from newsletter email
const newsletterEmail = await findNewsletterEmail(req.body.to)
const newsletterEmail = await findNewsletterEmailByAddress(req.body.to)
if (!newsletterEmail) {
logger.info('newsletter email not found', { email: req.body.to })

4
packages/api/src/routers/svc/newsletters.ts
View File

@ -2,7 +2,7 @@ import express from 'express'
import { SubscriptionStatus } from '../../generated/graphql'
import { readPushSubscription } from '../../pubsub'
import {
findNewsletterEmail,
findNewsletterEmailByAddress,
updateConfirmationCode,
} from '../../services/newsletters'
import { updateReceivedEmail } from '../../services/received_emails'
@ -105,7 +105,7 @@ export function newsletterServiceRouter() {
}
// get user from newsletter email
const newsletterEmail = await findNewsletterEmail(data.email)
const newsletterEmail = await findNewsletterEmailByAddress(data.email)
if (!newsletterEmail) {
logger.info(`newsletter email not found: ${data.email}`)
return res.status(200).send('Not Found')

40
packages/api/src/services/labels.ts
View File

@ -26,26 +26,32 @@ export const findOrCreateLabels = async (
labels: CreateLabelInput[],
userId: string
): Promise<Label[]> => {
return authTrx(async (tx) => {
const labelRepo = tx.withRepository(labelRepository)
// find existing labels
const labelEntities = await labelRepo.findByNames(labels.map((l) => l.name))
return authTrx(
async (tx) => {
const labelRepo = tx.withRepository(labelRepository)
// find existing labels
const labelEntities = await labelRepo.findByNames(
labels.map((l) => l.name)
)
const existingLabelsInLowerCase = labelEntities.map((l) =>
l.name.toLowerCase()
)
const newLabels = labels.filter(
(l) => !existingLabelsInLowerCase.includes(l.name.toLowerCase())
)
if (newLabels.length === 0) {
return labelEntities
}
const existingLabelsInLowerCase = labelEntities.map((l) =>
l.name.toLowerCase()
)
const newLabels = labels.filter(
(l) => !existingLabelsInLowerCase.includes(l.name.toLowerCase())
)
if (newLabels.length === 0) {
return labelEntities
}
// create new labels
const newLabelEntities = await labelRepo.createLabels(newLabels, userId)
// create new labels
const newLabelEntities = await labelRepo.createLabels(newLabels, userId)
return [...labelEntities, ...newLabelEntities]
})
return [...labelEntities, ...newLabelEntities]
},
undefined,
userId
)
}
export const saveLabelsInLibraryItem = async (

40
packages/api/src/services/library_item.ts
View File

@ -276,28 +276,32 @@ export const searchLibraryItems = async (
const sortField = sort?.by || SortBy.SAVED
// add pagination and sorting
return authTrx(async (tx) => {
const queryBuilder = tx
.createQueryBuilder(LibraryItem, 'library_item')
.leftJoinAndSelect('library_item.labels', 'labels')
.leftJoinAndSelect('library_item.highlights', 'highlights')
.leftJoinAndSelect('highlights.user', 'user')
.leftJoinAndSelect('user.profile', 'profile')
.where('library_item.user_id = :userId', { userId })
return authTrx(
async (tx) => {
const queryBuilder = tx
.createQueryBuilder(LibraryItem, 'library_item')
.leftJoinAndSelect('library_item.labels', 'labels')
.leftJoinAndSelect('library_item.highlights', 'highlights')
.leftJoinAndSelect('highlights.user', 'user')
.leftJoinAndSelect('user.profile', 'profile')
.where('library_item.user_id = :userId', { userId })
// build the where clause
buildWhereClause(queryBuilder, args)
// build the where clause
buildWhereClause(queryBuilder, args)
const libraryItems = await queryBuilder
.addOrderBy(`library_item.${sortField}`, sortOrder)
.offset(from)
.limit(size)
.getMany()
const libraryItems = await queryBuilder
.addOrderBy(`library_item.${sortField}`, sortOrder)
.offset(from)
.limit(size)
.getMany()
const count = await queryBuilder.getCount()
const count = await queryBuilder.getCount()
return { libraryItems, count }
})
return { libraryItems, count }
},
undefined,
userId
)
}
export const findLibraryItemById = async (

17
packages/api/src/services/newsletters.ts
View File

@ -9,10 +9,10 @@ import { getRepository } from '../repository'
import { userRepository } from '../repository/user'
import addressparser = require('nodemailer/lib/addressparser')
const parsedAddress = (emailAddress: string): string | undefined => {
const parsedAddress = (emailAddress: string) => {
const res = addressparser(emailAddress, { flatten: true })
if (!res || res.length < 1) {
return undefined
throw new Error('Invalid email address')
}
return res[0].address
}
@ -72,7 +72,7 @@ export const updateConfirmationCode = async (
const address = parsedAddress(emailAddress)
const result = await getRepository(NewsletterEmail)
.createQueryBuilder()
.where('address ILIKE :address', { address })
.where('LOWER(address) = :address', { address: address.toLowerCase() })
.update({
confirmationCode: confirmationCode,
})
@ -81,14 +81,14 @@ export const updateConfirmationCode = async (
return !!result.affected
}
export const findNewsletterEmail = async (
export const findNewsletterEmailByAddress = async (
emailAddress: string
): Promise<NewsletterEmail | null> => {
const address = parsedAddress(emailAddress)
return getRepository(NewsletterEmail)
.createQueryBuilder('newsletter_email')
.innerJoinAndSelect('newsletter_email.user', 'user')
.where('address ILIKE :address', { address })
.where('LOWER(address) = :address', { address: address.toLowerCase() })
.getOne()
}
@ -106,9 +106,8 @@ const createRandomEmailAddress = (userName: string, length: number): string => {
return `${userName}-${nanoid(length)}e@${inbox}.omnivore.app`
}
export const getNewsletterEmailById = async (
id: string,
userId: string
export const findNewsletterEmailById = async (
id: string
): Promise<NewsletterEmail | null> => {
return getRepository(NewsletterEmail).findOneBy({ id, user: { id: userId } })
return getRepository(NewsletterEmail).findOneBy({ id })
}

28
packages/api/src/services/save_email.ts
View File

@ -3,9 +3,7 @@ import {
LibraryItemState,
LibraryItemType,
} from '../entity/library_item'
import { authTrx } from '../repository'
import { getInternalLabelWithColor } from '../repository/label'
import { libraryItemRepository } from '../repository/library_item'
import { enqueueThumbnailTask } from '../utils/createTask'
import {
cleanUrl,
@ -23,7 +21,11 @@ import {
parseUrlMetadata,
} from '../utils/parser'
import { findOrCreateLabels } from './labels'
import { createLibraryItem } from './library_item'
import {
createLibraryItem,
findLibraryItemByUrl,
updateLibraryItem,
} from './library_item'
import { updateReceivedEmail } from './received_emails'
import { saveSubscription } from './subscriptions'
@ -69,17 +71,19 @@ export const saveEmail = async (
siteIcon = await fetchFavicon(url)
}
const existingLibraryItem = await authTrx((t) =>
t.withRepository(libraryItemRepository).findOneBy({
originalUrl: cleanedUrl,
state: LibraryItemState.Succeeded,
})
const existingLibraryItem = await findLibraryItemByUrl(
cleanedUrl,
input.userId
)
if (existingLibraryItem) {
const updatedLibraryItem = await libraryItemRepository.save({
...existingLibraryItem,
archivedAt: null,
})
const updatedLibraryItem = await updateLibraryItem(
existingLibraryItem.id,
{
archivedAt: null,
state: LibraryItemState.Succeeded,
},
input.userId
)
logger.info('updated page from email', updatedLibraryItem)
return updatedLibraryItem

22
packages/api/src/services/user_device_tokens.ts
View File

@ -5,9 +5,14 @@ import { authTrx } from '../repository'
import { analytics } from '../utils/analytics'
export const findDeviceTokenById = async (
id: string
id: string,
userId?: string
): Promise<UserDeviceToken | null> => {
return authTrx((t) => t.getRepository(UserDeviceToken).findOneBy({ id }))
return authTrx(
(t) => t.getRepository(UserDeviceToken).findOneBy({ id }),
undefined,
userId
)
}
export const findDeviceTokenByToken = async (
@ -41,11 +46,14 @@ export const createDeviceToken = async (
},
})
return authTrx((t) =>
t.getRepository(UserDeviceToken).save({
token,
user: { id: userId },
})
return authTrx(
(t) =>
t.getRepository(UserDeviceToken).save({
token,
user: { id: userId },
}),
undefined,
userId
)
}

2
packages/api/src/services/webhook.ts
View File

@ -36,7 +36,7 @@ export const findWebhooks = async (userId?: string) => {
export const findWebhookById = async (id: string, userId?: string) => {
return authTrx(
(tx) => tx.getRepository(Webhook).findBy({ id }),
(tx) => tx.getRepository(Webhook).findOneBy({ id }),
undefined,
userId
)

7
packages/api/test/resolvers/newsletters.test.ts
View File

@ -9,7 +9,8 @@ import {
import { getRepository } from '../../src/repository'
import {
createNewsletterEmail,
findNewsletterEmail,
findNewsletterEmailByAddress,
findNewsletterEmailById,
} from '../../src/services/newsletters'
import { createSubscription } from '../../src/services/subscriptions'
import { deleteUser } from '../../src/services/user'
@ -181,7 +182,7 @@ describe('Newsletters API', () => {
it('responds with status code 200', async () => {
const response = await graphqlRequest(query, authToken).expect(200)
const newsletterEmail = await findNewsletterEmail(
const newsletterEmail = await findNewsletterEmailById(
response.body.data.createNewsletterEmail.id
)
expect(newsletterEmail).not.to.be.undefined
@ -241,7 +242,7 @@ describe('Newsletters API', () => {
it('responds with status code 200', async () => {
const response = await graphqlRequest(query, authToken).expect(200)
const newsletterEmail = await findNewsletterEmail(
const newsletterEmail = await findNewsletterEmailByAddress(
response.body.data.deleteNewsletterEmail.newsletterEmail.id
)
expect(newsletterEmail).to.be.null

10
packages/api/test/resolvers/user_device_tokens.test.ts
View File

@ -5,7 +5,7 @@ import { UserDeviceToken } from '../../src/entity/user_device_tokens'
import { SetDeviceTokenErrorCode } from '../../src/generated/graphql'
import { getRepository } from '../../src/repository'
import { deleteUser } from '../../src/services/user'
import { deleteDeviceTokens, findDeviceTokenById } from '../../src/services/user_device_tokens'
import { createDeviceToken, deleteDeviceTokens, findDeviceTokenById } from '../../src/services/user_device_tokens'
import { createTestDeviceToken, createTestUser } from '../db'
import { generateFakeUuid, graphqlRequest, request } from '../util'
@ -106,7 +106,8 @@ describe('Device tokens API', () => {
it('responds with status code 200 and creates the token', async () => {
const response = await graphqlRequest(query, authToken).expect(200)
const deviceToken = await findDeviceTokenById(
response.body.data.setDeviceToken.deviceToken.id
response.body.data.setDeviceToken.deviceToken.id,
user.id
)
expect(deviceToken).not.to.be.null
})
@ -163,10 +164,7 @@ describe('Device tokens API', () => {
before(async () => {
// create test device token
await getRepository(UserDeviceToken).save({
user: { id: user.id },
token,
})
await createDeviceToken(user.id, token)
})
after(async () => {

2
packages/api/test/routers/auth.test.ts
View File

@ -606,7 +606,7 @@ describe('auth router', () => {
pendingUserToken!,
'web'
).expect(200)
const user = await getRepository(User).findOneByOrFail({ name })
const user = await userRepository.findOneByOrFail({ name })
const { count } = await searchLibraryItems({}, user.id)
expect(count).to.eql(3)

21
packages/api/test/routers/emails.test.ts
View File

@ -2,6 +2,7 @@ import { expect } from 'chai'
import * as jwt from 'jsonwebtoken'
import 'mocha'
import sinon from 'sinon'
import { NewsletterEmail } from '../../src/entity/newsletter_email'
import { ReceivedEmail } from '../../src/entity/received_email'
import { User } from '../../src/entity/user'
import { createNewsletterEmail } from '../../src/services/newsletters'
@ -14,31 +15,32 @@ import { createTestUser } from '../db'
import { request } from '../util'
describe('Emails Router', () => {
const newsletterEmail = 'fakeUser@omnivore.app'
const from = 'fake from'
const subject = 'fake subject'
const text = 'fake text'
const to = newsletterEmail
let user: User
let token: string
let receivedEmail: ReceivedEmail
let newsletterEmail: NewsletterEmail
let authToken: string
before(async () => {
// create test user and login
user = await createTestUser('fakeUser')
await createNewsletterEmail(user.id, newsletterEmail)
newsletterEmail = await createNewsletterEmail(user.id)
token = process.env.PUBSUB_VERIFICATION_TOKEN!
receivedEmail = await saveReceivedEmail(
from,
to,
newsletterEmail.address,
subject,
text,
'',
user.id,
'non-article'
)
authToken = jwt.sign(user.id, process.env.JWT_SECRET || '')
})
after(async () => {
@ -74,7 +76,7 @@ describe('Emails Router', () => {
data: Buffer.from(
JSON.stringify({
from,
to,
to: newsletterEmail.address,
subject,
html,
text,
@ -103,7 +105,7 @@ describe('Emails Router', () => {
data: Buffer.from(
JSON.stringify({
from,
to,
to: newsletterEmail.address,
subject,
html,
text,
@ -128,14 +130,13 @@ describe('Emails Router', () => {
const text = 'test text'
const from = 'fake from'
const subject = 'fake subject'
const authToken = jwt.sign(newsletterEmail, process.env.JWT_SECRET || '')
it('saves the email in the database', async () => {
const data = {
html,
text,
from,
to: newsletterEmail,
to: newsletterEmail.address,
subject,
}
const res = await request
@ -150,7 +151,7 @@ describe('Emails Router', () => {
it('saves the email if body is empty', async () => {
const data = {
from,
to: newsletterEmail,
to: newsletterEmail.address,
subject,
}
const res = await request
@ -165,7 +166,7 @@ describe('Emails Router', () => {
it('saves the email if subject is empty', async () => {
const data = {
from,
to: newsletterEmail,
to: newsletterEmail.address,
html,
}
const res = await request

1
packages/api/test/routers/integrations.test.ts
View File

@ -151,6 +151,7 @@ describe('Integrations routers', () => {
shortId: 'test shortId',
highlightPositionPercent,
user,
libraryItem: item,
},
item.id,
user.id