@sixb/core 0.1.11 → 0.1.13

package/src/auth/csrf.ts

@@ -14,20 +14,29 @@ export function isCsrfExemptMethod(method: string): boolean {
 
 export function verifyDoubleSubmitCsrf(
   request: Request,
-  options: { readonly cookieName: string; readonly headerName?: string }
+  options: { readonly cookieName: string }
 ): boolean {
   if (isCsrfExemptMethod(request.method)) {
     return true
   }
 
-  const cookieValue = getCookie(request, options.cookieName)
-  const headerValue = request.headers.get(options.headerName ?? CSRF_HEADER_NAME)
+  return verifyCsrfToken(request, {
+    cookieName: options.cookieName,
+    token: request.headers.get(CSRF_HEADER_NAME),
+  })
+}
 
-  if (!cookieValue || !headerValue) {
+/** Match a submitted CSRF token (header or form field) against the request's CSRF cookie. */
+export function verifyCsrfToken(
+  request: Request,
+  options: { readonly cookieName: string; readonly token: string | null }
+): boolean {
+  const cookieValue = getCookie(request, options.cookieName)
+  if (!cookieValue || !options.token) {
     return false
   }
 
-  return safeEqual(cookieValue, headerValue)
+  return safeEqual(cookieValue, options.token)
 }
 
 function safeEqual(left: string, right: string): boolean {

package/src/auth/index.ts

@@ -15,6 +15,7 @@ export {
   isValidAuthSessionAudience,
   resolveAuthSessionAudience,
 } from "./audience"
+export { getRequestClientAddress, setRequestClientAddress } from "./client-address"
 export {
   clearCsrfCookieHeader,
   clearSessionCookieHeader,
@@ -32,6 +33,7 @@ export {
   CSRF_HEADER_NAME,
   generateCsrfToken,
   isCsrfExemptMethod,
+  verifyCsrfToken,
   verifyDoubleSubmitCsrf,
 } from "./csrf"
 export type { AuthRuntimeErrorCode } from "./errors"
@@ -85,6 +87,7 @@ export type {
   GetMembershipOptionsResult,
   InvitationDeliveryAuthStrategy,
   InvitationDeliveryInput,
+  InvitationDestination,
   InvitationGroupOption,
   InvitationRecipientInput,
   InvitationRecipientResult,
@@ -92,7 +95,6 @@ export type {
   InviteDeliveryResult,
   InviteDeliveryStatus,
   InviteUserInput,
-  InviteUserOptions,
   InviteUserResult,
   ListInvitationsInput,
   ListInvitationsResult,
@@ -133,7 +135,6 @@ export type {
   RevokePersonalAccessTokenInput,
   RevokeServiceAccountAccessTokenInput,
   RevokeServiceAccountAccessTokenResult,
-  SecurityContext,
   ServiceAccountWithGroups,
   SixbAuthConfig,
   SuspendMemberInput,