@withstudiocms/auth-kit 0.1.0-beta.2 → 0.1.0-beta.4

package/dist/config.js

@@ -22,7 +22,7 @@ function makePasswordModConfig({
     throw new Error(`CMS_ENCRYPTION_KEY must decode to 16 bytes, got ${raw.byteLength}`);
   }
   const clamp = (v, min, max) => Number.isSafeInteger(v) ? Math.min(max, Math.max(min, v)) : min;
-  const env = (k) => typeof process !== "undefined" && process.env ? process.env[k] : void 0;
+  const env = (k) => process?.env?.[k];
   const parsedN = Number.parseInt(env("SCRYPT_N") ?? "", 10);
   const parsedR = Number.parseInt(env("SCRYPT_R") ?? "", 10);
   const parsedP = Number.parseInt(env("SCRYPT_P") ?? "", 10);

package/dist/index.d.ts

@@ -7,15 +7,15 @@ export { Password } from './modules/password.js';
  * @param scrypt - The scrypt configuration object from `PasswordModConfigFinal`.
  * @returns An Effect that provides an object with a `run` method for performing scrypt operations.
  */
-export declare const makeScrypt: (config: PasswordModConfigFinal) => Effect.Effect.AsEffect<Effect.Effect<Effect.Effect<{
+export declare const makeScrypt: (config: PasswordModConfigFinal) => Effect.Effect<Effect.Effect<{
     run: (password: import("crypto").BinaryLike) => Effect.Effect<Buffer<ArrayBufferLike>, import("@withstudiocms/effect/scrypt").ScryptError, never>;
-}, never, never>, Error, never>>;
+}, never, never>, Error, never>;
 declare const AuthKit_base: Effect.Service.Class<AuthKit, "@withstudiocms/AuthKit", {
     readonly effect: Effect.Effect<{
         readonly Encryption: Effect.Effect<{
-            readonly encrypt: (data: Uint8Array<ArrayBufferLike>) => Effect.Effect.AsEffect<Effect.Effect<Uint8Array<ArrayBufferLike>, import("./errors.js").EncryptionError, never>>;
+            readonly encrypt: (data: Uint8Array<ArrayBufferLike>) => Effect.Effect<Uint8Array<ArrayBufferLike>, import("./errors.js").EncryptionError, never>;
             readonly encryptToString: (data: string) => Effect.Effect<Uint8Array<ArrayBufferLike>, import("./errors.js").EncryptionError, never>;
-            readonly decrypt: (data: Uint8Array<ArrayBufferLike>) => Effect.Effect.AsEffect<Effect.Effect<Uint8Array<ArrayBufferLike>, import("./errors.js").DecryptionError, never>>;
+            readonly decrypt: (data: Uint8Array<ArrayBufferLike>) => Effect.Effect<Uint8Array<ArrayBufferLike>, import("./errors.js").DecryptionError, never>;
             readonly decryptToString: (data: Uint8Array<ArrayBufferLike>) => Effect.Effect<string, import("./errors.js").DecryptionError, never>;
         }, import("./errors.js").EncryptionError, never>;
         readonly Password: Effect.Effect<{
@@ -24,18 +24,18 @@ declare const AuthKit_base: Effect.Service.Class<AuthKit, "@withstudiocms/AuthKi
             readonly verifyPasswordStrength: (pass: string) => Effect.Effect<string | true, import("./errors.js").PasswordError | import("./errors.js").CheckIfUnsafeError | import("@effect/platform/HttpClientError").ResponseError, never>;
         }, never, never>;
         readonly Session: Effect.Effect<{
-            readonly generateSessionToken: () => Effect.Effect.AsEffect<Effect.Effect<string, import("./errors.js").SessionError, never>>;
+            readonly generateSessionToken: () => Effect.Effect<string, import("./errors.js").SessionError, never>;
             readonly createSession: (token: string, userId: string) => Effect.Effect<import("./types.js").UserSession, import("./errors.js").SessionError, never>;
             readonly validateSessionToken: (token: string) => Effect.Effect<import("./types.js").SessionValidationResult, import("./errors.js").SessionError, never>;
-            readonly invalidateSession: (sessionId: string) => Effect.Effect.AsEffect<Effect.Effect<void, import("./errors.js").SessionError, never>>;
-            readonly setSessionTokenCookie: (context: import("astro").APIContext<Record<string, any>, Record<string, string | undefined>> | import("astro").AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, token: string, expiresAt: Date, secure?: boolean | undefined) => Effect.Effect.AsEffect<Effect.Effect<void, import("./errors.js").SessionError, never>>;
-            readonly deleteSessionTokenCookie: (context: import("astro").APIContext<Record<string, any>, Record<string, string | undefined>> | import("astro").AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, secure?: boolean | undefined) => Effect.Effect.AsEffect<Effect.Effect<void, import("./errors.js").SessionError, never>>;
-            readonly setOAuthSessionTokenCookie: (context: import("astro").APIContext<Record<string, any>, Record<string, string | undefined>> | import("astro").AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, key: string, value: string, secure?: boolean | undefined) => Effect.Effect.AsEffect<Effect.Effect<void, import("./errors.js").SessionError, never>>;
+            readonly invalidateSession: (sessionId: string) => Effect.Effect<void, import("./errors.js").SessionError, never>;
+            readonly setSessionTokenCookie: (context: import("astro").APIContext<Record<string, any>, Record<string, string | undefined>> | import("astro").AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, token: string, expiresAt: Date, secure?: boolean | undefined) => Effect.Effect<void, import("./errors.js").SessionError, never>;
+            readonly deleteSessionTokenCookie: (context: import("astro").APIContext<Record<string, any>, Record<string, string | undefined>> | import("astro").AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, secure?: boolean | undefined) => Effect.Effect<void, import("./errors.js").SessionError, never>;
+            readonly setOAuthSessionTokenCookie: (context: import("astro").APIContext<Record<string, any>, Record<string, string | undefined>> | import("astro").AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, key: string, value: string, secure?: boolean | undefined) => Effect.Effect<void, import("./errors.js").SessionError, never>;
             readonly createUserSession: (userId: string, context: import("astro").APIContext<Record<string, any>, Record<string, string | undefined>> | import("astro").AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, secure?: boolean | undefined) => Effect.Effect<void, import("./errors.js").SessionError, never>;
         }, import("./errors.js").SessionError, never>;
         readonly User: Effect.Effect<{
             readonly verifyUsernameInput: (username: string) => Effect.Effect<string | true, import("./errors.js").CheckIfUnsafeError | import("./errors.js").UserError, never>;
-            readonly createUserAvatar: (email: string) => Effect.Effect.AsEffect<Effect.Effect<string, import("./errors.js").UserError, never>>;
+            readonly createUserAvatar: (email: string) => Effect.Effect<string, import("./errors.js").UserError, never>;
             readonly createLocalUser: (name: string, username: string, email: string, password: string) => Effect.Effect<{
                 name: string;
                 username: string;
@@ -79,7 +79,7 @@ declare const AuthKit_base: Effect.Service.Class<AuthKit, "@withstudiocms/AuthKi
                 notifications: string | null;
             }, import("@withstudiocms/effect/scrypt").ScryptError | import("./errors.js").UserError, never>;
             readonly getUserPasswordHash: (userId: string) => Effect.Effect<string, import("./errors.js").UserError, never>;
-            readonly getUserFromEmail: (email: string) => Effect.Effect.AsEffect<Effect.Effect<import("./types.js").CombinedUserData | null | undefined, import("./errors.js").UserError, never>>;
+            readonly getUserFromEmail: (email: string) => Effect.Effect<import("./types.js").CombinedUserData | null | undefined, import("./errors.js").UserError, never>;
             readonly getUserData: (context: import("astro").APIContext<Record<string, any>, Record<string, string | undefined>> | import("astro").AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>) => Effect.Effect<import("./types.js").UserSessionData, import("./errors.js").SessionError | import("./errors.js").UserError, never>;
             readonly getUserPermissionLevel: (userData: import("./types.js").UserSessionData | import("./types.js").CombinedUserData | null) => Effect.Effect<import("./types.js").UserPermissionLevel, import("./errors.js").UserError, never>;
             readonly isUserAllowed: (userData: import("./types.js").UserSessionData | import("./types.js").CombinedUserData | null, requiredPerms: "owner" | "admin" | "editor" | "visitor" | "unknown") => Effect.Effect<boolean, import("./errors.js").UserError, never>;

package/dist/modules/encryption.d.ts

@@ -15,8 +15,8 @@ import { Effect } from '@withstudiocms/effect';
  * Throws errors if encryption or decryption fails, or if the input data is invalid.
  */
 export declare const Encryption: (CMS_ENCRYPTION_KEY: string) => Effect.Effect<{
-    readonly encrypt: (data: Uint8Array<ArrayBufferLike>) => Effect.Effect.AsEffect<Effect.Effect<Uint8Array<ArrayBufferLike>, import("../errors.js").EncryptionError, never>>;
+    readonly encrypt: (data: Uint8Array<ArrayBufferLike>) => Effect.Effect<Uint8Array<ArrayBufferLike>, import("../errors.js").EncryptionError, never>;
     readonly encryptToString: (data: string) => Effect.Effect<Uint8Array<ArrayBufferLike>, import("../errors.js").EncryptionError, never>;
-    readonly decrypt: (data: Uint8Array<ArrayBufferLike>) => Effect.Effect.AsEffect<Effect.Effect<Uint8Array<ArrayBufferLike>, import("../errors.js").DecryptionError, never>>;
+    readonly decrypt: (data: Uint8Array<ArrayBufferLike>) => Effect.Effect<Uint8Array<ArrayBufferLike>, import("../errors.js").DecryptionError, never>;
     readonly decryptToString: (data: Uint8Array<ArrayBufferLike>) => Effect.Effect<string, import("../errors.js").DecryptionError, never>;
 }, import("../errors.js").EncryptionError, never>;

package/dist/modules/session.d.ts

@@ -23,12 +23,12 @@ import type { SessionConfig, SessionValidationResult } from '../types.js';
  * @throws {SessionError} If required session tools are not provided in the configuration.
  */
 export declare const Session: (config: SessionConfig) => Effect.Effect<{
-    readonly generateSessionToken: () => Effect.Effect.AsEffect<Effect.Effect<string, SessionError, never>>;
+    readonly generateSessionToken: () => Effect.Effect<string, SessionError, never>;
     readonly createSession: (token: string, userId: string) => Effect.Effect<import("../types.js").UserSession, SessionError, never>;
     readonly validateSessionToken: (token: string) => Effect.Effect<SessionValidationResult, SessionError, never>;
-    readonly invalidateSession: (sessionId: string) => Effect.Effect.AsEffect<Effect.Effect<void, SessionError, never>>;
-    readonly setSessionTokenCookie: (context: APIContext<Record<string, any>, Record<string, string | undefined>> | AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, token: string, expiresAt: Date, secure?: boolean | undefined) => Effect.Effect.AsEffect<Effect.Effect<void, SessionError, never>>;
-    readonly deleteSessionTokenCookie: (context: APIContext<Record<string, any>, Record<string, string | undefined>> | AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, secure?: boolean | undefined) => Effect.Effect.AsEffect<Effect.Effect<void, SessionError, never>>;
-    readonly setOAuthSessionTokenCookie: (context: APIContext<Record<string, any>, Record<string, string | undefined>> | AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, key: string, value: string, secure?: boolean | undefined) => Effect.Effect.AsEffect<Effect.Effect<void, SessionError, never>>;
+    readonly invalidateSession: (sessionId: string) => Effect.Effect<void, SessionError, never>;
+    readonly setSessionTokenCookie: (context: APIContext<Record<string, any>, Record<string, string | undefined>> | AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, token: string, expiresAt: Date, secure?: boolean | undefined) => Effect.Effect<void, SessionError, never>;
+    readonly deleteSessionTokenCookie: (context: APIContext<Record<string, any>, Record<string, string | undefined>> | AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, secure?: boolean | undefined) => Effect.Effect<void, SessionError, never>;
+    readonly setOAuthSessionTokenCookie: (context: APIContext<Record<string, any>, Record<string, string | undefined>> | AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, key: string, value: string, secure?: boolean | undefined) => Effect.Effect<void, SessionError, never>;
     readonly createUserSession: (userId: string, context: APIContext<Record<string, any>, Record<string, string | undefined>> | AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>, secure?: boolean | undefined) => Effect.Effect<void, SessionError, never>;
 }, SessionError, never>;

package/dist/modules/user.d.ts

@@ -34,7 +34,7 @@ import { UserPermissionLevel } from '../types.js';
  */
 export declare const User: ({ Scrypt, session, userTools }: UserConfig) => Effect.Effect<{
     readonly verifyUsernameInput: (username: string) => Effect.Effect<string | true, import("../errors.js").CheckIfUnsafeError | UserError, never>;
-    readonly createUserAvatar: (email: string) => Effect.Effect.AsEffect<Effect.Effect<string, UserError, never>>;
+    readonly createUserAvatar: (email: string) => Effect.Effect<string, UserError, never>;
     readonly createLocalUser: (name: string, username: string, email: string, password: string) => Effect.Effect<{
         name: string;
         username: string;
@@ -78,7 +78,7 @@ export declare const User: ({ Scrypt, session, userTools }: UserConfig) => Effec
         notifications: string | null;
     }, import("@withstudiocms/effect/scrypt").ScryptError | UserError, never>;
     readonly getUserPasswordHash: (userId: string) => Effect.Effect<string, UserError, never>;
-    readonly getUserFromEmail: (email: string) => Effect.Effect.AsEffect<Effect.Effect<CombinedUserData | null | undefined, UserError, never>>;
+    readonly getUserFromEmail: (email: string) => Effect.Effect<CombinedUserData | null | undefined, UserError, never>;
     readonly getUserData: (context: APIContext<Record<string, any>, Record<string, string | undefined>> | AstroGlobal<Record<string, any>, import("astro/runtime/server/index.js").AstroComponentFactory, Record<string, string | undefined>>) => Effect.Effect<UserSessionData, import("../errors.js").SessionError | UserError, never>;
     readonly getUserPermissionLevel: (userData: UserSessionData | CombinedUserData | null) => Effect.Effect<UserPermissionLevel, UserError, never>;
     readonly isUserAllowed: (userData: UserSessionData | CombinedUserData | null, requiredPerms: "owner" | "admin" | "editor" | "visitor" | "unknown") => Effect.Effect<boolean, UserError, never>;

package/dist/utils/libravatar.d.ts

@@ -14,7 +14,7 @@ interface UserIdentity {
     hash: string | null;
     domain: string | null;
 }
-type TargetComponents = [string | null, number | null];
+export type TargetComponents = [string | null, number | null];
 /**
  * Return the right (target, port) pair from a list of SRV records.
  */

package/dist/utils/password.d.ts

@@ -33,7 +33,7 @@ export declare const buildSecurePassword: (args_0: {
     generation: string;
     salt: string;
     hash: string;
-}) => Effect.Effect.AsEffect<Effect.Effect<string, never, never>>;
+}) => Effect.Effect<string, never, never>;
 /**
  * Breaks down a secure password hash into its components.
  *
@@ -44,15 +44,15 @@ export declare const buildSecurePassword: (args_0: {
  * @param hash - The secure password hash to break down.
  * @returns An object containing the generation, salt, and hash value.
  */
-export declare const breakSecurePassword: (hash: string) => Effect.Effect.AsEffect<Effect.Effect<{
+export declare const breakSecurePassword: (hash: string) => Effect.Effect<{
     generation: string;
     salt: string;
     hash: string;
-}, PasswordError, never>>;
+}, PasswordError, never>;
 /**
  * @private Internal function for the `verifyPasswordStrength` function
  */
-export declare const verifyPasswordLength: (pass: string) => Effect.Effect.AsEffect<Effect.Effect<"Password must be between 6 and 255 characters long." | undefined, PasswordError, never>>;
+export declare const verifyPasswordLength: (pass: string) => Effect.Effect<"Password must be between 6 and 255 characters long." | undefined, PasswordError, never>;
 /**
  * @private Internal function for the `verifyPasswordStrength` function
  */

package/dist/utils/session.d.ts

@@ -15,8 +15,8 @@ export declare const defaultSessionConfig: SessionConfig;
 /**
  * Generates a session ID by hashing the provided token using SHA-256 and encoding it in hexadecimal format.
  */
-export declare const makeSessionId: (token: string) => Effect.Effect.AsEffect<Effect.Effect<string, import("../errors.js").SessionError, never>>;
+export declare const makeSessionId: (token: string) => Effect.Effect<string, import("../errors.js").SessionError, never>;
 /**
  * Generates a new expiration date for a session.
  */
-export declare const makeExpirationDate: (expTime: number) => Effect.Effect.AsEffect<Effect.Effect<Date, import("../errors.js").SessionError, never>>;
+export declare const makeExpirationDate: (expTime: number) => Effect.Effect<Date, import("../errors.js").SessionError, never>;

package/dist/utils/user.d.ts

@@ -19,7 +19,7 @@ export declare const verifyUsernameLength: (username: string) => Effect.Effect<s
  * @param username - The username string to validate.
  * @returns An error message if the username contains invalid characters, otherwise `undefined`.
  */
-export declare const verifyUsernameCharacters: (username: string) => Effect.Effect.AsEffect<Effect.Effect<string | undefined, import("../errors.js").UserError, never>>;
+export declare const verifyUsernameCharacters: (username: string) => Effect.Effect<string | undefined, import("../errors.js").UserError, never>;
 /**
  * Verifies if the provided username is considered unsafe (e.g., commonly used usernames like "admin", "root", etc.).
  *
@@ -40,7 +40,7 @@ export declare const verifyUsernameSafe: (username: string) => Effect.Effect<str
  *
  * @returns {Effect<UserSessionData>} An Effect containing the default UserSessionData.
  */
-export declare const getDefaultUserSession: () => Effect.Effect.AsEffect<Effect.Effect<UserSessionData, never, never>>;
+export declare const getDefaultUserSession: () => Effect.Effect<UserSessionData, never, never>;
 /**
  * Determines the user's permission level based on the provided user data.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@withstudiocms/auth-kit",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0-beta.4",
   "description": "Utilities for managing authentication",
   "author": {
     "name": "withstudiocms",
@@ -59,7 +59,7 @@
     "@oslojs/binary": "^1.0.0",
     "@oslojs/crypto": "^1.0.1",
     "@oslojs/encoding": "^1.1.0",
-    "@withstudiocms/effect": "0.1.0-beta.3"
+    "@withstudiocms/effect": "0.1.0-beta.5"
   },
   "devDependencies": {
     "@types/node": "^22.0.0"