PR comments #2

waspc/data/Generator/templates/sdk/wasp/server/auth/hooks.ts

@@ -3,7 +3,6 @@ import type { Request as ExpressRequest } from 'express'
 import { type ProviderId, createUser, findAuthWithUserBy } from '../../auth/utils.js'
 import { prisma } from '../index.js'
 import { Expand } from '../../universal/types.js'
-import { ProviderName } from '../_types/index.js';
 
 // PUBLIC API
 export type OnBeforeSignupHook = (
@@ -71,7 +70,7 @@ type OnAfterSignupHookParams = {
    * OAuth flow data that was generated during the OAuth flow. This is only
    * available if the user signed up using OAuth.
   */
-  oauth?: OAuthParams
+  oauth?: OAuthData
   /**
    * Request object that can be used to access the incoming request.
   */
@@ -86,7 +85,7 @@ type OnBeforeOAuthRedirectHookParams = {
   /**
    * Unique request ID that was generated during the OAuth flow.
   */
-  uniqueRequestId: OAuthParams['uniqueRequestId']
+  oauth: Pick<OAuthData, 'uniqueRequestId'>
   /**
    * Request object that can be used to access the incoming request.
   */
@@ -117,15 +116,15 @@ type OnAfterLoginHookParams = {
    * OAuth flow data that was generated during the OAuth flow. This is only
    * available if the user logged in using OAuth.
   */
-  oauth?: OAuthParams
+  oauth?: OAuthData
   /**
    * Request object that can be used to access the incoming request.
   */
   req: ExpressRequest
 } & InternalAuthHookParams
 
 // PRIVATE API (server)
-export type OAuthParams = {
+export type OAuthData = {
   /**
    * Unique request ID that was generated during the OAuth flow.
   */

waspc/data/Generator/templates/sdk/wasp/server/auth/index.ts

@@ -30,7 +30,7 @@ export type {
   OnBeforeLoginHook,
   OnAfterLoginHook,
   InternalAuthHookParams,
-  OAuthParams,
+  OAuthData,
 } from './hooks.js'
 
 {=# isExternalAuthEnabled =}

waspc/data/Generator/templates/server/src/auth/providers/oauth/handler.ts

@@ -19,10 +19,10 @@ import {
   loginPath,
   handleOAuthErrorAndGetRedirectUri,
 } from 'wasp/server/auth'
-import { OAuthParams } from 'wasp/server/auth'
+import { OAuthData } from 'wasp/server/auth'
 import { onBeforeOAuthRedirectHook } from '../../hooks.js'
 
-export function createOAuthProviderRouter<OT extends OAuthType, Tokens extends OAuthParams['tokens'] = never>({
+export function createOAuthProviderRouter<OT extends OAuthType, Tokens extends OAuthData['tokens'] = never>({
   provider,
   oAuthType,
   userSignupFields,
@@ -75,7 +75,7 @@ export function createOAuthProviderRouter<OT extends OAuthType, Tokens extends O
       const { url: redirectUrlAfterHook } = await onBeforeOAuthRedirectHook({
         req,
         url: redirectUrl,
-        uniqueRequestId: oAuthState.state,
+        oauth: { uniqueRequestId: oAuthState.state }
       })
       return redirect(res, redirectUrlAfterHook.toString())
     }),

waspc/data/Generator/templates/server/src/auth/providers/oauth/user.ts

@@ -11,7 +11,7 @@ import {
 import { type {= authEntityUpper =} } from 'wasp/entities'
 import { prisma } from 'wasp/server'
 import { type UserSignupFields, type ProviderConfig } from 'wasp/auth/providers/types'
-import { type OAuthParams } from 'wasp/server/auth'
+import { type OAuthData } from 'wasp/server/auth'
 import { getRedirectUriForOneTimeCode, tokenStore } from 'wasp/server/auth'
 import {
   onBeforeSignupHook,
@@ -33,7 +33,7 @@ export async function finishOAuthFlowAndGetRedirectUri({
   providerUserId: string;
   userSignupFields: UserSignupFields | undefined;
   req: ExpressRequest;
-  oauth: OAuthParams;
+  oauth: OAuthData;
 }): Promise<URL> {
   const providerId = createProviderId(provider.id, providerUserId);
 
@@ -63,7 +63,7 @@ async function getAuthIdFromProviderDetails({
   providerProfile: any;
   userSignupFields: UserSignupFields | undefined;
   req: ExpressRequest;
-  oauth: OAuthParams;
+  oauth: OAuthData;
 }): Promise<{= authEntityUpper =}['id']> {
   const existingAuthIdentity = await prisma.{= authIdentityEntityLower =}.findUnique({
     where: {

waspc/examples/todoApp/src/auth/hooks.ts

@@ -43,7 +43,7 @@ export const onBeforeOAuthRedirect: OnBeforeOAuthRedirectHook = async (
   log('query params before oAuth redirect', args.req.query)
 
   // Saving query params for later use in onAfterSignup hook
-  const id = args.uniqueRequestId
+  const id = args.oauth.uniqueRequestId
   oAuthQueryStore.set(id, args.req.query)
 
   return { url: args.url }