@sebspark/gcp-iam 0.1.0 → 0.2.1

package/dist/index.d.mts

@@ -8,6 +8,6 @@ import { Logger } from 'winston';
  * @param logger An optional logger to use for logging.
  * @returns A JWT.
  */
-declare const getApiGatewayToken: (apiURL: string, serviceAccountEmail: string, logger?: Logger) => Promise<string>;
+declare const getApiGatewayToken: (apiURL: string, logger?: Logger) => Promise<string>;
 
 export { getApiGatewayToken };

package/dist/index.d.ts

@@ -8,6 +8,6 @@ import { Logger } from 'winston';
  * @param logger An optional logger to use for logging.
  * @returns A JWT.
  */
-declare const getApiGatewayToken: (apiURL: string, serviceAccountEmail: string, logger?: Logger) => Promise<string>;
+declare const getApiGatewayToken: (apiURL: string, logger?: Logger) => Promise<string>;
 
 export { getApiGatewayToken };

package/dist/index.js

@@ -26,6 +26,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/apiGatewayToken.ts
 var import_iam_credentials = require("@google-cloud/iam-credentials");
+var import_google_auth_library = require("google-auth-library");
 
 // src/lruCache.ts
 var LruCache = class {
@@ -64,14 +65,20 @@ var expInSeconds = 60 * 60;
 var apiGatewayJwtCache = new LruCache({
   ttl: 1e3 * expInSeconds / 2
 });
-var getApiGatewayToken = async (apiURL, serviceAccountEmail, logger) => {
+var getApiGatewayToken = async (apiURL, logger) => {
   const cachedJwt = apiGatewayJwtCache.get(apiURL);
-  console.log(cachedJwt);
   if (cachedJwt) {
     return cachedJwt;
   }
   try {
     const iamClient = new import_iam_credentials.IAMCredentialsClient();
+    const auth = new import_google_auth_library.GoogleAuth();
+    const cred = await auth.getCredentials();
+    const serviceAccountEmail = cred.client_email;
+    if (!serviceAccountEmail) {
+      throw new Error("No service account e-mail could be found.");
+    }
+    logger == null ? void 0 : logger.info(`Serice account e-mail beeing used: ${serviceAccountEmail}`);
     const header = {
       alg: "RS256",
       typ: "JWT"

package/dist/index.mjs

@@ -1,5 +1,6 @@
 // src/apiGatewayToken.ts
 import { IAMCredentialsClient } from "@google-cloud/iam-credentials";
+import { GoogleAuth } from "google-auth-library";
 
 // src/lruCache.ts
 var LruCache = class {
@@ -38,14 +39,20 @@ var expInSeconds = 60 * 60;
 var apiGatewayJwtCache = new LruCache({
   ttl: 1e3 * expInSeconds / 2
 });
-var getApiGatewayToken = async (apiURL, serviceAccountEmail, logger) => {
+var getApiGatewayToken = async (apiURL, logger) => {
   const cachedJwt = apiGatewayJwtCache.get(apiURL);
-  console.log(cachedJwt);
   if (cachedJwt) {
     return cachedJwt;
   }
   try {
     const iamClient = new IAMCredentialsClient();
+    const auth = new GoogleAuth();
+    const cred = await auth.getCredentials();
+    const serviceAccountEmail = cred.client_email;
+    if (!serviceAccountEmail) {
+      throw new Error("No service account e-mail could be found.");
+    }
+    logger == null ? void 0 : logger.info(`Serice account e-mail beeing used: ${serviceAccountEmail}`);
     const header = {
       alg: "RS256",
       typ: "JWT"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/gcp-iam",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -19,6 +19,7 @@
     "tsconfig": "*"
   },
   "dependencies": {
-    "@google-cloud/iam-credentials": "3.3.0"
+    "@google-cloud/iam-credentials": "3.3.0",
+    "google-auth-library": "^9.15.0"
   }
-}
+}