@absolutejs/auth 0.9.5 → 0.10.1

package/dist/index.js

@@ -1768,7 +1768,7 @@ var COOKIE_DURATION = SECONDS_IN_A_MINUTE * COOKIE_MINUTES;
 var authorize = ({
   clientProviders,
   authorizeRoute = "/oauth2/:provider/authorization",
-  onAuthorize
+  onAuthorizeSuccess
 }) => new Elysia().get(authorizeRoute, async ({
   error,
   redirect,
@@ -1827,7 +1827,7 @@ var authorize = ({
   try {
     const authorizationURL = await providerInstance.createAuthorizationUrl(codeVerifier ? { codeVerifier, scope, state: currentState } : { scope, state: currentState });
     searchParams?.forEach(([key, value]) => authorizationURL.searchParams.set(key, value));
-    onAuthorize?.({
+    onAuthorizeSuccess?.({
       authorizationUrl: authorizationURL,
       authProvider: normalizedProvider
     });
@@ -1860,7 +1860,7 @@ var isNonEmptyString = (str) => str !== null && str !== undefined && str.trim()
 var callback = ({
   clientProviders,
   callbackRoute = "/oauth2/callback",
-  onCallback
+  onCallbackSuccess
 }) => new Elysia3().use(sessionStore()).get(callbackRoute, async ({
   error,
   redirect,
@@ -1904,7 +1904,7 @@ var callback = ({
   const originUrl = origin_url?.value ?? "/";
   try {
     const tokenResponse = await providerInstance.validateAuthorizationCode(requiresPKCE ? { code, codeVerifier: verifier } : { code });
-    await onCallback?.({
+    await onCallbackSuccess?.({
       authProvider,
       originUrl,
       providerInstance,
@@ -1923,7 +1923,7 @@ import { Elysia as Elysia4 } from "elysia";
 var profile = ({
   clientProviders,
   profileRoute = "/oauth2/profile",
-  onProfile
+  onProfileSuccess
 }) => new Elysia4().use(sessionStore()).get(profileRoute, async ({
   error,
   store: { session },
@@ -1952,7 +1952,7 @@ var profile = ({
   const { accessToken } = userSession;
   try {
     const userProfile = await providerInstance.fetchUserProfile(accessToken);
-    await onProfile?.({
+    await onProfileSuccess?.({
       authProvider: auth_provider.value,
       userProfile
     });
@@ -1977,14 +1977,14 @@ var protectRoute = () => new Elysia5().use(sessionStore()).derive(({ store: { se
     }
     return handleAuth();
   }
-})).as("scoped");
+})).as("global");
 
 // src/refresh.ts
 import { Elysia as Elysia6 } from "elysia";
 var refresh = ({
   clientProviders,
   refreshRoute = "/oauth2/tokens",
-  onRefresh
+  onRefreshSuccess
 }) => new Elysia6().use(sessionStore()).post(refreshRoute, async ({
   error,
   store: { session },
@@ -2019,7 +2019,7 @@ var refresh = ({
   }
   try {
     const tokenResponse = await providerInstance.refreshAccessToken(refreshToken);
-    onRefresh?.({
+    onRefreshSuccess?.({
       authProvider: auth_provider.value,
       tokenResponse
     });
@@ -2039,7 +2039,7 @@ import { Elysia as Elysia7 } from "elysia";
 var revoke = ({
   clientProviders,
   revokeRoute = "/oauth2/revocation",
-  onRevocation
+  onRevocationSuccess
 }) => new Elysia7().use(sessionStore()).post(revokeRoute, async ({
   error,
   store: { session },
@@ -2071,7 +2071,7 @@ var revoke = ({
   const { accessToken } = userSession;
   try {
     await providerInstance.revokeToken(accessToken);
-    onRevocation?.({
+    onRevocationSuccess?.({
       authProvider: auth_provider.value,
       tokenToRevoke: accessToken
     });
@@ -2106,20 +2106,23 @@ var signout = ({
     return error("Unauthorized", "No user session found");
   }
   const userSession = session[user_session_id.value];
-  user_session_id.remove();
-  auth_provider.remove();
   if (userSession === undefined) {
-    return new Response(null, { status: 204 });
+    return error("Unauthorized", "User session not found");
   }
+  session[user_session_id.value] = undefined;
+  user_session_id.remove();
+  auth_provider.remove();
   try {
     onSignOut?.({
       authProvider: auth_provider.value,
-      user: userSession.user
+      userSession
     });
     return new Response(null, { status: 204 });
   } catch (err) {
-    const msg = err instanceof Error ? `Failed to sign out: ${err.message}` : `Failed to sign out: ${err}`;
-    return error("Internal Server Error", msg);
+    if (err instanceof Error) {
+      return error("Internal Server Error", `Error: ${err.message} - ${err.stack ?? ""}`);
+    }
+    return error("Internal Server Error", `Unknown Error: ${err}`);
   }
 });
 
@@ -2136,37 +2139,17 @@ var status = ({
   if (user_session_id === undefined) {
     return error("Bad Request", "Cookies are missing");
   }
-  if (user_session_id.value === undefined) {
-    onStatus?.({
-      user: null
-    });
-    return new Response(JSON.stringify({ isLoggedIn: false, user: null }), {
-      headers: { "Content-Type": "application/json" }
-    });
-  }
-  const userSession = session[user_session_id.value];
-  if (userSession === undefined) {
-    onStatus?.({
-      user: null
-    });
-    return new Response(JSON.stringify({ isLoggedIn: false, user: null }), {
-      headers: { "Content-Type": "application/json" }
-    });
-  }
-  const { user } = userSession;
+  const sessionId = user_session_id.value;
+  const user = sessionId !== undefined && session[sessionId] ? session[sessionId].user : null;
   try {
-    onStatus?.({
-      user
-    });
+    await onStatus?.({ user });
   } catch (err) {
     if (err instanceof Error) {
       return error("Internal Server Error", `Error: ${err.message} - ${err.stack ?? ""}`);
     }
     return error("Internal Server Error", `Unknown Error: ${err}`);
   }
-  return new Response(JSON.stringify({ isLoggedIn: true, user }), {
-    headers: { "Content-Type": "application/json" }
-  });
+  return new Response(JSON.stringify({ isLoggedIn: user !== null, user }), { headers: { "Content-Type": "application/json" } });
 });
 // src/utils.ts
 var instantiateUserSession = async ({
@@ -2217,13 +2200,13 @@ var absoluteAuth = async ({
   statusRoute,
   refreshRoute,
   revokeRoute,
-  onAuthorize,
-  onProfile,
-  onCallback,
+  onAuthorizeSuccess,
+  onProfileSuccess,
+  onCallbackSuccess,
   onStatus,
-  onRefresh,
+  onRefreshSuccess,
   onSignOut,
-  onRevocation
+  onRevocationSuccess
 }) => {
   const entryPromises = [];
   for (const [providerName, providerConfig] of Object.entries(providersConfiguration)) {
@@ -2239,15 +2222,15 @@ var absoluteAuth = async ({
     ]));
   }
   const clientProviders = Object.fromEntries(await Promise.all(entryPromises));
-  return new Elysia10().use(signout({ onSignOut, signoutRoute })).use(revoke({ clientProviders, onRevocation, revokeRoute })).use(status({ onStatus, statusRoute })).use(refresh({ clientProviders, onRefresh, refreshRoute })).use(authorize({ authorizeRoute, clientProviders, onAuthorize })).use(callback({
+  return new Elysia10().use(signout({ onSignOut, signoutRoute })).use(revoke({ clientProviders, onRevocationSuccess, revokeRoute })).use(status({ onStatus, statusRoute })).use(refresh({ clientProviders, onRefreshSuccess, refreshRoute })).use(authorize({ authorizeRoute, clientProviders, onAuthorizeSuccess })).use(callback({
     callbackRoute,
     clientProviders,
-    onCallback
+    onCallbackSuccess
   })).use(profile({
     clientProviders,
-    onProfile,
+    onProfileSuccess,
     profileRoute
-  })).use(protectRoute()).as("scoped");
+  })).use(protectRoute());
 };
 export {
   scopeRequiredProviderOptions,
@@ -2271,5 +2254,5 @@ export {
   absoluteAuth
 };
 
-//# debugId=BC759492E9C8975864756E2164756E21
+//# debugId=8D19AE9D1492196B64756E2164756E21
 //# sourceMappingURL=index.js.map