remove auth/browser

package.json

@@ -183,15 +183,10 @@
       "import": "./saleor-app.mjs",
       "require": "./saleor-app.js"
     },
-    "./auth/node": {
-      "types": "./auth/node.index.d.ts",
-      "import": "./auth/node/index.mjs",
-      "require": "./auth/node/index.js"
-    },
-    "./auth/browser": {
-      "types": "./auth/node.index.d.ts",
-      "import": "./auth/node/index.mjs",
-      "require": "./auth/node/index.js"
+    "./auth": {
+      "types": "./auth/index.d.ts",
+      "import": "./auth/index.mjs",
+      "require": "./auth/index.js"
     },
     "./headers": {
       "types": "./headers.d.ts",

src/auth/node/fetch-remote-jwks.ts → src/auth/fetch-remote-jwks.ts

@@ -1,9 +1,9 @@
 import { SpanKind, SpanStatusCode } from "@opentelemetry/api";
 import { SemanticAttributes } from "@opentelemetry/semantic-conventions";
 
-import { getJwksUrlFromSaleorApiUrl } from "@/auth/node/index";
+import { getJwksUrlFromSaleorApiUrl } from "@/auth/index";
 
-import { getOtelTracer, OTEL_CORE_SERVICE_NAME } from "../../open-telemetry";
+import { getOtelTracer, OTEL_CORE_SERVICE_NAME } from "../open-telemetry";
 
 export const fetchRemoteJwks = async (saleorApiUrl: string) => {
   const tracer = getOtelTracer();
@@ -32,6 +32,6 @@
       } finally {
         span.end();
       }
     },
   );
 };

src/auth/browser/has-permissions-in-jwt-token.ts → src/auth/has-permissions-in-jwt-token.ts

@@ -1,5 +1,5 @@
-import { createDebug } from "../../debug";
-import { Permission } from "../../types";
+import { createDebug } from "../debug";
+import { Permission } from "../types";
 import { DashboardTokenPayload } from "./verify-jwt";
 
 const debug = createDebug("checkJwtPermissions");

src/auth/node/index.ts → src/auth/index.ts

@@ -1 +1,2 @@
+export { verifyJWT } from "./verify-jwt";
 export { getJwksUrlFromSaleorApiUrl, verifySignatureWithJwks } from "./verify-signature";

src/auth/browser/verify-jwt.ts → src/auth/verify-jwt.ts

@@ -1,9 +1,9 @@
 import * as jose from "jose";
 
-import { getJwksUrlFromSaleorApiUrl } from "@/auth/node";
+import { getJwksUrlFromSaleorApiUrl } from "@/auth/index";
 
-import { createDebug } from "../../debug";
-import { Permission } from "../../types";
+import { createDebug } from "../debug";
+import { Permission } from "../types";
 import { hasPermissionsInJwtToken } from "./has-permissions-in-jwt-token";
 import { verifyTokenExpiration } from "./verify-token-expiration";
 

src/auth/node/verify-signature.ts → src/auth/verify-signature.ts

@@ -1,6 +1,6 @@
 import * as jose from "jose";
 
-import { createDebug } from "../../debug";
+import { createDebug } from "../debug";
 
 const debug = createDebug("verify-signature");
 

src/auth/browser/verify-token-expiration.ts → src/auth/verify-token-expiration.ts

@@ -1,4 +1,4 @@
-import { createDebug } from "../../debug";
+import { createDebug } from "../debug";
 import { DashboardTokenPayload } from "./verify-jwt";
 
 const debug = createDebug("verify-token-expiration");

src/handlers/actions/register-action-handler.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-import * as fetchRemoteJwksModule from "@/auth/node/fetch-remote-jwks";
+import * as fetchRemoteJwksModule from "@/auth/fetch-remote-jwks";
 import * as getAppIdModule from "@/get-app-id";
 import { SALEOR_API_URL_HEADER } from "@/headers";
 import { MockAdapter } from "@/test-utils/mock-adapter";

src/handlers/actions/register-action-handler.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { APL, AuthData } from "@/APL";
-import { fetchRemoteJwks } from "@/auth/node/fetch-remote-jwks";
+import { fetchRemoteJwks } from "@/auth/fetch-remote-jwks";
 import { createDebug } from "@/debug";
 import { getAppId } from "@/get-app-id";
 import { SALEOR_API_URL_HEADER } from "@/headers";

src/handlers/platforms/aws-lambda/create-app-register-handler.test.ts

@@ -2,7 +2,7 @@ import type { APIGatewayProxyEventV2 } from "aws-lambda";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import { AuthData } from "@/APL";
-import * as fetchRemoteJwksModule from "@/auth/node/fetch-remote-jwks";
+import * as fetchRemoteJwksModule from "@/auth/fetch-remote-jwks";
 import * as getAppIdModule from "@/get-app-id";
 import { SALEOR_API_URL_HEADER } from "@/headers";
 import { MockAPL } from "@/test-utils/mock-apl";

src/handlers/platforms/fetch-api/create-app-register-handler.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import { AuthData } from "@/APL";
-import * as fetchRemoteJwksModule from "@/auth/node/fetch-remote-jwks";
+import * as fetchRemoteJwksModule from "@/auth/fetch-remote-jwks";
 import * as getAppIdModule from "@/get-app-id";
 import { SALEOR_API_URL_HEADER } from "@/headers";
 import { MockAPL } from "@/test-utils/mock-apl";

src/handlers/platforms/next/create-app-register-handler.test.ts

@@ -2,7 +2,7 @@ import { createMocks } from "node-mocks-http";
 import { beforeEach, describe, expect, it, Mock, vi } from "vitest";
 
 import { APL, AuthData } from "@/APL";
-import * as fetchRemoteJwksModule from "@/auth/node/fetch-remote-jwks";
+import * as fetchRemoteJwksModule from "@/auth/fetch-remote-jwks";
 import * as getAppIdModule from "@/get-app-id";
 import { SALEOR_API_URL_HEADER } from "@/headers";
 import { MockAPL } from "@/test-utils/mock-apl";

src/handlers/shared/protected-action-validator.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-import * as verifyJWTModule from "@/auth/browser/verify-jwt";
+import * as verifyJWTModule from "@/auth/verify-jwt";
 import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@/headers";
 import { MockAdapter } from "@/test-utils/mock-adapter";
 import { MockAPL } from "@/test-utils/mock-apl";

src/handlers/shared/protected-action-validator.ts

@@ -1,7 +1,7 @@
 import { SpanKind, SpanStatusCode } from "@opentelemetry/api";
 
 import { APL, AuthData } from "@/APL";
-import { verifyJWT } from "@/auth/browser/verify-jwt";
+import { verifyJWT } from "@/auth/verify-jwt";
 import { createDebug } from "@/debug";
 import { getOtelTracer } from "@/open-telemetry";
 import { Permission } from "@/types";

src/handlers/shared/saleor-webhook-validator.test.ts

@@ -1,8 +1,8 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import { AuthData } from "@/APL";
-import * as fetchRemoteJwksModule from "@/auth/node/fetch-remote-jwks";
-import * as verifySignatureModule from "@/auth/node/verify-signature";
+import * as fetchRemoteJwksModule from "@/auth/fetch-remote-jwks";
+import * as verifySignatureModule from "@/auth/verify-signature";
 import { MockAdapter } from "@/test-utils/mock-adapter";
 import { MockAPL } from "@/test-utils/mock-apl";
 

src/handlers/shared/saleor-webhook-validator.ts

@@ -1,8 +1,8 @@
 import { SpanKind, SpanStatusCode } from "@opentelemetry/api";
 
 import { APL } from "@/APL";
-import { fetchRemoteJwks } from "@/auth/node/fetch-remote-jwks";
-import { verifySignatureWithJwks } from "@/auth/node/verify-signature";
+import { fetchRemoteJwks } from "@/auth/fetch-remote-jwks";
+import { verifySignatureWithJwks } from "@/auth/verify-signature";
 import { createDebug } from "@/debug";
 import { getOtelTracer } from "@/open-telemetry";
 import { SaleorSchemaVersion } from "@/types";

tsup.config.ts

@@ -28,8 +28,7 @@ export default defineConfig({
     "handlers/fetch-api/index": "src/handlers/platforms/fetch-api/index.ts",
     "handlers/aws-lambda/index": "src/handlers/platforms/aws-lambda/index.ts",
     "handlers/next-app-router/index": "src/handlers/platforms/next-app-router/index.ts",
-    "auth/node/index": "src/auth/node/index.ts",
-    "auth/browser/index": "src/auth/browser/index.ts",
+    "auth/node/index": "src/auth/index.ts",
   },
   dts: true,
   clean: true,