@eduzz/miau-client 0.0.18 → 0.0.19

package/dist/miau-types/index.d.ts

@@ -1,5 +1,4 @@
 export * from './types/Application';
-export * from './types/Organization';
 export * from './types/Resource';
 export * from './types/Secret';
 export * from './types/Permission';

package/dist/miau-types/types/Application.d.ts

@@ -1,7 +1,6 @@
 import { type Resource } from './Resource';
 export type Application = {
     id?: string;
-    organizationId: string;
     name: string;
     slug: string;
     resources: Resource[];

package/dist/miau-types/types/Permission.d.ts

@@ -1,7 +1,6 @@
 import { type Resource } from './Resource';
 export type Permission = {
     id?: string;
-    organizationId: string;
     sourceAppId: string;
     targetAppId: string;
     metadata: Record<string, string>;

package/dist/miau-types/types/Request.d.ts

@@ -1,3 +1,10 @@
+export type MiauClientToken = {
+    secret: {
+        id: string;
+        environment: string;
+    };
+    application: MiauApplication;
+};
 export type MiauApplication = {
     id: string;
     name: string;

package/dist/miau-types/types/Secret.d.ts

@@ -3,6 +3,7 @@ export type Secret = {
     applicationId: string;
     name: string;
     value: string;
+    allowedNetwork: string;
     environment: string;
     expiresAt?: Date;
     createdAt: Date;

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "@eduzz/miau-client",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "Eduzz Miau Client",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
-    "dev": "tsx watch src/index.ts --outDir dist",
+    "-dev": "tsx watch src/index.ts --outDir dist",
+    "dev": "chokidar 'src/**/*.ts' -c 'pnpm build  && pnpm i'",
     "lint": "eslint && tsc --noEmit",
     "build": "esbuild src/index.ts --bundle --sourcemap --platform=node --target=es2020 --outfile=dist/index.js",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "prepublish": "sh ./scripts/prepare-publish.sh"
   },
   "devDependencies": {
-    "@eduzz/miau-types": "workspace:*"
+    "@eduzz/miau-types": "workspace:*",
+    "chokidar-cli": "^3.0.0"
   }
 }

package/src/MiauClient.ts

@@ -8,7 +8,7 @@ import { type Permission } from '@eduzz/miau-types';
 
 import { miauMiddleware, type RequestAugmentation } from './middleware';
 
-type MiauClientConfig = { apiUrl: string; appSecret: string };
+type MiauClientConfig = { apiUrl: string; appSecret: string; environment: string };
 type FetchInput = Parameters<typeof fetch>[0];
 type FetchInit = Parameters<typeof fetch>[1];
 
@@ -27,19 +27,25 @@ const reusableFetch = async <T>(input: FetchInput, init?: FetchInit): Promise<{
 
 export class MiauClient {
   private apiUrl: string;
+  private environment: string;
   private jwtToken: string | undefined;
   private jwksClient: JwksClient | undefined;
   private basicAuthToken: string;
   private permissionsCache: Map<string, { data: Permission; expiresAt: number }> = new Map();
   private permissionsRequests: Map<string, Promise<{ data: Permission; headers: Headers }>> = new Map();
 
-  constructor(props: MiauClientConfig) {
-    this.apiUrl = props.apiUrl;
-    const apiKey = props.appSecret.substring(7, 32);
-    const hashedSecret = crypto.createHash('sha256').update(props.appSecret).digest('hex');
+  constructor(config: MiauClientConfig) {
+    this.apiUrl = config.apiUrl;
+    this.environment = config.environment;
+    const apiKey = config.appSecret.substring(7, 32);
+    const hashedSecret = crypto.createHash('sha256').update(config.appSecret).digest('hex');
     this.basicAuthToken = Buffer.from(`${apiKey}:${hashedSecret}`).toString('base64');
   }
 
+  public getEnvironment() {
+    return this.environment;
+  }
+
   public async getPublicKey(kid: string) {
     if (!this.jwksClient) {
       this.jwksClient = new JwksClient({ jwksUri: this.getJwksUrl(), cache: true });
@@ -66,19 +72,21 @@ export class MiauClient {
       }
     });
 
+    const data = await response.json();
+
     if (response.status !== 200) {
-      throw new Error('Failed to fetch token');
+      throw new Error(data.message || 'Failed to fetch JWT token');
     }
 
-    this.jwtToken = (await response.json()).jwt;
+    this.jwtToken = data.jwt;
     return this.jwtToken;
   }
 
-  public middleware<T = Record<string, string>>(
-    requestAugmentation?: RequestAugmentation<T>,
-    fallbackMidlleware?: RequestHandler
-  ): RequestHandler {
-    return miauMiddleware<T>(this, requestAugmentation, fallbackMidlleware);
+  public middleware<T = Record<string, string>>(config?: {
+    requestAugmentation?: RequestAugmentation<T>;
+    fallbackMidlleware?: RequestHandler;
+  }): RequestHandler {
+    return miauMiddleware<T>(this, config?.requestAugmentation, config?.fallbackMidlleware);
   }
 
   public async getPermissions(targetAppId: string) {

package/src/middleware.ts

@@ -1,7 +1,7 @@
 import { type RequestHandler, type NextFunction, type Request, type Response } from 'express';
 import jwt from 'jsonwebtoken';
 
-import type { MiauApplication, Resource } from '@eduzz/miau-types';
+import type { MiauApplication, MiauClientToken, Resource } from '@eduzz/miau-types';
 
 import type { MiauClient } from './MiauClient';
 
@@ -46,13 +46,30 @@ export const miauMiddleware = <T>(
       }
 
       const publicKey = await miauClient.getPublicKey(decodedToken.header.kid);
-      const appToken = jwt.verify(token, publicKey, { algorithms: ['RS256'] }) as MiauApplication;
-
-      if (!appToken || !appToken.id || !appToken.name) {
+      const clientToken = jwt.verify(token, publicKey, { algorithms: ['RS256'] }) as MiauClientToken;
+
+      if (
+        !clientToken ||
+        !clientToken.application ||
+        !clientToken.secret ||
+        !clientToken.application.id ||
+        !clientToken.secret.id ||
+        !clientToken.secret.environment
+      ) {
         throw new HttpError(400, 'Invalid Token', 'Token verification failed');
       }
 
-      const permission = await miauClient.getPermissions(appToken.id);
+      const { application, secret } = clientToken;
+
+      if (secret.environment != miauClient.getEnvironment()) {
+        throw new HttpError(
+          400,
+          'Invalid Environment',
+          `Secret environment ${secret.environment} does not match client environment ${miauClient.getEnvironment()}`
+        );
+      }
+
+      const permission = await miauClient.getPermissions(application.id);
 
       if (!permission) {
         throw new HttpError(401, 'Unauthorized', 'No permissions found for this application');
@@ -70,7 +87,7 @@ export const miauMiddleware = <T>(
         throw new HttpError(403, 'Forbidden', `You do not have permission to access ${req.method} ${req.path}`);
       }
 
-      req.miauApplication = { id: appToken?.id, name: appToken?.name };
+      req.miauApplication = { id: application.id, name: application.name };
       req.miauMetadata = permission?.metadata || {};
 
       if (requestAugmentation) {

package/.turbo/turbo-build.log

@@ -1,9 +0,0 @@
-
-> @eduzz/miau-client@0.0.18 build /home/runner/work/eduzz-miau/eduzz-miau/packages/client
-> esbuild src/index.ts --bundle --sourcemap --platform=node --target=es2020 --outfile=dist/index.js
-
-
-  dist/index.js      438.6kb
-  dist/index.js.map  735.6kb
-
-⚡ Done in 583ms

package/dist/miau-types/types/Organization.d.ts

@@ -1,8 +0,0 @@
-export type Organization = {
-    id: string;
-    name: string;
-    slug: string;
-    createdAt: Date;
-    updatedAt: Date;
-    deletedAt?: Date;
-};