dn-react-router-toolkit 0.1.10 → 0.1.12

package/dist/auth-kit/auth_service.d.mts

@@ -20,6 +20,7 @@ declare class AuthService {
     });
     verify(request: Request): Promise<jose.JWTPayload | undefined>;
     verifyOrRefresh(request: Request): Promise<jose.JWTPayload | undefined>;
+    getAccessTokenFromRequest(request: Request): Promise<any>;
     getAccessTokenFromCookies(request: Request): Promise<any>;
     getRefreshTokenFromCookies(request: Request): Promise<any>;
     refresh(request: Request): Promise<jose.JWTPayload | undefined>;

package/dist/auth-kit/auth_service.d.ts

@@ -20,6 +20,7 @@ declare class AuthService {
     });
     verify(request: Request): Promise<jose.JWTPayload | undefined>;
     verifyOrRefresh(request: Request): Promise<jose.JWTPayload | undefined>;
+    getAccessTokenFromRequest(request: Request): Promise<any>;
     getAccessTokenFromCookies(request: Request): Promise<any>;
     getRefreshTokenFromCookies(request: Request): Promise<any>;
     refresh(request: Request): Promise<jose.JWTPayload | undefined>;

package/dist/auth-kit/auth_service.js

@@ -68,7 +68,7 @@ var AuthService = class {
     this.OBJECT_STORAGE = OBJECT_STORAGE;
   }
   async verify(request) {
-    const accessToken = request?.headers.get("Authorization")?.replace("Bearer ", "") || await this.getAccessTokenFromCookies(request);
+    const accessToken = await this.getAccessTokenFromRequest(request);
     if (accessToken) {
       return this.JWT_MANAGER.verifyAccessToken(accessToken);
     }
@@ -80,6 +80,12 @@ var AuthService = class {
     }
     return this.refresh(request);
   }
+  async getAccessTokenFromRequest(request) {
+    if (request.headers.get("Authorization")) {
+      return request.headers.get("Authorization")?.replace("Bearer ", "");
+    }
+    return this.getAccessTokenFromCookies(request);
+  }
   async getAccessTokenFromCookies(request) {
     const accessToken = await ACCESS_TOKEN_COOKIE.parse(
       request.headers.get("cookie")

package/dist/auth-kit/auth_service.mjs

@@ -30,7 +30,7 @@ var AuthService = class {
     this.OBJECT_STORAGE = OBJECT_STORAGE;
   }
   async verify(request) {
-    const accessToken = request?.headers.get("Authorization")?.replace("Bearer ", "") || await this.getAccessTokenFromCookies(request);
+    const accessToken = await this.getAccessTokenFromRequest(request);
     if (accessToken) {
       return this.JWT_MANAGER.verifyAccessToken(accessToken);
     }
@@ -42,6 +42,12 @@ var AuthService = class {
     }
     return this.refresh(request);
   }
+  async getAccessTokenFromRequest(request) {
+    if (request.headers.get("Authorization")) {
+      return request.headers.get("Authorization")?.replace("Bearer ", "");
+    }
+    return this.getAccessTokenFromCookies(request);
+  }
   async getAccessTokenFromCookies(request) {
     const accessToken = await ACCESS_TOKEN_COOKIE.parse(
       request.headers.get("cookie")

package/dist/auth-kit/with_auth.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/auth-kit/with_auth.ts
@@ -33,39 +23,17 @@ __export(with_auth_exports, {
   createWithAuthHandler: () => createWithAuthHandler
 });
 module.exports = __toCommonJS(with_auth_exports);
-
-// src/auth-kit/auth_service.ts
-var import_bcryptjs = __toESM(require("bcryptjs"));
-var import_uuid = require("uuid");
-var import_react_router = require("react-router");
-var ACCESS_TOKEN_KEY = "access_token";
-var REFRESH_TOKEN_KEY = "refresh_token";
-var ACCESS_TOKEN_COOKIE = (0, import_react_router.createCookie)(ACCESS_TOKEN_KEY, {
-  path: "/",
-  httpOnly: process.env.NODE_ENV === "production",
-  secure: process.env.NODE_ENV === "production",
-  sameSite: "strict"
-});
-var REFRESH_TOKEN_COOKIE = (0, import_react_router.createCookie)(REFRESH_TOKEN_KEY, {
-  path: "/",
-  httpOnly: process.env.NODE_ENV === "production",
-  secure: process.env.NODE_ENV === "production",
-  sameSite: "strict"
-});
-
-// src/auth-kit/with_auth.ts
 function createWithAuthHandler({ JWT_MANAGER, AUTH }) {
   return function(fn) {
     const handler = async function(arg) {
-      const cookie = arg.request.headers.get("cookie");
-      const accessToken = await ACCESS_TOKEN_COOKIE.parse(cookie);
+      const accessToken = await AUTH.getAccessTokenFromRequest(arg.request);
       if (accessToken) {
         const payload = await JWT_MANAGER.verifyAccessToken(accessToken);
         if (payload) {
           return fn(payload)(arg);
         }
       }
-      const refreshToken = await REFRESH_TOKEN_COOKIE.parse(cookie);
+      const refreshToken = await AUTH.getRefreshTokenFromCookies(arg.request);
       if (refreshToken) {
         try {
           const newAccessToken = await AUTH.refreshAccessToken(refreshToken);

package/dist/auth-kit/with_auth.mjs

@@ -1,35 +1,15 @@
-// src/auth-kit/auth_service.ts
-import bcryptjs from "bcryptjs";
-import { v4 } from "uuid";
-import { createCookie } from "react-router";
-var ACCESS_TOKEN_KEY = "access_token";
-var REFRESH_TOKEN_KEY = "refresh_token";
-var ACCESS_TOKEN_COOKIE = createCookie(ACCESS_TOKEN_KEY, {
-  path: "/",
-  httpOnly: process.env.NODE_ENV === "production",
-  secure: process.env.NODE_ENV === "production",
-  sameSite: "strict"
-});
-var REFRESH_TOKEN_COOKIE = createCookie(REFRESH_TOKEN_KEY, {
-  path: "/",
-  httpOnly: process.env.NODE_ENV === "production",
-  secure: process.env.NODE_ENV === "production",
-  sameSite: "strict"
-});
-
 // src/auth-kit/with_auth.ts
 function createWithAuthHandler({ JWT_MANAGER, AUTH }) {
   return function(fn) {
     const handler = async function(arg) {
-      const cookie = arg.request.headers.get("cookie");
-      const accessToken = await ACCESS_TOKEN_COOKIE.parse(cookie);
+      const accessToken = await AUTH.getAccessTokenFromRequest(arg.request);
       if (accessToken) {
         const payload = await JWT_MANAGER.verifyAccessToken(accessToken);
         if (payload) {
           return fn(payload)(arg);
         }
       }
-      const refreshToken = await REFRESH_TOKEN_COOKIE.parse(cookie);
+      const refreshToken = await AUTH.getRefreshTokenFromCookies(arg.request);
       if (refreshToken) {
         try {
           const newAccessToken = await AUTH.refreshAccessToken(refreshToken);

package/dist/file-kit/client/file_uploader.js

@@ -61,6 +61,9 @@ var FileUploader = class {
   endpoint;
   constructor(endpoint = "/api/files") {
     this.endpoint = endpoint;
+    this.uploadFile = this.uploadFile.bind(this);
+    this.uploadBlob = this.uploadBlob.bind(this);
+    this.deleteFile = this.deleteFile.bind(this);
   }
   uploadFile(file, options = {}) {
     return this.uploadBlob(file, file.name, options);
@@ -84,6 +87,7 @@ var FileUploader = class {
       });
       if (webpBlob) {
         blob = webpBlob;
+        name = name.replace(/\.[^/.]+$/, "") + ".webp";
       }
     }
     const { type, size } = blob;

package/dist/file-kit/client/file_uploader.mjs

@@ -35,6 +35,9 @@ var FileUploader = class {
   endpoint;
   constructor(endpoint = "/api/files") {
     this.endpoint = endpoint;
+    this.uploadFile = this.uploadFile.bind(this);
+    this.uploadBlob = this.uploadBlob.bind(this);
+    this.deleteFile = this.deleteFile.bind(this);
   }
   uploadFile(file, options = {}) {
     return this.uploadBlob(file, file.name, options);
@@ -58,6 +61,7 @@ var FileUploader = class {
       });
       if (webpBlob) {
         blob = webpBlob;
+        name = name.replace(/\.[^/.]+$/, "") + ".webp";
       }
     }
     const { type, size } = blob;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dn-react-router-toolkit",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.mjs",
   "module": "./dist/index.js",