auth-vir 2.3.2 → 2.3.4

package/dist/auth-client/backend-auth.client.d.ts

@@ -1,4 +1,4 @@
-import { type AnyObject, type JsonCompatibleObject, type MaybePromise, type PartialWithUndefined, type RequiredAndNotNull } from '@augment-vir/common';
+import { type AnyObject, type JsonCompatibleObject, type MaybePromise, type PartialWithUndefined } from '@augment-vir/common';
 import { type AnyDuration } from 'date-vir';
 import { type IncomingHttpHeaders, type OutgoingHttpHeaders } from 'node:http';
 import { type EmptyObject, type RequireExactlyOne, type RequireOneOrNone } from 'type-fest';
@@ -165,7 +165,7 @@ export declare class BackendAuthClient<DatabaseUser extends AnyObject, UserId ex
         userId: UserId;
         requestHeaders: IncomingHttpHeaders;
         isSignUpCookie: boolean;
-    }): Promise<Pick<RequiredAndNotNull<OutgoingHttpHeaders>, 'set-cookie'> & Record<CsrfHeaderName, string>>;
+    }): Promise<OutgoingHttpHeaders>;
     /** Combines `.getInsecureUser()` and `.getSecureUser()` into one method. */
     getInsecureOrSecureUser(params: {
         requestHeaders: IncomingHttpHeaders;

package/dist/auth-client/frontend-auth.client.d.ts

@@ -46,6 +46,11 @@ export type FrontendAuthClientConfig = PartialWithUndefined<{
 export declare class FrontendAuthClient<AssumedUserParams extends JsonCompatibleObject = EmptyObject> {
     protected readonly config: FrontendAuthClientConfig;
     protected userCheckInterval: undefined | ReturnType<typeof createBlockingInterval>;
+    /**
+     * Keeps track of whether the latest state of auth is logged in (`true`) or not (`false`). This
+     * is used for determining if the check user interval should keep running.
+     */
+    protected isLatestAuthorized: boolean;
     constructor(config?: FrontendAuthClientConfig);
     /**
      * Destroys the client and performs all necessary cleanup (like clearing the user check
@@ -84,9 +89,11 @@ export declare class FrontendAuthClient<AssumedUserParams extends JsonCompatible
     /**
      * Use to verify _all_ responses received from the backend. Immediately logs the user out once
      * an unauthorized response is detected.
+     *
+     * @returns `true` if the auth is okay, `false` otherwise.
      */
     verifyResponseAuth(response: Readonly<SetOptionalWithUndefined<SelectFrom<Response, {
         status: true;
         headers: true;
-    }>, 'headers'>>): Promise<void>;
+    }>, 'headers'>>): Promise<boolean>;
 }

package/dist/auth-client/frontend-auth.client.js

@@ -11,13 +11,22 @@ import { AuthHeaderName } from '../headers.js';
 export class FrontendAuthClient {
     config;
     userCheckInterval;
+    /**
+     * Keeps track of whether the latest state of auth is logged in (`true`) or not (`false`). This
+     * is used for determining if the check user interval should keep running.
+     */
+    isLatestAuthorized = false;
     constructor(config = {}) {
         this.config = config;
         if (config.checkUser) {
             this.userCheckInterval = createBlockingInterval(async () => {
+                /** No need to check current user status when there is no user. */
+                if (!this.isLatestAuthorized) {
+                    return;
+                }
                 const response = await config.checkUser?.performCheck();
                 if (response) {
-                    await this.verifyResponseAuth({
+                    this.isLatestAuthorized = await this.verifyResponseAuth({
                         status: response.status,
                     });
                 }
@@ -102,6 +111,7 @@ export class FrontendAuthClient {
     }
     /** Wipes the current user auth. */
     async logout() {
+        this.isLatestAuthorized = false;
         await this.config.authClearedCallback?.();
         wipeCurrentCsrfToken(this.config.overrides);
     }
@@ -122,15 +132,20 @@ export class FrontendAuthClient {
             throw new Error('Did not receive any CSRF token.');
         }
         storeCsrfToken(csrfToken, this.config.overrides);
+        this.isLatestAuthorized = true;
     }
     /**
      * Use to verify _all_ responses received from the backend. Immediately logs the user out once
      * an unauthorized response is detected.
+     *
+     * @returns `true` if the auth is okay, `false` otherwise.
      */
     async verifyResponseAuth(response) {
         if (response.status === HttpStatus.Unauthorized &&
             !response.headers?.get(AuthHeaderName.IsSignUpAuth)) {
             await this.logout();
+            return false;
         }
+        return true;
     }
 }

package/dist/generated/internal/class.js

@@ -21,8 +21,8 @@ const config = {
             "fromEnvVar": null
         },
         "config": {
-            "engineType": "client",
-            "moduleFormat": "esm"
+            "moduleFormat": "esm",
+            "engineType": "client"
         },
         "binaryTargets": [
             {
@@ -39,8 +39,8 @@ const config = {
         "isCustomOutput": true
     },
     "relativePath": "../../test-files",
-    "clientVersion": "6.17.1",
-    "engineVersion": "272a37d34178c2894197e17273bf937f25acdeac",
+    "clientVersion": "6.18.0",
+    "engineVersion": "34b5a692b7bd79939a9a2c3ef97d816e749cda2f",
     "datasourceNames": [
         "db"
     ],
@@ -54,8 +54,8 @@ const config = {
             }
         }
     },
-    "inlineSchema": "generator jsClient {\n  provider        = \"prisma-client\"\n  previewFeatures = [\"strictUndefinedChecks\", \"relationJoins\"]\n  output          = \"../src/generated\"\n  engineType      = \"client\"\n  moduleFormat    = \"esm\"\n}\n\ngenerator shapes {\n  provider = \"prisma-shapes\"\n  output   = \"../src/generated\"\n}\n\ngenerator stringDates {\n  provider = \"prisma-string-dates\"\n  output   = \"../src/generated\"\n}\n\ngenerator taggedIds {\n  provider = \"prisma-tagged-ids\"\n  output   = \"../src/generated\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n  url      = env(\"DATABASE_URL\")\n}\n\nmodel User {\n  id        String   @id @default(cuid(2))\n  createdAt DateTime @default(now())\n  updatedAt DateTime @default(now()) @updatedAt\n\n  name String\n}\n",
-    "inlineSchemaHash": "7d1ca802697687a0d28701b345324b445a425e1f524d6377a89cbc48895f7110",
+    "inlineSchema": "generator jsClient {\n  provider        = \"prisma-client\"\n  previewFeatures = [\"strictUndefinedChecks\", \"relationJoins\"]\n  output          = \"../src/generated\"\n  engineType      = \"client\"\n  moduleFormat    = \"esm\"\n}\n\ngenerator shapes {\n  provider = \"prisma-shapes\"\n  output   = \"../src/generated\"\n}\n\ngenerator stringDates {\n  provider = \"prisma-string-dates\"\n  output   = \"../src/generated\"\n}\n\ngenerator brandedFields {\n  provider = \"prisma-branded-fields\"\n  output   = \"../src/generated\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n  url      = env(\"DATABASE_URL\")\n}\n\nmodel User {\n  id        String   @id @default(cuid(2))\n  createdAt DateTime @default(now())\n  updatedAt DateTime @default(now()) @updatedAt\n\n  name String\n}\n",
+    "inlineSchemaHash": "23208c8e58615c00e5101cfaaa5341ce46c109a1169d3aea10dae8caa3594dcc",
     "copyEngine": true,
     "runtimeDataModel": {
         "models": {},

package/dist/generated/internal/prismaNamespace.d.ts

@@ -58,13 +58,14 @@ export type PrismaVersion = {
     engine: string;
 };
 /**
- * Prisma Client JS version: 6.17.1
- * Query Engine version: 272a37d34178c2894197e17273bf937f25acdeac
+ * Prisma Client JS version: 6.18.0
+ * Query Engine version: 34b5a692b7bd79939a9a2c3ef97d816e749cda2f
  */
 export declare const prismaVersion: PrismaVersion;
 /**
  * Utility Types
  */
+export type Bytes = runtime.Bytes;
 export type JsonObject = runtime.JsonObject;
 export type JsonArray = runtime.JsonArray;
 export type JsonValue = runtime.JsonValue;

package/dist/generated/internal/prismaNamespace.js

@@ -38,12 +38,12 @@ export const skip = runtime.skip;
 export const Decimal = runtime.Decimal;
 export const getExtensionContext = runtime.Extensions.getExtensionContext;
 /**
- * Prisma Client JS version: 6.17.1
- * Query Engine version: 272a37d34178c2894197e17273bf937f25acdeac
+ * Prisma Client JS version: 6.18.0
+ * Query Engine version: 34b5a692b7bd79939a9a2c3ef97d816e749cda2f
  */
 export const prismaVersion = {
-    client: "6.17.1",
-    engine: "272a37d34178c2894197e17273bf937f25acdeac"
+    client: "6.18.0",
+    engine: "34b5a692b7bd79939a9a2c3ef97d816e749cda2f"
 };
 export const NullTypes = {
     DbNull: runtime.objectEnumValues.classes.DbNull,

package/dist/generated/models/User.d.ts

@@ -1,8 +1,5 @@
-import { type Tagged } from 'type-fest';
-export type UserId = Tagged<string, 'model-User-field-id', {
-    model: 'User';
-    field: 'id';
-}>;
+import { type Branded } from '@augment-vir/common';
+export type UserId = Branded<string, 'model-User-field-id'>;
 import { type UtcIsoString } from 'date-vir';
 import type * as runtime from "@prisma/client/runtime/client";
 import type * as Prisma from "../internal/prismaNamespace.js";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "auth-vir",
-    "version": "2.3.2",
+    "version": "2.3.4",
     "description": "Auth made easy and secure via JWT cookies, CSRF tokens, and password hashing helpers.",
     "keywords": [
         "auth",
@@ -42,18 +42,18 @@
         "test:web": "virmator test web"
     },
     "dependencies": {
-        "@augment-vir/assert": "^31.42.0",
-        "@augment-vir/common": "^31.42.0",
+        "@augment-vir/assert": "^31.45.0",
+        "@augment-vir/common": "^31.45.0",
         "date-vir": "^8.0.0",
         "hash-wasm": "^4.12.0",
         "jose": "^6.1.0",
-        "object-shape-tester": "^6.9.2",
+        "object-shape-tester": "^6.9.3",
         "type-fest": "^5.1.0",
         "url-vir": "^2.1.6"
     },
     "devDependencies": {
-        "@augment-vir/test": "^31.42.0",
-        "@prisma/client": "^6.17.1",
+        "@augment-vir/test": "^31.45.0",
+        "@prisma/client": "^6.18.0",
         "@types/node": "^24.9.1",
         "@web/dev-server-esbuild": "^1.0.4",
         "@web/test-runner": "^0.20.2",
@@ -62,7 +62,7 @@
         "@web/test-runner-visual-regression": "^0.10.0",
         "istanbul-smart-text-reporter": "^1.1.5",
         "markdown-code-example-inserter": "^3.0.3",
-        "prisma-vir": "^1.2.2",
+        "prisma-vir": "^2.0.0",
         "typedoc": "^0.28.14"
     },
     "engines": {

package/src/auth-client/backend-auth.client.ts

@@ -4,7 +4,6 @@ import {
     type JsonCompatibleObject,
     type MaybePromise,
     type PartialWithUndefined,
-    type RequiredAndNotNull,
 } from '@augment-vir/common';
 import {calculateRelativeDate, getNowInUtcTimezone, isDateAfter, type AnyDuration} from 'date-vir';
 import {type IncomingHttpHeaders, type OutgoingHttpHeaders} from 'node:http';
@@ -426,9 +425,7 @@ export class BackendAuthClient<
         userId: UserId;
         requestHeaders: IncomingHttpHeaders;
         isSignUpCookie: boolean;
-    }): Promise<
-        Pick<RequiredAndNotNull<OutgoingHttpHeaders>, 'set-cookie'> & Record<CsrfHeaderName, string>
-    > {
+    }): Promise<OutgoingHttpHeaders> {
         const oppositeCookieName = isSignUpCookie ? AuthCookieName.Auth : AuthCookieName.SignUp;
         const hasExistingOppositeCookie = requestHeaders.cookie?.includes(`${oppositeCookieName}=`);
 

package/src/auth-client/frontend-auth.client.ts

@@ -70,14 +70,24 @@ export type FrontendAuthClientConfig = PartialWithUndefined<{
  */
 export class FrontendAuthClient<AssumedUserParams extends JsonCompatibleObject = EmptyObject> {
     protected userCheckInterval: undefined | ReturnType<typeof createBlockingInterval>;
+    /**
+     * Keeps track of whether the latest state of auth is logged in (`true`) or not (`false`). This
+     * is used for determining if the check user interval should keep running.
+     */
+    protected isLatestAuthorized = false;
 
     constructor(protected readonly config: FrontendAuthClientConfig = {}) {
         if (config.checkUser) {
             this.userCheckInterval = createBlockingInterval(
                 async () => {
+                    /** No need to check current user status when there is no user. */
+                    if (!this.isLatestAuthorized) {
+                        return;
+                    }
+
                     const response = await config.checkUser?.performCheck();
                     if (response) {
-                        await this.verifyResponseAuth({
+                        this.isLatestAuthorized = await this.verifyResponseAuth({
                             status: response.status,
                         });
                     }
@@ -184,6 +194,7 @@ export class FrontendAuthClient<AssumedUserParams extends JsonCompatibleObject =
 
     /** Wipes the current user auth. */
     public async logout() {
+        this.isLatestAuthorized = false;
         await this.config.authClearedCallback?.();
         wipeCurrentCsrfToken(this.config.overrides);
     }
@@ -218,11 +229,14 @@ export class FrontendAuthClient<AssumedUserParams extends JsonCompatibleObject =
         }
 
         storeCsrfToken(csrfToken, this.config.overrides);
+        this.isLatestAuthorized = true;
     }
 
     /**
      * Use to verify _all_ responses received from the backend. Immediately logs the user out once
      * an unauthorized response is detected.
+     *
+     * @returns `true` if the auth is okay, `false` otherwise.
      */
     public async verifyResponseAuth(
         response: Readonly<
@@ -237,12 +251,15 @@ export class FrontendAuthClient<AssumedUserParams extends JsonCompatibleObject =
                 'headers'
             >
         >,
-    ): Promise<void> {
+    ): Promise<boolean> {
         if (
             response.status === HttpStatus.Unauthorized &&
             !response.headers?.get(AuthHeaderName.IsSignUpAuth)
         ) {
             await this.logout();
+            return false;
         }
+
+        return true;
     }
 }

package/src/generated/internal/class.ts

@@ -26,8 +26,8 @@ const config: runtime.GetPrismaClientConfig = {
       "fromEnvVar": null
     },
     "config": {
-      "engineType": "client",
-      "moduleFormat": "esm"
+      "moduleFormat": "esm",
+      "engineType": "client"
     },
     "binaryTargets": [
       {
@@ -44,8 +44,8 @@ const config: runtime.GetPrismaClientConfig = {
     "isCustomOutput": true
   },
   "relativePath": "../../test-files",
-  "clientVersion": "6.17.1",
-  "engineVersion": "272a37d34178c2894197e17273bf937f25acdeac",
+  "clientVersion": "6.18.0",
+  "engineVersion": "34b5a692b7bd79939a9a2c3ef97d816e749cda2f",
   "datasourceNames": [
     "db"
   ],
@@ -59,8 +59,8 @@ const config: runtime.GetPrismaClientConfig = {
       }
     }
   },
-  "inlineSchema": "generator jsClient {\n  provider        = \"prisma-client\"\n  previewFeatures = [\"strictUndefinedChecks\", \"relationJoins\"]\n  output          = \"../src/generated\"\n  engineType      = \"client\"\n  moduleFormat    = \"esm\"\n}\n\ngenerator shapes {\n  provider = \"prisma-shapes\"\n  output   = \"../src/generated\"\n}\n\ngenerator stringDates {\n  provider = \"prisma-string-dates\"\n  output   = \"../src/generated\"\n}\n\ngenerator taggedIds {\n  provider = \"prisma-tagged-ids\"\n  output   = \"../src/generated\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n  url      = env(\"DATABASE_URL\")\n}\n\nmodel User {\n  id        String   @id @default(cuid(2))\n  createdAt DateTime @default(now())\n  updatedAt DateTime @default(now()) @updatedAt\n\n  name String\n}\n",
-  "inlineSchemaHash": "7d1ca802697687a0d28701b345324b445a425e1f524d6377a89cbc48895f7110",
+  "inlineSchema": "generator jsClient {\n  provider        = \"prisma-client\"\n  previewFeatures = [\"strictUndefinedChecks\", \"relationJoins\"]\n  output          = \"../src/generated\"\n  engineType      = \"client\"\n  moduleFormat    = \"esm\"\n}\n\ngenerator shapes {\n  provider = \"prisma-shapes\"\n  output   = \"../src/generated\"\n}\n\ngenerator stringDates {\n  provider = \"prisma-string-dates\"\n  output   = \"../src/generated\"\n}\n\ngenerator brandedFields {\n  provider = \"prisma-branded-fields\"\n  output   = \"../src/generated\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n  url      = env(\"DATABASE_URL\")\n}\n\nmodel User {\n  id        String   @id @default(cuid(2))\n  createdAt DateTime @default(now())\n  updatedAt DateTime @default(now()) @updatedAt\n\n  name String\n}\n",
+  "inlineSchemaHash": "23208c8e58615c00e5101cfaaa5341ce46c109a1169d3aea10dae8caa3594dcc",
   "copyEngine": true,
   "runtimeDataModel": {
     "models": {},

package/src/generated/internal/prismaNamespace.ts

@@ -93,18 +93,19 @@ export type PrismaVersion = {
 }
 
 /**
- * Prisma Client JS version: 6.17.1
- * Query Engine version: 272a37d34178c2894197e17273bf937f25acdeac
+ * Prisma Client JS version: 6.18.0
+ * Query Engine version: 34b5a692b7bd79939a9a2c3ef97d816e749cda2f
  */
 export const prismaVersion: PrismaVersion = {
-  client: "6.17.1",
-  engine: "272a37d34178c2894197e17273bf937f25acdeac"
+  client: "6.18.0",
+  engine: "34b5a692b7bd79939a9a2c3ef97d816e749cda2f"
 }
 
 /**
  * Utility Types
  */
 
+export type Bytes = runtime.Bytes
 export type JsonObject = runtime.JsonObject
 export type JsonArray = runtime.JsonArray
 export type JsonValue = runtime.JsonValue

package/src/generated/models/User.ts

@@ -1,6 +1,6 @@
-import {type Tagged} from 'type-fest';
+import {type Branded} from '@augment-vir/common';
 
-export type UserId = Tagged<string, 'model-User-field-id', {model: 'User', field: 'id'}>;
+export type UserId = Branded<string, 'model-User-field-id'>;
 
 // @ts-nocheck
 import {type UtcIsoString} from 'date-vir';