graphlit-client 1.0.20240418008 → 1.0.20240418009

package/dist/client.d.ts

@@ -1,7 +1,7 @@
 import { ApolloClient, NormalizedCacheObject } from '@apollo/client/core';
 import * as Types from './generated/graphql-types';
 declare class Graphlit {
-    client: ApolloClient<NormalizedCacheObject>;
+    client: ApolloClient<NormalizedCacheObject> | undefined;
     private apiUri;
     private environmentId;
     private organizationId;
@@ -10,6 +10,7 @@ declare class Graphlit {
     private correlationId;
     private token;
     constructor(organizationId?: string, environmentId?: string, jwtSecret?: string, ownerId?: string, apiUri?: string, correlationId?: string);
+    private initializeJWT;
     createAlert(alert: Types.AlertInput): Promise<Types.Alert>;
     updateAlert(alert: Types.AlertUpdateInput): Promise<Types.Alert>;
     deleteAlert(id: string): Promise<Types.Alert>;

package/dist/client.js

@@ -33,9 +33,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Types = exports.Graphlit = void 0;
+const jose_1 = require("jose");
 const core_1 = require("@apollo/client/core");
 const Documents = __importStar(require("./generated/graphql-documents"));
-const jwt = __importStar(require("jsonwebtoken"));
 const dotenv = __importStar(require("dotenv"));
 // Initialize dotenv to use environment variables
 dotenv.config();
@@ -50,32 +50,54 @@ class Graphlit {
         this.ownerId = ownerId || process.env.GRAPHLIT_OWNER_ID;
         // optional: for billing correlation of multiple operations
         this.correlationId = correlationId || undefined;
-        // Set token expiration to one hour from now
-        const expiration = Math.floor(Date.now() / 1000) + (60 * 60);
-        const payload = {
-            "https://graphlit.io/jwt/claims": Object.assign(Object.assign({ "x-graphlit-environment-id": this.environmentId, "x-graphlit-organization-id": this.organizationId }, (this.ownerId && { "x-graphlit-owner-id": this.ownerId })), { "x-graphlit-role": "Owner" }),
-            exp: expiration,
-            iss: "graphlit",
-            aud: "https://portal.graphlit.io",
-        };
+        if (!this.organizationId) {
+            throw new Error("Graphlit organization identifier is required.");
+        }
+        if (!this.environmentId) {
+            throw new Error("Graphlit environment identifier is required.");
+        }
         if (!this.jwtSecret) {
-            throw new Error("JWT secret is required.");
+            throw new Error("Graphlit environment JWT secret is required.");
         }
-        this.token = jwt.sign(payload, this.jwtSecret, { algorithm: 'HS256' });
-        const httpLink = (0, core_1.createHttpLink)({
-            uri: this.apiUri,
-        });
-        const authLink = new core_1.ApolloLink((operation, forward) => {
-            operation.setContext({
-                headers: {
-                    Authorization: this.token ? `Bearer ${this.token}` : "",
-                }
+        this.initializeJWT().then(() => {
+            const httpLink = (0, core_1.createHttpLink)({
+                uri: this.apiUri,
+            });
+            const authLink = new core_1.ApolloLink((operation, forward) => {
+                operation.setContext({
+                    headers: {
+                        Authorization: this.token ? `Bearer ${this.token}` : "",
+                    }
+                });
+                return forward(operation);
+            });
+            this.client = new core_1.ApolloClient({
+                link: authLink.concat(httpLink),
+                cache: new core_1.InMemoryCache(),
             });
-            return forward(operation);
         });
-        this.client = new core_1.ApolloClient({
-            link: authLink.concat(httpLink),
-            cache: new core_1.InMemoryCache(),
+    }
+    initializeJWT() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.jwtSecret)
+                return;
+            const expiration = Math.floor(Date.now() / 1000) + (60 * 60); // one hour from now
+            const payload = {
+                "https://graphlit.io/jwt/claims": Object.assign(Object.assign({ "x-graphlit-environment-id": this.environmentId, "x-graphlit-organization-id": this.organizationId }, (this.ownerId && { "x-graphlit-owner-id": this.ownerId })), { "x-graphlit-role": "Owner" }),
+                exp: expiration,
+                iss: "graphlit",
+                aud: "https://portal.graphlit.io",
+            };
+            const secretKeyJWK = yield (0, jose_1.importJWK)({
+                kty: 'oct',
+                k: Buffer.from(this.jwtSecret).toString('base64'),
+                alg: 'HS256'
+            }, 'HS256');
+            this.token = yield new jose_1.SignJWT(payload)
+                .setProtectedHeader({ alg: 'HS256' })
+                .setIssuedAt()
+                .setExpirationTime('1h')
+                .sign(secretKeyJWK);
         });
     }
     createAlert(alert) {
@@ -381,6 +403,8 @@ class Graphlit {
     // helper functions
     mutateAndCheckError(mutation, variables) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.client)
+                throw new Error("Apollo Client not configured.");
             try {
                 const result = yield this.client.mutate({
                     mutation,
@@ -404,6 +428,8 @@ class Graphlit {
     }
     queryAndCheckError(query, variables) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.client)
+                throw new Error("Apollo Client not configured.");
             try {
                 const result = yield this.client.query({
                     query,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphlit-client",
-  "version": "1.0.20240418008",
+  "version": "1.0.20240418009",
   "description": "Graphlit API TypeScript Client",
   "main": "dist/client.js",
   "types": "dist/client.d.ts",
@@ -27,11 +27,10 @@
     "@graphql-codegen/typescript": "^4.0.6",
     "@graphql-codegen/typescript-operations": "^4.2.0",
     "graphql": "^16.8.1",
-    "jsonwebtoken": "^9.0.2"
+    "jose": "^5.2.4"
   },
   "devDependencies": {
     "@graphql-codegen/typescript-document-nodes": "^4.0.6",
-    "@types/jsonwebtoken": "^9.0.6",
     "typescript": "^5.4.5"
   }
 }