More conversion fixes

Author: augustuswm

remix-auth-rfd/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxide/remix-auth-rfd",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "engines": {
     "node": ">=18"
   },

remix-auth-rfd/package.json

@@ -19,7 +19,7 @@ export type RfdScope =
   | 'rfd:discussion:r'
   | 'search'
 
-export type RfdApiProvider = 'email' | 'google'
+export type RfdApiProvider = 'email' | 'google' | 'github'
 
 export type RfdAccessToken = {
   iss: string

remix-auth-rfd/src/index.ts

@@ -18,7 +18,7 @@ export class InvalidMethod extends Error {}
 export class MissingRequiredField extends Error {}
 export class RemoteError extends Error {}
 
-export type TurnstileMagicLinkStrategyOptions = {
+export type RfdMagicLinkStrategyOptions = {
   storage: SessionStorage
   host: string
   clientSecret: string
@@ -32,21 +32,21 @@ export type TurnstileMagicLinkStrategyOptions = {
   scope?: RfdScope[]
 }
 
-export type TurnstileMagicLinkVerifyParams = {
+export type RfdMagicLinkVerifyParams = {
   attemptId: string
   email: string
   user: GetUserResponse_for_RfdPermission
   token: string
 }
 
-export class TurnstileMagicLinkStrategy<User> extends Strategy<User, TurnstileMagicLinkVerifyParams> {
+export class RfdMagicLinkStrategy<User> extends Strategy<User, RfdMagicLinkVerifyParams> {
   public name = 'rfd-magic-link'
 
   // Session based storage to use for storing the client side authentication materials
   // for tracking the authentication flow
   private readonly storage: SessionStorage
 
-  // Turnstile server to perform authentication against
+  // Rfd server to perform authentication against
   private readonly host: string
 
   // Client secret that will be used to exchange magic link codes for user information
@@ -73,11 +73,11 @@ export class TurnstileMagicLinkStrategy<User> extends Strategy<User, TurnstileMa
   private readonly sessionAttemptKey: string = 'auth:v-ml:attempt'
   private readonly sessionEmailKey: string = 'auth:v-ml:email'
 
-  protected verify: Strategy.VerifyFunction<User, TurnstileMagicLinkVerifyParams>
+  protected verify: Strategy.VerifyFunction<User, RfdMagicLinkVerifyParams>
 
   constructor(
-    options: TurnstileMagicLinkStrategyOptions,
-    verify: Strategy.VerifyFunction<User, TurnstileMagicLinkVerifyParams>,
+    options: RfdMagicLinkStrategyOptions,
+    verify: Strategy.VerifyFunction<User, RfdMagicLinkVerifyParams>,
   ) {
     super(verify)
     this.verify = verify
@@ -151,7 +151,7 @@ export class TurnstileMagicLinkStrategy<User> extends Strategy<User, TurnstileMa
       session.set(this.sessionAttemptKey, attemptId)
       session.set(this.sessionEmailKey, email)
     } catch (err) {
-      console.error('Turnstile server failed to send magic link email', err)
+      console.error('RFD server failed to send magic link email', err)
       throw new RemoteError('Failed to send magic link email')
     }
 

remix-auth-rfd/src/magic-link.ts

@@ -13,7 +13,7 @@ import { Strategy } from 'remix-auth/strategy'
 import { RfdApiProvider, RfdScope } from '.'
 import { client, handleApiResponse } from './util'
 
-export type TurnstileOAuthStrategyOptions = {
+export type RfdOAuthStrategyOptions = {
   host: string
   clientId: string
   clientSecret: string
@@ -29,12 +29,12 @@ export type ExpiringUser = {
   expiresAt: Date
 }
 
-export type TurnstileVerifyCallback<T> = Strategy.VerifyFunction<T, OAuth2Strategy.VerifyOptions>
+export type RfdVerifyCallback<T> = Strategy.VerifyFunction<T, OAuth2Strategy.VerifyOptions>
 
-export class TurnstileOAuthStrategy<User extends ExpiringUser> extends OAuth2Strategy<
+export class RfdOAuthStrategy<User extends ExpiringUser> extends OAuth2Strategy<
   User
 > {
-  public name = `turnstile`
+  public name = `rfd`
   protected readonly userInfoUrl
   protected readonly host
 
@@ -46,8 +46,8 @@ export class TurnstileOAuthStrategy<User extends ExpiringUser> extends OAuth2Str
       redirectURI,
       remoteProvider,
       scopes,
-    }: TurnstileOAuthStrategyOptions,
-    verify: TurnstileVerifyCallback<User>,
+    }: RfdOAuthStrategyOptions,
+    verify: RfdVerifyCallback<User>,
   ) {
     super(
       {

remix-auth-rfd/src/oauth.ts

@@ -1,5 +1,5 @@
-import Api, { ApiResult } from '@oxide/turnstile.ts/client'
-import { ApiWithRetry } from '@oxide/turnstile.ts/client-retry'
+import Api, { ApiResult } from '@oxide/rfd.ts/client'
+import { ApiWithRetry } from '@oxide/rfd.ts/client-retry'
 
 const retryOnReset = () => {
   const limit = 1
@@ -22,10 +22,10 @@ export function handleApiResponse<T>(response: ApiResult<T>): T {
   if (response.type === 'success') {
     return response.data
   } else if (response.type === 'client_error') {
-    console.error('Failed attempting to send request to turnstile server', response)
+    console.error('Failed attempting to send request to RFD server', response)
     throw response.error as Error
   } else {
-    console.error('Failed attempting to send request to turnstile server', response)
+    console.error('Failed attempting to send request to RFD server', response)
     throw new Error(response.data.message)
   }
 }