@atproto/pds 0.4.199 → 0.4.201

package/tests/oauth.test.ts

@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { once } from 'node:events'
 import {
   IncomingMessage,
@@ -7,93 +6,25 @@ import {
   createServer,
 } from 'node:http'
 import { AddressInfo } from 'node:net'
-import { type Browser, type Page, launch } from 'puppeteer'
+import { type Browser, launch } from 'puppeteer'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
-// @ts-expect-error (json file)
 import files from '@atproto/oauth-client-browser-example' with { type: 'json' }
-
-class PageHelper implements AsyncDisposable {
-  constructor(protected readonly page: Page) {}
-
-  async goto(url: string) {
-    await this.page.goto(url)
-  }
-
-  async waitForNetworkIdle() {
-    await this.page.waitForNetworkIdle()
-  }
-
-  async navigationAction(run: () => Promise<unknown>): Promise<void> {
-    const promise = this.page.waitForNavigation()
-    await run()
-    await promise
-    await this.waitForNetworkIdle()
-  }
-
-  async checkTitle(expected: string) {
-    await this.waitForNetworkIdle()
-    await expect(this.page.title()).resolves.toBe(expected)
-  }
-
-  async clickOn(selector: string) {
-    const elementHandle = await this.getVisibleElement(selector)
-    await elementHandle.click()
-    return elementHandle
-  }
-
-  async clickOnButton(text: string) {
-    return this.clickOn(`button::-p-text(${text})`)
-  }
-
-  async typeIn(selector: string, text: string) {
-    const elementHandle = await this.getVisibleElement(selector)
-    elementHandle.focus()
-    await elementHandle.type(text)
-    return elementHandle
-  }
-
-  async typeInInput(name: string, text: string) {
-    return this.typeIn(`input[name="${name}"]`, text)
-  }
-
-  async ensureTextVisibility(text: string, tag = 'p') {
-    await this.page.waitForSelector(`${tag}::-p-text(${text})`)
-  }
-
-  protected async getVisibleElement(selector: string) {
-    const elementHandle = await this.page.waitForSelector(selector)
-
-    expect(elementHandle).not.toBeNull()
-    assert(elementHandle)
-
-    await expect(elementHandle.isVisible()).resolves.toBe(true)
-
-    return elementHandle
-  }
-
-  async [Symbol.asyncDispose]() {
-    return this.page.close()
-  }
-
-  static async from(browser: Browser) {
-    const page = await browser.newPage()
-    return new PageHelper(page)
-  }
-}
+import { PageHelper } from './_puppeteer.js'
 
 describe('oauth', () => {
   let browser: Browser
   let network: TestNetworkNoAppView
-  let client: Server
+  let server: Server
 
   let appUrl: string
 
+  // @NOTE We are using another language than "en" as default language to
+  // test the language negotiation.
+  const languages = ['fr-BE', 'fr', 'en-US', 'en']
+
   beforeAll(async () => {
     browser = await launch({
-      browser: 'chrome',
-      // @NOTE We are using another language than "en" as default language to
-      // test the language negotiation.
-      args: ['--accept-lang=fr-BE,en-GB,en'],
+      browser: 'chrome', // "firefox"
 
       // For debugging:
       // headless: false,
@@ -113,11 +44,11 @@ describe('oauth', () => {
       password: 'alice-pass',
     })
 
-    client = createServer(clientHandler)
-    client.listen(0)
-    await once(client, 'listening')
+    server = createServer(clientHandler)
+    server.listen(0)
+    await once(server, 'listening')
 
-    const { port } = client.address() as AddressInfo
+    const { port } = server.address() as AddressInfo
 
     appUrl = `http://127.0.0.1:${port}?${new URLSearchParams({
       plc_directory_url: network.plc.url,
@@ -129,27 +60,24 @@ describe('oauth', () => {
   })
 
   afterAll(async () => {
-    await client?.close()
+    await server?.close()
     await network?.close()
     await browser?.close()
   })
 
-  it('Allows to sign-up trough OAuth', async () => {
-    const page = await PageHelper.from(browser)
+  // This uses prompt=create under the hood:
+  it('Allows to sign-up through OAuth', async () => {
+    const page = await PageHelper.from(browser, { languages })
 
     await page.goto(appUrl)
 
     await page.checkTitle('OAuth Client Example')
 
     await page.navigationAction(async () => {
-      await page.clickOnButton(
-        `Login or signup with ${new URL(network.pds.url).host}`,
-      )
+      await page.clickOnButton(`Sign up with ${new URL(network.pds.url).host}`)
     })
 
-    await page.checkTitle('Authentification')
-
-    await page.clickOnButton('Créer un nouveau compte')
+    await page.checkTitle('Créer un compte')
 
     await page.typeInInput('handle', 'bob')
 
@@ -186,6 +114,38 @@ describe('oauth', () => {
     await page[Symbol.asyncDispose]()
   })
 
+  it('Allows login or signup through OAuth via a choice', async () => {
+    const page = await PageHelper.from(browser, { languages })
+
+    await page.goto(appUrl)
+
+    await page.checkTitle('OAuth Client Example')
+
+    await page.navigationAction(async () => {
+      await page.clickOnButton(`Login with ${new URL(network.pds.url).host}`)
+    })
+
+    await page.checkTitle('Authentification')
+
+    await page.ensureTextVisibility('Annuler', 'button')
+    await page.ensureTextVisibility('Se connecter', 'button')
+    await page.ensureTextVisibility('Créer un nouveau compte', 'button')
+
+    // Cancel the OAuth flow:
+    await page.navigationAction(async () => {
+      await page.clickOnButton('Annuler')
+    })
+
+    await page.checkTitle('OAuth Client Example')
+
+    await page.ensureTextVisibility('Login with the Atmosphere', 'h2')
+
+    await page.waitForNetworkIdle()
+
+    // TODO: Find out why we can't use "using" here
+    await page[Symbol.asyncDispose]()
+  })
+
   it('allows resetting the password', async () => {
     const sendTemplateMock = jest
       .spyOn(network.pds.ctx.mailer, 'sendResetPassword')
@@ -193,7 +153,7 @@ describe('oauth', () => {
         // noop
       })
 
-    const page = await PageHelper.from(browser)
+    const page = await PageHelper.from(browser, { languages })
 
     await page.goto(appUrl)
 
@@ -243,8 +203,8 @@ describe('oauth', () => {
     sendTemplateMock.mockRestore()
   })
 
-  it('Allows to sign-in trough OAuth', async () => {
-    const page = await PageHelper.from(browser)
+  it('Allows to sign-in through OAuth', async () => {
+    const page = await PageHelper.from(browser, { languages })
 
     await page.goto(appUrl)
 
@@ -290,7 +250,7 @@ describe('oauth', () => {
   })
 
   it('remembers the session', async () => {
-    const page = await PageHelper.from(browser)
+    const page = await PageHelper.from(browser, { languages })
 
     await page.goto(appUrl)
 

package/tsconfig.tests.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["./tests/_util.ts","./tests/account-deactivation.test.ts","./tests/account-deletion.test.ts","./tests/account-migration.test.ts","./tests/account.test.ts","./tests/app-passwords.test.ts","./tests/auth.test.ts","./tests/blob-deletes.test.ts","./tests/create-post.test.ts","./tests/crud.test.ts","./tests/db.test.ts","./tests/email-confirmation.test.ts","./tests/entryway.test.ts","./tests/file-uploads.test.ts","./tests/handle-validation.test.ts","./tests/handles.test.ts","./tests/invite-codes.test.ts","./tests/invites-admin.test.ts","./tests/moderation.test.ts","./tests/moderator-auth.test.ts","./tests/oauth.test.ts","./tests/plc-operations.test.ts","./tests/preferences.test.ts","./tests/races.test.ts","./tests/rate-limits.test.ts","./tests/recovery.test.ts","./tests/sequencer.test.ts","./tests/server.test.ts","./tests/takedown-appeal.test.ts","./tests/proxied/admin.test.ts","./tests/proxied/feedgen.test.ts","./tests/proxied/notif.test.ts","./tests/proxied/procedures.test.ts","./tests/proxied/proxy-catchall.test.ts","./tests/proxied/proxy-header.test.ts","./tests/proxied/read-after-write.test.ts","./tests/proxied/views.test.ts","./tests/seeds/basic.ts","./tests/seeds/follows.ts","./tests/seeds/likes.ts","./tests/seeds/reposts.ts","./tests/seeds/thread.ts","./tests/seeds/users-bulk.ts","./tests/seeds/users.ts","./tests/sync/invertible-ops.test.ts","./tests/sync/list.test.ts","./tests/sync/subscribe-repos.test.ts","./tests/sync/sync.test.ts"],"version":"5.8.3"}