@auth/solid-start 0.1.0 → 0.1.2

package/README.MD

@@ -27,8 +27,8 @@ AUTH_TRUST_HOST=true
 in this example we are using github so make sure to set the following environment variables:
 
 ```
-GITHUB_ID=your_github_oatuh_id
-GITHUB_SECRET=your_github_oatuh_secret
+GITHUB_ID=your_github_oauth_id
+GITHUB_SECRET=your_github_oauth_secret
 ```
 
 ```ts

package/client.d.ts

@@ -1,6 +1,24 @@
-import { LiteralUnion, SignInOptions, SignInAuthorizationParams, SignOutParams } from 'next-auth/react';
 import { RedirectableProviderType, BuiltInProviderType } from '@auth/core/providers';
 
+type LiteralUnion<T extends U, U = string> = T | (U & Record<never, never>);
+interface SignInOptions extends Record<string, unknown> {
+    /**
+     * Specify to which URL the user will be redirected after signing in. Defaults to the page URL the sign-in is initiated from.
+     *
+     * [Documentation](https://next-auth.js.org/getting-started/client#specifying-a-callbackurl)
+     */
+    callbackUrl?: string;
+    /** [Documentation](https://next-auth.js.org/getting-started/client#using-the-redirect-false-option) */
+    redirect?: boolean;
+}
+interface SignOutParams<R extends boolean = true> {
+    /** [Documentation](https://next-auth.js.org/getting-started/client#specifying-a-callbackurl-1) */
+    callbackUrl?: string;
+    /** [Documentation](https://next-auth.js.org/getting-started/client#using-the-redirect-false-option-1 */
+    redirect?: R;
+}
+/** Match `inputType` of `new URLSearchParams(inputType)` */
+type SignInAuthorizationParams = string | string[][] | Record<string, string> | URLSearchParams;
 /**
  * Client-side method to initiate a signin flow
  * or send the user to the signin page listing all possible providers.
@@ -17,4 +35,4 @@ declare function signIn<P extends RedirectableProviderType | undefined = undefin
  */
 declare function signOut(options?: SignOutParams): Promise<void>;
 
-export { signIn, signOut };
+export { SignInAuthorizationParams, signIn, signOut };

package/index.js

@@ -1,6 +1,4 @@
 import { Auth } from "@auth/core";
-import { parseString, splitCookiesString } from "set-cookie-parser";
-import { serialize } from "cookie";
 const actions = [
   "providers",
   "session",
@@ -11,23 +9,6 @@ const actions = [
   "verify-request",
   "error"
 ];
-const getSetCookieCallback = (cook) => {
-  if (!cook)
-    return;
-  const splitCookie = splitCookiesString(cook);
-  for (const cookName of [
-    "__Secure-next-auth.session-token",
-    "next-auth.session-token",
-    "next-auth.pkce.code_verifier",
-    "__Secure-next-auth.pkce.code_verifier"
-  ]) {
-    const temp = splitCookie.find((e) => e.startsWith(`${cookName}=`));
-    if (temp) {
-      return parseString(temp);
-    }
-  }
-  return parseString(splitCookie?.[0] ?? "");
-};
 function SolidAuthHandler(prefix, authOptions) {
   return async (event) => {
     const { request } = event;
@@ -36,19 +17,7 @@ function SolidAuthHandler(prefix, authOptions) {
     if (!actions.includes(action) || !url.pathname.startsWith(prefix + "/")) {
       return;
     }
-    const res = await Auth(request, authOptions);
-    if (["callback", "signin", "signout"].includes(action)) {
-      const parsedCookie = getSetCookieCallback(
-        res.clone().headers.get("Set-Cookie")
-      );
-      if (parsedCookie) {
-        res.headers.set(
-          "Set-Cookie",
-          serialize(parsedCookie.name, parsedCookie.value, parsedCookie)
-        );
-      }
-    }
-    return res;
+    return await Auth(request, authOptions);
   };
 }
 function SolidAuth(config) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@auth/solid-start",
   "description": "Authentication for SolidStart.",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "files": [
     "client.*",
@@ -24,23 +24,17 @@
   },
   "devDependencies": {
     "@solidjs/meta": "^0.28.0",
-    "@types/cookie": "0.5.1",
     "@types/node": "^18.7.14",
-    "@types/set-cookie-parser": "^2.4.2",
     "solid-js": "^1.5.7",
-    "solid-start": "^0.2.1",
+    "solid-start": "^0.2.14",
     "tsup": "^6.5.0",
-    "typescript": "^4.8.2",
-    "@auth/core": "0.2.3",
-    "next-auth": "4.18.6"
+    "typescript": "5.2.2",
+    "@auth/core": "0.16.0"
   },
   "peerDependencies": {
     "@auth/core": "~0.2.2 || ^0.2.2",
     "solid-js": "^1.5.7",
-    "solid-start": "^0.2.1"
-  },
-  "dependencies": {
-    "set-cookie-parser": "^2.5.1"
+    "solid-start": "^0.2.14"
   },
   "keywords": [
     "SolidJS",

package/src/client.ts

@@ -1,14 +1,35 @@
-import type {
-  LiteralUnion,
-  SignInOptions,
-  SignInAuthorizationParams,
-  SignOutParams,
-} from "next-auth/react"
 import type {
   BuiltInProviderType,
   RedirectableProviderType,
 } from "@auth/core/providers"
 
+type LiteralUnion<T extends U, U = string> = T | (U & Record<never, never>)
+
+interface SignInOptions extends Record<string, unknown> {
+  /**
+   * Specify to which URL the user will be redirected after signing in. Defaults to the page URL the sign-in is initiated from.
+   *
+   * [Documentation](https://next-auth.js.org/getting-started/client#specifying-a-callbackurl)
+   */
+  callbackUrl?: string
+  /** [Documentation](https://next-auth.js.org/getting-started/client#using-the-redirect-false-option) */
+  redirect?: boolean
+}
+
+interface SignOutParams<R extends boolean = true> {
+  /** [Documentation](https://next-auth.js.org/getting-started/client#specifying-a-callbackurl-1) */
+  callbackUrl?: string
+  /** [Documentation](https://next-auth.js.org/getting-started/client#using-the-redirect-false-option-1 */
+  redirect?: R
+}
+
+/** Match `inputType` of `new URLSearchParams(inputType)` */
+export type SignInAuthorizationParams =
+  | string
+  | string[][]
+  | Record<string, string>
+  | URLSearchParams
+
 /**
  * Client-side method to initiate a signin flow
  * or send the user to the signin page listing all possible providers.
@@ -51,7 +72,7 @@ export async function signIn<
       "Content-Type": "application/x-www-form-urlencoded",
       "X-Auth-Return-Redirect": "1",
     },
-    // @ts-expect-error -- ignore
+    // @ts-ignore
     body: new URLSearchParams({
       ...options,
       csrfToken,

package/src/index.ts

@@ -1,6 +1,4 @@
 import { Auth } from "@auth/core"
-import { Cookie, parseString, splitCookiesString } from "set-cookie-parser"
-import { serialize } from "cookie"
 import type { AuthAction, AuthConfig, Session } from "@auth/core/types"
 
 export interface SolidAuthConfig extends AuthConfig {
@@ -22,26 +20,6 @@ const actions: AuthAction[] = [
   "error",
 ]
 
-// currently multiple cookies are not supported, so we keep the next-auth.pkce.code_verifier cookie for now:
-// because it gets updated anyways
-// src: https://github.com/solidjs/solid-start/issues/293
-const getSetCookieCallback = (cook?: string | null): Cookie | undefined => {
-  if (!cook) return
-  const splitCookie = splitCookiesString(cook)
-  for (const cookName of [
-    "__Secure-next-auth.session-token",
-    "next-auth.session-token",
-    "next-auth.pkce.code_verifier",
-    "__Secure-next-auth.pkce.code_verifier",
-  ]) {
-    const temp = splitCookie.find((e) => e.startsWith(`${cookName}=`))
-    if (temp) {
-      return parseString(temp)
-    }
-  }
-  return parseString(splitCookie?.[0] ?? "") // just return the first cookie if no session token is found
-}
-
 function SolidAuthHandler(prefix: string, authOptions: SolidAuthConfig) {
   return async (event: any) => {
     const { request } = event
@@ -54,19 +32,7 @@ function SolidAuthHandler(prefix: string, authOptions: SolidAuthConfig) {
       return
     }
 
-    const res = await Auth(request, authOptions)
-    if (["callback", "signin", "signout"].includes(action)) {
-      const parsedCookie = getSetCookieCallback(
-        res.clone().headers.get("Set-Cookie")
-      )
-      if (parsedCookie) {
-        res.headers.set(
-          "Set-Cookie",
-          serialize(parsedCookie.name, parsedCookie.value, parsedCookie as any)
-        )
-      }
-    }
-    return res
+    return await Auth(request, authOptions)
   }
 }